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

Merge branch 'dev_robotaxi-d-app-module_2130_221116_2.13.0' into mutidev_robotaxi-d-app-module_2130_221116_2.13.0_multi_display

Browse Source 
# Conflicts:
#	app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt
This commit is contained in:
donghongyu
2022-12-01 10:38:40 +08:00
parent 2974edc51c d13d4e8d9b
commit 6d32688dd6
115 changed files with 2684 additions and 638 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
foudations/mogo-commons/src/main/java/com/mogo/commons/constants/HostConst.java Normal file
View File

@@ -0,0 +1,37 @@
package com.mogo.commons.constants;
import com.mogo.commons.debug.DebugConfig;
public class HostConst {
public static final String DEVA_HOST = "http://dzt-deva.zhidaozhixing.com";
public static final String DATA_SERVICE_HOST = "http://dzt-dataService.zhidaozhixing.com";
public static final String REALTIME_LOCATION_HOST = "http://dzt-realtimeLocation.zhidaozhixing.com";
public static final String GEOFENCE_HOST = "http://dzt-geoFenceCarService.zhidaozhixing.com";
public static final String CARLIFE_HOST = "http://dzt-carlife.zhidaozhixing.com";
public static final String STRATEGY_PUSH_HOST = "http://dzt-strategyPush.zhidaozhixing.com";
public static final String CAMERA_STREAM_HOST = "http://dzt-smartTransportationAiCloud.zhidaozhixing.com";
public static final String OPEN_CAMERA_STREAM_HOST = "http://10.0.16.6:18080";
public static final String CITY_HOST = "http://dzt-city.zhidaozhixing.com";
public static final String SOCKET_CENTER_DOMAIN = "socketRegion";
// public static final String UPGRADE_APP_HOST_TEST = "http://10.0.200.12:32423?/";
public static final String UPGRADE_APP_HOST = "http://eagle-mis.zhidaozhixing.com/";
public static final String CMDB_HOST = "http://eagle-mis.zhidaozhixing.com/eagleEye-mis/cmdbapi/";
public static final String HOST_DEV = "https://eagle-qa.zhidaozhixing.com";
public static final String HOST_RELEASE = "https://eagle-mis.zhidaozhixing.com";
public static String getHost() {
String host = HOST_RELEASE;
switch (DebugConfig.getNetMode()) {
case DebugConfig.NET_MODE_DEV:
case DebugConfig.NET_MODE_QA:
host = HOST_DEV;
break;
}
return host;
}
}

9
foudations/mogo-commons/src/main/java/com/mogo/commons/voice/AIAssist.java
View File

@@ -62,6 +62,15 @@ public class AIAssist {
}
}
/**
* 重新初始化Tts(首次sn获取比较慢，而TTS初始化比较早会拿不到授权)
*/
public void initTtsAgain(String sn) {
if (mTTS != null) {
mTTS.initTts(sn);
}
}
/**
* 是否语音注册成功
*