yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add net mode

Browse Source
This commit is contained in:
wangcongtao
2020-04-27 17:25:51 +08:00
parent 25b44ce76c
commit 053fc868f8
7 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -92,6 +92,10 @@ android {
dimension "env"
buildConfigField 'int', 'NET_ENV', '3'
}
demo {
dimension "env"
buildConfigField 'int', 'NET_ENV', '4'
}
}
}

7
foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java
View File

@@ -128,7 +128,12 @@ public class AbsMogoApplication extends Application {
}
private static void initAccountSdk() {
AccountClientManager.init( sApp, DebugConfig.getNetMode(), NetEnvironManager.OS_2C, "os2.0-launcher" );
int mode = DebugConfig.getNetMode();
if ( mode == DebugConfig.NET_MODE_DEMO ) {
// 演示环境用 qa 的
mode = DebugConfig.NET_MODE_QA;
}
AccountClientManager.init( sApp, mode, NetEnvironManager.OS_2C, "os2.0-launcher" );
AccountClientManager.getTicket( new TicketInfoCallback() {
@Override
public void onSuccess( String ticket ) {

6
foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
View File

@@ -38,6 +38,11 @@ public class DebugConfig {
*/
public static final int NET_MODE_QA = 2;
/**
* 演示环境
*/
public static final int NET_MODE_DEMO = 4;
/**
* 生产环境
*/
@@ -62,6 +67,7 @@ public class DebugConfig {
*
* @param netMode {@link #NET_MODE_DEV}
* {@link #NET_MODE_QA}
* {@link #NET_MODE_DEMO}
* {@link #NET_MODE_RELEASE}
*/
public static void setNetMode( int netMode ) {

46
gradle.properties
View File

@@ -27,29 +27,29 @@ PASSWORD=xintai2018
RELEASE=false
# 模块版本
## 工程内模块
MOGO_COMMONS_VERSION=1.0.3.8.1
MOGO_UTILS_VERSION=1.0.3.8.1
MAP_AMAP_VERSION=1.0.3.8.1
MOGO_MAP_VERSION=1.0.3.8.1
MOGO_MAP_API_VERSION=1.0.3.8.1
MOGO_SERVICE_VERSION=1.0.3.8.1
MOGO_SERVICE_API_VERSION=1.0.3.8.1
MOGO_CONNECTION_VERSION=1.0.3.8.1
MOGO_MODULE_APPS_VERSION=1.0.3.8.1
MOGO_MODULE_NAVI_VERSION=1.0.3.8.1
MOGO_MODULE_SHARE_VERSION=1.0.3.8.1
MOGO_MODULE_COMMON_VERSION=1.0.3.8.1
MOGO_MODULE_MAIN_VERSION=1.0.3.8.1
MOGO_MODULE_MAP_VERSION=1.0.3.8.1
MOGO_MODULE_SERVICE_VERSION=1.0.3.8.1
MOGO_MODULE_EXTENSIONS_VERSION=1.0.3.8.1
MOGO_MODULE_SEARCH_VERSION=1.0.3.8.1
MOGO_MODULE_BACK_VERSION=1.0.3.8.1
MOGO_MODULE_GPS_SIMULATOR_VERSION=1.0.3.8.1
MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.0.3.8.1
MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.0.3.8.1
MOGO_MODULE_AUTHORIZE_VERSION=1.0.3.8.1
MOGO_MODULE_GUIDE_VERSION=1.0.3.8.1
MOGO_COMMONS_VERSION=1.0.3.8.2
MOGO_UTILS_VERSION=1.0.3.8.2
MAP_AMAP_VERSION=1.0.3.8.2
MOGO_MAP_VERSION=1.0.3.8.2
MOGO_MAP_API_VERSION=1.0.3.8.2
MOGO_SERVICE_VERSION=1.0.3.8.2
MOGO_SERVICE_API_VERSION=1.0.3.8.2
MOGO_CONNECTION_VERSION=1.0.3.8.2
MOGO_MODULE_APPS_VERSION=1.0.3.8.2
MOGO_MODULE_NAVI_VERSION=1.0.3.8.2
MOGO_MODULE_SHARE_VERSION=1.0.3.8.2
MOGO_MODULE_COMMON_VERSION=1.0.3.8.2
MOGO_MODULE_MAIN_VERSION=1.0.3.8.2
MOGO_MODULE_MAP_VERSION=1.0.3.8.2
MOGO_MODULE_SERVICE_VERSION=1.0.3.8.2
MOGO_MODULE_EXTENSIONS_VERSION=1.0.3.8.2
MOGO_MODULE_SEARCH_VERSION=1.0.3.8.2
MOGO_MODULE_BACK_VERSION=1.0.3.8.2
MOGO_MODULE_GPS_SIMULATOR_VERSION=1.0.3.8.2
MOGO_MODULE_GPS_SIMULATOR_DEBUG_VERSION=1.0.3.8.2
MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION=1.0.3.8.2
MOGO_MODULE_AUTHORIZE_VERSION=1.0.3.8.2
MOGO_MODULE_GUIDE_VERSION=1.0.3.8.2
## 工程外部模块

2
modules/mogo-module-authorize/src/main/java/com/mogo/module/authorize/constant/HttpConstant.kt
View File

@@ -7,12 +7,14 @@ class HttpConstant {
companion object {
const val HOST_DEV = "http://dzt-test.zhidaohulian.com"
const val HOST_TEST = "http://dzt-test.zhidaohulian.com"
const val HOST_DEMO = "http://dzt-show.zhidaohulian.com"
const val HOST_PRODUCT = "https://dzt.zhidaohulian.com"
fun getNetHost(): String {
return when (DebugConfig.getNetMode()) {
DebugConfig.NET_MODE_DEV -> HOST_DEV
DebugConfig.NET_MODE_QA -> HOST_TEST
DebugConfig.NET_MODE_DEMO -> HOST_DEMO
else -> HOST_PRODUCT
}
}

3
modules/mogo-module-service/src/main/java/com/mogo/module/service/network/RefreshModel.java
View File

@@ -32,6 +32,7 @@ public class RefreshModel {
public static final String HOST_DEV = "http://dzt-test.zhidaohulian.com";
public static final String HOST_TEST = "http://dzt-test.zhidaohulian.com";
public static final String HOST_DEMO = "http://dzt-show.zhidaohulian.com";
public static final String HOST_PRODUCT = "https://dzt.zhidaohulian.com";
private final Context mContext;
@@ -49,6 +50,8 @@ public class RefreshModel {
return HOST_DEV;
case DebugConfig.NET_MODE_QA:
return HOST_TEST;
case DebugConfig.NET_MODE_DEMO:
return HOST_DEMO;
default:
return HOST_PRODUCT;
}

2
modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/HttpConstant.kt
View File

@@ -7,12 +7,14 @@ class HttpConstant {
companion object {
const val HOST_DEV = "http://dzt-test.zhidaohulian.com"
const val HOST_TEST = "http://dzt-test.zhidaohulian.com"
const val HOST_DEMO = "http://dzt-show.zhidaohulian.com"
const val HOST_PRODUCT = "https://dzt.zhidaohulian.com"
fun getNetHost(): String {
return when (DebugConfig.getNetMode()) {
DebugConfig.NET_MODE_DEV -> HOST_DEV
DebugConfig.NET_MODE_QA -> HOST_TEST
DebugConfig.NET_MODE_DEMO -> HOST_DEMO
else -> HOST_PRODUCT
}
}