From a21f42ca87aca7c6f69d81975c94c21236305442 Mon Sep 17 00:00:00 2001
From: mReturn <1058851652@qq.com>
Date: Wed, 6 May 2020 12:41:53 +0800
Subject: [PATCH] 切换开发环境功能
---
app/src/main/java/com/dayu/bigfish/InitializeActivity.java | 4 ++--
app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java | 8 ++++----
app/src/main/res/layout/activity_setting.xml | 1 +
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/dayu/bigfish/InitializeActivity.java b/app/src/main/java/com/dayu/bigfish/InitializeActivity.java
index ade7e45..be0866b 100755
--- a/app/src/main/java/com/dayu/bigfish/InitializeActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/InitializeActivity.java
@@ -50,10 +50,10 @@ public class InitializeActivity extends DataBindingActivity<ActivityInitializeMa
@Override
public void initView() {
- if (Constants.CAN_CHANGE_ENV){
+ if (Constants.IS_DEBUG){
AppUtils.initEnv();
}else {
- SPUtils.put("env",Constants.ENVIROMENT);
+ SPUtils.put("env","");
}
MobclickAgent.openActivityDurationTrack(false);
diff --git a/app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java b/app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
index bf33f43..ee39afc 100755
--- a/app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
+++ b/app/src/main/java/com/dayu/bigfish/ui/SettingActivity.java
@@ -53,13 +53,13 @@ public class SettingActivity extends BaseActivity<SettingPresenter, ActivitySett
//初始化切换开发环境相关布局
private void initChangeEnv() {
- mBind.llChangeEnv.setVisibility(Constants.CAN_CHANGE_ENV ? View.VISIBLE : View.GONE);
+// mBind.llChangeEnv.setVisibility(Constants.CAN_CHANGE_ENV ? View.VISIBLE : View.GONE);
mBind.rlDev.setVisibility(AppUtils.isDevEnv() ? View.GONE : View.VISIBLE);
mBind.rlUat.setVisibility(AppUtils.isUatEnv() ? View.GONE : View.VISIBLE);
mBind.rlRelease.setVisibility(AppUtils.isReleaseEnv() ? View.GONE : View.VISIBLE);
-// if (Constants.IS_DEBUG) {
-// mBind.tvTitle.setOnClickListener(v -> onTitleClick());
-// }
+ if (Constants.IS_DEBUG) {
+ mBind.tvTitle.setOnClickListener(v -> onTitleClick());
+ }
}
@Override
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index 1630d48..03abf97 100755
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -223,6 +223,7 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/ll_change_env"
+ android:layout_marginTop="20dp"
>
<RelativeLayout
android:id="@+id/rl_dev"
--
libgit2 0.25.0