add pnc actions func

2022-08-16 11:06:36 +08:00
parent e70223dcdc
commit a97f7f870a
18 changed files with 335 additions and 39 deletions
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt
@@ -5,9 +5,8 @@ import com.alibaba.android.arouter.facade.annotation.Route
 import com.mogo.eagle.core.data.config.FunctionBuildConfig
 import com.mogo.eagle.core.data.constants.MogoServicePaths.PATH_V2X_MODULE
 import com.mogo.eagle.core.function.api.base.IMoGoFunctionServerProvider
-import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightManager
+import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightManager
 import com.mogo.eagle.core.function.v2x.events.V2XEventManager
-import com.mogo.eagle.core.function.v2x.redlightwarning.RedLightWarningManager
 import com.mogo.eagle.core.function.v2x.speedlimit.SpeedLimitDataManager
 import com.mogo.eagle.core.function.v2x.trafficlight.core.TrafficLightDispatcher
 import com.mogo.eagle.core.function.v2x.vip.VipCarManager
@@ -20,7 +19,7 @@ class V2XProvider : IMoGoFunctionServerProvider {
        get() = "V2XProvider"

    override fun init(context: Context) {
-        CallTrafficLightManager.getTrafficLightProvider().initTrafficLightServer(context)
+        CallerTrafficLightManager.getTrafficLightProvider().initTrafficLightServer(context)
        VipCarManager.INSTANCE.initServer(context)
        SpeedLimitDataManager.getInstance().start()
        TrafficLightDispatcher.INSTANCE.initServer(context)
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/redlightwarning/RedLightWarningManager.kt
@@ -10,9 +10,8 @@ import com.mogo.eagle.core.function.api.vip.IMoGoVipSetListener
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
-import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.call.vip.CallVipSetListenerManager
-import com.mogo.eagle.core.function.v2x.vip.VipCarManager
 import com.mogo.eagle.core.utilcode.util.ThreadUtils
 import com.mogo.map.navi.IMogoCarLocationChangedListener2
 import com.mogo.module.common.MogoApisHandler
@@ -72,12 +71,9 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener,
    }

    fun listenTrafficLight() {
-        CallTrafficLightListenerManager.registerEnterCrossRoadListener(TAG, this)
-        CallTrafficLightListenerManager.registerTrafficLightListener(TAG, this)
-        MogoApisHandler.getInstance().apis.registerCenterApi.registerCarLocationChangedListener(
-            VipCarManager.TAG,
-            this
-        )
+        CallerTrafficLightListenerManager.registerEnterCrossRoadListener(TAG, this)
+        CallerTrafficLightListenerManager.registerTrafficLightListener(TAG, this)
+        MogoApisHandler.getInstance().apis.registerCenterApi.registerCarLocationChangedListener(TAG, this)
        CallVipSetListenerManager.registerVipSetListener(TAG, this)
    }

@@ -196,9 +192,9 @@ class RedLightWarningManager : IMoGoTrafficLightListener, IMoGoVipSetListener,
    }

    fun onDestroy() {
-        CallTrafficLightListenerManager.unRegisterTrafficLightListener(TAG)
+        CallerTrafficLightListenerManager.unRegisterTrafficLightListener(TAG)
        CallVipSetListenerManager.unRegisterVipSetListener(TAG)
-        CallTrafficLightListenerManager.unRegisterEnterCrossRoadListener(TAG)
+        CallerTrafficLightListenerManager.unRegisterEnterCrossRoadListener(TAG)
        MogoApisHandler.getInstance().apis.registerCenterApi.unregisterCarLocationChangedListener(
            TAG, this
        )
--- 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
@@ -11,7 +11,7 @@ import com.mogo.eagle.core.data.trafficlight.TrafficLightResult
 import com.mogo.eagle.core.data.trafficlight.isInRange
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
-import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.v2x.trafficlight.TrafficLightHMIManager
 import com.mogo.eagle.core.function.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_LOOP_SEARCH_CROSS_ROAD
 import com.mogo.eagle.core.function.v2x.trafficlight.core.TrafficLightThreadHandler.Companion.MSG_WHAT_LOOP_SEARCH_TRAFFIC_LIGHT
@@ -52,7 +52,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
                //第一次查询路口时，如果红绿灯显示，则隐藏掉
                if(firstLoopCrossRoad && TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()){
                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-                    CallTrafficLightListenerManager.resetTrafficLightData()
+                    CallerTrafficLightListenerManager.resetTrafficLightData()
                }
                firstLoopCrossRoad = false
                mLocation?.let { it ->
@@ -81,7 +81,7 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
                        it.latitude, it.longitude, it.bearing.toDouble(), road, { result ->
                            trafficLightResult = result
 //                            TrafficLightHMIManager.INSTANCE.updateTrafficLight(result)
-                            CallTrafficLightListenerManager.invokeTrafficLightStatus(result)
+                            CallerTrafficLightListenerManager.invokeTrafficLightStatus(result)
                        },
                        { errorMsg ->
                            //如果没有获取到正确的红绿灯数据，则取消读灯，继续读路口，防止出现一直读灯的情况
@@ -103,9 +103,9 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
                            }
                            if (TrafficLightHMIManager.INSTANCE.isWarningTrafficLightShow()) {
                                TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-                                CallTrafficLightListenerManager.resetTrafficLightData()
+                                CallerTrafficLightListenerManager.resetTrafficLightData()
                            }
-                            CallTrafficLightListenerManager.invokeTrafficRequestError()
+                            CallerTrafficLightListenerManager.invokeTrafficRequestError()

                        })
                }
@@ -130,18 +130,18 @@ class MogoTrafficLightManager : IMogoCarLocationChangedListener2 {
                if (trafficLightResult != null && it.isInRange(loc.latitude, loc.longitude)) {
                    inRange = true
 //                    CallerLogger.d(M_V2X + TAG, "进入路口")
-                    CallTrafficLightListenerManager.invokeEnterCrossRoad(true)
+                    CallerTrafficLightListenerManager.invokeEnterCrossRoad(true)
                    return
                }
                if (inRange) {
 //                    CallerLogger.d(M_V2X + TAG, "离开路口")
-                    CallTrafficLightListenerManager.invokeEnterCrossRoad(false)
+                    CallerTrafficLightListenerManager.invokeEnterCrossRoad(false)
                    inRange = false
                    trafficLightResult = null
                    firstLoopCrossRoad = true
                    mThreadHandler?.sendEmptyMessage(MSG_WHAT_STOP_SEARCH_TRAFFIC_LIGHT)
                    TrafficLightHMIManager.INSTANCE.hideTrafficLight()
-                    CallTrafficLightListenerManager.resetTrafficLightData()
+                    CallerTrafficLightListenerManager.resetTrafficLightData()
                }
            }
        }
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/trafficlight/core/TrafficLightDispatcher.kt
@@ -7,7 +7,7 @@ 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.hmi.CallerHmiManager
-import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.v2x.trafficlight.TrafficLightHMIManager
 import perception.TrafficLightOuterClass
 import perception.TrafficLightOuterClass.TrafficLight
@@ -34,11 +34,11 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener , IMoGoTrafficLigh
    fun initServer(context: Context){
        mContext = context
        //注册监听AI云获取红绿灯状态
-        CallTrafficLightListenerManager.registerTrafficLightListener(TAG, this)
+        CallerTrafficLightListenerManager.registerTrafficLightListener(TAG, this)
        //注册监听AI云进入路口
-        CallTrafficLightListenerManager.registerEnterCrossRoadListener(TAG, this)
+        CallerTrafficLightListenerManager.registerEnterCrossRoadListener(TAG, this)
        //注册监听红绿灯请求失败
-        CallTrafficLightListenerManager.registerTrafficRequestErrorListener(TAG,this)
+        CallerTrafficLightListenerManager.registerTrafficRequestErrorListener(TAG,this)
        //注册监听工控机感知红绿灯
        CallerAutopilotIdentifyListenerManager.addListener(TAG, this)
    }
@@ -119,13 +119,13 @@ class TrafficLightDispatcher : IMoGoAutopilotIdentifyListener , IMoGoTrafficLigh

    fun destroy(){
        //取消注册监听AI云获取红绿灯状态
-        CallTrafficLightListenerManager.unRegisterTrafficLightListener(TAG)
+        CallerTrafficLightListenerManager.unRegisterTrafficLightListener(TAG)
        //取消注册监听工控机感知红绿灯
        CallerAutopilotIdentifyListenerManager.removeListener(TAG)
        //取消注册监听红绿灯请求失败
-        CallTrafficLightListenerManager.unRegisterTrafficRequestErrorListener(TAG)
+        CallerTrafficLightListenerManager.unRegisterTrafficRequestErrorListener(TAG)
        //取消注册监听AI云进入路口
-        CallTrafficLightListenerManager.unRegisterEnterCrossRoadListener(TAG)
+        CallerTrafficLightListenerManager.unRegisterEnterCrossRoadListener(TAG)
    }

 }
--- a/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
+++ b/core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/vip/VipCarManager.kt
@@ -15,7 +15,7 @@ import com.mogo.eagle.core.function.api.trafficlight.IMoGoTrafficLightListener
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager
-import com.mogo.eagle.core.function.call.trafficlight.CallTrafficLightListenerManager
+import com.mogo.eagle.core.function.call.trafficlight.CallerTrafficLightListenerManager
 import com.mogo.eagle.core.function.call.vip.CallVipSetListenerManager
 import com.mogo.eagle.core.function.v2x.trafficlight.core.MogoTrafficLightManager
 import com.mogo.eagle.core.function.v2x.vip.network.VipNetWorkModel
@@ -183,8 +183,8 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
        )
        CallerHmiManager.vipIdentification(true)
        CallVipSetListenerManager.invokeVipSetStatus(true)
-        CallTrafficLightListenerManager.registerTrafficLightListener(TAG, this)
-        CallTrafficLightListenerManager.registerEnterCrossRoadListener(TAG, this)
+        CallerTrafficLightListenerManager.registerTrafficLightListener(TAG, this)
+        CallerTrafficLightListenerManager.registerEnterCrossRoadListener(TAG, this)
    }

    private fun cancelVip() {
@@ -194,8 +194,8 @@ class VipCarManager : IMogoOnMessageListener<VipMessage>, IMoGoTrafficLightListe
        }
        CallerHmiManager.vipIdentification(false)
        CallVipSetListenerManager.invokeVipSetStatus(false)
-        CallTrafficLightListenerManager.unRegisterTrafficLightListener(TAG)
-        CallTrafficLightListenerManager.unRegisterEnterCrossRoadListener(TAG)
+        CallerTrafficLightListenerManager.unRegisterTrafficLightListener(TAG)
+        CallerTrafficLightListenerManager.unRegisterEnterCrossRoadListener(TAG)
    }

    private fun canGetThroughCross(