From 621c8f36d2c54df0ecefcf9003d86f10ea830835 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 30 Nov 2022 12:59:28 +0800 Subject: [PATCH] [2.13.0] fix bug of sn token invoke --- .../mogo/launcher/stageone/HttpDnsStartUp.kt | 18 ++++++++++++------ .../MoGoAdasMsgConnectStatusListenerImpl.kt | 2 +- .../trace/TraceManager.kt | 4 ++-- .../core/function/hmi/ui/MoGoHmiFragment.kt | 4 ++-- .../function/api/cloud/IMoGoCloudListener.kt | 2 +- .../call/cloud/CallerCloudListenerManager.kt | 4 ++-- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt index a3a37c3b0d..bd03b1596e 100644 --- a/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt +++ b/app/src/main/java/com/mogo/launcher/stageone/HttpDnsStartUp.kt @@ -21,6 +21,7 @@ import com.mogo.commons.device.Devices import com.mogo.commons.network.NetConfigUtils import com.mogo.commons.network.Utils import com.mogo.eagle.core.data.config.FunctionBuildConfig +import com.mogo.eagle.core.data.constants.HostConst import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_CONNECT_FAIL import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_CONNECT_LOST import com.mogo.eagle.core.data.deva.chain.ChainConstant.Companion.CHAIN_ALIAS_CODE_CLOUD_CONNECT_SUCCESS @@ -39,7 +40,6 @@ import com.mogo.eagle.core.utilcode.util.ProcessUtils import com.mogo.eagle.core.utilcode.util.ThreadPoolService import com.mogo.eagle.core.utilcode.util.TimeUtils import com.mogo.map.location.GDLocationClient -import com.mogo.eagle.core.data.constants.HostConst import com.rousetime.android_startup.AndroidStartup import com.zhjt.mogo_core_function_devatools.env.EnvChangeManager import com.zhjt.service.chain.ChainLog @@ -202,9 +202,9 @@ class HttpDnsStartUp : AndroidStartup() { override fun onTokenGot(token: String, sn: String) { clientConfig.token = token // 由于存在token过期问题，在更新后会回调至此处，增加二次判定 - if(!gotToken){ - CallerLogger.d(SceneConstant.M_MAIN + TAG, "onTokenGot ") - CallerCloudListenerManager.invokeCloudTokenGot(token) + if (!gotToken) { + CallerLogger.d(SceneConstant.M_MAIN + TAG, "onTokenGot token : $token , sn :$sn") + CallerCloudListenerManager.invokeCloudTokenGot(token, sn) // 异步初始化NetConfig asyncInit() // HttpDns ttl回调 --- socketTTL @@ -270,7 +270,10 @@ class HttpDnsStartUp : AndroidStartup() { HttpDnsConst.HTTP_DNS_ADDRESS_TYPE_HTTP ) ?: return if (dnsCacheIp != cacheIp) { - CallerLogger.d(SceneConstant.M_MAIN + TAG, "获取缓存Dns IP : $dnsCacheIp , 原缓存 IP ： $cacheIp") + CallerLogger.d( + SceneConstant.M_MAIN + TAG, + "获取缓存Dns IP : $dnsCacheIp , 原缓存 IP ： $cacheIp" + ) startSocketService() cacheIp = dnsCacheIp } @@ -352,7 +355,10 @@ class HttpDnsStartUp : AndroidStartup() { clientPkFileName = "sn" ) override fun onError(code: String, msg: String?) { - CallerLogger.d(SceneConstant.M_MAIN + TAG, "socket-onError code : $code , msg : $msg") + CallerLogger.d( + SceneConstant.M_MAIN + TAG, + "socket-onError code : $code , msg : $msg" + ) } }) // 开启Socket长链服务 diff --git a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt index a9da4f3990..bac4a75aaa 100644 --- a/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt +++ b/core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/adapter/MoGoAdasMsgConnectStatusListenerImpl.kt @@ -191,7 +191,7 @@ class MoGoAdasMsgConnectStatusListenerImpl : OnAdasConnectStatusListener, } - override fun tokenGot(sn: String) { + override fun tokenGot(token: String, sn: String) { syncBasicInfoToAutopilot(sn) } diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt index a0c48db9ec..c71096ce5a 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/trace/TraceManager.kt @@ -32,7 +32,7 @@ class TraceManager : IMoGoCloudListener { @Synchronized fun init(context: Context) { - if(init){ + if (init) { return } // 初始化Trace抓取服务 @@ -101,7 +101,7 @@ class TraceManager : IMoGoCloudListener { init = true } - override fun tokenGot(sn: String) { + override fun tokenGot(token: String, sn: String) { FileWriteManager.getInstance().updateDeviceId(sn) } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt index 736f671801..e86c041a40 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt +++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt @@ -950,7 +950,7 @@ class MoGoHmiFragment : MvpFragment(), SharedPrefsMgr.getInstance(it) .putLong("roadwork", System.currentTimeMillis() / 1000) } - CallerAutoPilotManager.sendTripInfo(5, "", "", "", false); + CallerAutoPilotManager.sendTripInfo(5, "", "", "", false) } } @@ -1564,7 +1564,7 @@ class MoGoHmiFragment : MvpFragment(), EXIT_AUTOPILOT_FOR_LOCATION, EXIT_AUTOPILOT_FOR_CHASSIS, EXIT_AUTOPILOT_FOR_DISTANCE -> { - showWarningV2X( + warningV2X( EventTypeEnum.TAKE_OVER_EVENT.poiType, EventTypeEnum.TAKE_OVER_EVENT.content, EventTypeEnum.TAKE_OVER_EVENT.tts, diff --git a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/cloud/IMoGoCloudListener.kt b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/cloud/IMoGoCloudListener.kt index a59f644004..89cf1c82cc 100644 --- a/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/cloud/IMoGoCloudListener.kt +++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/cloud/IMoGoCloudListener.kt @@ -2,5 +2,5 @@ package com.mogo.eagle.core.function.api.cloud interface IMoGoCloudListener { - fun tokenGot(sn:String) + fun tokenGot(token: String, sn: String) } \ No newline at end of file diff --git a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/cloud/CallerCloudListenerManager.kt b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/cloud/CallerCloudListenerManager.kt index dc9b71dfb9..5c6208c3d6 100644 --- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/cloud/CallerCloudListenerManager.kt +++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/cloud/CallerCloudListenerManager.kt @@ -53,10 +53,10 @@ object CallerCloudListenerManager { /** * 分发获取到的设备sn */ - fun invokeCloudTokenGot(sn: String) { + fun invokeCloudTokenGot(token: String, sn: String) { M_CLOUD_LISTENER.forEach { val listener = it.value - listener.tokenGot(sn) + listener.tokenGot(token, sn) } } } \ No newline at end of file