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-02 19:53:12 +08:00
parent 346bbfb0c2 095c926fb6
commit feeecbb564
8 changed files with 157 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt
View File

@@ -81,7 +81,6 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
// if (ProcessUtils.isMainProcess(context)) {
initGDLoc()
initHttpDns()
initCloudClientConfig()
// }
return true
}
@@ -112,8 +111,10 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE
// 设置是否输出日志
clientConfig.isShowDebugLog = true
// 使用中台长链接
clientConfig.isUseOriginSocket = true
// 设置是否输出网络日志
clientConfig.isShowNetDebugLog = true //todo test em arrow
clientConfig.isShowNetDebugLog = false
// 设置是否是直播推流的主播
clientConfig.isAnchor = true
when (DebugConfig.getCarMachineType()) {
@@ -205,7 +206,10 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
clientConfig.token = token
// 由于存在token过期问题，在更新后会回调至此处，增加二次判定
if (!gotToken) {
CallerLogger.d(SceneConstant.M_MAIN + TAG, "onTokenGot token : $token , sn :$sn")
CallerLogger.d(
SceneConstant.M_MAIN + TAG,
"onTokenGot token : $token , sn :$sn"
)
CallerCloudListenerManager.invokeCloudTokenGot(token, sn)
// 异步初始化NetConfig
asyncInit()
@@ -315,7 +319,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
)
override fun onConnectFailure() {
CallerLogger.d(SceneConstant.M_MAIN + TAG, "socket-onConnectFailure")
MogoStatusManager.getInstance().setCloudSocketMode(TAG,false)
MogoStatusManager.getInstance().setCloudSocketMode(TAG, false)
}
@ChainLog(
@@ -328,7 +332,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
)
override fun onConnectSuccess() {
CallerLogger.d(SceneConstant.M_MAIN + TAG, "socket-onConnectSuccess")
MogoStatusManager.getInstance().setCloudSocketMode(TAG,true)
MogoStatusManager.getInstance().setCloudSocketMode(TAG, true)
}
@ChainLog(
@@ -341,7 +345,7 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
)
override fun onConnectLost() {
CallerLogger.d(SceneConstant.M_MAIN + TAG, "socket-onConnectLost")
MogoStatusManager.getInstance().setCloudSocketMode(TAG,false)
MogoStatusManager.getInstance().setCloudSocketMode(TAG, false)
}
@ChainLog(
@@ -366,11 +370,4 @@ class HttpDnsStartUp : AndroidStartup<Boolean>() {
.init(context, DebugConfig.getSocketAppId(), lat, lon)
}
private fun initCloudClientConfig() {
// 使用旧Socket链路 true = 旧链路，false = 新链路
if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)||
AppIdentityModeUtils.isBus(FunctionBuildConfig.appIdentityMode)) {
clientConfig.isUseOriginSocket = true
}
}
}