[Change]

增加控制地图「白天」「夜间」模式

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt

@@ -455,6 +455,14 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }
 
+
+        /**
+         * 修改地图样式按钮（白天模式、夜间模式）
+         */
+        tbChangeCurrentMapStyle.setOnCheckedChangeListener { buttonView, isChecked ->
+            CallerHDMapManager.stepInVrMode(isChecked)
+        }
+
         //设置鹰眼本地参数配置监听
         setEagleEyeConfigListener()
         //域控制器中心事件点击监听

core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/MainActivity.java

@@ -195,7 +195,8 @@ public class MainActivity extends MvpActivity<MainView, MainPresenter> implement
 
                     // TODO 这里临时兼容进入VR模式
                     MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, true);
-                    MogoMapListenerHandler.getInstance().onMapModeChanged(EnumMapUI.Type_VR);
+                    // 设置地图样式
+                    MogoMapListenerHandler.getInstance().onMapModeChanged(EnumMapUI.MAP_STYLE_DAY_VR);
                 }, 1000);
                 CallerLogger.INSTANCE.i(M_HMI + TAG, "App launch timer cost " + (System.currentTimeMillis() - start) + "ms");
             });

core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml

@@ -1128,6 +1128,18 @@
                         app:layout_constraintRight_toLeftOf="@id/btnDrawTrolley"
                         app:layout_constraintTop_toBottomOf="@id/reset_changesight" />
 
+                    <ToggleButton
+                        android:id="@+id/tbChangeCurrentMapStyle"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_margin="2dp"
+                        android:gravity="center"
+                        android:textOff="切换地图为「白天模式」"
+                        android:textOn="切换地图为「夜间模式」"
+                        android:textSize="@dimen/dp_24"
+                        app:layout_constraintLeft_toRightOf="@+id/tbChangeCurrentCarIcon"
+                        app:layout_constraintTop_toTopOf="@id/tbChangeCurrentCarIcon" />
+
                     <Button
                         android:id="@+id/btnDrawTrolley"
                         android:layout_width="0dp"

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFragment.java

@@ -9,15 +9,12 @@ import androidx.annotation.Nullable;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.eagle.core.data.constants.MoGoFragmentPaths;
-import com.mogo.eagle.core.data.constants.MogoServicePaths;
 import com.mogo.eagle.core.data.map.CenterLine;
 import com.mogo.eagle.core.function.api.map.IMogoMapFrameController;
 import com.mogo.eagle.core.function.api.map.hd.IMoGoMapFragmentProvider;
-import com.mogo.eagle.core.function.call.base.CallerBase;
 import com.mogo.map.IMogoMap;
 import com.mogo.map.IMogoUiSettings;
 import com.mogo.map.MogoMapView;
-import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 
 /**
@@ -50,7 +47,6 @@ public class MapFragment extends MvpFragment<MapView, MapPresenter>
 
     @Override
     protected void initViews() {
-        CallerBase.getApiInstance(IMogoMapFrameController.class, MogoServicePaths.PATH_MAP_FRAME_CONTROLLER).initDelegate(this);
     }
 
     @Override
@@ -64,9 +60,9 @@ public class MapFragment extends MvpFragment<MapView, MapPresenter>
     }
 
     @Override
-    public void changeToVRMode() {
+    public void stepInVrMode(boolean isDayMode) {
         try {
-            mMogoMapView.getMap().getUIController().changeMapMode(EnumMapUI.Type_VR);
+            mMogoMapView.getMap().getUIController().stepInVrMode(isDayMode);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -175,7 +171,6 @@ public class MapFragment extends MvpFragment<MapView, MapPresenter>
 
     @Override
     public void destroy() {
-        CallerBase.getApiInstance(IMogoMapFrameController.class, MogoServicePaths.PATH_MAP_FRAME_CONTROLLER).destroy();
     }
 
     @Override

core/function-impl/mogo-core-function-map/src/main/java/com/mogo/eagle/core/function/map/MapFrameController.java

@@ -1,48 +0,0 @@
-package com.mogo.eagle.core.function.map;
-
-import android.content.Context;
-
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.mogo.eagle.core.data.constants.MogoServicePaths;
-import com.mogo.eagle.core.function.api.map.IMogoMapFrameController;
-
-/**
- * @author congtaowang
- * @since 2020/10/23
- * <p>
- * 地图控制交互层
- */
-@Route(path = MogoServicePaths.PATH_MAP_FRAME_CONTROLLER)
-public 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) {
-        MapIdentifySubscriber.Companion.getInstance();
-    }
-
-    @Override
-    public void destroy() {
-        mController = null;
-    }
-}

core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/events/manager/impl/MoGoV2XMarkerManager.java

@@ -1,7 +1,7 @@
 package com.mogo.eagle.core.function.v2x.events.manager.impl;
 
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
 import static com.mogo.eagle.core.function.v2x.events.consts.V2XConst.V2X_EVENT_ALARM_POI;
+import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_V2X;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -10,7 +10,6 @@ import com.alibaba.android.arouter.facade.annotation.Route;
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.data.map.MogoLatLng;
 import com.mogo.eagle.core.data.map.MogoLocation;
-import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.function.v2x.events.bridge.BridgeApi;
 import com.mogo.eagle.core.function.v2x.events.consts.MoGoV2XServicePaths;
 import com.mogo.eagle.core.function.v2x.events.consts.V2XConst;
@@ -21,6 +20,7 @@ import com.mogo.eagle.core.function.v2x.events.manager.V2XStatusManager;
 import com.mogo.eagle.core.function.v2x.events.marker.V2XMarkerAdapter;
 import com.mogo.eagle.core.function.v2x.events.utils.EntityUtilsKt;
 import com.mogo.eagle.core.function.v2x.events.utils.MapUtils;
+import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.util.ViewUtils;
 import com.mogo.map.MogoMapUIController;
 import com.mogo.map.MogoMarkerManager;
@@ -28,7 +28,6 @@ import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.marker.MogoMarkerOptions;
-import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.common.drawer.MarkerDrawer;
 import com.mogo.module.common.drawer.marker.IMarkerView;
@@ -234,10 +233,6 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager {
     @Override
     public void drawableAlarmPOI(Context context, V2XRoadEventEntity roadEventEntity, IMogoMarkerClickListener clickListener) {
         try {
-            IMogoMapUIController mapUiController = MogoMapUIController.getInstance();
-            if (mapUiController != null) {
-                mapUiController.changeMapMode(EnumMapUI.NorthUP_2D);
-            }
             IMoGoV2XStatusManager v2xStatus = BridgeApi.INSTANCE.v2xStatus();
             if (v2xStatus != null) {
                 v2xStatus.setRoadEventPOIShow(TAG, true);