[2.13.0-arhc-opt] merge

2023-02-07 15:00:25 +08:00
parent ed71827687
commit a382fc36c1
66 changed files with 1116 additions and 1182 deletions
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/FuncBizProvider.kt
@@ -15,7 +15,6 @@ import com.mogo.eagle.function.biz.v2x.overview.OverViewDataManager
 import com.mogo.eagle.function.biz.v2x.overview.db.OverviewDb
 import com.mogo.eagle.function.biz.v2x.speedlimit.SpeedLimitDispatcher
 import com.mogo.eagle.function.biz.v2x.trafficlight.core.MogoTrafficLightManager
-import com.mogo.eagle.function.biz.v2x.trafficlight.core.TrafficLightDispatcher
 import com.mogo.eagle.function.biz.v2x.vip.VipCarManager

@Route(path = MogoServicePaths.PATH_FUNC_BIZ)
@@ -31,8 +30,6 @@ class FuncBizProvider : IMoGoFuncBizProvider {

        MogoTrafficLightManager.INSTANCE.initServer(context)
        VipCarManager.INSTANCE.initServer(context)
-        TrafficLightDispatcher.INSTANCE.initServer(context) //todo 宏宇 放入dataCenter
-        SpeedLimitDispatcher.INSTANCE.initLimit(context) //todo 宏宇，放入dataCenter
 //        RedLightWarningManager.INSTANCE.listenTrafficLight()
    }

@@ -89,7 +86,6 @@ class FuncBizProvider : IMoGoFuncBizProvider {
        cronTaskManager.release()

        VipCarManager.INSTANCE.destroy()
-        TrafficLightDispatcher.INSTANCE.destroy()
 //        RedLightWarningManager.INSTANCE.onDestroy()
    }
 }
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/redlightwarning/RedLightWarningManager.kt
@@ -13,14 +13,14 @@ import com.mogo.eagle.core.data.msgbox.V2XMsg
 import com.mogo.eagle.core.data.trafficlight.*
 import com.mogo.eagle.core.data.trafficlight.TrafficLightStatusHelper.getCurrentRoadTrafficLight
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
-import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
-import com.mogo.eagle.core.function.api.vip.IMoGoVipSetListener
+import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener
+import com.mogo.eagle.core.function.api.v2x.IMoGoVipSetListener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationGCJ20ListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
-import com.mogo.eagle.core.function.call.vip.CallVipSetListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallVipSetListenerManager
 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.core.utilcode.util.LocationUtils
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/speedlimit/SpeedLimitDispatcher.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/speedlimit/SpeedLimitDispatcher.kt
@@ -1,64 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.speedlimit
-
-import android.content.Context
-import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig
-import com.mogo.eagle.core.data.enums.DataSourceType
-import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener
-import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager
-import com.mogo.eagle.core.function.call.v2x.CallerViewLimitingVelocityListenerManager
-import com.zhjt.service_biz.BizConfig
-
-/**
- * @author lixiaopeng
- * @description 对多个限速进行调度（map，rsu ...）
- * @since: 2023/1/12
- */
-class SpeedLimitDispatcher : ILimitingVelocityListener {
-    companion object {
-        const val TAG = "SpeedLimitDispatcher"
-        val INSTANCE: SpeedLimitDispatcher by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
-            SpeedLimitDispatcher()
-        }
-    }
-
-    private var mContext: Context? = null
-
-    //obu限速状态
-    private var hasObuStatus: Boolean = false
-
-    fun initLimit(context: Context) {
-        mContext = context
-        CallerLimitingVelocityListenerManager.addListener(TAG, this)
-    }
-
-    /**
-     * 地图限速数据
-     */
-//    @BizConfig(FuncBizConfig.V2I, "", FuncBizConfig.BIZ_SLW) //todo arrow 重新考虑放的位置
-    override fun onLimitingVelocityChange(limitingVelocity: Int, sourceType: DataSourceType) {
-        when (sourceType) { // obu 优先级高于 map，体现链路能力
-            DataSourceType.OBU -> {
-                hasObuStatus = limitingVelocity > 0
-                CallerViewLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(
-                    limitingVelocity,
-                    sourceType
-                )
-                return
-            }
-            DataSourceType.MAP -> {
-                if (!hasObuStatus) {
-                    CallerViewLimitingVelocityListenerManager.invokeOnLimitingVelocityChange(
-                        limitingVelocity,
-                        sourceType
-                    )
-                }
-            }
-            else -> {}
-        }
-    }
-
-    fun destroy() {
-        CallerLimitingVelocityListenerManager.removeListener(TAG)
-    }
-
-}
--- 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,7 +8,7 @@ import com.mogo.eagle.core.data.trafficlight.*
 import com.mogo.eagle.core.function.api.autopilot.IMoGoChassisLocationGCJ02Listener
 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.core.function.call.v2x.CallerTrafficLightListenerManager
 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
@@ -75,7 +75,6 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener {
                    trafficLightNetWorkModel.requestTrafficLight(
                        it.latitude, it.longitude, it.heading, road, { result ->
                            trafficLightResult = result
-//                            TrafficLightHMIManager.INSTANCE.updateTrafficLight(result)
                            CallerTrafficLightListenerManager.invokeTrafficLightStatus(result)
                        },
                        { errorMsg ->
--- 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
@@ -1,181 +0,0 @@
-package com.mogo.eagle.function.biz.v2x.trafficlight.core
-
-import android.content.Context
-import android.os.Handler
-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.trafficlight.IMoGoTrafficLightListener
-import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
-import perception.TrafficLightOuterClass
-import perception.TrafficLightOuterClass.TrafficLight
-
-/**
- * @author XuXinChao
- * @description 对多个红绿灯信号来源进行统一调度（AI云、工控机、OBU）
- * @优先级：OBU,云,工控
- * @since: 2022/4/28
- */
-class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener, IMoGoTrafficLightListener {
-
-    companion object {
-        const val TAG = "TrafficLightDispatcher"
-        val INSTANCE: TrafficLightDispatcher by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
-            TrafficLightDispatcher()
-        }
-
-    }
-
-    private var mContext: Context? = null
-
-    //是否有AI获取红绿灯灯态
-    private var hasAiLightStatus: Boolean = false
-
-    //obu数据
-    private var hasObuLightStatus: Boolean = false
-
-    fun initServer(context: Context) {
-        mContext = context
-        //注册监听AI云获取红绿灯状态
-        CallerTrafficLightListenerManager.addListener(TAG, this)
-        //注册监听工控机感知红绿灯
-        CallerAutopilotIdentifyListenerManager.addListener(TAG, this)
-    }
-
-    /**
-     * 工控机感知红绿灯
-     * @param trafficLights 感知红绿灯
-     */
-    override fun onAutopilotPerceptionTrafficLight(trafficLights: TrafficLightOuterClass.TrafficLights?) {
-        if (!hasObuLightStatus) {
-            if (!hasAiLightStatus) {
-                trafficLights?.let { it ->
-                    var light: TrafficLight? = null
-                    if (it.hasStraight()) {
-                        light = it.straight
-                    } else if (it.hasLeft()) {
-                        light = it.left
-                    } else if (it.hasRight()) {
-                        light = it.right
-                    } else if (it.hasUTurn()) {
-                        light = it.uTurn
-                    }
-                    if (light == null) {
-                        //隐藏红绿灯显示
-                        CallerTrafficLightListenerManager.disableTrafficLight()
-                    } else {
-                        when (light.state) {
-                            TrafficLightOuterClass.LightState.STATE_RED -> {
-                                //红灯
-                                CallerTrafficLightListenerManager.showTrafficLight(
-                                    TrafficLightEnum.RED,
-                                    DataSourceType.TELEMATIC
-                                )
-                                CallerTrafficLightListenerManager.changeCountdownRed(0)
-                            }
-                            TrafficLightOuterClass.LightState.STATE_YELLOW -> {
-                                //黄灯
-                                CallerTrafficLightListenerManager.showTrafficLight(
-                                    TrafficLightEnum.YELLOW,
-                                    DataSourceType.TELEMATIC
-                                )
-                                CallerTrafficLightListenerManager.changeCountdownYellow(0)
-                            }
-                            TrafficLightOuterClass.LightState.STATE_GREEN -> {
-                                //绿灯
-                                CallerTrafficLightListenerManager.showTrafficLight(
-                                    TrafficLightEnum.GREEN,
-                                    DataSourceType.TELEMATIC
-                                )
-                                CallerTrafficLightListenerManager.changeCountdownGreen(0)
-                            }
-                            TrafficLightOuterClass.LightState.STATE_OFF -> {
-                                //黑灯，隐藏红绿灯显示
-                                CallerTrafficLightListenerManager.disableTrafficLight()
-                            }
-                            else -> {}
-                        }
-                    }
-
-                }
-            }
-        }
-    }
-
-    /**
-     * AI云获取红绿灯状态
-     */
-    override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) {
-        if (!hasObuLightStatus) {
-            updateTrafficLight(trafficLightResult)
-            hasAiLightStatus = true
-        }
-    }
-
-    /**
-     * 车辆进入路口回调
-     * @param enter true:进入路口；false:离开路口
-     */
-    override fun onEnterCrossRoad(enter: Boolean) {
-        if (!enter) {
-            Handler().postDelayed({
-                hasAiLightStatus = false
-                hasObuLightStatus = false
-            }, 5000)
-            //如果没有OBU灯态则进行隐藏，如果有OBU灯态，则交由OBU管理
-            CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus)
-        }
-    }
-
-    /**
-     * 红绿灯接口请求失败
-     */
-    override fun onTrafficRequestError() {
-        hasAiLightStatus = false
-        CallerTrafficLightListenerManager.resetTrafficLightStatus(!hasObuLightStatus)
-    }
-
-    /**
-     * obu 红绿灯数据
-     */
-    override fun onObuTrafficLightStatus(light: TrafficLightEnum) {
-        super.onObuTrafficLightStatus(light)
-        hasObuLightStatus = true
-        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() {
-        //取消注册监听AI云获取红绿灯状态
-        CallerTrafficLightListenerManager.removeListener(TAG)
-        //取消注册监听工控机感知红绿灯
-        CallerAutopilotIdentifyListenerManager.removeListener(TAG)
-    }
-
-}
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/vip/VipCarManager.kt
@@ -19,13 +19,12 @@ import com.mogo.eagle.core.data.trafficlight.currentRoadTrafficLight
 import com.mogo.eagle.core.data.trafficlight.isGreen
 import com.mogo.eagle.core.data.trafficlight.isRed
 import com.mogo.eagle.core.data.v2x.VipMessage
-import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
-import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
+import com.mogo.eagle.core.function.api.v2x.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.autopilot.CallerChassisLocationWGS84ListenerManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.msgbox.CallerMsgBoxManager
-import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
-import com.mogo.eagle.core.function.call.vip.CallVipSetListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallerTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.v2x.CallVipSetListenerManager
 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.core.utilcode.util.ToastUtils