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

31
app/src/main/java/com/gh/gamecenter/SplashScreenActivity.java
View File

@ -29,8 +29,10 @@ import com.gh.common.tracker.TrackerLogger;
import com.gh.common.util.AdHelper;
import com.gh.common.util.DeviceTokenUtils;
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.GameSubstituteRepositoryHelper;
import com.gh.common.util.GsonUtils;
import com.gh.common.util.MtaHelper;
@ -126,7 +128,28 @@ public class SplashScreenActivity extends BaseActivity {
// mStartMainActivityDirectly = true;
SPUtils.setLong(Constants.SP_INITIAL_USAGE_TIME, System.currentTimeMillis());
HaloApp.getInstance().isBrandNewInstall = true;
showPrivacyDialog(guideLayout);
if (!EnvHelper.isTestEnv()) {
showPrivacyDialog(guideLayout);
} else {
DialogHelper.showDialog(this,
"选择接口环境",
"这个弹窗只会在右上角有环境标签的测试包出现\n进入应用以后还可以到关于我们页面长按应用图标重新选择",
"正式环境",
"测试环境",
() -> {
SPUtils.setBoolean(Constants.SP_IS_DEV_ENV, false);
showPrivacyDialog(guideLayout);
},
() -> {
SPUtils.setBoolean(Constants.SP_IS_DEV_ENV, true);
showPrivacyDialog(guideLayout);
},
false,
"",
""
);
}
} else {
cancelPreviousUpdateTask();
@ -183,7 +206,7 @@ public class SplashScreenActivity extends BaseActivity {
@SuppressLint("CheckResult")
private void deviceDialogSetting() {
RetrofitManager.getInstance(HaloApp.getInstance().getApplication())
.getSensitiveApi().deviceDialogs()
.getApi().deviceDialogs()
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new BiResponse<List<DeviceDialogEntity>>() {
@ -215,7 +238,7 @@ public class SplashScreenActivity extends BaseActivity {
private void getFilterDetailTags() {
RetrofitManager.getInstance(HaloApp.getInstance().getApplication())
.getSensitiveApi().getFilterDetailTags()
.getApi().getFilterDetailTags()
.subscribe(new Response<ArrayList<String>>() {
@Override
public void onResponse(@Nullable ArrayList<String> response) {
@ -227,7 +250,7 @@ public class SplashScreenActivity extends BaseActivity {
private void getAuthDialog() {
RetrofitManager.getInstance(HaloApp.getInstance().getApplication())
.getSensitiveApi()
.getApi()
.authDialog()
.subscribe(new Response<List<AuthDialogEntity>>() {
@Override