diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt
index a405df4e2f..64147510b7 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/greenwave/GreenWaveView.kt
@@ -22,7 +22,6 @@ import com.mogo.eagle.core.utilcode.kotlin.scope
 import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils
 import com.mogo.eagle.core.utilcode.rv.divider.CommonDividerItemDecoration
 import com.mogo.eagle.core.utilcode.util.SizeUtils
-import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import kotlinx.coroutines.Runnable
 import kotlinx.coroutines.launch
 import kotlin.math.abs
@@ -121,7 +120,6 @@ class GreenWaveView: LinearLayout, IMoGoChassisLocationGCJ02Listener, RecyclerVi
         CallerHmiViewControlListenerManager.removeListener(this)
         val rv: RecyclerView? = if (isDriver) driver_wave_rv else passenger_wave_rv
         rv?.removeOnItemTouchListener(this)
-        stopAutoScroll()
     }
 
     override fun onChassisLocationGCJ02(mogoLocation: MogoLocation?) {
@@ -132,7 +130,7 @@ class GreenWaveView: LinearLayout, IMoGoChassisLocationGCJ02Listener, RecyclerVi
             lastSpeed = speed
         }
         if (isChanged) {
-            UiThreadHandler.post {
+            scope.launch {
                 if (isDriver) {
                     driver_speed?.text = speed.toString()
                 } else {
@@ -166,6 +164,7 @@ class GreenWaveView: LinearLayout, IMoGoChassisLocationGCJ02Listener, RecyclerVi
 
     private fun hide() {
         scope.launch {
+            stopAutoScroll()
             visibility = View.GONE
         }
     }
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
index 2b467c9070..ce55fc2610 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/enums/EventTypeEnumNew.kt
@@ -1517,6 +1517,7 @@ enum class EventTypeEnumNew(
                 TYPE_PEDESTRIAN_CROSSING.poiType -> TYPE_PEDESTRIAN_CROSSING.tts
                 TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.poiType -> TYPE_SOCKET_ROAD_OTHER_RETROGRADE_VEHICLE.tts
                 TYPE_USECASE_ROAD_BUS_STATION.poiType -> TYPE_USECASE_ROAD_BUS_STATION.tts
+                TYPE_SOCKET_ROAD_PEOPLE_CROSS.poiType -> TYPE_SOCKET_ROAD_PEOPLE_CROSS.tts
                 else -> TYPE_ERROR.tts
             }
         }