diff --git a/app/release/app_1.3_release.apk b/app/release/app_1.3_release.apk
new file mode 100644
index 0000000..ec3e231
Binary files /dev/null and b/app/release/app_1.3_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index db55c75..4a15786 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5},"path":"app-release.apk","properties":{"packageId":"com.dayu.bigfish","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":7},"path":"app-release.apk","properties":{"packageId":"com.dayu.bigfish","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/dayu/bigfish/Constants.java b/app/src/main/java/com/dayu/bigfish/Constants.java
index 9d8daed..c8c4017 100755
--- a/app/src/main/java/com/dayu/bigfish/Constants.java
+++ b/app/src/main/java/com/dayu/bigfish/Constants.java
@@ -21,20 +21,20 @@ public class Constants {
public static final String BASE_COUNT = "https://47.94.101.239:7500/";
/***********************测试环境配置**********************************/
- public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
- public static final String BASE_URL = "http://47.94.101.239:3112";
- public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
- public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
- public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
- public static final boolean UM_DEBUG = true;
+// public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
+// public static final String BASE_URL = "http://47.94.101.239:3112";
+// public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
+// public final static String WEB_SOP = "http://47.94.101.239:9004/#/sop";
+// public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
+// public static final boolean UM_DEBUG = true;
/**************************正式环境*******************************/
-// public static final int DEBUGLEVEL = LogUtils.LEVEL_OFF;
-// public static final String BASE_URL = "https://mobile.dayu.ai";
-// public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
-// public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
-// public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
-// public static final boolean UM_DEBUG = false;
+ public static final int DEBUGLEVEL = LogUtils.LEVEL_OFF;
+ public static final String BASE_URL = "https://mobile.dayu.ai";
+ public final static String UP_PHOTO = "/file/uploadMore?targetPath=online/sp/mobile/android/business/checkApply";
+ public final static String WEB_SOP = "https://sop.kf.ai/#/sop";
+ public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
+ public static final boolean IS_DEBUG = false;
/*****************/
/**
* 登录.
diff --git a/app/src/main/java/com/dayu/bigfish/MyApplication.java b/app/src/main/java/com/dayu/bigfish/MyApplication.java
index 4acab63..b2cf1ed 100755
--- a/app/src/main/java/com/dayu/bigfish/MyApplication.java
+++ b/app/src/main/java/com/dayu/bigfish/MyApplication.java
@@ -72,7 +72,7 @@ public class MyApplication extends MultiDexApplication {
* 初始化友盟.
*/
private void initUM() {
- MobclickAgent.setDebugMode(Constants.UM_DEBUG);
+ MobclickAgent.setDebugMode(Constants.IS_DEBUG);
UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, null);
UMConfigure.setLogEnabled(true);
UMConfigure.setEncryptEnabled(true);
diff --git a/app/src/main/java/com/dayu/bigfish/presenter/commonSubmite/CommonSubmitePresenter.java b/app/src/main/java/com/dayu/bigfish/presenter/commonSubmite/CommonSubmitePresenter.java
index 6b28811..a6f7cd8 100644
--- a/app/src/main/java/com/dayu/bigfish/presenter/commonSubmite/CommonSubmitePresenter.java
+++ b/app/src/main/java/com/dayu/bigfish/presenter/commonSubmite/CommonSubmitePresenter.java
@@ -112,9 +112,10 @@ public class CommonSubmitePresenter extends CommonSubmiteContract.Presenter {
@Override
public void applyPart() {
ApiFactory.applyPart(mOrderId, mComment.get(), mUserName, mAccountId).subscribe(baseObserver(
- aBoolean -> {mView.dumpBack();
- EventBus.getDefault().post(new RefreshApplyPart(1));
- }));
+ aBoolean -> {
+ mView.dumpBack();
+ EventBus.getDefault().post(new RefreshApplyPart(1));
+ }));
}
@Override
diff --git a/app/src/main/java/com/dayu/bigfish/utils/managers/HxManager.java b/app/src/main/java/com/dayu/bigfish/utils/managers/HxManager.java
index 8c19c18..02ef5d9 100644
--- a/app/src/main/java/com/dayu/bigfish/utils/managers/HxManager.java
+++ b/app/src/main/java/com/dayu/bigfish/utils/managers/HxManager.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;
+import static com.dayu.bigfish.Constants.IS_DEBUG;
/**
* Created by luofan on 2017/12/1.
@@ -56,7 +57,7 @@ public class HxManager {
//初始化
EMClient.getInstance().init(context, options);
//在做打包混淆时，关闭debug模式，避免消耗不必要的资源
- EMClient.getInstance().setDebugMode(true);
+ EMClient.getInstance().setDebugMode(IS_DEBUG);
initEasemob();
initEM();
sdkInited = true;
diff --git a/app/src/main/java/com/dayu/bigfish/utils/managers/UserManager.java b/app/src/main/java/com/dayu/bigfish/utils/managers/UserManager.java
index eb02b50..5e89e7a 100755
--- a/app/src/main/java/com/dayu/bigfish/utils/managers/UserManager.java
+++ b/app/src/main/java/com/dayu/bigfish/utils/managers/UserManager.java
@@ -59,8 +59,8 @@ public class UserManager {
UserInfo userInfo = getUser();
if (userInfo != null) {
//有数据
- if ((!TextUtils.isEmpty(userInfo.getAccountId())) && !TextUtils.isEmpty(userInfo.getSiteId())
- && userInfo.getStatus() == 1) {
+ if (!TextUtils.isEmpty(userInfo.getAccountId()) && !TextUtils.isEmpty(userInfo.getSiteId())
+ && !TextUtils.isEmpty(userInfo.getAccountName()) && userInfo.getStatus() == 1) {
return true;
} else {
return false;