[dev_arch_opt_3.0]

[Change]
[
1、修复合并3.0出现的页面逻辑冲突
]

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

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/SweeperProvider.java

@@ -1,6 +1,5 @@
 package com.mogo.och.sweeper;
 
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
 import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_SWEEPER;
 
 import android.content.Context;
@@ -14,14 +13,13 @@ import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.commons.module.status.StatusDescriptor;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
+import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.och.sweeper.constant.SweeperConst;
 import com.mogo.och.sweeper.fragment.SweeperFragment;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.Objects;
-
 /**
  * 清扫车业务实现入口
  *
@@ -41,8 +39,10 @@ public class SweeperProvider implements IMogoOCH {
      */
     private void stepIntoVrMode(){
         CallerLogger.INSTANCE.d( M_SWEEPER + TAG, "进入vr模式" );
-        MogoMapUIController.getInstance()
-                .stepInVrMode(false);
+        IMogoMapUIController controller = CallerMapUIServiceManager.INSTANCE.getMapUIController();
+        if (controller != null) {
+            controller.stepInVrMode(false);
+        }
     }
 
     @Override

OCH/mogo-och-sweeper/src/main/java/com/mogo/och/sweeper/fragment/BaseSweeperTabFragment.java

@@ -12,6 +12,7 @@ import android.widget.RelativeLayout;
 
 import androidx.constraintlayout.widget.Group;
 
+import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.MvpFragment;
@@ -24,7 +25,6 @@ import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
 import com.mogo.eagle.core.function.call.map.CallerMapUIServiceManager;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener;
-import com.mogo.map.MogoMapUIController;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.listener.MogoMapListenerHandler;
 import com.mogo.map.marker.IMogoMarkerManager;
@@ -35,10 +35,6 @@ import com.mogo.och.sweeper.ui.SweeperOperatePanelView;
 import com.mogo.och.sweeper.view.SweeperTrafficDataView;
 import com.mogo.och.sweeper.view.SweeperWorkModeView;
 
-import androidx.constraintlayout.widget.Group;
-
-import static com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant.M_BUS;
-
 /**
  * 网约车基础Fragment，主要负责布局通用界面，处理站点面板和通话面板互斥情况
  * <p>

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

@@ -86,6 +86,7 @@
             android:id="@+id/viewTrafficLightVr"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:visibility="gone"
             android:layout_marginTop="@dimen/hmi_traffic_light_layout_margin_top"
             android:layout_marginEnd="@dimen/hmi_traffic_light_layout_margin_right"
             app:layout_constraintRight_toRightOf="parent"