:wq

fix bug tts of callchat and trafficlight code

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

@@ -27,11 +27,13 @@ import com.mogo.eagle.core.function.hmi.ui.camera.CameraListView
 import com.mogo.eagle.core.function.hmi.ui.notice.NoticeBannerView
 import com.mogo.eagle.core.function.hmi.ui.notice.NoticeNormalBannerView
 import com.mogo.eagle.core.function.hmi.ui.setting.DebugSettingView
+import com.mogo.eagle.core.function.hmi.ui.utils.visible
 import com.mogo.eagle.core.function.hmi.ui.widget.V2XNotificationView
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.module.common.enums.EventTypeEnum
 import com.mogo.utils.logger.Logger
 import kotlinx.android.synthetic.main.fragment_hmi.*
+import androidx.core.view.isVisible as isVisible
 
 /**
  * @author xiaoyuzhou
@@ -281,6 +283,10 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
         viewTrafficLightVr?.showWarningTrafficLight(checkLightId)
     }
 
+    override fun isWarningTrafficLightShow(): Boolean {
+        return viewTrafficLightVr.visibility == View.VISIBLE
+    }
+
     /**
      * 关闭红绿灯预警展示，并重制灯态
      */

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/TrafficLightHMIManager.kt

@@ -15,6 +15,10 @@ class TrafficLightHMIManager {
 
     private var initView: Boolean = false
 
+    fun isWarningTrafficLightShow():Boolean{
+        return CallerHmiManager.isWarningTrafficLightShow()
+    }
+
     fun updateTrafficLight(trafficLightResult: TrafficLightResult) {
         val currentTrafficLight = trafficLightResult.currentRoadTrafficLight()
         currentTrafficLight?.let {

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt

@@ -46,6 +46,13 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
             TrafficLightThreadHandler(WorkThreadHandler.newInstance("TrafficLight").looper,
                 {
                     Logger.d(TAG, "loop search roadID , mLocation : $mLocation")
+
+                    //查询路口时，如果红绿灯显示，则隐藏掉
+                    if(TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()){
+                        TrafficLightHMIManager.INSTANCE.hideTrafficLight()
+                        CallTrafficLightListenerManager.resetTrafficLightData()
+                    }
+
                     mLocation?.let { it ->
                         val tileId = MogoApisHandler.getInstance().apis
                             .mapServiceApi.mapUIController.getTileId(it.longitude, it.latitude)
@@ -74,7 +81,12 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
                                 CallTrafficLightListenerManager.invokeTrafficLightStatus(result)
                             },
                             { errorMsg ->
+                                //如果没有获取到正确的红绿灯数据，则取消读灯，继续读路口，防止出现一直读灯的情况
                                 Logger.d(TAG, "request Traffic Light error : $errorMsg")
+                                //stop loop traffic light
+                                trafficLightNetWorkModel.cancelRequestTrafficLight()
+                                //未查到红绿灯，加入2秒延时请求路口ID
+                                mThreadHandler?.sendEmptyMessageDelayed(MSG_WHAT_LOOP_SEARCH_CROSS_ROAD, 2_000L)
                             })
                     }
                 }, {
@@ -116,7 +128,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
                 && (CoordinateUtils.calculateLineDistance(
                     it.longitude, it.latitude,
                     trafficLightResult!!.lon, trafficLightResult!!.lat
-                ) < 5)
+                ) < 10)
             ) {
                 trafficLightResult = null
                 TrafficLightHMIManager.INSTANCE.hideTrafficLight()