[Update]优化多屏连接状态

app_ipc_monitoring/build.gradle

@@ -75,6 +75,6 @@ dependencies {
     implementation project(':core:mogo-core-utils')
     implementation 'org.greenrobot:eventbus:3.2.0'
     implementation 'com.android.support:multidex:1.0.3'
-    implementation 'com.mogo.cloud:telematic:1.3.56'
+    implementation 'com.mogo.cloud:telematic:1.3.57'
     implementation 'com.jcraft:jsch:0.1.55'
 }

core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/MoGoAutopilotProvider.kt

@@ -26,7 +26,6 @@ import com.mogo.eagle.core.function.autopilot.adapter.MoGoHandAdasMsgManager
 import com.mogo.eagle.core.function.autopilot.server.AsyncDataToAutopilotServer
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotManager
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotCarConfigListenerManager
-import com.mogo.eagle.core.function.call.bindingcar.CallerBindingcarManager
 import com.mogo.eagle.core.function.call.map.CallerMapDataCollectorManager
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
@@ -66,6 +65,8 @@ class MoGoAutopilotProvider :
     IMoGoAutopilotCarConfigListener {
     private val TAG = "MoGoAutoPilotProvider"
     private var mContext: Context? = null
+    @Volatile
+    private var isFirstDisc = true
 
     override val functionName: String
         get() = TAG
@@ -499,11 +500,14 @@ class MoGoAutopilotProvider :
         }
     }
 
-    private fun handleConnStatusWithServer(statusCode: Int, sign: String?) {
+    private fun handleConnStatusWithServer(statusCode: Int, content: String?) {
         when (statusCode) {
             ConnectState.STATUS_CONNECT_SUCCESS -> {
+                if (!isFirstDisc) {
+                    isFirstDisc = true
+                }
                 ToastUtils.showShort("连接司机屏成功!")
-                invokeNettyConnResult("乘客屏连接司机屏成功，司机屏SN为：$sign")
+                invokeNettyConnResult("乘客屏连接司机屏成功")
                 // 连接成功后，乘客屏没拿到车牌号就像司机屏请求
                 if (AppConfigInfo.plateNumber.isNullOrEmpty()) {
                     var byteArray = byteArrayOf(0)
@@ -514,10 +518,20 @@ class MoGoAutopilotProvider :
                     }
                 }
             }
-            else -> {
-                ToastUtils.showLong("和司机端连接异常!")
-                invokeNettyConnResult("乘客屏和司机屏连接异常，状态码为：$statusCode")
+            ConnectState.STATUS_CONNECT_CLOSED -> {// 由于重连机制会回调多次
+                if (isFirstDisc) {
+                    isFirstDisc = false
+                    AppConfigInfo.plateNumber = ""
+                    ToastUtils.showLong("断开和司机屏的连接!")
+                    invokeNettyConnResult("断开和司机屏的连接!")
+                }
             }
+            ConnectState.STATUS_CONNECT_ERROR -> {
+                AppConfigInfo.plateNumber = ""
+                ToastUtils.showLong("和司机端连接异常!")
+                invokeNettyConnResult("乘客屏和司机屏连接异常，错误为：$content")
+            }
+            else -> {}
         }
     }
 

gradle.properties

@@ -23,7 +23,7 @@ kotlin.parallel.tasks.in.project=true
 #优化kapt
 #并行运行kapt1.2.60版本以上支持
 kapt.use.worker.api=true
-#增量编译 kapt1.3.56版本以上支持
+#增量编译 kapt1.3.57版本以上支持
 kapt.incremental.apt=true
 #kapt avoiding 如果用kapt依赖的内容没有变化，会完全重用编译内容，省掉app:kaptGenerateStubsDebugKotlin的时间
 kapt.include.compile.classpath=false
@@ -63,23 +63,23 @@ SERVICE_CHAIN_VERSION=1.1.0
 LOGLIB_VERSION=1.3.0
 ######## MogoAiCloudSDK Version ########
 # 网络请求LOGLIB_VERSION
-MOGO_NETWORK_VERSION=1.3.56
+MOGO_NETWORK_VERSION=1.3.57
 # 鉴权
-MOGO_PASSPORT_VERSION=1.3.56
+MOGO_PASSPORT_VERSION=1.3.57
 # 常链接
-MOGO_SOCKET_VERSION=1.3.56
+MOGO_SOCKET_VERSION=1.3.57
 # 数据采集
-MOGO_REALTIME_VERSION=1.3.56
+MOGO_REALTIME_VERSION=1.3.57
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.3.56
+MOGO_TANLU_VERSION=1.3.57
 # 直播推流
-MOGO_LIVE_VERSION=1.3.56
+MOGO_LIVE_VERSION=1.3.57
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.3.56
+MOGO_TRAFFICLIVE_VERSION=1.3.57
 # 定位服务
-MOGO_LOCATION_VERSION=1.3.56
+MOGO_LOCATION_VERSION=1.3.57
 # 远程通讯模块
-MOGO_TELEMATIC_VERSION=1.3.56
+MOGO_TELEMATIC_VERSION=1.3.57
 ######## MogoAiCloudSDK Version ########
 # 自研地图
 MAP_SDK_VERSION=2.1.1.2
@@ -155,7 +155,7 @@ MOGO_OCH_TAXI_VERSION=2.0.66
 # mogoAiCloud sdk services
 MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.10
 # v2x-sdk
-MOGO_V2X_SDK_VERSION=1.3.56
+MOGO_V2X_SDK_VERSION=1.3.57
 ################# 旧版本架构模块版本 #################