fixed conflict

2022-07-29 15:39:47 +08:00
parent 1b0e17e12c
commit 035759d3cf
46 changed files with 8465 additions and 26 deletions
--- a/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
+++ b/core/mogo-core-function-call/src/main/java/com/mogo/eagle/core/function/call/hmi/CallerHmiManager.kt
@@ -315,6 +315,10 @@ object CallerHmiManager : CallerBase() {
        waringProviderApi?.showMaskView()
    }

+    fun hideMaskView() {
+        waringProviderApi?.hideMaskView()
+    }
+
    /**
     *注册工控机升级提示圆点View的回调
     * @param 提示圆点View