diff --git a/app/src/main/java/com/gh/common/repository/RemenkapaiRepository.kt b/app/src/main/java/com/gh/common/repository/RemenkapaiRepository.kt index bd58750bb9..6f1c3d0789 100644 --- a/app/src/main/java/com/gh/common/repository/RemenkapaiRepository.kt +++ b/app/src/main/java/com/gh/common/repository/RemenkapaiRepository.kt @@ -16,7 +16,7 @@ object RemenkapaiRepository { @JvmStatic fun getRemenkapai(size: Int): Observable> { return if (remenkapaiList.isEmpty()) { - RetrofitManager.getInstance(getApplication()).api.remenkapai + RetrofitManager.getInstance(getApplication()).sensitiveApi.remenkapai .map(RegionSettingHelper.filterGame) .map { gameList -> filterEntityWithoutApk(gameList) } .map { pickRandomSizeEntity(size) } diff --git a/app/src/main/java/com/gh/gamecenter/MainActivity.java b/app/src/main/java/com/gh/gamecenter/MainActivity.java index f2a333ddb0..f63574b644 100644 --- a/app/src/main/java/com/gh/gamecenter/MainActivity.java +++ b/app/src/main/java/com/gh/gamecenter/MainActivity.java @@ -737,7 +737,7 @@ public class MainActivity extends BaseActivity { if (mSp.getBoolean(SettingsFragment.CONCERN_GAME_SP_KEY, true)) { //设置页面控制是否安装后自动关注 // 安装后关注游戏 DownloadEntity finalDownloadEntity = mDownloadEntity; - RetrofitManager.getInstance(this).getApi().getGameDigestByPackageName(UrlFilterUtils.getFilterQuery("package", packageName)) + RetrofitManager.getInstance(this).getSensitiveApi().getGameDigestByPackageName(UrlFilterUtils.getFilterQuery("package", packageName)) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(new Response>() { diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarViewModel.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarViewModel.kt index 4eb4e87ad6..ae2a00e53b 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/fuli/kaifu/ServersCalendarViewModel.kt @@ -44,7 +44,7 @@ class ServersCalendarViewModel(application: Application, @SuppressLint("CheckResult") fun loadServerData() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance(getApplication()).sensitiveApi .getGameServerCalendar(game.id) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt index be797b09df..08a36133bc 100644 --- a/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt +++ b/app/src/main/java/com/gh/gamecenter/packagehelper/PackageRepository.kt @@ -50,6 +50,7 @@ object PackageRepository { private val mApplication = HaloApp.getInstance().application private val mApi = RetrofitManager.getInstance(mApplication).api + private val mSensitiveApi = RetrofitManager.getInstance(mApplication).sensitiveApi private val mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(mApplication) private const val LAST_UPLOAD_APPLIST_TIME = "last_upload_applist_time" @@ -197,7 +198,7 @@ object PackageRepository { for (pkgName in list) { val filterQuery = UrlFilterUtils.getFilterQuery("package", pkgName) - mApi.loadGameDataByPackageName(filterQuery) + mSensitiveApi.loadGameDataByPackageName(filterQuery) .map(RegionSettingHelper.filterGame) .map(ApkActiveUtils.filterMapperList) .subscribeOn(Schedulers.io()) diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java index 95e32fc8e6..cf3cc8604a 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java @@ -3,6 +3,7 @@ package com.gh.gamecenter.retrofit; import android.content.Context; import android.text.TextUtils; +import com.gh.common.constant.Config; import com.gh.common.util.AntiBotHelper; import com.gh.common.util.GzipUtils; import com.gh.common.util.NetworkUtils; @@ -83,11 +84,13 @@ class OkHttpCacheInterceptor implements Interceptor { } try { - byte[] result = AntiBotHelper.getManager().avmpSign(3, bodyToString(request.body()).getBytes("UTF-8")); - String wToken = new String(result, "UTF-8"); - request = request.newBuilder() - .addHeader("wToken", wToken) - .build(); + if (request.url().toString().contains(Config.SENSITIVE_API_HOST)) { + byte[] result = AntiBotHelper.getManager().avmpSign(3, bodyToString(request.body()).getBytes("UTF-8")); + String wToken = new String(result, "UTF-8"); + request = request.newBuilder() + .addHeader("wToken", wToken) + .build(); + } } catch (Exception e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt b/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt index 89fe5b3f97..a795e7af7c 100644 --- a/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/subject/SubjectViewModel.kt @@ -40,7 +40,7 @@ class SubjectViewModel(application: Application, var subjectData: SubjectData?) } private fun loadSubjectName() { - RetrofitManager.getInstance(getApplication()).api + RetrofitManager.getInstance(getApplication()).sensitiveApi .getSubjectName(subjectData?.subjectId) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) diff --git a/app/src/main/java/com/gh/gamecenter/tag/TagsListViewModel.kt b/app/src/main/java/com/gh/gamecenter/tag/TagsListViewModel.kt index 37e56978f6..fcffefc96e 100644 --- a/app/src/main/java/com/gh/gamecenter/tag/TagsListViewModel.kt +++ b/app/src/main/java/com/gh/gamecenter/tag/TagsListViewModel.kt @@ -35,7 +35,7 @@ class TagsListViewModel(application: Application) : ListViewModel> { return RetrofitManager.getInstance(getApplication()) - .api + .sensitiveApi .getGamesWithSpecificTag(getSortSize(), getSortType(), page) }