[2.13.0-arhc-opt] merge

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoHmiProvider.kt

@@ -1,6 +1,7 @@
 package com.mogo.eagle.core.function.api.hmi.warning
 
 import android.view.ViewGroup
+import com.alibaba.android.arouter.facade.template.IProvider
 import com.mogo.eagle.core.data.bindingcar.IPCUpgradeStateInfo
 import com.mogo.eagle.core.data.dispatch.DispatchAdasAutoPilotLocReceiverBean
 import com.mogo.eagle.core.data.enums.WarningDirectionEnum
@@ -13,47 +14,19 @@ import com.mogo.eagle.core.data.report.ReportEntity
  * @author xiaoyuzhou
  * @date 2021/8/2 7:36 下午
  */
-interface IMoGoHmiProvider {
-
-    /**
-     * 浓雾预警
-     */
-    fun displayEffects()
-
-    /**
-     * 控制sn绑定功能
-     */
-    fun setSnBinding(isOpen: Boolean)
-
-    /**
-     * 控制展示obu的弱势交通
-     */
-    fun setObuWeaknessTraffic(isOpen: Boolean)
-
-    /**
-     * 控制展示云端的弱势交通
-     */
-    fun setCloudWeaknessTraffic(isOpen: Boolean)
+interface IMoGoHmiProvider :IProvider{
 
     /**
      * 不展示顶部弹窗，其它保留
      */
-    fun warningV2X(v2xType: String, alertContent: CharSequence?, ttsContent: String?, listener: IMoGoWarningStatusListener?, playTts: Boolean, expireTime: Long)
+    fun warningV2X(v2xType: String, alertContent: CharSequence?, ttsContent: String?, listener: IMoGoWarningStatusListener?, direction: WarningDirectionEnum, expireTime: Long)
 
     /**
      * 展示指定方位上的红框预警
      * @param direction
      * @see WarningDirectionEnum
      */
-    fun showWarning(direction: WarningDirectionEnum)
-
-    /**
-     * 展示指定方位上的红框预警
-     * @param direction
-     * @see WarningDirectionEnum
-     * @param closeTime 倒计时
-     */
-    fun showWarning(direction: WarningDirectionEnum, closeTime: Long)
+    fun showWarning(v2xType: String ,direction: WarningDirectionEnum, expireTime: Long)
 
     /**
      * 主动消失边框预警
@@ -74,30 +47,35 @@ interface IMoGoHmiProvider {
      */
     fun showNoticeNormalData(normalData: NoticeNormalData?)
 
+    /**
+     * 路侧直播，超视距感知
+     */
     fun startRoadCameraLive(flvUrl: String)
 
+    /**
+     * 超视距感知关闭
+     */
     fun showNoSignView()
 
+    /**
+     * 展示工具栏
+     */
     fun showToolsView()
 
-    fun hideToolsView()
-
     /**
-     * 加载全览模式图层
+     * 关闭工具栏
      */
-    fun showSmallFragment()
-
-    fun hideSmallFragment()
+    fun hideToolsView()
 
     /**
      * 展示绑定车辆弹框
      */
-    fun showToBindingcarDialog()
+    fun showToBindingCarDialog()
 
     /**
      * 展示修改绑定车辆弹框
      */
-    fun showModifyBindingcarDialog()
+    fun showModifyBindingCarDialog()
 
     /**
      * 展示升级app弹框
@@ -122,8 +100,21 @@ interface IMoGoHmiProvider {
      */
     fun showIPCReportWindow(errorReportList: ArrayList<ReportEntity>,warningReportList: ArrayList<ReportEntity>,reportLevel: Int)
 
+    /**
+     * 道路视频 放入指定url
+     */
     fun showVideoDialog(infList: List<Infrastructure>)
 
+    /**
+     * 调度弹窗展示
+     */
+    fun showDispatchDialog(msgData: DispatchAdasAutoPilotLocReceiverBean)
+
+    /**
+     * 隐藏调度弹窗
+     */
+    fun dismissDispatchDialog()
+
     /**
      * 设置状态栏暗夜或明亮模式
      * 默认 light
@@ -150,14 +141,4 @@ interface IMoGoHmiProvider {
      */
     fun updateMfStatus(tag: String, status: Boolean)
 
-    /**
-     * 调度弹窗展示
-     */
-    fun showDispatchDialog(msgData: DispatchAdasAutoPilotLocReceiverBean)
-
-    /**
-     * 隐藏调度弹窗
-     */
-    fun dismissDispatchDialog()
-
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/ILimitingVelocityListener.kt

@@ -6,5 +6,8 @@ import com.mogo.eagle.core.data.enums.DataSourceType
  * 限速信息回掉
  */
 interface ILimitingVelocityListener {
-    fun onLimitingVelocityChange(limitingVelocity: Int,sourceType: DataSourceType)
+
+    fun onUnion(limitingVelocity: Int,sourceType: DataSourceType){}
+
+    fun onLimitingVelocityChange(limitingVelocity: Int,sourceType: DataSourceType){}
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IMoGoTrafficLightListener.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.api.trafficlight
+package com.mogo.eagle.core.function.api.v2x
 
 import com.mogo.eagle.core.data.enums.DataSourceType
 import com.mogo.eagle.core.data.enums.TrafficLightEnum
@@ -28,7 +28,7 @@ interface IMoGoTrafficLightListener {
     /**
      * obu红绿灯状态
      */
-    fun onObuTrafficLightStatus(light: TrafficLightEnum){}
+    fun onTrafficLightPlusSource(light: TrafficLightEnum, remain:Int = -1, lightSource: DataSourceType){}
 
     /**
      * 展示红绿灯预警

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IMoGoVipSetListener.kt

@@ -1,4 +1,4 @@
-package com.mogo.eagle.core.function.api.vip
+package com.mogo.eagle.core.function.api.v2x
 
 interface IMoGoVipSetListener {
 

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/v2x/IV2XEventListener.kt

@@ -0,0 +1,10 @@
+package com.mogo.eagle.core.function.api.v2x
+
+import com.mogo.eagle.core.data.enums.WarningDirectionEnum
+
+interface IV2XEventListener {
+
+    fun show(v2xType: String, direction: WarningDirectionEnum, time: Long)
+
+    fun dismiss(direction: WarningDirectionEnum)
+}