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-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
+++ b/core/mogo-core-function-api/src/main/java/com/mogo/eagle/core/function/api/hmi/warning/IMoGoWaringProvider.kt
@@ -190,6 +190,8 @@ interface IMoGoWaringProvider : IMoGoHmiViewProxy {

    fun showMaskView()

+    fun hideMaskView()
+
    /**
     * 加载全览模式图层
     */