fixed conflict

2022-07-28 18:17:43 +08:00
parent fd99007dd1
commit 1b0e17e12c
11 changed files with 215 additions and 5 deletions
--- a/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java
@@ -354,6 +354,7 @@ public class MogoMapUIController implements IMogoMapUIController {
    }


+
    @Override
    public void stepInVrMode(boolean isDayMode) {
        initDelegate();
@@ -403,4 +404,12 @@ public class MogoMapUIController implements IMogoMapUIController {
        }
        return 0.0;
    }
+
+    @Override
+    public void setLockMode(boolean isLock) {
+        initDelegate();
+        if (mDelegate != null) {
+            mDelegate.setLockMode(isLock);
+        }
+    }
 }