[2.13.0-arch-opt] merg

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt

@@ -1,23 +1,18 @@
 package com.mogo.eagle.core.function.call.hmi
 
-import android.view.View
 import android.view.ViewGroup
 import com.alibaba.android.arouter.launcher.ARouter
 import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths
-import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.BIZ_SLW
-import com.mogo.eagle.core.data.deva.bizconfig.FuncBizConfig.Companion.V2I
 import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum
 import com.mogo.eagle.core.data.map.Infrastructure
 import com.mogo.eagle.core.data.notice.NoticeNormalData
 import com.mogo.eagle.core.data.notice.NoticeTrafficStylePushData
 import com.mogo.eagle.core.data.report.ReportEntity
-import com.mogo.eagle.core.function.api.hmi.view.IViewLimitingVelocity
 import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoHmiProvider
 import com.mogo.eagle.core.function.api.hmi.warning.IMoGoWarningStatusListener
-import com.zhjt.service_biz.BizConfig
 
 /**
  * @author xiaoyuzhou
@@ -37,42 +32,6 @@ object CallerHmiManager {
         waringProviderApi?.displayEffects()
     }
 
-    /**
-     * 隐藏 脉速表
-     * @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
-     */
-    fun setSpeedChartViewVisibility(visibility: Int) {
-        waringProviderApi?.setSpeedChartViewVisibility(visibility)
-    }
-
-    /**
-     * 隐藏 自动驾驶触发 按钮
-     *  @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
-     */
-    fun setAutopilotStatusViewVisibility(visibility: Int) {
-        waringProviderApi?.setAutopilotStatusViewVisibility(visibility)
-    }
-
-    /**
-     * 隐藏 切换视角 按钮
-     * @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
-     */
-    fun setPerspectiveSwitchViewVisibility(visibility: Int) {
-        waringProviderApi?.setPerspectiveSwitchViewVisibility(visibility)
-    }
-
-    /**
-     * 隐藏 工具箱 按钮
-     * @param visibility View.VISIBLE, View.INVISIBLE,View.GONE
-     */
-    fun setToolsViewVisibility(visibility: Int) {
-        waringProviderApi?.setToolsViewVisibility(visibility)
-    }
-
-    fun setCameraViewVisibility(visibility: Int) {
-        waringProviderApi?.setCameraViewVisibility(visibility)
-    }
-
     /**
      * 控制转向灯功能
      */
@@ -200,24 +159,6 @@ object CallerHmiManager {
         waringProviderApi?.changeCountdownTrafficLightNum(readNum, yellowNum, greenNum)
     }
 
-    /**
-     * 展示限速预警
-     *
-     * @param limitingSpeed 限速速度
-     * @param limitSpeedSource 限速来源 1:MAP, 2:RSU
-     */
-    @BizConfig(V2I, "", BIZ_SLW)
-    fun showLimitingVelocity(limitingSpeed: Int, limitSpeedSource: Int) {
-        waringProviderApi?.showLimitingVelocity(limitingSpeed, limitSpeedSource)
-    }
-
-    /**
-     * 关闭限速预警
-     */
-    fun disableLimitingVelocity() {
-        waringProviderApi?.disableLimitingVelocity()
-    }
-
     /**
      * 展示指定方位上的红框预警
      * @param direction
@@ -346,14 +287,6 @@ object CallerHmiManager {
         waringProviderApi?.setProxyTrafficLightView(view)
     }
 
-    /**
-     * 设置 限速 代理View
-     * @param view
-     */
-    fun setProxyLimitingSpeedView(view: IViewLimitingVelocity) {
-        waringProviderApi?.setProxyLimitingSpeedView(view)
-    }
-
     /**
      * 展示工控机监控上报数据
      * @param errorReportList 错误级别上报数据列表

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallLimitingVelocityListenerManager.kt

@@ -1,29 +0,0 @@
-package com.mogo.eagle.core.function.call.v2x
-
-import com.mogo.eagle.core.function.api.v2x.LimitingVelocityListener
-import com.mogo.eagle.core.function.call.base.CallerBase
-
-/**
- * 限速信息监听
- */
-object CallLimitingVelocityListenerManager : CallerBase<LimitingVelocityListener>() {
-
-    private const val TAG = "CallLimitingVelocityListenerManager"
-
-    private var mCurrentLimitingVelocity = 0
-
-    override fun doSomeAfterAddListener(tag: String, listener: LimitingVelocityListener) {
-        listener.onLimitingVelocityChange(mCurrentLimitingVelocity)
-    }
-
-    fun invokeOnLimitingVelocityChange(limitingVelocity: Int) {
-        this.mCurrentLimitingVelocity = limitingVelocity
-        M_LISTENERS.forEach {
-            val tag = it.key
-            //LogUtils.dTag(TAG, "invokeOnLimitingVelocityChange tag is : $tag")
-            val listener = it.value
-            listener.onLimitingVelocityChange(limitingVelocity)
-        }
-    }
-
-}

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallObuLimitingSpeedListenerManager.kt

@@ -1,26 +0,0 @@
-package com.mogo.eagle.core.function.call.v2x
-
-import com.mogo.eagle.core.function.api.v2x.ObuLimitingSpeedListener
-import com.mogo.eagle.core.function.call.base.CallerBase
-import java.util.concurrent.ConcurrentHashMap
-
-/**
- * 限速信息监听
- */
-object CallObuLimitingSpeedListenerManager : CallerBase<ObuLimitingSpeedListener>(){
-
-    private const val TAG = "CallObuLimitingSpeedListenerManager"
-    private val M_TRAFFIC_LIGHT_LISTENER: ConcurrentHashMap<String, ObuLimitingSpeedListener> =
-            ConcurrentHashMap()
-    private var mObuLimitSpeed = 0
-
-    fun invokeOnObuLimitingSpeedChange(limitingSpeed: Int) {
-        this.mObuLimitSpeed = limitingSpeed
-        M_TRAFFIC_LIGHT_LISTENER.forEach {
-            val tag = it.key
-            val listener = it.value
-            listener.onObuLimitingSpeedChange(limitingSpeed)
-        }
-    }
-
-}

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerLimitingVelocityListenerManager.kt

@@ -0,0 +1,28 @@
+package com.mogo.eagle.core.function.call.v2x
+
+import com.mogo.eagle.core.data.enums.DataSourceType
+import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener
+import com.mogo.eagle.core.function.call.base.CallerBase
+
+/**
+ * 限速信息监听
+ */
+object CallerLimitingVelocityListenerManager : CallerBase<ILimitingVelocityListener>() {
+
+    private var mCurrentLimitingVelocity = 0
+    private var sourceType = DataSourceType.DEFAULT
+
+    override fun doSomeAfterAddListener(tag: String, listener: ILimitingVelocityListener) {
+        listener.onLimitingVelocityChange(mCurrentLimitingVelocity, sourceType)
+    }
+
+    fun invokeOnLimitingVelocityChange(limitingVelocity: Int, sourceType: DataSourceType) {
+        this.mCurrentLimitingVelocity = limitingVelocity
+        this.sourceType = sourceType
+        M_LISTENERS.forEach {
+            val listener = it.value
+            listener.onLimitingVelocityChange(limitingVelocity, sourceType)
+        }
+    }
+
+}

core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/v2x/CallerViewLimitingVelocityListenerManager.kt

@@ -0,0 +1,28 @@
+package com.mogo.eagle.core.function.call.v2x
+
+import com.mogo.eagle.core.data.enums.DataSourceType
+import com.mogo.eagle.core.function.api.v2x.ILimitingVelocityListener
+import com.mogo.eagle.core.function.call.base.CallerBase
+
+/**
+ * 限速信息监听
+ */
+object CallerViewLimitingVelocityListenerManager : CallerBase<ILimitingVelocityListener>() {
+
+    private var mCurrentLimitingVelocity = 0
+    private var sourceType = DataSourceType.DEFAULT
+
+    override fun doSomeAfterAddListener(tag: String, listener: ILimitingVelocityListener) {
+        listener.onLimitingVelocityChange(mCurrentLimitingVelocity, sourceType)
+    }
+
+    fun invokeOnLimitingVelocityChange(limitingVelocity: Int, sourceType: DataSourceType) {
+        this.mCurrentLimitingVelocity = limitingVelocity
+        this.sourceType = sourceType
+        M_LISTENERS.forEach {
+            val listener = it.value
+            listener.onLimitingVelocityChange(limitingVelocity, sourceType)
+        }
+    }
+
+}