Merge branch 'dev_robotaxi-p-app_110_220304_1.1.0' into dev_robotaxi-d-app-module_260_220304_2.6.0

# Conflicts:
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt
#	core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
#	core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/NoticeNormalBroadcastReceiver.kt

@@ -3,9 +3,6 @@ package com.mogo.eagle.core.function.hmi.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.alibaba.android.arouter.launcher.ARouter
-import com.mogo.service.IMogoServiceApis
-import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.data.notice.NoticeNormalData
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.utilcode.util.SharedPrefs
@@ -19,14 +16,10 @@ class NoticeNormalBroadcastReceiver : BroadcastReceiver() {
 
     companion object {
         private const val TAG = "NoticeNormalBroadcastReceiver"
-        private var mMogoServiceApis: IMogoServiceApis? = null
     }
 
     override fun onReceive(context: Context, intent: Intent) {
         try {
-            mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS)
-                    .navigation(context) as IMogoServiceApis
-
             // 分发场景
             dispatchShowWaring("11", "官方公告", "测试普通云公告普通云公告普通云公告普通云公告普通云公告普通云公告普通云公告哈哈哈哈哈哈好好",
                     "https://dataservice-1255510688.cos.ap-beijing.myqcloud.com/carImg/yycp_NoticeDETAIL_location.png",

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/TurnLightBroadcastReceiver.kt

@@ -3,17 +3,8 @@ package com.mogo.eagle.core.function.hmi.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import android.util.Log
-import com.alibaba.android.arouter.launcher.ARouter
-import com.mogo.eagle.core.data.constants.MogoServicePaths
-import com.mogo.eagle.core.data.notice.NoticeNormalData
-import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showBrakeLight
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager.showTurnLight
-import com.mogo.eagle.core.function.hmi.WaringConst
-import com.mogo.eagle.core.utilcode.mogo.logger.Logger
-import com.mogo.eagle.core.utilcode.util.SharedPrefs
-import com.mogo.service.IMogoServiceApis
 
 /**
  * 转向灯，刹车

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XLimitingVelocityBroadcastReceiver.kt

@@ -3,12 +3,9 @@ package com.mogo.eagle.core.function.hmi.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.alibaba.android.arouter.launcher.ARouter
-import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
-import com.mogo.service.IMogoServiceApis
 
 /**
  * V2X 预警广播接收。用于跨应用，跨进程，内部也可以通过这种方式 控制限速标志
@@ -20,13 +17,10 @@ class V2XLimitingVelocityBroadcastReceiver : BroadcastReceiver() {
 
     companion object {
         private const val TAG = "V2XLimitingVelocityBroadcastReceiver"
-        private var mMogoServiceApis: IMogoServiceApis? = null
     }
 
     override fun onReceive(context: Context, intent: Intent) {
         try {
-            mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS)
-                .navigation(context) as IMogoServiceApis
             mContext = context
 
             val limitingVelocityIsShow =

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XTrafficLightBroadcastReceiver.kt

@@ -3,12 +3,9 @@ package com.mogo.eagle.core.function.hmi.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.alibaba.android.arouter.launcher.ARouter
-import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
-import com.mogo.service.IMogoServiceApis
 
 /**
  * V2X 预警广播接收。用于跨应用，跨进程，内部也可以通过这种方式 触发红绿灯场景
@@ -20,13 +17,10 @@ class V2XTrafficLightBroadcastReceiver : BroadcastReceiver() {
 
     companion object {
         private const val TAG = "V2XTrafficLightBroadcastReceiver"
-        private var mMogoServiceApis: IMogoServiceApis? = null
     }
 
     override fun onReceive(context: Context, intent: Intent) {
         try {
-            mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS)
-                .navigation(context) as IMogoServiceApis
             mContext = context
 
             val trafficLightIsShow =

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/receiver/V2XWarningBroadcastReceiver.kt

@@ -3,13 +3,10 @@ package com.mogo.eagle.core.function.hmi.receiver
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
-import com.alibaba.android.arouter.launcher.ARouter
-import com.mogo.eagle.core.data.constants.MogoServicePaths
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager
 import com.mogo.eagle.core.function.hmi.WaringConst
 import com.mogo.eagle.core.utilcode.mogo.logger.Logger
 import com.mogo.module.common.enums.EventTypeEnum
-import com.mogo.service.IMogoServiceApis
 
 /**
  * V2X 预警广播接收。用于跨应用，跨进程，内部也可以通过这种方式弹出预警提示框
@@ -21,13 +18,10 @@ class V2XWarningBroadcastReceiver : BroadcastReceiver() {
 
     companion object {
         private const val TAG = "V2XWarningBroadcastReceiver"
-        private var mMogoServiceApis: IMogoServiceApis? = null
     }
 
     override fun onReceive(context: Context, intent: Intent) {
         try {
-            mMogoServiceApis = ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS)
-                .navigation(context) as IMogoServiceApis
             mContext = context
             val v2xIsShow =
                 intent.getBooleanExtra(WaringConst.BROADCAST_V2X_IS_SHOW_EXTRA_KEY, false)

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/MoGoHmiFragment.kt

@@ -21,6 +21,7 @@ import com.mogo.eagle.core.data.enums.WarningDirectionEnum
 import com.mogo.eagle.core.data.notice.NoticeNormalData
 import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotIdentifyListener
+import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWaringProvider
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotIdentifyListenerManager
@@ -81,6 +82,10 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
 
     private var upgradeTipsView: (() -> View)? = null
 
+    override fun setProxyTrafficLightView(view: IViewTrafficLight) {
+        mViewTrafficLightVr = view
+    }
+
     override fun vipIdentification(visible: Boolean) {
         ThreadUtils.runOnUiThread {
             Logger.d(TAG, "vipIdentification")
@@ -126,6 +131,8 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
         view.postDelayed({
             activity?.let { CarcorderPreviewView.show(it) }
         }, 1000)*/
+
+        setProxyTrafficLightView(viewTrafficLightVr)
     }
 
     @OptIn(ExperimentalCoroutinesApi::class)
@@ -135,7 +142,8 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
             CallerDevaToolsManager.onReceiveBadCaseRecord(record)
         }
         if (record.type == 2 && (record.stat == 101 || record.stat == 100)) {
-            CallerMapDataCollectorManager.finish(record.id, record.stat, "", record.fileName ?: "", record.note ?: "")
+            CallerMapDataCollectorManager.finish(record.id, record.stat, "", record.fileName
+                    ?: "", record.note ?: "")
         }
     }
 
@@ -172,6 +180,9 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
         }
     }
 
+    override fun setProxyTrafficLightView(view: IViewTrafficLight) {
+        mViewTrafficLightVr = view
+    }
 
     private fun showToolsFloat() {
         Logger.d(TAG, "showToolsFloat")
@@ -272,6 +283,20 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
         if (HmiBuildConfig.isShowBadCaseView) {
             CallerDevaToolsManager.initBadCase(vsBadCaseToolsView)
         }
+
+        // 控制 限速UI 展示
+        if (HmiBuildConfig.isShowLimitingVelocityView) {
+            showLimitingVelocity(View.VISIBLE)
+        } else {
+            showLimitingVelocity(View.GONE)
+        }
+
+        // 控制 红绿灯 展示
+        if (HmiBuildConfig.isShowTrafficLightView) {
+            setTrafficLightVrVisibility(View.VISIBLE)
+        } else {
+            setTrafficLightVrVisibility(View.GONE)
+        }
     }
 
     override fun getLayoutId(): Int {
@@ -290,6 +315,10 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
         viewSpeedChart?.visibility = visibility
     }
 
+    override fun setTrafficLightVrVisibility(visibility: Int) {
+        mViewTrafficLightVr?.visibility = visibility
+    }
+
     override fun setAutopilotStatusViewVisibility(visibility: Int) {
         viewAutopilotStatus?.visibility = visibility
     }
@@ -446,30 +475,30 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
      * @param checkLightId 0-都是默认不亮起，1-红，2-黄，3-绿
      */
     override fun showWarningTrafficLight(checkLightId: Int) {
-        viewTrafficLightVr?.showWarningTrafficLight(checkLightId)
+        mViewTrafficLightVr?.showWarningTrafficLight(checkLightId)
     }
 
     override fun isWarningTrafficLightShow(): Boolean {
-        return viewTrafficLightVr?.visibility == View.VISIBLE
+        return mViewTrafficLightVr?.visibility == View.VISIBLE
     }
 
     /**
      * 关闭红绿灯预警展示，并重制灯态
      */
     override fun disableWarningTrafficLight() {
-        viewTrafficLightVr?.disableWarningTrafficLight()
+        mViewTrafficLightVr?.disableWarningTrafficLight()
     }
 
     override fun changeCountdownRed(redNum: Int) {
-        viewTrafficLightVr?.changeCountdownRed(redNum)
+        mViewTrafficLightVr?.changeCountdownRed(redNum)
     }
 
     override fun changeCountdownYellow(yellowNum: Int) {
-        viewTrafficLightVr?.changeCountdownYellow(yellowNum)
+        mViewTrafficLightVr?.changeCountdownYellow(yellowNum)
     }
 
     override fun changeCountdownGreen(greenNum: Int) {
-        viewTrafficLightVr?.changeCountdownGreen(greenNum)
+        mViewTrafficLightVr?.changeCountdownGreen(greenNum)
     }
 
     /**
@@ -478,7 +507,7 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
      * @param greenNum 绿灯倒计时
      */
     override fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int) {
-        viewTrafficLightVr?.changeCountdownTrafficLightNum(readNum, yellowNum, greenNum)
+        mViewTrafficLightVr?.changeCountdownTrafficLightNum(readNum, yellowNum, greenNum)
     }
 
     /**
@@ -781,9 +810,9 @@ class MoGoHmiFragment : MvpFragment<MoGoWarningContract.View?, WaringPresenter?>
             val tipsView = upgradeTipsView?.invoke()
             //如果工控机处于“下载中”、“可升级（下载完成）”、“升级中”、“升级失败”状态时，工具箱入口显示红色角标
             if (AdUpgradeStateHelper.showUpgradeTips(downloadStatus, upgradeStatus)) {
-                if (HmiBuildConfig.isShowUpgradeTipsView){
+                if (HmiBuildConfig.isShowUpgradeTipsView) {
                     viewUpgradeTips?.visibility = View.VISIBLE
-                }else{
+                } else {
                     tipsView?.let {
                         it.visibility = View.VISIBLE
                     }

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/widget/TrafficLightView.kt

@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import androidx.constraintlayout.widget.ConstraintLayout
+import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
 import com.mogo.eagle.core.function.hmi.R
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler
 import kotlinx.android.synthetic.main.view_traffic_light_vr.view.*
@@ -15,10 +16,10 @@ import kotlinx.android.synthetic.main.view_traffic_light_vr.view.*
  * 红绿灯控件
  */
 class TrafficLightView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr) {
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : IViewTrafficLight(context, attrs, defStyleAttr)  {
 
 
     init {
@@ -30,7 +31,7 @@ class TrafficLightView @JvmOverloads constructor(
      *
      * @param checkLightId 0-都是默认，1-红，2-黄，3-绿
      */
-    fun showWarningTrafficLight(checkLightId: Int) {
+    override fun showWarningTrafficLight(checkLightId: Int) {
         UiThreadHandler.post {
             visibility = View.VISIBLE
             when (checkLightId) {
@@ -61,7 +62,7 @@ class TrafficLightView @JvmOverloads constructor(
     /**
      * 关闭红绿灯预警展示，并重制灯态
      */
-    fun disableWarningTrafficLight() {
+    override fun disableWarningTrafficLight() {
         UiThreadHandler.post {
             visibility = View.GONE
             ctvRedTrafficLight.isChecked = false
@@ -79,7 +80,7 @@ class TrafficLightView @JvmOverloads constructor(
      * @param yellowNum 黄灯倒计时
      * @param greenNum 绿灯倒计时
      */
-    fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int) {
+    override fun changeCountdownTrafficLightNum(readNum: Int, yellowNum: Int, greenNum: Int) {
         UiThreadHandler.post {
             changeCountdownGreen(readNum)
             changeCountdownYellow(yellowNum)
@@ -87,7 +88,7 @@ class TrafficLightView @JvmOverloads constructor(
         }
     }
 
-    fun changeCountdownGreen(greenNum: Int) {
+    override fun changeCountdownGreen(greenNum: Int) {
         UiThreadHandler.post {
             if (greenNum > 0) {
                 ctvGreenTrafficLight.text = "$greenNum"
@@ -97,7 +98,7 @@ class TrafficLightView @JvmOverloads constructor(
         }
     }
 
-    fun changeCountdownYellow(yellowNum: Int) {
+    override fun changeCountdownYellow(yellowNum: Int) {
         UiThreadHandler.post {
             if (yellowNum > 0) {
                 ctvYellowTrafficLight.text = "$yellowNum"
@@ -107,7 +108,7 @@ class TrafficLightView @JvmOverloads constructor(
         }
     }
 
-    fun changeCountdownRed(redNum: Int) {
+     override fun changeCountdownRed(redNum: Int) {
         UiThreadHandler.post {
             if (redNum > 0) {
                 ctvRedTrafficLight.text = "$redNum"
@@ -117,5 +118,4 @@ class TrafficLightView @JvmOverloads constructor(
         }
     }
 
-
 }

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

@@ -3,6 +3,7 @@ package com.mogo.eagle.core.function.v2x.speedlimit;
 import android.location.Location;
 
 import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
+import com.mogo.eagle.core.function.call.v2x.CallLimitingVelocityListenerManager;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.navi.IMogoCarLocationChangedListener2;
 import com.mogo.module.common.MogoApisHandler;
@@ -39,6 +40,7 @@ public class SpeedLimitDataManager implements IMogoCarLocationChangedListener2 {
                         public void run() {
                             if (speedLimmit > 0) {
                                 CallerHmiManager.INSTANCE.showLimitingVelocity(speedLimmit);
+                                CallLimitingVelocityListenerManager.INSTANCE.invokeOnLimitingVelocityChange(speedLimmit);
                             }
                         }
                     });