fixed conflict

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

@@ -9,13 +9,6 @@ import com.mogo.eagle.core.function.api.hmi.view.IViewTrafficLight
  */
 interface IMoGoHmiViewProxy {
 
-
-    /**
-     * 设置 V2X预警 代理View
-     * @param view
-     */
-    fun setViewNotificationProvider(provider: IViewNotificationProvider)
-
     /**
      * 设置 红绿灯 代理View
      * @param view
@@ -28,9 +21,4 @@ interface IMoGoHmiViewProxy {
      */
     fun setProxyLimitingSpeedView(view: IViewLimitingVelocity)
 
-
-    interface IViewNotificationProvider {
-
-        fun getNotificationView() : IViewNotification?
-    }
 }

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

@@ -0,0 +1,47 @@
+package com.mogo.eagle.core.function.api.hmi.view
+
+import android.view.ViewGroup
+
+interface IViewControlListener {
+
+    companion object{
+        const val SpeedPanelView_TAG = "SpeedPanelView_TAG"
+        const val AutoPilotStatusView_TAG = "AutoPilotStatusView_TAG"
+        const val PerspectiveSwitchView_TAG = "PerspectiveSwitchView_TAG"
+        const val CameraView_TAG = "CameraView_TAG"
+        const val ToolsView_TAG = "ToolsView_TAG"
+    }
+
+    /** --------- View --------- **/
+    fun visible(v:Int){
+
+    }
+
+    /** --------- StatusBar --------- **/
+    /**
+     * 设置状态栏暗夜或明亮模式
+     * 默认 light
+     */
+    fun setStatusBarDarkOrLight(light: Boolean){}
+
+    /**
+     * 更新(添加/删除)状态栏右侧元素
+     */
+    fun updateStatusBarRightView(insert: Boolean, tag: String, viewGroup: ViewGroup){}
+
+    /**
+     * 更新(添加/删除)状态栏左侧元素
+     */
+    fun updateStatusBarLeftView(insert: Boolean, tag: String, viewGroup: ViewGroup){}
+
+    /**
+     * 更新(添加/删除)下载进度
+     */
+    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

@@ -264,16 +264,6 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
      */
     fun updateStatusBarLeftView(insert: Boolean, tag: String, viewGroup: ViewGroup)
 
-    /**
-     * 设置司机端消息盒子是否展示
-     */
-    fun updateDriverMsgBoxTipView(show: Boolean)
-
-    /**
-     * 设置乘客端消息盒子是否展示
-     */
-    fun updatePassengerMsgBoxTipView(show: Boolean)
-
     /**
      * 更新(添加/删除)下载进度
      */
@@ -284,6 +274,16 @@ interface IMoGoHmiProvider : IMoGoHmiViewProxy {
      */
     fun updateMfStatus(tag: String, status: Boolean)
 
+    /**
+     * 设置司机端消息盒子是否展示
+     */
+    fun updateDriverMsgBoxTipView(show: Boolean)
+
+    /**
+     * 设置乘客端消息盒子是否展示
+     */
+    fun updatePassengerMsgBoxTipView(show: Boolean)
+
     /**
      * 调度弹窗展示
      */