From b4216da0d5fac110f46f0dc0d4389584b0cfe5b4 Mon Sep 17 00:00:00 2001
From: zhongchao <zhongchao@zhidaoauto.com>
Date: Fri, 13 Jan 2023 18:50:58 +0800
Subject: [PATCH] [2.13.2] merge

---
 .../och/bus/fragment/BaseBusTabFragment.java  |  15 +-
 .../ui/TaxiPassengerBaseFragment.java         | 131 ++++++++++--------
 .../mogo/och/taxi/ui/BaseTaxiTabFragment.java |  15 +-
 .../hmi/ui/setting/DebugSettingView.kt        |  10 ++
 .../function/hmi/ui/setting/SOPSettingView.kt |   1 +
 .../main/res/layout/view_debug_setting.xml    |  12 ++
 .../core/data/config/FunctionBuildConfig.kt   |   7 +
 .../eagle/core/data/config/HmiBuildConfig.kt  |   2 +-
 .../java/com/mogo/map/utils/ObjectUtils.java  |   3 +-
 9 files changed, 124 insertions(+), 72 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
index bbfd9df381..2017b5a63a 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
@@ -27,6 +27,7 @@ import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.mvp.Presenter;
 import com.mogo.commons.voice.AIAssist;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.config.HmiBuildConfig;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
@@ -140,16 +141,20 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
             @Override
             public void onClickImpl(View v) {
                 //切换地图的远近视图
-                if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isLongSight()) {
+                if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isLongSight()
+                        || MogoMapUIController.getInstance().getCurrentMapVisualAngle().isRoma()) {
                     CallerVisualAngleManager.INSTANCE.updateLongSightLevel(false);
-//                    Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
+                    Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                     mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium);
                 } else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
                     CallerVisualAngleManager.INSTANCE.updateLongSightLevel(true);
-//                    Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
-                    MogoMapUIController.getInstance().setRomaMode();
-//                    MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                    if (FunctionBuildConfig.isRomaMode) {
+                        MogoMapUIController.getInstance().setRomaMode();
+                    } else {
+                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
+                        MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                    }
                     mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_long);
                 } else {
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
index 26fbc8a313..62f47df941 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
+++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
@@ -14,6 +14,7 @@ import androidx.fragment.app.FragmentTransaction;
 
 import com.mogo.commons.module.status.MogoStatusManager;
 import com.mogo.commons.mvp.MvpFragment;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.api.hmi.IMoGoHmiViewProxy;
 import com.mogo.eagle.core.function.api.hmi.view.IViewNotification;
@@ -30,10 +31,10 @@ import com.mogo.map.uicontroller.VisualAngleMode;
 import com.mogo.och.taxi.passenger.R;
 import com.mogo.och.taxi.passenger.callback.ITPClickStartAutopilotCallback;
 import com.mogo.och.taxi.passenger.event.UIStatus;
+import com.mogo.och.taxi.passenger.mulprocess.EmptyService;
 import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter;
 import com.mogo.och.taxi.passenger.ui.comment.TaxiPassengerArrivedView;
 import com.mogo.och.taxi.passenger.ui.leftmenu.OverlayLeftViewUtils;
-import com.mogo.och.taxi.passenger.mulprocess.EmptyService;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
@@ -112,31 +113,35 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         return new TaxiPassengerV2XNotificationView(getContext());
     }
 
-    private void updateSwitchMapIcon(){
+    private void updateSwitchMapIcon() {
         if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isLongSight()) {
             mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_long);
         } else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
             mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_medium);
-        }else {
+        } else {
             mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_medium);
         }
     }
-    private void initListener(){
+
+    private void initListener() {
         mMapswitchBtn.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 //视角切换
-                if (MogoMapUIController.getInstance()
-                        .getCurrentMapVisualAngle().isLongSight()) {
+                if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isLongSight()
+                        || MogoMapUIController.getInstance().getCurrentMapVisualAngle().isRoma()) {
                     CallerVisualAngleManager.INSTANCE.updateLongSightLevel(false);
-//                    Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
+                    Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                     mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_medium);
                 } else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
                     CallerVisualAngleManager.INSTANCE.updateLongSightLevel(true);
-//                    Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
-                    MogoMapUIController.getInstance().setRomaMode();
-//                    MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                    if (FunctionBuildConfig.isRomaMode) {
+                        MogoMapUIController.getInstance().setRomaMode();
+                    } else {
+                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
+                        MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                    }
                     mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_long);
                 } else {
                     MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
@@ -147,7 +152,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         });
     }
 
-    private void initArrivedView(){
+    private void initArrivedView() {
         mArrivedEndView = new WeakReference<>(new TaxiPassengerArrivedView(getContext()));
         mArrivedEndView.get().setITaxiPassengerScoreCallback((taxiPassengerScoreUpdateOrderReqBean) -> getPresenter().arrivedAndScore(taxiPassengerScoreUpdateOrderReqBean));
     }
@@ -175,9 +180,10 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
 
     /**
      * VR mode 转换
+     *
      * @param isVRMode
      */
-    public void switchVRFlatMode(boolean isVRMode){
+    public void switchVRFlatMode(boolean isVRMode) {
         if (mRootView != null) {
             mRootView.setVisibility(isVRMode ? View.VISIBLE : View.GONE);
         }
@@ -189,6 +195,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
      * @param status 2 - running  1 - enable  2 - disable
      */
     private int mPrevAPStatus = -1;
+
     public void onAutopilotStatusChanged(int status) {
         getActivity().runOnUiThread(() -> {
             if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != status) {
@@ -201,7 +208,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
                 onAutopilotStatusSuccessDone();
             }
             // 3. 其他过程直接更新
-            if (mPrevAPStatus != status){
+            if (mPrevAPStatus != status) {
                 autopilotStatusAnimchanged(status);
             }
             mPrevAPStatus = status;
@@ -212,7 +219,7 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
 //        mAutopilotTv.setText(isInAutopilot?"自动驾驶":"开启自动驾驶");
         if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status) {
             mAutopilotImage.setImageResource(R.drawable.taxi_p_auto_nor);
-        } else if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE == status){
+        } else if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE == status) {
             mAutopilotImage.setImageResource(R.drawable.taxi_p_un_auto_nor);
         } else {
             mAutopilotImage.setImageResource(R.drawable.taxi_p_un_auto_nor);
@@ -242,20 +249,21 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         removeListener();
     }
 
-    private void removeListener(){
-        if (mStartAutopilotView == null || mStartAutopilotView.get() == null){
+    private void removeListener() {
+        if (mStartAutopilotView == null || mStartAutopilotView.get() == null) {
             return;
         }
         mStartAutopilotView.get().setOnClickStartAutopilotBtnCallback(null);
     }
+
     @Subscribe(threadMode = ThreadMode.MAIN)
-    public void changeOverview(UIStatus uiStatus){
-        if(uiStatus.status==UIStatus.LIVE){
+    public void changeOverview(UIStatus uiStatus) {
+        if (uiStatus.status == UIStatus.LIVE) {
             CallerHmiManager.INSTANCE.hideSmallFragment();
-            showOrHideServingOrderFragment(true,false);
-        }else if(uiStatus.status==UIStatus.OVERVIEW){
+            showOrHideServingOrderFragment(true, false);
+        } else if (uiStatus.status == UIStatus.OVERVIEW) {
             CallerHmiManager.INSTANCE.showSmallFragment();
-            showOrHideServingOrderFragment(false,false);
+            showOrHideServingOrderFragment(false, false);
         }
     }
 
@@ -266,25 +274,26 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
 
     /**
      * 显示或隐藏订单信息
+     *
      * @param isShow
      */
-    public void showOrHideServingOrderFragment(boolean isShow,boolean showOrHideLefeMenu){
+    public void showOrHideServingOrderFragment(boolean isShow, boolean showOrHideLefeMenu) {
 
         FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
-        if (isShow){
-            if (ochServingOrderFragment == null){
+        if (isShow) {
+            if (ochServingOrderFragment == null) {
                 ochServingOrderFragment = new TaxiPassengerServingOrderFragment().newInstance();
             }
-            if(showOrHideLefeMenu) {
+            if (showOrHideLefeMenu) {
                 OverlayLeftViewUtils.INSTANCE.showOverlayView(getActivity(), 0, true, -1, true);
             }
-            if (ochServingOrderFragment.isHidden()){
+            if (ochServingOrderFragment.isHidden()) {
                 transaction
                         .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
                         .show(ochServingOrderFragment).commitAllowingStateLoss();
                 return;
             }
-            if (ochServingOrderFragment.isAdded()){
+            if (ochServingOrderFragment.isAdded()) {
                 transaction
                         .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
                         .show(ochServingOrderFragment).commitAllowingStateLoss();
@@ -295,13 +304,13 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
                     .add(R.id.module_mogo_och_navi_panel_container, ochServingOrderFragment)
                     .show(ochServingOrderFragment).commitAllowingStateLoss();
 
-        }else {
-            if (ochServingOrderFragment != null){
+        } else {
+            if (ochServingOrderFragment != null) {
                 transaction
                         .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_CLOSE)
                         .hide(ochServingOrderFragment).commitAllowingStateLoss();
             }
-            if(showOrHideLefeMenu) {
+            if (showOrHideLefeMenu) {
                 OverlayLeftViewUtils.INSTANCE.dismissOverlayView(true);
                 CallerHmiManager.INSTANCE.hideSmallFragment();
             }
@@ -313,18 +322,19 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
      * 乘客验证成功，页面显示，按钮置于不可点击
      * 司机端确认可点击开启自动驾驶, 按钮置为可点击
      * 订单前往目的地，页面消失
+     *
      * @param isShow
      */
-    public void showOrHideStartAutopilotView(boolean isShow, boolean isClickable){
-        if (isShow){
-            if (mStartAutopilotView == null || mStartAutopilotView.get() == null){
+    public void showOrHideStartAutopilotView(boolean isShow, boolean isClickable) {
+        if (isShow) {
+            if (mStartAutopilotView == null || mStartAutopilotView.get() == null) {
                 mStartAutopilotView = new WeakReference<>(new TaxiPassengerStartAutopilotView(getContext()));
             }
             mStartAutopilotView.get().setOnClickStartAutopilotBtnCallback(this);
-            OverlayViewUtils.showOverlayView(getActivity(),mStartAutopilotView.get());
+            OverlayViewUtils.showOverlayView(getActivity(), mStartAutopilotView.get());
             updateStartAutopilotBtnStatus(isClickable);
-        }else {
-            if (mStartAutopilotView == null || mStartAutopilotView.get() == null){
+        } else {
+            if (mStartAutopilotView == null || mStartAutopilotView.get() == null) {
                 return;
             }
             mStartAutopilotView.get().setOnClickStartAutopilotBtnCallback(null);
@@ -333,15 +343,15 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
         }
     }
 
-    public void updateStartAutopilotBtnStatus(boolean isClickable){
-        if (mStartAutopilotView == null || mStartAutopilotView.get() == null){
+    public void updateStartAutopilotBtnStatus(boolean isClickable) {
+        if (mStartAutopilotView == null || mStartAutopilotView.get() == null) {
             return;
         }
         mStartAutopilotView.get().handleStartAutopilotBtnStatus(isClickable);
     }
 
-    public void onAutopilotStatusSuccessDone(){
-        if (mStartAutopilotView == null || mStartAutopilotView.get() == null){
+    public void onAutopilotStatusSuccessDone() {
+        if (mStartAutopilotView == null || mStartAutopilotView.get() == null) {
             return;
         }
         mStartAutopilotView.get().onAutopilotStatusSuccess();
@@ -353,36 +363,38 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
      * ② 到达上车点  隐藏到达终点的页面（上一个订单没有评价）
      * ③ 到达目的地  显示到达终点的页面
      * ④ debug 使用
-     * @param isShow true 展示 false 隐藏
+     *
+     * @param isShow            true 展示 false 隐藏
      * @param arrivedEndStation 目的地
-     * @param  orderNo 订单No
+     * @param orderNo           订单No
      */
-    public void showOrHideArrivedEndLayout(boolean isShow, String arrivedEndStation,String orderNo){
-        if (isShow){
-            if(mArrivedEndView==null||mArrivedEndView.get()==null){
+    public void showOrHideArrivedEndLayout(boolean isShow, String arrivedEndStation, String orderNo) {
+        if (isShow) {
+            if (mArrivedEndView == null || mArrivedEndView.get() == null) {
                 initArrivedView();
             }
-            OverlayViewUtils.showOverlayView(getActivity(),mArrivedEndView.get(),R.style.och_window_anim_alpha);
+            OverlayViewUtils.showOverlayView(getActivity(), mArrivedEndView.get(), R.style.och_window_anim_alpha);
             UiThreadHandler.postDelayed(new Runnable() {
                 @Override
                 public void run() {
-                    mArrivedEndView.get().setDataAndStartAnimation(arrivedEndStation,orderNo);
+                    mArrivedEndView.get().setDataAndStartAnimation(arrivedEndStation, orderNo);
                 }
                 //如果在全屏 回收需要300毫秒 后期优化使用单独的播放器
-            },500);
-        }else {
-            if(mArrivedEndView==null||mArrivedEndView.get()==null){
+            }, 500);
+        } else {
+            if (mArrivedEndView == null || mArrivedEndView.get() == null) {
                 return;
             }
             OverlayViewUtils.dismissOverlayView(mArrivedEndView.get());
         }
     }
+
     // 20 司机到达上车点
     public void preOrderThankPageTenlogic(String startSiteAddr,
                                           String endSiteAddr,
                                           String passengerNum,
                                           String carNumber,
-                                          String phone){
+                                          String phone) {
         showOrHideArrivedEndLayout(false, "", "");
         showOrHidePressengerCheckPager(true, startSiteAddr,
                 endSiteAddr, passengerNum, carNumber, phone);
@@ -401,33 +413,34 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
                                                String phone) {
         try {
             if (isShow) {
-                if(mArrivedCheckView==null||mArrivedCheckView.get()==null){
+                if (mArrivedCheckView == null || mArrivedCheckView.get() == null) {
                     initCheckView();
                 }
-                mArrivedCheckView.get().setData(startSiteAddr, endSiteAddr, passengerNum, carNumber,phone);
+                mArrivedCheckView.get().setData(startSiteAddr, endSiteAddr, passengerNum, carNumber, phone);
                 OverlayViewUtils.showOverlayView(getActivity(), mArrivedCheckView.get());
             } else {
-                if(mArrivedCheckView==null||mArrivedCheckView.get()==null){
+                if (mArrivedCheckView == null || mArrivedCheckView.get() == null) {
                     return;
                 }
                 OverlayViewUtils.dismissOverlayView(mArrivedCheckView.get());
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
     /**
-     *  用户评分后接口回调
+     * 用户评分后接口回调
+     *
      * @param isSuccess true 打分成功 false 打分失败
      */
     public void showArrivedEndLayout2Thank(boolean isSuccess) {
-        if(mArrivedEndView==null||mArrivedEndView.get()==null){
+        if (mArrivedEndView == null || mArrivedEndView.get() == null) {
             initArrivedView();
         }
-        if(isSuccess){
+        if (isSuccess) {
             mArrivedEndView.get().scoreSuccess();
-        }else {
+        } else {
             mArrivedEndView.get().scoreFail();
         }
     }
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
index 77e075b126..3eef0d1b5a 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
@@ -24,6 +24,7 @@ import androidx.fragment.app.FragmentTransaction;
 import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.mvp.Presenter;
+import com.mogo.eagle.core.data.config.FunctionBuildConfig;
 import com.mogo.eagle.core.data.config.HmiBuildConfig;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
@@ -177,16 +178,20 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
                 //视角切换
                 long start = SystemClock.elapsedRealtime();
                 try {
-                    if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isLongSight()) {
+                    if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isLongSight()
+                        || MogoMapUIController.getInstance().getCurrentMapVisualAngle().isRoma()) {
                         CallerVisualAngleManager.INSTANCE.updateLongSightLevel(false);
-//                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
+                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(true);
                         MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
                         mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_medium);
                     } else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
                         CallerVisualAngleManager.INSTANCE.updateLongSightLevel(true);
-//                        Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
-                        MogoMapUIController.getInstance().setRomaMode();
-//                        MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                        if (FunctionBuildConfig.isRomaMode) {
+                            MogoMapUIController.getInstance().setRomaMode();
+                        } else {
+                            Objects.requireNonNull(CallerMapUIServiceManager.INSTANCE.getMapUIController()).setLockMode(false);
+                            MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_LONG_SIGHT, null);
+                        }
                         mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_long);
                     } else {
                         MogoMapUIController.getInstance().changeMapVisualAngle(VisualAngleMode.MODE_MEDIUM_SIGHT, null);
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
index 477985bc7c..01e4de1b36 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
@@ -641,6 +641,15 @@ class DebugSettingView @JvmOverloads constructor(
             }
         }
 
+        tbDrawRomaMode.isChecked = FunctionBuildConfig.isRomaMode
+        //云端感知绘制
+        tbDrawRomaMode.setOnCheckedChangeListener { _, isChecked ->
+            FunctionBuildConfig.isRomaMode = isChecked
+            if (!FunctionBuildConfig.isRomaMode) {
+                tbDrawRomaMode.isChecked = false
+            }
+        }
+
         //重启工控机所有节点
         btnIpcReboot.onClick {
             CallerAutoPilotManager.sendIpcReboot()
@@ -1148,6 +1157,7 @@ class DebugSettingView @JvmOverloads constructor(
         /**
          * 云端弱势交通控制
          */
+        tbCloudWeaknessTraffic.isChecked = HmiBuildConfig.isShowCloudWeaknessTrafficView
         tbCloudWeaknessTraffic.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) { //默认关闭
                 CallerHmiManager.setCloudWeaknessTraffic(true)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
index ca74993d5a..4a575188d4 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
+++ b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/SOPSettingView.kt
@@ -89,6 +89,7 @@ class SOPSettingView @JvmOverloads constructor(
         /**
          * 云端弱势交通控制
          */
+        tbCloudWeaknessTrafficSop.isChecked = HmiBuildConfig.isShowCloudWeaknessTrafficView
         tbCloudWeaknessTrafficSop.setOnCheckedChangeListener { _, isChecked ->
             if (isChecked) { //默认关闭
                 CallerHmiManager.setCloudWeaknessTraffic(true)
diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
index 5fddb03d64..bef611254c 100644
--- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
+++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml
@@ -266,6 +266,18 @@
                 android:textOn="关闭云端感知绘制"
                 android:textSize="@dimen/dp_24" />
 
+            <ToggleButton
+                android:id="@+id/tbDrawRomaMode"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="@dimen/dp_10"
+                android:padding="@dimen/dp_20"
+                android:background="@drawable/radio_button_normal_background_right"
+                android:textColor="#000"
+                android:textOff="开启漫游模式"
+                android:textOn="关闭漫游模式"
+                android:textSize="@dimen/dp_24" />
+
             <ToggleButton
                 android:id="@+id/tbMojie"
                 android:layout_width="match_parent"
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
index 82b09f021f..9781b83db3 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/FunctionBuildConfig.kt
@@ -71,6 +71,13 @@ object FunctionBuildConfig {
     @JvmField
     var isDrawAiCloudFusion = true
 
+    /**
+     * 是否绘制云端感知物
+     */
+    @Volatile
+    @JvmField
+    var isRomaMode = false
+
     /**
      * 是否开启感知物替换颜色功能
      * 默认关闭
diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt
index f156f8b981..934d7262a7 100644
--- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt
+++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/config/HmiBuildConfig.kt
@@ -91,7 +91,7 @@ object HmiBuildConfig {
      */
     @JvmField
     @Volatile
-    var isShowCloudWeaknessTrafficView = false
+    var isShowCloudWeaknessTrafficView = true
 
     /**
      * 是否展示obu的限速
diff --git a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
index 4b341c03d3..b3a7541987 100644
--- a/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
+++ b/libraries/mogo-map/src/main/java/com/mogo/map/utils/ObjectUtils.java
@@ -156,8 +156,7 @@ public class ObjectUtils {
             markerOptions.setLat(aiData.getWgslat());
             markerOptions.setLon(aiData.getWgslon());
             markerOptions.setTime(Double.valueOf(aiData.getSatelliteTime()).longValue());
-//            markerOptions.setColor("#00FF00FF");
-            markerOptions.setColor("#F0F8FFFF");
+            markerOptions.setColor("#00FF00FF");
         } catch (Exception e) {
             e.printStackTrace();
         }