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

调整测试环境和正式环境切换的逻辑

Browse Source
This commit is contained in:
juntao
2021-12-10 17:57:25 +08:00
parent 5d4434eebd
commit 39ec77faae
66 changed files with 204 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/gh/base/BaseActivity.java
View File

@ -32,6 +32,7 @@ import com.gh.common.util.DialogHelper;
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.ExtensionsKt;
import com.gh.common.util.MtaHelper;
import com.gh.common.util.NetworkUtils;
@ -170,7 +171,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
@SuppressWarnings("ConstantConditions")
@Override
public void setContentView(View view) {
if (BuildConfig.DEBUG || BuildConfig.BUILD_TIME != 0) {
if (!(this instanceof SplashScreenActivity) && EnvHelper.isTestEnv()) {
view = getRootViewWithEnvIndicator(view);
}
super.setContentView(view);
@ -227,7 +228,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy
TextView tv = new TextView(this);
String envText = "正式环境";
tv.setBackground(ContextCompat.getDrawable(this, R.color.theme));
if (BuildConfig.FLAVOR.equals("internal")) {
if (EnvHelper.isDevEnv()) {
envText = "测试环境";
tv.setBackground(ContextCompat.getDrawable(this, R.color.theme_red));
}