Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将BUILD_TIME、IS_NIGHT_MODE_ON移动到module_common/build.gradle中

Browse Source
This commit is contained in:
张玉久
2022-06-01 11:56:42 +08:00
parent fdbdd1bd02
commit 0afefdffb6
21 changed files with 62 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java
View File

@ -51,7 +51,6 @@ import com.gh.gamecenter.common.utils.NetworkUtils;
import com.gh.gamecenter.common.utils.NightModeUtils;
import com.gh.gamecenter.common.utils.PackageFlavorHelper;
import com.gh.gamecenter.common.utils.ShareUtils;
import com.gh.gamecenter.core.provider.IBuildConfigProvider;
import com.gh.gamecenter.core.provider.IDownloadManagerProvider;
import com.gh.gamecenter.core.provider.IEntranceUtilsProvider;
import com.gh.gamecenter.core.provider.IPackageInstallerProvider;
@ -189,8 +188,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
super.onResume();
startPageTime = System.currentTimeMillis();
IBuildConfigProvider buildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation();
if (buildConfig.getIsNightModeOn()
if (BuildConfig.IS_NIGHT_MODE_ON
&& !NightModeUtils.INSTANCE.getSystemMode()
&& mNightMode != NightModeUtils.INSTANCE.isNightMode(this)) {
onNightModeChange();
@ -289,8 +287,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
screenRootView.addView(view);
screenRootView.addView(ll);
IBuildConfigProvider buildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation();
if (buildConfig.getIsNightModeOn()) {
if (BuildConfig.IS_NIGHT_MODE_ON) {
screenRootView.addView(getNightModeIndicatorView());
}
@ -569,8 +566,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
}
protected void onNightModeChange() {
IBuildConfigProvider buildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation();
if (buildConfig.getIsNightModeOn()) {
if (BuildConfig.IS_NIGHT_MODE_ON) {
mNightMode = NightModeUtils.INSTANCE.isNightMode(this);
TextView tv = findViewById(ID_NIGHT_INDICATOR);
if (tv != null) {

12
module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment.java
View File

@ -20,19 +20,16 @@ import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentTransaction;
import androidx.recyclerview.widget.RecyclerView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.gh.gamecenter.common.BuildConfig;
import com.gh.gamecenter.common.R;
import com.gh.gamecenter.common.callback.OnListClickListener;
import com.gh.gamecenter.common.callback.OnRequestCallBackListener;
import com.gh.gamecenter.common.constant.Constants;
import com.gh.gamecenter.common.constant.RouteConsts;
import com.gh.gamecenter.common.eventbus.EBMiPush;
import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler;
import com.gh.gamecenter.common.syncpage.SyncDataEntity;
import com.gh.gamecenter.common.syncpage.SyncPageRepository;
import com.gh.gamecenter.common.utils.NightModeUtils;
import com.gh.gamecenter.core.provider.IBuildConfigProvider;
import com.lightgame.OnTitleClickListener;
import com.lightgame.utils.RuntimeUtils;
import com.lightgame.utils.Utils;
@ -165,8 +162,7 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
if (addSyncPageObserver()) {
initSyncPageObserver();
}
IBuildConfigProvider buildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation();
if (buildConfig != null && buildConfig.getIsNightModeOn()) {
if (BuildConfig.IS_NIGHT_MODE_ON) {
mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext());
} else {
mNightMode = false;
@ -244,8 +240,7 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
isEverPause = false;
startPageTime = System.currentTimeMillis();
IBuildConfigProvider buildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation();
if (buildConfig.getIsNightModeOn()
if (BuildConfig.IS_NIGHT_MODE_ON
&& !NightModeUtils.INSTANCE.getSystemMode()
&& mNightMode != NightModeUtils.INSTANCE.isNightMode(requireContext())) {
onNightModeChange();
@ -358,8 +353,7 @@ public abstract class BaseFragment<T> extends Fragment implements OnRequestCallB
public void onConfigurationChanged(@NonNull Configuration newConfig) {
super.onConfigurationChanged(newConfig);
IBuildConfigProvider buildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation();
if (buildConfig.getIsNightModeOn()) {
if (BuildConfig.IS_NIGHT_MODE_ON) {
onNightModeChange();
}
}

9
module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt
View File

@ -458,8 +458,7 @@ fun throwExceptionInDebug(message: String = "", predicate: Boolean = true) {
* 在自动打包的包里弹 toast
*/
fun toastInInternalRelease(content: String) {
val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider
if (buildConfig?.getBuildTime() != 0L) {
if (BuildConfig.BUILD_TIME != 0L) {
Utils.toast(HaloApp.getInstance(), content)
}
}
@ -1245,8 +1244,7 @@ fun String.emojiCount(): Int {
* WebView启用强制深色模式
*/
fun WebView.enableForceDark(nightMode: Boolean) {
val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider
if (buildConfig?.getIsNightModeOn() == true && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
if (BuildConfig.IS_NIGHT_MODE_ON && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) {
WebSettingsCompat.setForceDark(settings, if (nightMode) WebSettingsCompat.FORCE_DARK_ON else WebSettingsCompat.FORCE_DARK_OFF)
}
}
@ -1255,8 +1253,7 @@ fun WebView.enableForceDark(nightMode: Boolean) {
* 日夜间模式切换更新状态栏底色
*/
fun Activity.updateStatusBarColor(@ColorRes nightColor: Int, @ColorRes dayColor: Int) {
val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider
if (buildConfig?.getIsNightModeOn() == true) {
if (BuildConfig.IS_NIGHT_MODE_ON) {
DisplayUtils.setStatusBarColor(
this,
if (NightModeUtils.isNightMode(this)) nightColor else dayColor

7
module_common/src/main/java/com/gh/gamecenter/common/utils/NightModeUtils.kt
View File

@ -4,6 +4,7 @@ import android.content.Context
import android.content.res.Configuration
import androidx.appcompat.app.AppCompatDelegate
import com.alibaba.android.arouter.launcher.ARouter
import com.gh.gamecenter.common.BuildConfig
import com.gh.gamecenter.common.constant.Constants
import com.gh.gamecenter.common.constant.RouteConsts
import com.gh.gamecenter.core.provider.IBuildConfigProvider
@ -15,8 +16,7 @@ object NightModeUtils {
*/
fun isNightMode(context: Context): Boolean {
// 仅配置开启的包才提供夜间模式功能
val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider
return if (buildConfig?.getIsNightModeOn() == true) {
return if (BuildConfig.IS_NIGHT_MODE_ON) {
val uiMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
uiMode == Configuration.UI_MODE_NIGHT_YES
} else {
@ -50,8 +50,7 @@ object NightModeUtils {
*/
fun initNightMode(systemMode: Boolean, nightMode: Boolean) {
// 仅配置开启的包才提供夜间模式功能
val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider
if (buildConfig?.getIsNightModeOn() == true) {
if (BuildConfig.IS_NIGHT_MODE_ON) {
if (systemMode) {
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
} else {

8
module_common/src/main/java/com/gh/gamecenter/common/utils/PackageFlavorHelper.java
View File

@ -1,16 +1,12 @@
package com.gh.gamecenter.common.utils;
import com.alibaba.android.arouter.launcher.ARouter;
import com.gh.gamecenter.common.constant.RouteConsts;
import com.gh.gamecenter.core.provider.IBuildConfigProvider;
import com.gh.gamecenter.common.BuildConfig;
public class PackageFlavorHelper {
private PackageFlavorHelper() {
}
private static final IBuildConfigProvider mBuildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation();
// 包体是否为测试包
public static final boolean IS_TEST_FLAVOR = mBuildConfig.getBuildTime() != 0L || mBuildConfig.isDebug();
public static final boolean IS_TEST_FLAVOR = BuildConfig.BUILD_TIME != 0L || BuildConfig.DEBUG;
}