From 0ea0834140cd62998975998f54240daa64f4e26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Tue, 1 Nov 2022 16:09:05 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dweb=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=90=AF=E5=A4=9C=E9=97=B4=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gh/gamecenter/common/utils/Extensions.kt | 48 ++++++++++++++----- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt b/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt index 5a65702e2e..9a9a692084 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt @@ -1,6 +1,7 @@ package com.gh.gamecenter.common.utils import android.animation.Animator +import android.annotation.SuppressLint import android.app.Activity import android.content.ClipData import android.content.ClipboardManager @@ -331,7 +332,8 @@ fun Fragment.ifLogin(entrance: String, action: (() -> Unit)? = null) { } fun Context.ifLogin(entrance: String, action: (() -> Unit)? = null) { - val checkLoginConfig = ARouter.getInstance().build(RouteConsts.provider.checkLogin).navigation() as? ICheckLoginProvider + val checkLoginConfig = + ARouter.getInstance().build(RouteConsts.provider.checkLogin).navigation() as? ICheckLoginProvider checkLoginConfig?.checkLogin(this, entrance, action) } @@ -379,8 +381,10 @@ fun String.containHtmlTag(): Boolean { */ fun Fragment.showRegulationTestDialogIfNeeded(action: (() -> Unit)) { val provider = ARouter.getInstance().build(RouteConsts.provider.directUtils).navigation() as? IDirectProvider - val userManagerProvider = ARouter.getInstance().build(RouteConsts.provider.userManager).navigation() as? IUserManagerProvider - val dialogUtils = ARouter.getInstance().build(RouteConsts.provider.dialogUtils).navigation() as? IDialogUtilsProvider + val userManagerProvider = + ARouter.getInstance().build(RouteConsts.provider.userManager).navigation() as? IUserManagerProvider + val dialogUtils = + ARouter.getInstance().build(RouteConsts.provider.dialogUtils).navigation() as? IDialogUtilsProvider if (userManagerProvider?.userShouldTakeRegulationBaseOnLastRemind() == true) { dialogUtils?.showRegulationTestDialog(requireContext(), { provider?.directToRegulationTestPage(requireContext()) }, @@ -392,8 +396,10 @@ fun Fragment.showRegulationTestDialogIfNeeded(action: (() -> Unit)) { fun Context.showRegulationTestDialogIfNeeded(action: (() -> Unit)) { val provider = ARouter.getInstance().build(RouteConsts.provider.directUtils).navigation() as? IDirectProvider - val userManagerProvider = ARouter.getInstance().build(RouteConsts.provider.userManager).navigation() as? IUserManagerProvider - val dialogUtils = ARouter.getInstance().build(RouteConsts.provider.dialogUtils).navigation() as? IDialogUtilsProvider + val userManagerProvider = + ARouter.getInstance().build(RouteConsts.provider.userManager).navigation() as? IUserManagerProvider + val dialogUtils = + ARouter.getInstance().build(RouteConsts.provider.dialogUtils).navigation() as? IDialogUtilsProvider if (userManagerProvider?.userShouldTakeRegulationBaseOnLastRemind() == true) { dialogUtils?.showRegulationTestDialog(this, { provider?.directToRegulationTestPage(this) }, @@ -864,8 +870,10 @@ fun CharSequence.interceptUrlSpanAndRoundImageSpan(clickedCallback: ((url: Strin override fun onClick(widget: View) { clickedCallback?.invoke(it.url) - val webActivityProvider = ARouter.getInstance().build(RouteConsts.provider.webActivity).navigation() as? IWebProvider - val provider = ARouter.getInstance().build(RouteConsts.provider.defaultUrlHandler).navigation() as IDefaultUrlHandlerProvider + val webActivityProvider = + ARouter.getInstance().build(RouteConsts.provider.webActivity).navigation() as? IWebProvider + val provider = ARouter.getInstance().build(RouteConsts.provider.defaultUrlHandler) + .navigation() as IDefaultUrlHandlerProvider if (!provider.interceptUrl(widget.context, it.url, "")) { webActivityProvider?.getIntent(widget.context, it.url, true)?.run { widget.context.startActivity(this) @@ -992,8 +1000,10 @@ fun Context.doOnMainProcessOnly(callback: EmptyCallback) { * 虽然现在我们没有了友盟以后只是单进程APP，但在 debug 模式下还有 whatTheStack 这个进程如果不限定主进程会出现奇奇怪怪的问题 (BroadcastReceiver相关) */ inline fun Context.doOnMainProcessOnly(f: () -> Unit) { - val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider - val packageUtilsConfig = ARouter.getInstance().build(RouteConsts.provider.packageUtils).navigation() as? IPackageUtilsProvider + val buildConfig = + ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider + val packageUtilsConfig = + ARouter.getInstance().build(RouteConsts.provider.packageUtils).navigation() as? IPackageUtilsProvider val processName = packageUtilsConfig?.obtainProcessName(this) if (processName == null || buildConfig?.getApplicationId() == processName) { f.invoke() @@ -1005,8 +1015,10 @@ inline fun Context.doOnMainProcessOnly(f: () -> Unit) { } inline fun doOnMainProcessOnly(f: () -> Unit) { - val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider - val packageUtilsConfig = ARouter.getInstance().build(RouteConsts.provider.packageUtils).navigation() as? IPackageUtilsProvider + val buildConfig = + ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider + val packageUtilsConfig = + ARouter.getInstance().build(RouteConsts.provider.packageUtils).navigation() as? IPackageUtilsProvider val processName = packageUtilsConfig?.obtainProcessName(HaloApp.getInstance()) if (processName == null || buildConfig?.getApplicationId() == processName) { f.invoke() @@ -1251,9 +1263,19 @@ fun String.emojiCount(): Int { /** * WebView启用强制深色模式 */ +@SuppressLint("RequiresFeature") fun WebView.enableForceDark(isDarkModeOn: Boolean) { - if (BuildConfig.IS_DARK_MODE_ON && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { - WebSettingsCompat.setForceDark(settings, if (isDarkModeOn) WebSettingsCompat.FORCE_DARK_ON else WebSettingsCompat.FORCE_DARK_OFF) + val isFeatureSupported = try { + WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK) + } catch (throwable: Throwable) { + throwable.printStackTrace() + false + } + if (BuildConfig.IS_DARK_MODE_ON && isFeatureSupported) { + WebSettingsCompat.setForceDark( + settings, + if (isDarkModeOn) WebSettingsCompat.FORCE_DARK_ON else WebSettingsCompat.FORCE_DARK_OFF + ) } } From 8193b9ec9f22efef4be54f2d937f7d25ff4c72e2 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Tue, 1 Nov 2022 16:23:54 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=20onConfiguration?= =?UTF-8?q?Changed=20=E6=97=A5=E5=BF=97=E8=BE=85=E5=8A=A9=E9=97=AA?= =?UTF-8?q?=E9=80=80=E7=A1=AE=E5=AE=9A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gamecenter/common/base/activity/BaseActivity.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java index dbb6553a4c..ea8915246f 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java @@ -80,6 +80,9 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; +import io.sentry.Breadcrumb; +import io.sentry.Sentry; +import io.sentry.SentryLevel; import kotlin.Pair; import pub.devrel.easypermissions.EasyPermissions; @@ -570,6 +573,13 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy } } + Breadcrumb breadcrumb = new Breadcrumb(); + breadcrumb.setCategory("onConfigurationChanged"); + breadcrumb.setMessage("IsCalledBySystem " + isCalledBySystem + "," + + this.getClass().getSimpleName() + " lifecycle is " + getLifecycle().getCurrentState()); + breadcrumb.setLevel(SentryLevel.INFO); + Sentry.addBreadcrumb(breadcrumb); + if (BuildConfig.IS_DARK_MODE_ON && mIsDarkModeOn != DarkModeUtils.INSTANCE.isDarkModeOn(this)) { // 当且仅当页面处于可见状态时响应新的 UiMode，并将它传递下去 // （在不可见的 activity 调用 onConfigurationChanged 方法有一定概率触发 ANR） From 3ae27ebdb6a5bb4b73daa6f58351f97c0136c6d3 Mon Sep 17 00:00:00 2001 From: juntao Date: Tue, 1 Nov 2022 17:20:30 +0800 Subject: [PATCH 3/8] =?UTF-8?q?chore:=20=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=87=B3=205.14.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index a03e1878e5..8c058f379d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,8 +7,8 @@ ext { targetSdkVersion = 28 // application info (每个大版本之间的 versionCode 增加 20) - versionCode = 631 - versionName = "5.14.1" + versionCode = 632 + versionName = "5.14.2" applicationId = "com.gh.gamecenter" // AndroidX From 1ffb58feea49ba4db2f3c02541cda0557efeb2c4 Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Tue, 8 Nov 2022 11:09:32 +0800 Subject: [PATCH 4/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=A0=E4=B8=BA?= =?UTF-8?q?=E6=B7=B7=E6=B7=86=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=20onConf?= =?UTF-8?q?igurationChanged=20=E6=B2=A1=E6=9C=89=E8=B0=83=E7=94=A8=20super?= =?UTF-8?q?.onConfigurationChanged=20=E8=80=8C=E9=80=A0=E6=88=90=E7=9A=84?= =?UTF-8?q?=E9=97=AA=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gh/gamecenter/common/base/activity/BaseActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java index ea8915246f..6a6465098a 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java @@ -567,7 +567,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy // 这里根据调用栈是否存在 DarkModeUtils 来确定是否为系统回调 StackTraceElement[] trace = Thread.currentThread().getStackTrace(); for (StackTraceElement element : trace) { - if (element.getClassName().contains(DarkModeUtils.class.getSimpleName())) { + if (element.getClassName().equals(DarkModeUtils.class.getName())) { isCalledBySystem = false; break; } From 0cc8904852c507dfadedcf15bb496316ee18dffc Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Tue, 8 Nov 2022 11:33:33 +0800 Subject: [PATCH 5/8] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E6=B7=B1=E8=89=B2=E6=A8=A1=E5=BC=8F=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=BC=80=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/common/constant/Config.java | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java index 517f788a65..381b17cf49 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -381,7 +381,6 @@ public class Config { mNightModeSetting = data.getNightMode(); if (HaloApp.getInstance().isNewForThisVersion && mNightModeSetting != null && mNightModeSetting.getInstall()) { DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true); - DarkModeUtils.INSTANCE.updateAppDarkModeStatusToSp(true); DarkModeUtils.INSTANCE.initDarkMode(); } From b09f0cde185ada77276d1fc43e8a80285856cbeb Mon Sep 17 00:00:00 2001 From: chenjuntao Date: Tue, 8 Nov 2022 15:04:12 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20=E6=8D=95=E6=8A=93=E6=B8=85=E7=90=86?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=8C=85=E6=97=B6=E7=9A=84=20concurrent=20?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/download/DownloadManager.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/gh/download/DownloadManager.java b/app/src/main/java/com/gh/download/DownloadManager.java index 602f48bc44..51d51daee3 100644 --- a/app/src/main/java/com/gh/download/DownloadManager.java +++ b/app/src/main/java/com/gh/download/DownloadManager.java @@ -36,6 +36,7 @@ import com.gh.common.util.PackageUtils; import com.gh.gamecenter.core.utils.PageSwitchDataHelper; import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.BuildConfig; +import com.gh.gamecenter.core.utils.SentryHelper; import com.gh.gamecenter.download.DownloadedGameIdAndPackageNameDao; import com.gh.gamecenter.entity.ApkEntity; import com.gh.gamecenter.entity.GameEntity; @@ -389,12 +390,16 @@ public class DownloadManager implements DownloadStatusListener { * 清理不存在本地 APK 文件的任务 */ public void clearTasksThatFileBeenDeleted() { - for (DownloadEntity entity : getAllDownloadEntity()) { - if (entity.getStatus() == DownloadStatus.done) { - if (FileUtils.isEmptyFile(entity.getPath())) { - cancel(entity.getUrl()); + try { + for (DownloadEntity entity : getAllDownloadEntity()) { + if (entity.getStatus() == DownloadStatus.done) { + if (FileUtils.isEmptyFile(entity.getPath())) { + cancel(entity.getUrl()); + } } } + } catch (Exception e) { + SentryHelper.INSTANCE.onEvent("CLEAR_DELETED_TASK_ERROR", "exception_digest", e.getLocalizedMessage()); } } From 7712039804b099eeb7aa3fb60382e1016aa5ca48 Mon Sep 17 00:00:00 2001 From: juntao Date: Fri, 23 Apr 2021 17:48:45 +0800 Subject: [PATCH 7/8] =?UTF-8?q?chore:=20=E7=89=88=E6=9C=AC=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E8=87=B3=205.14.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dependencies.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 8c058f379d..b5ba5016ce 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -7,8 +7,8 @@ ext { targetSdkVersion = 28 // application info (每个大版本之间的 versionCode 增加 20) - versionCode = 632 - versionName = "5.14.2" + versionCode = 633 + versionName = "5.14.3" applicationId = "com.gh.gamecenter" // AndroidX From 255b6ea14172749ff84c400922464bc1ee7c1e37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Wed, 9 Nov 2022 13:46:20 +0800 Subject: [PATCH 8/8] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=95=B0=E6=8D=AE=E4=BF=9D=E5=AD=98=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/common/constant/Config.java | 40 +++++++++---------- .../gamecenter/entity/NewApiSettingsEntity.kt | 20 ++++++++++ .../gh/gamecenter/entity/NewSettingsEntity.kt | 14 ------- .../retrofit/service/ApiService.java | 2 +- .../gamecenter/common/constant/Constants.java | 3 ++ 5 files changed, 42 insertions(+), 37 deletions(-) create mode 100644 app/src/main/java/com/gh/gamecenter/entity/NewApiSettingsEntity.kt diff --git a/app/src/main/java/com/gh/common/constant/Config.java b/app/src/main/java/com/gh/common/constant/Config.java index 381b17cf49..88c181596a 100644 --- a/app/src/main/java/com/gh/common/constant/Config.java +++ b/app/src/main/java/com/gh/common/constant/Config.java @@ -8,23 +8,24 @@ import android.text.TextUtils; import androidx.annotation.Nullable; -import com.gh.gamecenter.common.utils.DarkModeUtils; -import com.gh.gamecenter.common.utils.EnvHelper; -import com.gh.gamecenter.common.constant.Constants; -import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.common.util.PackageHelper; import com.gh.common.util.PackageUtils; import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.SuggestionActivity; +import com.gh.gamecenter.common.constant.Constants; +import com.gh.gamecenter.common.eventbus.EBReuse; +import com.gh.gamecenter.common.retrofit.BiResponse; +import com.gh.gamecenter.common.retrofit.Response; +import com.gh.gamecenter.common.utils.DarkModeUtils; +import com.gh.gamecenter.common.utils.EnvHelper; +import com.gh.gamecenter.core.utils.GsonUtils; import com.gh.gamecenter.core.utils.SPUtils; import com.gh.gamecenter.entity.GameGuidePopupEntity; +import com.gh.gamecenter.entity.NewApiSettingsEntity; import com.gh.gamecenter.entity.NewSettingsEntity; import com.gh.gamecenter.entity.NewsEntity; import com.gh.gamecenter.entity.SettingsEntity; -import com.gh.gamecenter.common.eventbus.EBReuse; import com.gh.gamecenter.entity.VSetting; -import com.gh.gamecenter.common.retrofit.BiResponse; -import com.gh.gamecenter.common.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; import com.gh.vspace.VHelper; import com.halo.assistant.HaloApp; @@ -63,8 +64,9 @@ public class Config { private static SettingsEntity mSettingsEntity; private static NewSettingsEntity mNewSettingsEntity; + private static NewApiSettingsEntity mNewApiSettingsEntity; - private static NewSettingsEntity.NightMode mNightModeSetting; + private static NewApiSettingsEntity.NightMode mNightModeSetting; private static VSetting mVSetting; private static GameGuidePopupEntity mGameGuidePopupEntity; private static SharedPreferences mDefaultSharedPreferences; @@ -221,11 +223,11 @@ public class Config { } @Nullable - public static NewSettingsEntity.NightMode getNightModeSetting() { + public static NewApiSettingsEntity.NightMode getNightModeSetting() { if (mNightModeSetting != null) { return mNightModeSetting; - } else if (mNewSettingsEntity != null && mNewSettingsEntity.getNightMode() != null) { - return mNewSettingsEntity.getNightMode(); + } else if (mNewApiSettingsEntity != null && mNewApiSettingsEntity.getNightMode() != null) { + return mNewApiSettingsEntity.getNightMode(); } else { return null; } @@ -350,9 +352,6 @@ public class Config { @Override public void onSuccess(NewSettingsEntity data) { mNewSettingsEntity = data; - if (mNightModeSetting != null) { - mNewSettingsEntity.setNightMode(mNightModeSetting); - } SPUtils.setString(Constants.SP_NEW_SETTINGS, GsonUtils.toJson(data)); } }); @@ -370,24 +369,21 @@ public class Config { }); } - if (mNightModeSetting == null) { + if (mNewApiSettingsEntity == null) { RetrofitManager.getInstance() .getNewApi().getNewSettings(PackageUtils.getGhVersionName(), channel) .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(new BiResponse() { + .subscribe(new BiResponse() { @Override - public void onSuccess(NewSettingsEntity data) { + public void onSuccess(NewApiSettingsEntity data) { + mNewApiSettingsEntity = data; mNightModeSetting = data.getNightMode(); if (HaloApp.getInstance().isNewForThisVersion && mNightModeSetting != null && mNightModeSetting.getInstall()) { DarkModeUtils.INSTANCE.updateFollowSystemDarkModeToSp(true); DarkModeUtils.INSTANCE.initDarkMode(); } - - if (mNewSettingsEntity != null) { - mNewSettingsEntity.setNightMode(mNightModeSetting); - SPUtils.setString(Constants.SP_NEW_SETTINGS, GsonUtils.toJson(data)); - } + SPUtils.setString(Constants.SP_NEW_API_SETTINGS, GsonUtils.toJson(data)); } }); } diff --git a/app/src/main/java/com/gh/gamecenter/entity/NewApiSettingsEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/NewApiSettingsEntity.kt new file mode 100644 index 0000000000..d4ca9d7078 --- /dev/null +++ b/app/src/main/java/com/gh/gamecenter/entity/NewApiSettingsEntity.kt @@ -0,0 +1,20 @@ +package com.gh.gamecenter.entity + +import com.google.gson.annotations.SerializedName + +data class NewApiSettingsEntity( + @SerializedName("night_mode") + var nightMode: NightMode? = null, +) { + /** + * + * "icon": false, // 是否显示切换，true显示 + * "setting": false, // 设置页面是否显示，true显示 + * "install": false, // 安装时的默认值，true开启 + */ + data class NightMode( + val icon: Boolean, + val setting: Boolean, + val install: Boolean + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/entity/NewSettingsEntity.kt b/app/src/main/java/com/gh/gamecenter/entity/NewSettingsEntity.kt index c11ca689f2..6be2823b8b 100644 --- a/app/src/main/java/com/gh/gamecenter/entity/NewSettingsEntity.kt +++ b/app/src/main/java/com/gh/gamecenter/entity/NewSettingsEntity.kt @@ -5,8 +5,6 @@ import com.google.gson.annotations.SerializedName data class NewSettingsEntity( @SerializedName("install_model") var installModel: InstallModel? = null, - @SerializedName("night_mode") - var nightMode: NightMode? = null, ) { data class InstallModel( var status: String = "", @@ -14,16 +12,4 @@ data class NewSettingsEntity( @SerializedName("white_list") var whiteList: ArrayList? = arrayListOf() ) - - /** - * - * "icon": false, // 是否显示切换，true显示 - * "setting": false, // 设置页面是否显示，true显示 - * "install": false, // 安装时的默认值，true开启 - */ - data class NightMode( - val icon: Boolean, - val setting: Boolean, - val install: Boolean - ) } \ No newline at end of file diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java index 977d6015c3..fe843695d2 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/service/ApiService.java @@ -948,7 +948,7 @@ public interface ApiService { * 新的设置接口 */ @GET("settings") - Single getNewSettings(@Query("version") String version, @Query("channel") String channel); + Single getNewSettings(@Query("version") String version, @Query("channel") String channel); /** * 获取新的配置信息，因为旧的已经太大了避免冲突 diff --git a/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java b/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java index c48713da57..b9a7c6bee8 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/constant/Constants.java @@ -207,6 +207,9 @@ public class Constants { // 补充配置项 public static final String SP_NEW_SETTINGS = "new_settings"; + // 新接口配置项 + public static final String SP_NEW_API_SETTINGS = "new_api_settings"; + // 畅玩组件的配置 public static final String SP_V_SETTINGS = "v_settings";