[2.13.0-arch-opt] merge

2023-02-01 17:57:36 +08:00
parent 2df96d3dac
commit 25663f087b
98 changed files with 770 additions and 1693 deletions
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/TrafficLightHMIManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/TrafficLightHMIManager.kt
@@ -1,65 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.trafficlight
-
-import com.mogo.eagle.core.data.trafficlight.*
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
-
-class TrafficLightHMIManager {
-
-    companion object {
-        const val TAG = "TrafficLightHMIManager"
-
-        val INSTANCE: TrafficLightHMIManager by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
-            TrafficLightHMIManager()
-        }
-    }
-
-    private var initView: Boolean = false
-
-    fun isWarningTrafficLightShow(): Boolean {
-        return CallerHmiManager.isWarningTrafficLightShow()
-    }
-
-    fun updateTrafficLight(trafficLightResult: TrafficLightResult) {
-        val currentTrafficLight = trafficLightResult.currentRoadTrafficLight()
-        currentTrafficLight?.let {
-            if (!initView) {
-                initView = true
-                CallerHmiManager.showWarningTrafficLight(0,1)
-            }
-            callerHMIToChangeLight(it)
-        }
-    }
-
-    private fun callerHMIToChangeLight(trafficLightStatus: TrafficLightStatus) {
-        val remain = if (trafficLightStatus.remain > 99) {
-            99
-        } else {
-            trafficLightStatus.remain
-        }
-        when {
-            trafficLightStatus.isGreen() || trafficLightStatus.isFlashGreen() -> {
-                CallerHmiManager.showWarningTrafficLight(3,1)
-                CallerHmiManager.changeCountdownGreen(remain)
-//                CallerHmiManager.changeCountdownRed(-1)
-//                CallerHmiManager.changeCountdownYellow(-1)
-            }
-            trafficLightStatus.isYellow() -> {
-                CallerHmiManager.showWarningTrafficLight(2,1)
-                CallerHmiManager.changeCountdownYellow(remain)
-//                CallerHmiManager.changeCountdownGreen(-1)
-//                CallerHmiManager.changeCountdownRed(-1)
-            }
-            trafficLightStatus.isRed() -> {
-                CallerHmiManager.showWarningTrafficLight(1,1)
-                CallerHmiManager.changeCountdownRed(remain)
-//                CallerHmiManager.changeCountdownGreen(-1)
-//                CallerHmiManager.changeCountdownYellow(-1)
-            }
-        }
-    }
-
-    fun hideTrafficLight() {
-        initView = false
-        CallerHmiManager.disableWarningTrafficLight()
-    }
-}
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
@@ -8,14 +8,13 @@ import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Liste
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
-import com.mogo.eagle.function.biz.v2x.trafficlight.TrafficLightHMIManager
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
+import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
 import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_LOOP_SEARCH_CROSS_ROAD
 import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_LOOP_SEARCH_TRAFFIC_LIGHT
 import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_STOP_SEARCH_CROSS_ROAD
 import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_STOP_SEARCH_TRAFFIC_LIGHT
 import com.mogo.eagle.function.biz.v2x.trafficlight.network.TrafficLightNetWorkModel
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.Companion.M_V2X
 import mogo.telematics.pad.MessagePad

 class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener {
@@ -46,9 +45,8 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener {
        mThreadHandler =
            TrafficLightThreadHandler(Looper.getMainLooper(), {
                //第一次查询路口时，如果红绿灯显示，则隐藏掉
-                if (firstLoopCrossRoad && TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) {
-                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-                    CallerTrafficLightListenerManager.resetTrafficLightData()
+                if (firstLoopCrossRoad) {
+                    CallerTrafficLightListenerManager.resetTrafficLightStatus()
                }
                firstLoopCrossRoad = false
                mLocation?.let { it ->
@@ -98,10 +96,7 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener {
                                    2_000L
                                )
                            }
-                            if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) {
-                                TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-                                CallerTrafficLightListenerManager.resetTrafficLightData()
-                            }
+                            CallerTrafficLightListenerManager.resetTrafficLightStatus()
                            CallerTrafficLightListenerManager.invokeTrafficRequestError()

                        })
@@ -137,8 +132,7 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener {
                    trafficLightResult = null
                    firstLoopCrossRoad = true
                    mThreadHandler?.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_TRAFFIC_LIGHT)
-                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-                    CallerTrafficLightListenerManager.resetTrafficLightData()
+                    CallerTrafficLightListenerManager.resetTrafficLightStatus()
                }
            }
        }
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/TrafficLightDispatcher.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/TrafficLightDispatcher.kt
@@ -2,25 +2,23 @@ package com.mogo.eagle.function.biz.v2x.trafficlight.core

 import android.content.Context
 import android.os.Handler
-import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
+import com.mogo.eagle.core.data.enums.DataSourceType
+import com.mogo.eagle.core.data.enums.TrafficLightEnum
+import com.mogo.eagle.core.data.trafficlight.*
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener
-import com.mogo.eagle.core.function.api.obu.IMoGoObuTrafficLightListener
 import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
-import com.mogo.eagle.core.function.call.obu.CallerObuTrafficLightListenerManager
 import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
-import com.mogo.eagle.function.biz.v2x.trafficlight.TrafficLightHMIManager
 import perception.TrafficLightOuterClass
 import perception.TrafficLightOuterClass.TrafficLight

 /**
 * @author XuXinChao
- * @description 对多个红绿灯信号来源进行统一调度（AI云、工控机）
+ * @description 对多个红绿灯信号来源进行统一调度（AI云、工控机、OBU）
+ * @优先级：OBU,云,工控
 * @since: 2022/4/28
 */
-class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLightListener,
-    IMoGoObuTrafficLightListener {
+class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLightListener {

    companion object {
        const val TAG = "TrafficLightDispatcher"
@@ -34,6 +32,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight

    //是否有AI获取红绿灯灯态
    private var hasAiLightStatus: Boolean = false
+
    //obu数据
    private var hasObuLightStatus: Boolean = false

@@ -41,14 +40,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
        mContext = context
        //注册监听AI云获取红绿灯状态
        CallerTrafficLightListenerManager.addListener(TAG, this)
-        //注册监听AI云进入路口
-        CallerTrafficLightListenerManager.addListener(TAG, this)
-        //注册监听红绿灯请求失败
-        CallerTrafficLightListenerManager.addListener(TAG, this)
        //注册监听工控机感知红绿灯
        CallerAutopilotIdentifyListenerManager.addListener(TAG, this)
-        //obu红绿灯数据
-        CallerObuTrafficLightListenerManager.addListener(TAG, this)
    }

    /**
@@ -71,27 +64,36 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
                    }
                    if (light == null) {
                        //隐藏红绿灯显示
-                        TrafficLightHMIManager.INSTANCE.hideTrafficLight()
+                        CallerTrafficLightListenerManager.disableTrafficLight()
                    } else {
                        when (light.state) {
                            TrafficLightOuterClass.LightState.STATE_RED -> {
                                //红灯
-                                CallerHmiManager.showWarningTrafficLight(1, 2)
-                                CallerHmiManager.changeCountdownGreen(0)
+                                CallerTrafficLightListenerManager.showTrafficLight(
+                                    TrafficLightEnum.RED,
+                                    DataSourceType.TELEMATIC
+                                )
+                                CallerTrafficLightListenerManager.changeCountdownRed(0)
                            }
                            TrafficLightOuterClass.LightState.STATE_YELLOW -> {
                                //黄灯
-                                CallerHmiManager.showWarningTrafficLight(2, 2)
-                                CallerHmiManager.changeCountdownGreen(0)
+                                CallerTrafficLightListenerManager.showTrafficLight(
+                                    TrafficLightEnum.YELLOW,
+                                    DataSourceType.TELEMATIC
+                                )
+                                CallerTrafficLightListenerManager.changeCountdownYellow(0)
                            }
                            TrafficLightOuterClass.LightState.STATE_GREEN -> {
                                //绿灯
-                                CallerHmiManager.showWarningTrafficLight(3, 2)
-                                CallerHmiManager.changeCountdownGreen(0)
+                                CallerTrafficLightListenerManager.showTrafficLight(
+                                    TrafficLightEnum.GREEN,
+                                    DataSourceType.TELEMATIC
+                                )
+                                CallerTrafficLightListenerManager.changeCountdownGreen(0)
                            }
                            TrafficLightOuterClass.LightState.STATE_OFF -> {
                                //黑灯，隐藏红绿灯显示
-                                TrafficLightHMIManager.INSTANCE.hideTrafficLight()
+                                CallerTrafficLightListenerManager.disableTrafficLight()
                            }
                            else -> {}
                        }
@@ -107,7 +109,7 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
     */
    override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) {
        if (!hasObuLightStatus) {
-            TrafficLightHMIManager.INSTANCE.updateTrafficLight(trafficLightResult)
+            updateTrafficLight(trafficLightResult)
            hasAiLightStatus = true
        }
    }
@@ -122,11 +124,8 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
                hasAiLightStatus = false
                hasObuLightStatus = false
            }, 5000)
-            CallerTrafficLightListenerManager.resetTrafficLightData()
            //如果没有OBU灯态则进行隐藏，如果有OBU灯态，则交由OBU管理
-            if(!hasObuLightStatus){
-                TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-            }
+            CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus)
        }
    }

@@ -135,21 +134,41 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
     */
    override fun onTrafficRequestError() {
        hasAiLightStatus = false
-        CallerTrafficLightListenerManager.resetTrafficLightData()
-        if(!hasObuLightStatus){
-            if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) {
-                TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-            }
-        }
+        CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus)
    }

    /**
     * obu 红绿灯数据
     */
-    override fun onObuTrafficLight(light: Int) {
-        super.onObuTrafficLight(light)
+    override fun onObuTrafficLightStatus(light: TrafficLightEnum) {
+        super.onObuTrafficLightStatus(light)
        hasObuLightStatus = true
-        CallerHmiManager.showWarningTrafficLight(light, 3)
+        CallerTrafficLightListenerManager.showTrafficLight(light, DataSourceType.OBU)
+    }
+
+    private fun updateTrafficLight(trafficLightResult: TrafficLightResult) {
+        val currentTrafficLight = trafficLightResult.currentRoadTrafficLight()
+        currentTrafficLight?.let {
+            val remain = if (it.remain > 99) {
+                99
+            } else {
+                it.remain
+            }
+            when {
+                it.isGreen() || it.isFlashGreen() -> {
+                    CallerTrafficLightListenerManager.showTrafficLight(TrafficLightEnum.GREEN, DataSourceType.AICLOUD)
+                    CallerTrafficLightListenerManager.changeCountdownGreen(remain)
+                }
+                it.isYellow() -> {
+                    CallerTrafficLightListenerManager.showTrafficLight(TrafficLightEnum.YELLOW, DataSourceType.AICLOUD)
+                    CallerTrafficLightListenerManager.changeCountdownYellow(remain)
+                }
+                it.isRed() -> {
+                    CallerTrafficLightListenerManager.showTrafficLight(TrafficLightEnum.RED, DataSourceType.AICLOUD)
+                    CallerTrafficLightListenerManager.changeCountdownRed(remain)
+                }
+            }
+        }
    }

    fun destroy() {
@@ -157,10 +176,6 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLight
        CallerTrafficLightListenerManager.removeListener(TAG)
        //取消注册监听工控机感知红绿灯
        CallerAutopilotIdentifyListenerManager.removeListener(TAG)
-        //取消注册监听红绿灯请求失败
-        CallerTrafficLightListenerManager.removeListener(TAG)
-        //取消注册监听AI云进入路口
-        CallerTrafficLightListenerManager.removeListener(TAG)
    }

 }