diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index ddcee12424..5122b0f701 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -172,7 +172,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy @SuppressWarnings("ConstantConditions") @Override public void setContentView(View view) { - if (!(this instanceof SplashScreenActivity) && PackageFlavorHelper.isTestFlavor) { + if (!(this instanceof SplashScreenActivity) && PackageFlavorHelper.IS_TEST_FLAVOR) { view = getRootViewWithEnvIndicator(view); } super.setContentView(view); diff --git a/app/src/main/java/com/gh/common/loghub/LoghubHelper.kt b/app/src/main/java/com/gh/common/loghub/LoghubHelper.kt index 92fd69a84c..149e6bacc9 100644 --- a/app/src/main/java/com/gh/common/loghub/LoghubHelper.kt +++ b/app/src/main/java/com/gh/common/loghub/LoghubHelper.kt @@ -71,7 +71,7 @@ object LoghubHelper { setDropUnauthorizedLog(0) } - return if (!PackageFlavorHelper.isTestFlavor) { + return if (!PackageFlavorHelper.IS_TEST_FLAVOR) { LogProducerClient(config) } else { return LogProducerClient(config, diff --git a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt index 57079923ca..3d66975eb5 100644 --- a/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt +++ b/app/src/main/java/com/gh/common/util/EnergyTaskHelper.kt @@ -70,7 +70,7 @@ object EnergyTaskHelper { @SuppressLint("CheckResult") @JvmStatic fun postEnergyTask(action: String, id: String? = null, packageName: String? = null, url: String? = null) { - if (PackageFlavorHelper.isTestFlavor) { + if (PackageFlavorHelper.IS_TEST_FLAVOR) { val taskParams = JSONObject() taskParams.put("action", action) @@ -98,7 +98,7 @@ object EnergyTaskHelper { @SuppressLint("CheckResult") @JvmStatic fun postInviteCodeTask(code: String, from: String, callback: (() -> Unit)?) { - if (PackageFlavorHelper.isTestFlavor) { + if (PackageFlavorHelper.IS_TEST_FLAVOR) { val taskParams = JSONObject() taskParams.put("action", "enter_invite_code") diff --git a/app/src/main/java/com/gh/common/util/EnvHelper.kt b/app/src/main/java/com/gh/common/util/EnvHelper.kt index 0bb384a2ef..aaeecf15b5 100644 --- a/app/src/main/java/com/gh/common/util/EnvHelper.kt +++ b/app/src/main/java/com/gh/common/util/EnvHelper.kt @@ -13,7 +13,7 @@ object EnvHelper { @JvmStatic fun getHost(): String { - return if (PackageFlavorHelper.isTestFlavor) { + return if (PackageFlavorHelper.IS_TEST_FLAVOR) { BuildConfig.API_HOST } else { if (isDevEnv) { @@ -26,7 +26,7 @@ object EnvHelper { @JvmStatic fun getNewHost(): String { - return if (!PackageFlavorHelper.isTestFlavor) { + return if (!PackageFlavorHelper.IS_TEST_FLAVOR) { BuildConfig.NEW_API_HOST } else { if (isDevEnv) { diff --git a/app/src/main/java/com/gh/common/util/PackageFlavorHelper.java b/app/src/main/java/com/gh/common/util/PackageFlavorHelper.java index a166bf1407..0bf008fd04 100644 --- a/app/src/main/java/com/gh/common/util/PackageFlavorHelper.java +++ b/app/src/main/java/com/gh/common/util/PackageFlavorHelper.java @@ -3,8 +3,10 @@ package com.gh.common.util; import com.gh.gamecenter.BuildConfig; public class PackageFlavorHelper { + + private PackageFlavorHelper() {} // 包体是否为测试包 - public static final boolean isTestFlavor = BuildConfig.BUILD_TIME != 0L || BuildConfig.DEBUG; + public static final boolean IS_TEST_FLAVOR = BuildConfig.BUILD_TIME != 0L || BuildConfig.DEBUG; } diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 2d2e597004..f202e1ad4a 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -144,7 +144,7 @@ public class SplashScreenActivity extends BaseActivity { SPUtils.setLong(Constants.SP_INITIAL_USAGE_TIME, System.currentTimeMillis()); HaloApp.getInstance().isBrandNewInstall = true; - if (!PackageFlavorHelper.isTestFlavor) { + if (!PackageFlavorHelper.IS_TEST_FLAVOR) { showPrivacyDialog(guideLayout); } else { // Test dex2oat diff --git a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java index 21b0110899..951dbf3bf3 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java @@ -165,7 +165,7 @@ LoginFragment extends NormalFragment implements LoginUtils.onCaptchaCallBackList mUserViewModel = ViewModelProviders.of(this, factory).get(UserViewModel.class); mUserViewModel.getLoginObsUserinfo().observe(this, this); - if (PackageFlavorHelper.isTestFlavor) { + if (PackageFlavorHelper.IS_TEST_FLAVOR) { if (SPUtils.getBoolean(Constants.SP_HAS_COMPLETE_INVITE_CODE)) { mLoginInviteContainer.setVisibility(View.GONE); } else { diff --git a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java index 071cb8c44f..488fa64d62 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -240,7 +240,7 @@ public class SearchToolbarFragment extends BaseLazyFragment implements View.OnCl view.findViewById(R.id.actionbar_notification).setOnClickListener(this); view.findViewById(R.id.actionbar_search_rl).setOnClickListener(this); - if (PackageFlavorHelper.isTestFlavor) { + if (PackageFlavorHelper.IS_TEST_FLAVOR) { mSignView.setVisibility(View.VISIBLE); } else { mSignView.setVisibility(View.GONE); diff --git a/app/src/main/java/com/gh/gamecenter/game/upload/GameResourcePolicyDialogFragment.kt b/app/src/main/java/com/gh/gamecenter/game/upload/GameResourcePolicyDialogFragment.kt index 16023dc131..98a8191fdb 100644 --- a/app/src/main/java/com/gh/gamecenter/game/upload/GameResourcePolicyDialogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/game/upload/GameResourcePolicyDialogFragment.kt @@ -41,7 +41,7 @@ class GameResourcePolicyDialogFragment : BaseDialogFragment() { settings?.safeBrowsingEnabled = false } } - DWebView.setWebContentsDebuggingEnabled(PackageFlavorHelper.isTestFlavor) + DWebView.setWebContentsDebuggingEnabled(PackageFlavorHelper.IS_TEST_FLAVOR) // 适配大于屏幕宽度的页面 settings?.useWideViewPort = true diff --git a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt index adc0ac3bee..3f2c3e023e 100644 --- a/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/gamedetail/rating/edit/RatingEditActivity.kt @@ -154,7 +154,7 @@ class RatingEditActivity : ToolBarActivity(), KeyboardHeightObserver { settings.safeBrowsingEnabled = false } } - DWebView.setWebContentsDebuggingEnabled(PackageFlavorHelper.isTestFlavor) + DWebView.setWebContentsDebuggingEnabled(PackageFlavorHelper.IS_TEST_FLAVOR) // 适配大于屏幕宽度的页面 settings.useWideViewPort = true diff --git a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt index 4c8352359a..41e5be0abe 100644 --- a/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personal/PersonalFragment.kt @@ -216,7 +216,7 @@ class PersonalFragment : BaseLazyFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - if (PackageFlavorHelper.isTestFlavor) { + if (PackageFlavorHelper.IS_TEST_FLAVOR) { val indicator = requireActivity() .window .decorView diff --git a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt index bb9f30763d..8d4ec9a126 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt @@ -85,7 +85,7 @@ class UserHomeFragment : NormalFragment() { getUserInfo() getBadgeList() getUserPlayedGameCount() - if (PackageFlavorHelper.isTestFlavor) { + if (PackageFlavorHelper.IS_TEST_FLAVOR) { getUserLevel() } } diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 157778e83a..11e0ff8891 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -186,7 +186,7 @@ public class HaloApp extends MultiDexApplication { mChannel = ChannelReaderUtil.getChannel(this); if (mChannel == null || TextUtils.isEmpty(mChannel.trim())) { - if (PackageFlavorHelper.isTestFlavor) { + if (PackageFlavorHelper.IS_TEST_FLAVOR) { mChannel = Config.DEFAULT_CHANNEL; } else { mChannel = Config.DEFAULT_CHANNEL_FOR_RELEASE; diff --git a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java index 9b56799ade..536d6bb3c6 100644 --- a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java @@ -92,7 +92,7 @@ public class AboutFragment extends NormalFragment { mIcon.setOnLongClickListener(v -> { MtaHelper.onEvent("我的光环_设置", "关于光环", "图标长按"); - if (PackageFlavorHelper.isTestFlavor) { + if (PackageFlavorHelper.IS_TEST_FLAVOR) { DialogHelper.showDialog(requireContext(), "重选接口环境", "是否要清空应用数据并重选接口环境\n(清空后数据后需要手动再打开 APP)", diff --git a/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt b/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt index 0e0162bf3e..c0f8d17cab 100644 --- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.kt @@ -307,7 +307,7 @@ class WebFragment : LazyFragment(), IScrollable { mTimeElapsedHelper = TimeElapsedHelper(this@WebFragment) - DWebView.setWebContentsDebuggingEnabled(PackageFlavorHelper.isTestFlavor) + DWebView.setWebContentsDebuggingEnabled(PackageFlavorHelper.IS_TEST_FLAVOR) // 适配大于屏幕宽度的页面 settings.useWideViewPort = true