[3.3.2] change the time from 1200 to 1000 and invoke status from request to map invoke

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaBusView.kt

@@ -10,8 +10,8 @@ import com.mogo.eagle.core.function.api.map.roma.IMoGoRomaListener
 import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager.romaTrigger
 import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.kotlin.onClick
 import com.mogo.eagle.core.utilcode.util.ClickUtils
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 import kotlinx.android.synthetic.main.view_roma_bus_bg.view.ivRomaView
 import kotlinx.android.synthetic.main.view_roma_bus_bg.view.ll_roma_bg
@@ -57,7 +57,7 @@ class RomaBusView @JvmOverloads constructor(
         }
 
         setOnClickListener {
-            if (ClickUtils.isClickTooFrequent(this,1200)) {
+            if (ClickUtils.isClickTooFrequent(this,1000)) {
                 return@setOnClickListener
             }
             if(!click){
@@ -76,23 +76,25 @@ class RomaBusView @JvmOverloads constructor(
     }
 
     override fun romaStatus(status: Boolean) {
-        click = true
-        if (status) {
-            romaMode = true
-            if(openRes!=0){
-                ll_roma_bg.setBackgroundResource(openRes)
-            }else{
-                ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg)
+        ThreadUtils.runOnUiThread {
+            click = true
+            if (status) {
+                romaMode = true
+                if(openRes!=0){
+                    ll_roma_bg.setBackgroundResource(openRes)
+                }else{
+                    ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg)
+                }
+                ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg)
+            } else {
+                romaMode = false
+                if(normalRes!=0){
+                    ll_roma_bg.setBackgroundResource(normalRes)
+                }else{
+                    ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector)
+                }
+                ivRomaView.setBackgroundResource(R.drawable.romafront_select_bg)
             }
-            ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg)
-        } else {
-            romaMode = false
-            if(normalRes!=0){
-                ll_roma_bg.setBackgroundResource(normalRes)
-            }else{
-                ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector)
-            }
-            ivRomaView.setBackgroundResource(R.drawable.romafront_select_bg)
         }
     }
 

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaPassengerView.kt

@@ -11,6 +11,7 @@ import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.ClickUtils
 import com.mogo.eagle.core.utilcode.util.DeviceUtils
+import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.eagle.core.utilcode.util.ToastUtils
 
 class RomaPassengerView @JvmOverloads constructor(
@@ -41,7 +42,7 @@ class RomaPassengerView @JvmOverloads constructor(
             normalRes = a.getResourceId(R.styleable.RomaPassengerView_roma_close, 0)
             a.recycle()
             setOnClickListener {
-                if (ClickUtils.isClickTooFrequent(this,1200)) {
+                if (ClickUtils.isClickTooFrequent(this,1000)) {
                     return@setOnClickListener
                 }
                 if(!click){
@@ -66,16 +67,18 @@ class RomaPassengerView @JvmOverloads constructor(
     }
 
     override fun romaStatus(status: Boolean) {
-        click = true
-        if (status) {
-            romaMode = true
-            if (openRes != 0) {
-                setBackgroundResource(openRes)
-            }
-        } else {
-            romaMode = false
-            if (normalRes != 0) {
-                setBackgroundResource(normalRes)
+        ThreadUtils.runOnUiThread {
+            click = true
+            if (status) {
+                romaMode = true
+                if (openRes != 0) {
+                    setBackgroundResource(openRes)
+                }
+            } else {
+                romaMode = false
+                if (normalRes != 0) {
+                    setBackgroundResource(normalRes)
+                }
             }
         }
     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/RomaTaxiView.kt

@@ -10,8 +10,7 @@ import com.mogo.eagle.core.function.api.map.roma.IMoGoRomaListener
 import com.mogo.eagle.core.function.call.map.CallerMapIdentifyManager.romaTrigger
 import com.mogo.eagle.core.function.call.map.CallerMapRomaListener
 import com.mogo.eagle.core.function.hmi.R
-import com.mogo.eagle.core.utilcode.util.ClickUtils
-import com.mogo.eagle.core.utilcode.util.ToastUtils
+import com.mogo.eagle.core.utilcode.util.*
 import kotlinx.android.synthetic.main.view_roma_taxi_bg.view.ivRomaView
 import kotlinx.android.synthetic.main.view_roma_taxi_bg.view.ll_roma_bg
 
@@ -56,7 +55,7 @@ class RomaTaxiView @JvmOverloads constructor(
         }
 
         setOnClickListener {
-            if (ClickUtils.isClickTooFrequent(this,1200)) {
+            if (ClickUtils.isClickTooFrequent(this,1000)) {
                 return@setOnClickListener
             }
             if(!click){
@@ -75,23 +74,25 @@ class RomaTaxiView @JvmOverloads constructor(
     }
 
     override fun romaStatus(status: Boolean) {
-        click = true
-        if (status) {
-            romaMode = true
-            if(openRes!=0){
-                ll_roma_bg.setBackgroundResource(openRes)
-            }else{
-                ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg)
+        ThreadUtils.runOnUiThread {
+            click = true
+            if (status) {
+                romaMode = true
+                if(openRes!=0){
+                    ll_roma_bg.setBackgroundResource(openRes)
+                }else{
+                    ll_roma_bg.setBackgroundResource(R.drawable.romabg_press_select_bg)
+                }
+                ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg)
+            } else {
+                romaMode = false
+                if(normalRes!=0){
+                    ll_roma_bg.setBackgroundResource(normalRes)
+                }else{
+                    ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector)
+                }
+                ivRomaView.setBackgroundResource(R.drawable.romafront_select_bg)
             }
-            ivRomaView.setBackgroundResource(R.drawable.roma_press_select_bg)
-        } else {
-            romaMode = false
-            if(normalRes!=0){
-                ll_roma_bg.setBackgroundResource(normalRes)
-            }else{
-                ll_roma_bg.setBackgroundResource(R.drawable.roma_bg_selector)
-            }
-            ivRomaView.setBackgroundResource(R.drawable.romafront_select_bg)
         }
     }
 

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/business/ai/AiCloudIdentifyDataManager.kt

@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.business.ai
 import android.content.Context
 import android.os.Handler
 import android.os.Message
+import android.util.Log
 import com.mogo.aicloud.services.socket.IMogoOnMessageListener
 import com.mogo.aicloud.services.socket.MogoAiCloudSocketManager
 import com.mogo.commons.debug.DebugConfig
@@ -218,9 +219,6 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
                 if (dataReceive) {
                     // 请求地图开始漫游
                     MogoMapUIController.getInstance().setRomaMode(FunctionBuildConfig.romaModeStyle)
-                    CallerMapRomaListener.invokeMapRoma(true)
-                } else {
-                    CallerMapRomaListener.invokeMapRoma(false)
                 }
             },
             { errorMsg ->
@@ -249,6 +247,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
     //status 0：进入漫游模式成功 1；进入漫游模式失败 2：正常结束漫游 3：切换视角结束漫游
     override fun mapRomaStatus(status: Int, msg: String) {
         super.mapRomaStatus(status, msg)
+        Log.d("emArrow","Thread:${Thread.currentThread().name}")
         when (status) {
             0 -> {
                 MapBizTrace.log(
@@ -259,6 +258,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
                 )
                 showAiCloud.set(true)
                 FunctionBuildConfig.isDrawIdentifyData = false
+                CallerMapRomaListener.invokeMapRoma(true)
                 // 5秒没有触发 则预警日志写入
                 handler.sendEmptyMessageDelayed(H_ERROR_CLOUD, H_DELAY_TIME)
             }
@@ -267,6 +267,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
                 m.what = H_ERROR_MAP
                 m.obj = msg
                 handler.sendMessage(m)
+                CallerMapRomaListener.invokeMapRoma(false)
                 closeRoma(false)
             }
             2 -> { // 地图自动漫游结束，重置状态，调用close通知服务端
@@ -298,6 +299,7 @@ class AiCloudIdentifyDataManager : IMoGoPlanningRottingListener,
             aiCloudDataChange.set(false)
             MapIdentifySubscriber.instance.clearAiCloudRoma()
             FunctionBuildConfig.isDrawIdentifyData = true
+            CallerMapRomaListener.invokeMapRoma(false)
             if (invokeCloud) {
                 closeRoma(false)
             }