Merge branch 'dev_arch_opt_3.0' into dev_robosweeper-d_app-module_221230_1.1.0

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/biz/IMoGoFuncBizProvider.kt

@@ -56,6 +56,4 @@ interface IMoGoFuncBizProvider : IMoGoFunctionServerProvider {
     fun fetchInfStructures()
 
     fun getAllV2XEvents()
-
-    fun initOverViewDb(context: Context)
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IDevaToolsProvider.kt

@@ -109,6 +109,11 @@ interface IDevaToolsProvider : IProvider {
      */
     fun downLoadPackage(downloadKey: String, downloadUrl: String)
 
+    /**
+     * 更新下载进度
+     */
+    fun updateUpgradeProgress()
+
     /**
      * 展示状态栏
      */

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/devatools/IMoGoDevaToolsListener.kt

@@ -51,4 +51,8 @@ interface IMoGoDevaToolsListener {
 
     }
 
+    fun mofangStatus(status:Boolean){
+
+    }
+
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/view/IViewControlListener.kt

@@ -36,9 +36,4 @@ interface IViewControlListener {
      */
     fun updateStatusBarDownloadView(insert: Boolean, tag: String, progress: Int){}
 
-    /**
-     * 更新魔方的连接状态
-     */
-    fun updateMfStatus(tag: String, status: Boolean){}
-
 }

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

@@ -136,9 +136,5 @@ interface IMoGoHmiProvider :IProvider{
      */
     fun updateStatusBarDownloadView(insert: Boolean, tag: String, progress: Int)
 
-    /**
-     * 更新魔方的连接状态
-     */
-    fun updateMfStatus(tag: String, status: Boolean)
 
 }

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/IMogoMapService.java

@@ -40,10 +40,9 @@ public interface IMogoMapService extends IProvider {
     /**
      * 覆盖物操作
      *
-     * @param context
      * @return
      */
-    IMogoOverlayManager getOverlayManager(Context context);
+    IMogoOverlayManager getOverlayManager();
 
     /**
      * 获取高德定位服务

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/IMoGoVisualAngleChangeProvider.kt

@@ -0,0 +1,10 @@
+package com.mogo.eagle.core.function.api.map.angle
+
+import com.mogo.eagle.core.function.api.base.*
+
+interface IMoGoVisualAngleChangeProvider: IMoGoFunctionServerProvider {
+
+    fun updateLongSightLevel(level: Boolean)
+
+    fun changeAngle(scene: Scene)
+}

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/angle/Scenes.kt

@@ -0,0 +1,104 @@
+package com.mogo.eagle.core.function.api.map.angle
+
+import com.mogo.map.uicontroller.*
+import java.util.concurrent.*
+import java.util.concurrent.TimeUnit.SECONDS
+
+private interface IAttach {
+        val angle: VisualAngleMode
+        val priority: Int
+        val displayThreshold: Long  //最大展示时长 > 0; 表示最长展示多长时间， -1 表示，一直展示，直到触发默认视角, 0: 默认视角专用值，
+    }
+
+
+sealed class Scene: IAttach
+
+
+/**
+ * 默认视图
+ * @param delay: 表示多少稍后，默认值为2
+ * @param unit: 时间单位，默认为秒
+ */
+class Default(val delay: Long = 2, val unit: TimeUnit = SECONDS): Scene() {
+
+    override val angle: VisualAngleMode = VisualAngleMode.MODE_MEDIUM_SIGHT
+
+    override val priority: Int = 1
+
+    override val displayThreshold: Long
+        get() = 0
+
+    override fun toString(): String {
+        return "Default(delay=$delay, unit=$unit, angle=$angle, priority=$priority)"
+    }
+}
+
+
+/**
+ * 变道-接收到转向灯信息号
+ */
+class Turning(var open: Boolean = false): Scene() {
+
+    override val angle: VisualAngleMode = VisualAngleMode.MAP_STYLE_VR_ANGLE_TOP
+
+    override val priority: Int = 3
+
+    override val displayThreshold: Long
+        get() = -1
+
+    override fun toString(): String {
+        return "Turning(open: ${open}, priority=$priority, displayThreshold: $displayThreshold, priority=$priority)"
+    }
+}
+
+
+/**
+ * 后方车辆离自车过近
+ */
+object TooClose: Scene() {
+
+    override val angle: VisualAngleMode = VisualAngleMode.MAP_STYLE_VR_ANGLE_300
+
+    override val priority: Int = 2
+
+    override val displayThreshold: Long
+        get() = SECONDS.toMillis(8)
+
+    override fun toString(): String {
+        return "TooClose(priority=$priority, displayThreshold: $displayThreshold, priority=$priority)"
+    }
+}
+
+
+/**
+ * 道路事件
+ */
+object RoadEvent: Scene() {
+
+    override val angle: VisualAngleMode = VisualAngleMode.MODE_LONG_SIGHT
+
+    override val priority: Int = 5
+
+    override val displayThreshold: Long
+        get() = SECONDS.toMillis(8)
+
+    override fun toString(): String {
+        return "RoadEvent(priority=${priority}, displayThreshold: ${displayThreshold}, priority=${priority})"
+    }
+}
+
+
+/**
+ * 十字路口
+ */
+class CrossRoad(var open: Boolean = false): Scene() {
+    override val angle: VisualAngleMode = VisualAngleMode.MAP_STYLE_VR_ANGLE_CROSS
+    override val priority: Int = 4
+    override val displayThreshold: Long
+        get() = -1
+
+    override fun toString(): String {
+        return "CrossRoad(open: ${open}, priority=${priority}, displayThreshold: ${displayThreshold}, priority=${priority})"
+    }
+}
+

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/map/marker/IMoGoIdentifyListener.kt

@@ -0,0 +1,10 @@
+package com.mogo.eagle.core.function.api.map.marker
+
+import com.alibaba.android.arouter.facade.template.IProvider
+import mogo.telematics.pad.MessagePad
+
+interface IMoGoIdentifyListener :IProvider{
+
+    fun getIdentifyObj(uuid: String): MessagePad.TrackedObject?
+
+}

core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/obu/IMoGoObuLocationWGS84Listener.kt

@@ -11,7 +11,7 @@ interface IMoGoObuLocationWGS84Listener {
 
     /**
      * HV车辆基础信息
-     *
+     s
      * @param data 数据
      * @since 1.0.0
      */