Skip to content

android / dayu

Go to a project
Commit 8e389772 by zhangzhe
Options

2.3.1 uat

parent 9064395c master … dev dev_xx dev_xx_241116 dev_xx_250108_toast dev_xx_250224_report dev_xx_250414_sop dev_xx_web v2.7.2 v2.7.1 v2.7.0 v2.6.9 v2.6.7 v2.6.6 v2.6.5 v2.6.4 v2.6.3 v2.6.2 v2.6.1 v2.6.0 v2.5.9 v2.5.7 v2.5.5 v2.5.4 v2.5.3 v2.5.2 v2.5.0 v2.4.6 v2.4.5 v2.4.0 v_2.4.0 v2.3.2 v2.3.1 dev20230405
Inline Side-by-side
Showing with 49 additions and 48 deletions
.idea/gradle.xml
......@@ -3,9 +3,8 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<option name="distributionType" value="LOCAL" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
......
baseSDK/src/main/java/com/dayu/common/Constants.java
......@@ -12,30 +12,30 @@ public class Constants {
/**
* 测试环境配置.
*/
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static final String ENVIROMENT = "debug";
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 CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
public static final boolean IS_DEBUG = true;
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static final String ENVIROMENT = "debug";
// 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 CHECK_MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manyServiceResult";
// public final static String MULTI_WEB_SOP = "http://47.94.101.239:9004/#/manySop";
// public final static String WEB_SOP_DETAIL = "http://47.94.101.239:9004/#/sopdetail";
// public final static String WEB_ZHI_SHI = "http://47.94.101.239:9004/#/detail";
// public static final boolean IS_DEBUG = true;
/**
* uat环境配置.
*/
// public static final String ENVIROMENT = "uat";
// public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
// public static final String BASE_URL = "http://47.95.223.6:3112";
// public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
// public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
// public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
// public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
// public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
// public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
// public static final boolean IS_DEBUG = true;
public static final String ENVIROMENT = "uat";
public static final int LOG_LEVEL = LogUtils.LEVEL_ALL;
public static final String BASE_URL = "http://47.95.223.6:3112";
public final static String UP_PHOTO = "/file/uploadMore?targetPath=test/sp/mobile/android/business/checkApply";
public final static String WEB_SOP = "http://47.95.223.6:9004/#/sop";
public final static String WEB_SOP_DETAIL = "http://47.95.223.6:9004/#/sopdetail";
public final static String WEB_ZHI_SHI = "http://47.95.223.6:9004/#/detail";
public final static String CHECK_MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manyServiceResult";
public final static String MULTI_WEB_SOP = "http://47.95.223.6:9004/#/manySop";
public static final boolean IS_DEBUG = true;
/**
* 正式环境.
......
build.gradle
......@@ -5,8 +5,8 @@ buildscript {
ext.build_tools_version = "27.0.3"
ext.min_sdk_version = 16
ext.target_sdk_version = 23
ext.version_code = 21
ext.verson_name = "1.9.9"
ext.version_code = 231
ext.verson_name = "2.3.1"
ext.gradle_version = '3.1.4'
ext.isReleaseMinify = true
ext.isDebugMinify = false
......
userCenter/src/main/java/com/dayu/usercenter/presenter/pwlogin/PwLoginPresenter.java
......@@ -159,18 +159,19 @@ public class PwLoginPresenter extends PwLoginContract.Presenter {
}
private void showLoginDialog() {
mView.showLoginDialog((dialog, confirm) -> {
if (confirm) {
mView.startActivity(IdentityCertificationActivity.class);
} else {
if (UserManager.getInstance().getRole() == Constants.ENGINEER) {
ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
} else if (UserManager.getInstance().getRole() == Constants.MANAGER_ENGINEER) {
AppManager.getInstance().finishAllActivity();
ARouter.getInstance().build(RouterPath.PATH_SERVICESTATION).navigation();
}
}
});
ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
// mView.showLoginDialog((dialog, confirm) -> {
// if (confirm) {
// mView.startActivity(IdentityCertificationActivity.class);
// } else {
// if (UserManager.getInstance().getRole() == Constants.ENGINEER) {
// ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
// } else if (UserManager.getInstance().getRole() == Constants.MANAGER_ENGINEER) {
// AppManager.getInstance().finishAllActivity();
// ARouter.getInstance().build(RouterPath.PATH_SERVICESTATION).navigation();
// }
// }
// });
}
@Override
......
userCenter/src/main/java/com/dayu/usercenter/presenter/smslogin/SmsLoginPresenter.java
......@@ -206,17 +206,18 @@ public class SmsLoginPresenter extends SmsLoginContract.Presenter {
}
private void showLoginDialog() {
mView.showLoginDialog((dialog, confirm) -> {
if (confirm) {
mView.startActivity(IdentityCertificationActivity.class);
} else {
if (UserManager.getInstance().getRole() == Constants.ENGINEER) {
ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
} else if (UserManager.getInstance().getRole() == Constants.MANAGER_ENGINEER) {
AppManager.getInstance().finishAllActivity();
ARouter.getInstance().build(RouterPath.PATH_SERVICESTATION).navigation();
}
}
});
ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
// mView.showLoginDialog((dialog, confirm) -> {
// if (confirm) {
// mView.startActivity(IdentityCertificationActivity.class);
// } else {
// if (UserManager.getInstance().getRole() == Constants.ENGINEER) {
// ARouter.getInstance().build(RouterPath.PATH_MAIN).navigation();
// } else if (UserManager.getInstance().getRole() == Constants.MANAGER_ENGINEER) {
// AppManager.getInstance().finishAllActivity();
// ARouter.getInstance().build(RouterPath.PATH_SERVICESTATION).navigation();
// }
// }
// });
}
}
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