From a18d2bce7b2495c5617e6828818f3f1618f386aa Mon Sep 17 00:00:00 2001 From: HuanChengFly <609486518@qq.com> Date: Sat, 19 Sep 2020 21:52:30 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=88=A0=E9=99=A4=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2=E6=B7=B7=E6=B7=86=E4=BB=A5=E4=BF=AE=E5=A4=8D=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 2 -- .../java/com/huanchengfly/tieba/post/api/HttpConstant.kt | 8 +++----- .../main/java/com/huanchengfly/tieba/post/api/LiteApi.kt | 3 +-- .../tieba/post/api/retrofit/RetrofitTiebaApi.kt | 5 ++--- .../tieba/post/api/retrofit/interfaces/MiniTiebaApi.kt | 9 ++++----- .../tieba/post/api/retrofit/interfaces/NewTiebaApi.kt | 3 +-- .../post/api/retrofit/interfaces/OfficialTiebaApi.kt | 9 ++++----- .../tieba/post/api/retrofit/interfaces/WebTiebaApi.kt | 5 ++--- .../huanchengfly/tieba/post/utils/AppPreferencesUtils.kt | 3 +-- 9 files changed, 18 insertions(+), 29 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 31027529..e38f2b2a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,5 @@ apply plugin: 'com.android.application' apply plugin: 'AndResGuard' -apply plugin: 'io.michaelrocks.paranoid' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' apply plugin: 'kotlin-kapt' @@ -12,7 +11,6 @@ buildscript { } dependencies { classpath 'com.tencent.mm:AndResGuard-gradle-plugin:1.2.18' - classpath 'io.michaelrocks:paranoid-gradle-plugin:0.2.5' } } diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/HttpConstant.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/HttpConstant.kt index b9aaff44..c0b72ac9 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/HttpConstant.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/HttpConstant.kt @@ -1,8 +1,6 @@ package com.huanchengfly.tieba.post.api -import io.michaelrocks.paranoid.Obfuscate -@Obfuscate object Method { const val GET = "GET" const val POST = "POST" @@ -21,14 +19,14 @@ object Error { const val ERROR_UPDATE_NOT_ENABLE = 100 } -@Obfuscate + object Url { const val UPDATE_INFO = "https://huancheng65.github.io/TiebaLite/update_v2.json" const val CHECK_UPDATE = "https://tblite.huanchengfly.tk/api/update" const val CHANGELOG = "https://tblite.huanchengfly.tk/api/changelog/" } -@Obfuscate + object Header { const val FORCE_PARAM = "force_param" const val FORCE_PARAM_QUERY = "query" @@ -50,7 +48,7 @@ object Header { const val CUID_GID = "cuid_gid" } -@Obfuscate + object Param { const val BDUSS = "BDUSS" const val CLIENT_VERSION = "_client_version" diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/LiteApi.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/LiteApi.kt index 82e51429..7e39c81b 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/LiteApi.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/LiteApi.kt @@ -12,10 +12,9 @@ import com.huanchengfly.tieba.post.utils.VersionUtil import com.huanchengfly.tieba.post.utils.appPreferences import com.tsy.sdk.myokhttp.MyOkHttp import com.tsy.sdk.myokhttp.response.GsonResponseHandler -import io.michaelrocks.paranoid.Obfuscate import java.lang.ref.WeakReference -@Obfuscate + class LiteApi private constructor(context: Context) { private val myOkHttp: MyOkHttp = MyOkHttp() private val contextWeakReference: WeakReference = WeakReference(context) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/RetrofitTiebaApi.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/RetrofitTiebaApi.kt index 7176b914..49a20992 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/RetrofitTiebaApi.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/RetrofitTiebaApi.kt @@ -2,6 +2,7 @@ package com.huanchengfly.tieba.post.api.retrofit import android.os.Build import android.webkit.WebSettings +import com.huanchengfly.tieba.post.BaseApplication import com.huanchengfly.tieba.post.api.Header import com.huanchengfly.tieba.post.api.Param import com.huanchengfly.tieba.post.api.interceptors.SortAndSignInterceptor @@ -11,17 +12,15 @@ import com.huanchengfly.tieba.post.api.retrofit.interfaces.MiniTiebaApi import com.huanchengfly.tieba.post.api.retrofit.interfaces.NewTiebaApi import com.huanchengfly.tieba.post.api.retrofit.interfaces.OfficialTiebaApi import com.huanchengfly.tieba.post.api.retrofit.interfaces.WebTiebaApi -import com.huanchengfly.tieba.post.BaseApplication import com.huanchengfly.tieba.post.utils.AccountUtil import com.huanchengfly.tieba.post.utils.MobileInfoUtil import com.huanchengfly.tieba.post.utils.UIDUtil -import io.michaelrocks.paranoid.Obfuscate import okhttp3.ConnectionPool import okhttp3.Interceptor import okhttp3.OkHttpClient import retrofit2.Retrofit -@Obfuscate + object RetrofitTiebaApi { private val initTime = System.currentTimeMillis() private val clientId = "wappc_${initTime}_${Math.round(Math.random() * 1000).toInt()}" diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/MiniTiebaApi.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/MiniTiebaApi.kt index e4321d72..62c87517 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/MiniTiebaApi.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/MiniTiebaApi.kt @@ -1,18 +1,17 @@ package com.huanchengfly.tieba.post.api.retrofit.interfaces import android.text.TextUtils -import com.huanchengfly.tieba.post.api.models.* +import com.huanchengfly.tieba.post.BaseApplication +import com.huanchengfly.tieba.post.BaseApplication.ScreenInfo import com.huanchengfly.tieba.post.api.Header import com.huanchengfly.tieba.post.api.getScreenHeight import com.huanchengfly.tieba.post.api.getScreenWidth -import com.huanchengfly.tieba.post.BaseApplication -import com.huanchengfly.tieba.post.BaseApplication.ScreenInfo +import com.huanchengfly.tieba.post.api.models.* import com.huanchengfly.tieba.post.utils.AccountUtil -import io.michaelrocks.paranoid.Obfuscate import retrofit2.Call import retrofit2.http.* -@Obfuscate + interface MiniTiebaApi { @POST("/c/f/excellent/personalized") @FormUrlEncoded diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/NewTiebaApi.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/NewTiebaApi.kt index 82ba53a6..fe3a8b30 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/NewTiebaApi.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/NewTiebaApi.kt @@ -5,14 +5,13 @@ import com.huanchengfly.tieba.post.api.models.CommonResponse import com.huanchengfly.tieba.post.api.models.MessageListBean import com.huanchengfly.tieba.post.api.models.MsgBean import com.huanchengfly.tieba.post.api.models.ThreadStoreBean -import io.michaelrocks.paranoid.Obfuscate import retrofit2.Call import retrofit2.http.Field import retrofit2.http.FormUrlEncoded import retrofit2.http.Headers import retrofit2.http.POST -@Obfuscate + interface NewTiebaApi { @Headers("${Header.FORCE_LOGIN}: ${Header.FORCE_LOGIN_TRUE}") @POST("/c/s/msg") diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/OfficialTiebaApi.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/OfficialTiebaApi.kt index c5264ce6..071543c0 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/OfficialTiebaApi.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/OfficialTiebaApi.kt @@ -1,21 +1,20 @@ package com.huanchengfly.tieba.post.api.retrofit.interfaces +import com.huanchengfly.tieba.post.BaseApplication +import com.huanchengfly.tieba.post.BaseApplication.ScreenInfo +import com.huanchengfly.tieba.post.api.Header import com.huanchengfly.tieba.post.api.getScreenHeight import com.huanchengfly.tieba.post.api.getScreenWidth import com.huanchengfly.tieba.post.api.models.CommonResponse import com.huanchengfly.tieba.post.api.models.ThreadContentBean -import com.huanchengfly.tieba.post.api.Header -import com.huanchengfly.tieba.post.BaseApplication -import com.huanchengfly.tieba.post.BaseApplication.ScreenInfo import com.huanchengfly.tieba.post.utils.AccountUtil -import io.michaelrocks.paranoid.Obfuscate import retrofit2.Call import retrofit2.http.Field import retrofit2.http.FormUrlEncoded import retrofit2.http.Headers import retrofit2.http.POST -@Obfuscate + interface OfficialTiebaApi { @POST("/c/f/pb/page") @FormUrlEncoded diff --git a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/WebTiebaApi.kt b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/WebTiebaApi.kt index 14910b09..c74ee0ae 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/WebTiebaApi.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/api/retrofit/interfaces/WebTiebaApi.kt @@ -1,15 +1,14 @@ package com.huanchengfly.tieba.post.api.retrofit.interfaces import android.text.TextUtils +import com.huanchengfly.tieba.post.api.Header import com.huanchengfly.tieba.post.api.models.* import com.huanchengfly.tieba.post.api.models.web.* -import com.huanchengfly.tieba.post.api.Header import com.huanchengfly.tieba.post.models.MyInfoBean -import io.michaelrocks.paranoid.Obfuscate import retrofit2.Call import retrofit2.http.* -@Obfuscate + interface WebTiebaApi { @Headers( "${Header.FORCE_LOGIN}: ${Header.FORCE_LOGIN_TRUE}" diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/AppPreferencesUtils.kt b/app/src/main/java/com/huanchengfly/tieba/post/utils/AppPreferencesUtils.kt index 87def1e0..bfb32c12 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/utils/AppPreferencesUtils.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/AppPreferencesUtils.kt @@ -2,11 +2,10 @@ package com.huanchengfly.tieba.post.utils import android.content.Context import android.content.SharedPreferences -import io.michaelrocks.paranoid.Obfuscate import kotlin.properties.ReadWriteProperty import kotlin.reflect.KProperty -@Obfuscate + open class AppPreferencesUtils(context: Context) { private val preferences: SharedPreferences = context.getSharedPreferences("settings", Context.MODE_PRIVATE)