fixed conflict

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

@@ -13,7 +13,6 @@ 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.IMoGoHmiViewProxy.IViewNotificationProvider
 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
@@ -339,15 +338,6 @@ object CallerHmiManager {
         waringProviderApi?.hideSmallFragment()
     }
 
-    /**
-     * 工控机重启返回结果
-     * @param code
-     * @param msg
-     */
-    fun showDockerRebootResult(code: Int, msg: String) {
-        waringProviderApi?.showDockerRebootResult(code, msg)
-    }
-
     /**
      * 设置 红绿灯 代理View
      * @param view
@@ -364,14 +354,6 @@ object CallerHmiManager {
         waringProviderApi?.setProxyLimitingSpeedView(view)
     }
 
-    /**
-     * 设置 V2X弹窗预警 代理View
-     * @param view
-     */
-    fun setNotificationViewProvider(provider: IViewNotificationProvider) {
-        waringProviderApi?.setViewNotificationProvider(provider)
-    }
-
     /**
      * 展示工控机监控上报数据
      * @param errorReportList 错误级别上报数据列表

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

@@ -0,0 +1,52 @@
+package com.mogo.eagle.core.function.call.hmi
+
+import android.view.ViewGroup
+import com.mogo.eagle.core.function.api.hmi.view.IViewControlListener
+import com.mogo.eagle.core.function.call.base.CallerBase
+
+/**
+ * @author xiaoyuzhou
+ * @date 2021/9/23 10:22 上午
+ * HMI 视图上的监听管理
+ */
+object CallerHmiViewControlListenerManager : CallerBase<IViewControlListener>() {
+
+    /**
+     * 触发 view 显示隐藏
+     * @param v 显示/隐藏状态
+     */
+    fun invokeVisible(tag: String, v: Int) {
+        M_LISTENERS[tag]?.visible(v)
+    }
+
+    fun setStatusBarDarkOrLight(tag: String, light: Boolean) {
+        M_LISTENERS[tag]?.setStatusBarDarkOrLight(light)
+    }
+
+    fun updateStatusBarRightView(
+        tag: String,
+        insert: Boolean,
+        viewTag: String,
+        viewGroup: ViewGroup
+    ) {
+        M_LISTENERS[tag]?.updateStatusBarRightView(insert, tag, viewGroup)
+    }
+
+    fun updateStatusBarLeftView(
+        tag: String,
+        insert: Boolean,
+        viewTag: String,
+        viewGroup: ViewGroup
+    ) {
+        M_LISTENERS[tag]?.updateStatusBarLeftView(insert, tag, viewGroup)
+    }
+
+    fun updateStatusBarDownloadView(tag: String, insert: Boolean, viewTag: String, progress: Int) {
+        M_LISTENERS[tag]?.updateStatusBarDownloadView(insert, tag, progress)
+    }
+
+    fun updateMfStatus(tag: String, viewTag: String, status: Boolean) {
+        M_LISTENERS[tag]?.updateMfStatus(viewTag, status)
+    }
+
+}