切换地图的逻辑修改

modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java

@@ -1,5 +1,6 @@
 package com.mogo.module.map;
 
+import android.content.Context;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
@@ -12,7 +13,9 @@ import com.mogo.map.IMogoUiSettings;
 import com.mogo.map.MogoMapView;
 import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.IMogoMapUIController;
+import com.mogo.module.common.MogoApisHandler;
 import com.mogo.service.MogoServicePaths;
+import com.mogo.service.map.IMogoMapFrameController;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.statusmanager.StatusDescriptor;
@@ -24,7 +27,7 @@ import com.mogo.utils.logger.Logger;
  * <p>
  * 地图图层，地图操作都在这个图层完成
  */
-public class MapFragment extends MvpFragment< MapView, MapPresenter > implements MapView {
+public class MapFragment extends MvpFragment< MapView, MapPresenter > implements MapView, IMogoMapFrameController {
 
     private static final String TAG = "MapFragment";
 
@@ -33,6 +36,8 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
 
     private boolean mIsControllerByOthersStatus = false;
 
+    private boolean mIsFirstLoadCustomMap = true;
+
     @Override
     protected int getLayoutId() {
         return R.layout.module_map_fragment_map;
@@ -40,6 +45,30 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
 
     @Override
     protected void initViews() {
+        MogoApisHandler.getInstance().getApis().getMapFrameControllerApi().initDelegate( this );
+    }
+
+    @Override
+    public void initDelegate( IMogoMapFrameController controller ) {
+        // do not implement
+    }
+
+    @Override
+    public void changeTo2dMode() {
+        mMogoMapView.display2DMap( false, true );
+    }
+
+    @Override
+    public void changeToVRMode() {
+        mMogoMapView.displayVRMap( mIsFirstLoadCustomMap, true );
+        if ( mIsFirstLoadCustomMap ) {
+            mIsFirstLoadCustomMap = false;
+        }
+    }
+
+    @Override
+    public void init( Context context ) {
+        // do not implement
     }
 
     @Override
@@ -48,8 +77,10 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
         mMogoMapView = findViewById( R.id.module_map_id_map );
         mMogoMapView.onCreate( savedInstanceState );
         mMogoMap = mMogoMapView.getMap();
-        mMogoMap.getUIController().showMyLocation( true );
-        mMogoMap.getUIController().recoverLockMode();// 启动锁车
+        if ( mMogoMap.getUIController() != null ) {
+            mMogoMap.getUIController().showMyLocation( true );
+            mMogoMap.getUIController().recoverLockMode();// 启动锁车
+        }
     }
 
     @NonNull
@@ -129,11 +160,18 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
                 uiSettings.setZoomControlsEnabled( false );
                 //设置双指缩放手势是否可用。
                 uiSettings.setZoomGesturesEnabled( true );
-                mMogoMap.getUIController().changeMapMode( EnumMapUI.NorthUP_2D );
+                if ( mMogoMap.getUIController() != null ) {
+                    mMogoMap.getUIController().changeMapMode( EnumMapUI.NorthUP_2D );
+                }
             }
         }
     }
 
+    @Override
+    public void destroy() {
+        MogoApisHandler.getInstance().getApis().getMapFrameControllerApi().destroy();
+    }
+
     @Override
     public IMogoMapUIController getUIController() {
         return mMogoMap.getUIController();
@@ -146,5 +184,6 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
             mMogoMapView.onDestroy();
         }
         MapBroadCastHelper.getInstance( getContext() ).release();
+        destroy();
     }
 }

modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFrameController.java

@@ -0,0 +1,51 @@
+package com.mogo.module.map;
+
+import android.content.Context;
+
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.google.gson.internal.$Gson$Preconditions;
+import com.mogo.service.MogoServicePaths;
+import com.mogo.service.map.IMogoMapFrameController;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/10/23
+ *
+ * 描述
+ */
+
+@Route( path = MogoServicePaths.PATH_MAP_FRAME_CONTROLLER )
+class MapFrameController implements IMogoMapFrameController {
+
+    private IMogoMapFrameController mController;
+
+    @Override
+    public void initDelegate( IMogoMapFrameController controller ) {
+        mController = controller;
+    }
+
+    @Override
+    public void changeTo2dMode() {
+        if ( mController != null ) {
+            mController.changeTo2dMode();
+        }
+    }
+
+    @Override
+    public void changeToVRMode() {
+        if ( mController != null ) {
+            mController.changeToVRMode();
+        }
+    }
+
+    @Override
+    public void init( Context context ) {
+
+    }
+
+    @Override
+    public void destroy() {
+        mController = null;
+    }
+}