fixed conflict

2022-07-28 18:17:43 +08:00
parent fd99007dd1
commit 1b0e17e12c
11 changed files with 215 additions and 5 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
@@ -311,6 +311,10 @@ object CallerHmiManager : CallerBase() {
        waringProviderApi?.hideSmallFragment()
    }

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