Commit d7c77731 by 罗翻

android_1.3.0

parent 22febcbf
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5},"path":"app-release.apk","properties":{"packageId":"com.dayu.bigfish","split":"","minSdkVersion":"16"}}] [{"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 \ No newline at end of file
...@@ -21,20 +21,20 @@ public class Constants { ...@@ -21,20 +21,20 @@ public class Constants {
public static final String BASE_COUNT = "https://47.94.101.239:7500/"; public static final String BASE_COUNT = "https://47.94.101.239:7500/";
/***********************测试环境配置**********************************/ /***********************测试环境配置**********************************/
public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL; // public static final int DEBUGLEVEL = LogUtils.LEVEL_ALL;
public static final String BASE_URL = "http://47.94.101.239:3112"; // 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 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_SOP = "http://47.94.101.239:9004/#/sop";
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail"; // public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final boolean UM_DEBUG = true; // public static final boolean UM_DEBUG = true;
/**************************正式环境*******************************/ /**************************正式环境*******************************/
// public static final int DEBUGLEVEL = LogUtils.LEVEL_OFF; public static final int DEBUGLEVEL = LogUtils.LEVEL_OFF;
// public static final String BASE_URL = "https://mobile.dayu.ai"; 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 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_SOP = "https://sop.kf.ai/#/sop";
// public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail"; public final static String WEB_ZHI_SHI = "https://sop.kf.ai/#/detail";
// public static final boolean UM_DEBUG = false; public static final boolean IS_DEBUG = false;
/*****************/ /*****************/
/** /**
* 登录. * 登录.
......
...@@ -72,7 +72,7 @@ public class MyApplication extends MultiDexApplication { ...@@ -72,7 +72,7 @@ public class MyApplication extends MultiDexApplication {
* 初始化友盟. * 初始化友盟.
*/ */
private void initUM() { private void initUM() {
MobclickAgent.setDebugMode(Constants.UM_DEBUG); MobclickAgent.setDebugMode(Constants.IS_DEBUG);
UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, null); UMConfigure.init(this, UMConfigure.DEVICE_TYPE_PHONE, null);
UMConfigure.setLogEnabled(true); UMConfigure.setLogEnabled(true);
UMConfigure.setEncryptEnabled(true); UMConfigure.setEncryptEnabled(true);
......
...@@ -112,7 +112,8 @@ public class CommonSubmitePresenter extends CommonSubmiteContract.Presenter { ...@@ -112,7 +112,8 @@ public class CommonSubmitePresenter extends CommonSubmiteContract.Presenter {
@Override @Override
public void applyPart() { public void applyPart() {
ApiFactory.applyPart(mOrderId, mComment.get(), mUserName, mAccountId).subscribe(baseObserver( ApiFactory.applyPart(mOrderId, mComment.get(), mUserName, mAccountId).subscribe(baseObserver(
aBoolean -> {mView.dumpBack(); aBoolean -> {
mView.dumpBack();
EventBus.getDefault().post(new RefreshApplyPart(1)); EventBus.getDefault().post(new RefreshApplyPart(1));
})); }));
} }
......
...@@ -23,6 +23,7 @@ import java.util.List; ...@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import static android.app.PendingIntent.FLAG_CANCEL_CURRENT; import static android.app.PendingIntent.FLAG_CANCEL_CURRENT;
import static com.dayu.bigfish.Constants.IS_DEBUG;
/** /**
* Created by luofan on 2017/12/1. * Created by luofan on 2017/12/1.
...@@ -56,7 +57,7 @@ public class HxManager { ...@@ -56,7 +57,7 @@ public class HxManager {
//初始化 //初始化
EMClient.getInstance().init(context, options); EMClient.getInstance().init(context, options);
//在做打包混淆时,关闭debug模式,避免消耗不必要的资源 //在做打包混淆时,关闭debug模式,避免消耗不必要的资源
EMClient.getInstance().setDebugMode(true); EMClient.getInstance().setDebugMode(IS_DEBUG);
initEasemob(); initEasemob();
initEM(); initEM();
sdkInited = true; sdkInited = true;
......
...@@ -59,8 +59,8 @@ public class UserManager { ...@@ -59,8 +59,8 @@ public class UserManager {
UserInfo userInfo = getUser(); UserInfo userInfo = getUser();
if (userInfo != null) { if (userInfo != null) {
//有数据 //有数据
if ((!TextUtils.isEmpty(userInfo.getAccountId())) && !TextUtils.isEmpty(userInfo.getSiteId()) if (!TextUtils.isEmpty(userInfo.getAccountId()) && !TextUtils.isEmpty(userInfo.getSiteId())
&& userInfo.getStatus() == 1) { && !TextUtils.isEmpty(userInfo.getAccountName()) && userInfo.getStatus() == 1) {
return true; return true;
} else { } else {
return false; return false;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment