[2.13.0-arch-opt] merg

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/speedlimit/SpeedLimitDataManager.java

@@ -1,6 +1,5 @@
 package com.mogo.eagle.function.biz.v2x.speedlimit;
 
-import static com.mogo.eagle.core.data.config.HmiBuildConfig.isShowObuLimitSpeedView;
 import static com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.BIZ_SLW;
 import static com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.V2I;
 
@@ -8,9 +7,8 @@ import androidx.annotation.Nullable;
 
 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.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
-import com.mogo.eagle.core.function.call.v2x.CallLimitingVelocityListenerManager;
+import com.mogo.eagle.core.function.call.v2x.CallerLimitingVelocityListenerManager;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.zhjt.service_biz.BizConfig;
 
@@ -66,7 +64,7 @@ public class SpeedLimitDataManager implements IMoGoChassisLocationGCJ02Listener
                 UiThreadHandler.post(() -> {
                     if (speedLimit > 0) {
 //                        CallerHmiManager.INSTANCE.showLimitingVelocity(speedLimit, 1);
-                        CallLimitingVelocityListenerManager.INSTANCE.invokeOnLimitingVelocityChange(speedLimit);
+                        CallerLimitingVelocityListenerManager.INSTANCE.invokeOnLimitingVelocityChange(speedLimit);
 
                     }
                 });

core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/speedlimit/SpeedLimitDispatcher.kt

@@ -1,20 +1,19 @@
 package com.mogo.eagle.function.biz.v2x.speedlimit
 
 import android.content.Context
-import com.mogo.eagle.core.function.api.v2x.LimitingVelocityListener
-import com.mogo.eagle.core.function.api.v2x.ObuLimitingSpeedListener
-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.CallerTrafficLightListenerManager
-import com.mogo.eagle.core.function.call.v2x.CallLimitingVelocityListenerManager
-import com.mogo.eagle.core.function.call.v2x.CallObuLimitingSpeedListenerManager
+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 : LimitingVelocityListener, ObuLimitingSpeedListener {
+class SpeedLimitDispatcher : ILimitingVelocityListener {
     companion object {
         const val TAG = "SpeedLimitDispatcher"
         val INSTANCE: SpeedLimitDispatcher by lazy(mode = LazyThreadSafetyMode.SYNCHRONIZED) {
@@ -24,47 +23,42 @@ class SpeedLimitDispatcher : LimitingVelocityListener, ObuLimitingSpeedListener
 
     private var mContext: Context? = null
 
-    //是否有AI获取红绿灯灯态
+    //obu限速状态
     private var hasObuStatus: Boolean = false
 
-
     fun initLimit(context: Context) {
         mContext = context
-        //注册监听MAP的限速
-        CallLimitingVelocityListenerManager.addListener(TAG, this)
-        //注册监听OBU的限速
-        CallObuLimitingSpeedListenerManager.addListener(TAG, this)
+        CallerLimitingVelocityListenerManager.addListener(TAG, this)
     }
 
     /**
      * 地图限速数据
      */
-    override fun onLimitingVelocityChange(limitingVelocity: Int) {
-//        CallerHmiManager.disableLimitingVelocity()
-        if (!hasObuStatus) {
-            CallerHmiManager.showLimitingVelocity(limitingVelocity, 1)
-        }
-    }
-
-    /**
-     * obu限速
-     */
-    override fun onObuLimitingSpeedChange(limitingSpeed: Int) {
-//        CallerHmiManager.disableLimitingVelocity()
-        if (limitingSpeed > 0) {
-            hasObuStatus = true
-            CallerHmiManager.showLimitingVelocity(limitingSpeed, 2)
-        } else {
-            hasObuStatus = false
-            CallerHmiManager.disableLimitingVelocity()
+    @BizConfig(FuncBizConfig.V2I, "", FuncBizConfig.BIZ_SLW)
+    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() {
-        //取消注册监听AI云获取红绿灯状态
-        CallerTrafficLightListenerManager.removeListener(TAG)
-        //取消注册监听工控机感知红绿灯
-        CallerAutopilotIdentifyListenerManager.removeListener(TAG)
+        CallerLimitingVelocityListenerManager.removeListener(TAG)
     }
 
 }