[2.13.0-arch-opt] merge

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerAutoPilotControlManager.kt

@@ -309,6 +309,7 @@ object CallerAutoPilotControlManager {
      * @param isLastStop        是否最终站
      * @return boolean
      */
+    @JvmStatic
     fun sendTripInfo(type: Int, lineName: String, departureStopName: String, arrivalStopName: String, isLastStop: Boolean) {
         providerApi?.sendTripInfo(type, lineName, departureStopName, arrivalStopName, isLastStop)
     }

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/autopilot/CallerChassisLamplightListenerManager.kt

@@ -9,14 +9,37 @@ import com.mogo.eagle.core.function.call.base.CallerBase
  */
 object CallerChassisLamplightListenerManager : CallerBase<IMoGoChassisLamplightListener>() {
 
+    private var turnLightTimes = 0
+    private var isOnTurnLight = false
+
     /**
      * 车辆转向灯数据回调
      * @param lightSwitch
      */
-    fun invokeAutopilotLightSwitchData(lightSwitch: Chassis.LightSwitch?) {
+    fun invokeAutopilotLightSwitchData(lightSwitch: Chassis.LightSwitch) {
         M_LISTENERS.forEach {
             val listener = it.value
-            listener.onAutopilotLightSwitchData(lightSwitch)
+            listener.onAutopilotLightSwitchData(getTurnLightState(lightSwitch))
+        }
+    }
+
+    private fun getTurnLightState(turn_light: Chassis.LightSwitch): Chassis.LightSwitch? {
+        if (turn_light == Chassis.LightSwitch.LIGHT_NONE) {
+            return if (isOnTurnLight) {
+                if (turnLightTimes >= 10) {
+                    isOnTurnLight = false
+                    return turn_light
+                } else {
+                    turnLightTimes++
+                    null
+                }
+            } else {
+                null
+            }
+        } else {
+            turnLightTimes = 0
+            isOnTurnLight = true
+            return turn_light
         }
     }
 

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt

@@ -59,30 +59,20 @@ object CallerHmiManager {
         v2xType: String,
         alertContent: CharSequence?,
         ttsContent: String?,
-        tag: String?,
-        listenerIMoGo: IMoGoWarningStatusListener?,
-        playTts: Boolean,
+        listenerIMoGo: IMoGoWarningStatusListener? = null,
+        playTts: Boolean = true,
         expireTime: Long = 5000L,
     ) {
         waringProviderApi?.warningV2X(
             v2xType,
             alertContent,
             ttsContent,
-            tag,
             listenerIMoGo,
             playTts,
             expireTime
         )
     }
 
-    /**
-     * 关闭指定floatTag 的 VR下V2X预警弹窗
-     * @param tag 弹窗标识
-     */
-    fun disableWarningV2X(tag: String?) {
-        waringProviderApi?.disableWarningV2X(tag)
-    }
-
     /**
      * 展示指定方位上的红框预警
      * @param direction
@@ -111,7 +101,6 @@ object CallerHmiManager {
 
     /**
      * 呈现交通云公告弹窗(hmi)
-     *
      * @param trafficStylePushData
      */
     fun showTrafficBanner(trafficStylePushData: NoticeTrafficStylePushData?) {
@@ -120,7 +109,6 @@ object CallerHmiManager {
 
     /**
      * 普通公告弹窗
-     *
      */
     fun showNoticeNormalData(noticeNormal: NoticeNormalData) {
         waringProviderApi?.showNoticeNormalData(noticeNormal)
@@ -133,29 +121,11 @@ object CallerHmiManager {
         waringProviderApi?.startRoadCameraLive(flvUrl)
     }
 
-    /**
-     * 呈现转向灯ui
-     *
-     * @param light
-     */
-    fun showTurnLight(light: Int) {
-        waringProviderApi?.showTurnLight(light)
-    }
-
-    /**
-     * 呈现刹车灯ui
-     *
-     * @param brakeLight
-     */
-    fun showBrakeLight(brakeLight: Int) {
-        waringProviderApi?.showBrakeLight(brakeLight)
-    }
-
-    fun showBindingcarDialog() {
+    fun showBindingCarDialog() {
         waringProviderApi?.showToBindingcarDialog()
     }
 
-    fun showModifyBindingcarDialog() {
+    fun showModifyBindingCarDialog() {
         waringProviderApi?.showModifyBindingcarDialog()
     }