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 8fc82cf6dd..76628e984a 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
@@ -840,7 +840,9 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     override fun showTurnLight(light: Int) {
         if (HmiBuildConfig.isShowTurnLightView) {
             ThreadUtils.runOnUiThread {
-                turnLightView.setTurnLight(light)
+                turnLightView?.let {
+                    turnLightView.setTurnLight(light)
+                }
             }
         }
     }
@@ -851,7 +853,9 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
     override fun showBrakeLight(light: Int) {
         if (HmiBuildConfig.isShowBrakeLightView) {
             ThreadUtils.runOnUiThread {
-                brakeView.setBrakeLight(light)
+                brakeView?.let {
+                    brakeView.setBrakeLight(light)
+                }
             }
         }
     }
diff --git a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
index 62ae1f56e9..e6a41943b7 100644
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/MogoTrafficLightManager.kt
@@ -48,11 +48,11 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
             .registerCenterApi.registerCarLocationChangedListener(TAG, this)
         mThreadHandler =
             TrafficLightThreadHandler(Looper.getMainLooper(), {
-                //TODO emArrow 查询路口时，如果红绿灯显示，则隐藏掉
-//                if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) {
-//                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-//                    CallTrafficLightListenerManager.resetTrafficLightData()
-//                }
+                //查询路口时，如果红绿灯显示，则隐藏掉
+                if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) {
+                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
+                    CallTrafficLightListenerManager.resetTrafficLightData()
+                }
                 mLocation?.let { it ->
                     val tileId = CallerMapUIServiceManager.getMapUIController()?.getTileId(it.longitude, it.latitude) ?: 0
                     trafficLightNetWorkModel.requestRoadID(