diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index 84b2d6504a..ddcee12424 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -33,6 +33,7 @@ import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.EnvHelper; +import com.gh.common.util.PackageFlavorHelper; import com.gh.common.util.ExtensionsKt; import com.gh.common.util.MtaHelper; import com.gh.common.util.NetworkUtils; @@ -171,7 +172,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy @SuppressWarnings("ConstantConditions") @Override public void setContentView(View view) { - if (!(this instanceof SplashScreenActivity) && EnvHelper.isTestEnv()) { + if (!(this instanceof SplashScreenActivity) && PackageFlavorHelper.isTestFlavor) { 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 2fdf2e91df..92fd69a84c 100644 --- a/app/src/main/java/com/gh/common/loghub/LoghubHelper.kt +++ b/app/src/main/java/com/gh/common/loghub/LoghubHelper.kt @@ -1,7 +1,7 @@ package com.gh.common.loghub import com.aliyun.sls.android.producer.* -import com.gh.common.util.EnvHelper +import com.gh.common.util.PackageFlavorHelper import com.halo.assistant.HaloApp import com.lightgame.utils.Utils @@ -71,7 +71,7 @@ object LoghubHelper { setDropUnauthorizedLog(0) } - return if (!EnvHelper.isTestEnv()) { + return if (!PackageFlavorHelper.isTestFlavor) { 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 86cb4038e1..57079923ca 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 (EnvHelper.isTestEnv()) { + if (PackageFlavorHelper.isTestFlavor) { 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 (EnvHelper.isTestEnv()) { + if (PackageFlavorHelper.isTestFlavor) { 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 41c22cfa56..0bb384a2ef 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 (!isTestEnv()) { + return if (PackageFlavorHelper.isTestFlavor) { BuildConfig.API_HOST } else { if (isDevEnv) { @@ -26,7 +26,7 @@ object EnvHelper { @JvmStatic fun getNewHost(): String { - return if (!isTestEnv()) { + return if (!PackageFlavorHelper.isTestFlavor) { BuildConfig.NEW_API_HOST } else { if (isDevEnv) { @@ -37,10 +37,4 @@ object EnvHelper { } } - // 包体是否为测试包 - @JvmStatic - fun isTestEnv(): Boolean { - return BuildConfig.BUILD_TIME != 0L || BuildConfig.DEBUG - } - } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/PackageFlavorHelper.java b/app/src/main/java/com/gh/common/util/PackageFlavorHelper.java new file mode 100644 index 0000000000..a166bf1407 --- /dev/null +++ b/app/src/main/java/com/gh/common/util/PackageFlavorHelper.java @@ -0,0 +1,10 @@ +package com.gh.common.util; + +import com.gh.gamecenter.BuildConfig; + +public class PackageFlavorHelper { + + // 包体是否为测试包 + public static final boolean isTestFlavor = BuildConfig.BUILD_TIME != 0L || BuildConfig.DEBUG; + +} diff --git a/app/src/main/java/com/gh/common/view/RichEditor.java b/app/src/main/java/com/gh/common/view/RichEditor.java index 6fcfd38220..4d86b2bea8 100644 --- a/app/src/main/java/com/gh/common/view/RichEditor.java +++ b/app/src/main/java/com/gh/common/view/RichEditor.java @@ -17,7 +17,6 @@ import android.webkit.WebViewClient; import com.gh.common.constant.Config; import com.gh.common.util.DeviceUtils; import com.gh.common.util.DialogHelper; -import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EmptyCallback; import com.gh.common.util.EnvHelper; diff --git a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java index 74cd11a2bd..2d2e597004 100644 --- a/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java @@ -33,7 +33,7 @@ import com.gh.common.util.DeviceUtils; import com.gh.common.util.DialogHelper; import com.gh.common.util.DialogUtils; import com.gh.common.util.DisplayUtils; -import com.gh.common.util.EnvHelper; +import com.gh.common.util.PackageFlavorHelper; import com.gh.common.util.ExtensionsKt; import com.gh.common.util.GameSubstituteRepositoryHelper; import com.gh.common.util.GsonUtils; @@ -144,7 +144,7 @@ public class SplashScreenActivity extends BaseActivity { SPUtils.setLong(Constants.SP_INITIAL_USAGE_TIME, System.currentTimeMillis()); HaloApp.getInstance().isBrandNewInstall = true; - if (!EnvHelper.isTestEnv()) { + if (!PackageFlavorHelper.isTestFlavor) { 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 22b96c07cd..21b0110899 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/LoginFragment.java @@ -39,7 +39,7 @@ import com.gh.common.util.ClickUtils; import com.gh.common.util.DialogUtils; import com.gh.common.util.EnergyTaskHelper; import com.gh.common.util.EntranceUtils; -import com.gh.common.util.EnvHelper; +import com.gh.common.util.PackageFlavorHelper; import com.gh.common.util.ExtensionsKt; import com.gh.common.util.LogUtils; import com.gh.common.util.LoginHelper; @@ -49,7 +49,6 @@ import com.gh.common.util.PatternUtils; import com.gh.common.util.PermissionHelper; import com.gh.common.util.QuickLoginHelper; import com.gh.common.util.SPUtils; -import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.LoginActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; @@ -166,7 +165,7 @@ LoginFragment extends NormalFragment implements LoginUtils.onCaptchaCallBackList mUserViewModel = ViewModelProviders.of(this, factory).get(UserViewModel.class); mUserViewModel.getLoginObsUserinfo().observe(this, this); - if (EnvHelper.isTestEnv()) { + if (PackageFlavorHelper.isTestFlavor) { 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 9293f8e603..071cb8c44f 100644 --- a/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java +++ b/app/src/main/java/com/gh/gamecenter/fragment/SearchToolbarFragment.java @@ -29,13 +29,12 @@ import com.gh.common.util.DataCollectionUtils; import com.gh.common.util.DataUtils; import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; -import com.gh.common.util.EnvHelper; +import com.gh.common.util.PackageFlavorHelper; import com.gh.common.util.IntegralLogHelper; import com.gh.common.util.LogUtils; import com.gh.common.util.MtaHelper; import com.gh.common.util.SPUtils; import com.gh.download.DownloadManager; -import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.DownloadManagerActivity; import com.gh.gamecenter.MessageActivity; import com.gh.gamecenter.R; @@ -241,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 (EnvHelper.isTestEnv()) { + if (PackageFlavorHelper.isTestFlavor) { 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 f3be1f8fe9..16023dc131 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 @@ -11,10 +11,7 @@ import android.webkit.WebViewClient import android.widget.TextView import com.gh.base.fragment.BaseDialogFragment import com.gh.common.DefaultJsApi -import com.gh.common.util.EnvHelper -import com.gh.common.util.MtaHelper -import com.gh.common.util.dip2px -import com.gh.common.util.tryWithDefaultCatch +import com.gh.common.util.* import com.gh.common.view.dsbridge.DWebView import com.gh.gamecenter.R @@ -44,7 +41,7 @@ class GameResourcePolicyDialogFragment : BaseDialogFragment() { settings?.safeBrowsingEnabled = false } } - DWebView.setWebContentsDebuggingEnabled(EnvHelper.isTestEnv()) + DWebView.setWebContentsDebuggingEnabled(PackageFlavorHelper.isTestFlavor) // 适配大于屏幕宽度的页面 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 c80bcfa85a..adc0ac3bee 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(EnvHelper.isTestEnv()) + DWebView.setWebContentsDebuggingEnabled(PackageFlavorHelper.isTestFlavor) // 适配大于屏幕宽度的页面 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 f10a9add41..4c8352359a 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 (EnvHelper.isTestEnv()) { + if (PackageFlavorHelper.isTestFlavor) { 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 b857082ae5..bb9f30763d 100644 --- a/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/personalhome/UserHomeFragment.kt @@ -41,7 +41,6 @@ import com.halo.assistant.HaloApp import com.lightgame.utils.Utils import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.reuse_no_connection.* -import java.util.* import kotlin.math.abs class UserHomeFragment : NormalFragment() { @@ -86,7 +85,7 @@ class UserHomeFragment : NormalFragment() { getUserInfo() getBadgeList() getUserPlayedGameCount() - if (EnvHelper.isTestEnv()) { + if (PackageFlavorHelper.isTestFlavor) { getUserLevel() } } diff --git a/app/src/main/java/com/halo/assistant/HaloApp.java b/app/src/main/java/com/halo/assistant/HaloApp.java index 70b8826600..157778e83a 100644 --- a/app/src/main/java/com/halo/assistant/HaloApp.java +++ b/app/src/main/java/com/halo/assistant/HaloApp.java @@ -35,7 +35,7 @@ import com.gh.common.util.DataUtils; import com.gh.common.util.DeviceUtils; import com.gh.common.util.DownloadNotificationHelper; import com.gh.common.util.DownloadObserver; -import com.gh.common.util.EnvHelper; +import com.gh.common.util.PackageFlavorHelper; import com.gh.common.util.EmulatorUtil; import com.gh.common.util.HomeBottomBarHelper; import com.gh.common.util.ImageUtils; @@ -186,7 +186,7 @@ public class HaloApp extends MultiDexApplication { mChannel = ChannelReaderUtil.getChannel(this); if (mChannel == null || TextUtils.isEmpty(mChannel.trim())) { - if (EnvHelper.isTestEnv()) { + if (PackageFlavorHelper.isTestFlavor) { 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 9180b810db..9b56799ade 100644 --- a/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/AboutFragment.java @@ -17,14 +17,13 @@ import androidx.core.content.ContextCompat; import com.gh.common.util.DialogHelper; import com.gh.common.util.DirectUtils; import com.gh.common.util.EntranceUtils; -import com.gh.common.util.EnvHelper; +import com.gh.common.util.PackageFlavorHelper; import com.gh.common.util.ExtensionsKt; import com.gh.common.util.MtaHelper; import com.gh.common.util.PackageUtils; import com.gh.common.util.StringUtils; import com.gh.common.util.TimeUtils; import com.gh.common.util.ToastUtils; -import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.R; import com.gh.gamecenter.WebActivity; import com.gh.gamecenter.manager.UpdateManager; @@ -93,7 +92,7 @@ public class AboutFragment extends NormalFragment { mIcon.setOnLongClickListener(v -> { MtaHelper.onEvent("我的光环_设置", "关于光环", "图标长按"); - if (EnvHelper.isTestEnv()) { + if (PackageFlavorHelper.isTestFlavor) { 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 15070787f6..0e0162bf3e 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(EnvHelper.isTestEnv()) + DWebView.setWebContentsDebuggingEnabled(PackageFlavorHelper.isTestFlavor) // 适配大于屏幕宽度的页面 settings.useWideViewPort = true diff --git a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java index 17f527211c..8bb77437eb 100644 --- a/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/game/GameNewsSearchResultFragment.java @@ -19,7 +19,6 @@ import com.gh.common.util.EnvHelper; import com.gh.common.util.NewsUtils; import com.gh.common.util.UrlFilterUtils; import com.gh.common.view.VerticalItemDecoration; -import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.NewsDetailActivity; import com.gh.gamecenter.R; import com.gh.gamecenter.adapter.viewholder.FooterViewHolder; @@ -35,7 +34,6 @@ import java.util.List; import butterknife.BindView; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.functions.Function; import io.reactivex.schedulers.Schedulers; import retrofit2.HttpException;