2.11.1 添加 新obu断开连接方式

core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MoGoObuProvider.kt

@@ -7,12 +7,10 @@ import com.mogo.eagle.core.data.constants.MoGoConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.api.obu.IMoGoObuProvider
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
-import com.mogo.eagle.core.utilcode.mogo.MapAssetStyleUtils
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_OBU
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr
 import com.mogo.eagle.core.utilcode.util.CommonUtils
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 
 /**
  * @author xiaoyuzhou
@@ -27,7 +25,7 @@ class MoGoObuProvider : IMoGoObuProvider {
     private val busObuIp = "192.168.8.199"
     private val taxiObuIp = "192.168.1.199"
 
-//    private val taxiObuIp = "192.168.0.56"
+//    private val taxiObuIp = "192.168.1.186"
 
     override val functionName: String
         get() = TAG

core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuManager.kt

@@ -63,17 +63,16 @@ class MogoPrivateObuManager private constructor() {
         //自研obu初始化
         mObuStatusInfo.connectIP = ipAddress
         mObuStatusInfo.obuSdkVersion = MogoObuManager.getInstance().versionName
-
         if (!MogoObuManager.getInstance().isConnected) {
             MogoObuManager.getInstance().connect(context, mObuStatusInfo.connectIP)
         } else {
             try {
                 MogoObuManager.getInstance().disConnect()
                 Thread.sleep(500)
-                MogoObuManager.getInstance().connect(context, mObuStatusInfo.connectIP)
             } catch (e: Exception) {
                 e.printStackTrace()
             }
+            MogoObuManager.getInstance().connect(context, mObuStatusInfo.connectIP)
         }
     }
 
@@ -81,7 +80,6 @@ class MogoPrivateObuManager private constructor() {
         // OBU连接成功
         override fun onConnected() {
             CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "onConnected ------> ")
-            Log.d("liyz", "old  onConnected -----> ")
             mObuStatusInfo.obuStatus = true
             CallerObuListenerManager.invokeListener(mObuStatusInfo)
             mContext?.let { SharedPrefsMgr.getInstance(it).putBoolean("OBU", true) }
@@ -93,7 +91,6 @@ class MogoPrivateObuManager private constructor() {
         // OBU连接失败
         override fun onConnectFail(isNeedReconnect: Boolean) {
             CallerLogger.d("$M_OBU${MogoObuConst.TAG_MOGO_OBU}", "onConnectFail ------> ")
-            Log.d("liyz", "old  onConnectFail -----> ")
             mObuStatusInfo.obuStatus = false
             mObuStatusInfo.obuHvStatus = false
             mObuStatusInfo.obuRvStatus = false

core/function-impl/mogo-core-function-obu-mogo/src/main/java/com/mogo/eagle/core/function/obu/mogo/MogoPrivateObuNewManager.kt

@@ -69,6 +69,15 @@ class MogoPrivateObuNewManager private constructor() {
             .registerTopic(MogoObuTopicId.MAP_MATCH)
             .build()
 
+        //每次连接的时候如果连接连接了，先断开
+        if (MogoObuManager.getInstance().connectStatus == 1) {
+            try {
+                MogoObuManager.getInstance().disconnect()
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+
         MogoObuManager.getInstance().connect(options)
     }