fixed conflict

libraries/mogo-map/src/main/java/com/mogo/map/AMapViewWrapper.java

@@ -1110,4 +1110,10 @@ public class AMapViewWrapper implements IMogoMapView,
             }, 1000L);
         }
     }
+
+    @Override
+    public void setLockMode(boolean isLock) {
+        mMapView.getMapAutoViewHelper().setLockMode(true);
+    }
+
 }

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);
+        }
+    }
 }

libraries/mogo-map/src/main/java/com/mogo/map/uicontroller/AMapUIController.java

@@ -340,4 +340,12 @@ public class AMapUIController implements IMogoMapUIController {
         }
         return 0.0;
     }
+
+    @Override
+    public void setLockMode(boolean isLock) {
+        if (mClient != null) {
+            mClient.setLockMode(isLock);
+        }
+    }
+
 }