From 5a339383e92cf74db84b5879b3b752511503549b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 18 Jun 2021 20:03:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E6=AC=A1=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5VR=E6=A8=A1=E5=BC=8F=E6=95=88=E6=9E=9C=E4=BC=9A?=
 =?UTF-8?q?=E5=85=88=E4=BB=8E2D=E8=BF=87=E5=BA=A6=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mogo/map/impl/custom/AMapViewWrapper.java |  3 ++
 .../extensions/entrance/EntranceFragment.java | 32 +++++--------------
 .../com/mogo/module/service/MogoServices.java |  6 +++-
 .../impl/statusmanager/MogoStatusManager.java |  2 +-
 4 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
index 07a5a29fe5..fa50c2e6bf 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
@@ -353,6 +353,9 @@ public class AMapViewWrapper implements IMogoMapView,
                     setUIMode(ui);
                     break;
                 case Type_VR:
+                    if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
+                        mMapView.getMapAutoViewHelper().setScaleVRMode(true);
+                    }
                     mMapView.getMapAutoViewHelper().setMapStyle(MapAutoApi.MAP_STYLE_VR);
                     return;
                 case Type_Light:
diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
index d5fe0f553b..6eb79ddf6a 100644
--- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
+++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
@@ -380,10 +380,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         mSwitchMapModeImage = (ImageView) findViewById(R.id.module_switch_model_icon);
         mSwitchMapModeLayout.setOnClickListener(clickListener);
         mSwitchText = (TextView) findViewById(R.id.module_switch_model_text);
-
-        if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
-            enterVrMode();
-        }
     }
 
     private int debugPanelClickCount = 0;
@@ -393,7 +389,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     private Group groupFix;
 
     private void enterVrMode() {
-        if (!localIsVrMode) {
             tvEnterVrMode.setVisibility(View.GONE);
             mMove2CurrentLocation.setVisibility(View.GONE);
             mUploadRoadCondition.setVisibility(View.GONE);
@@ -415,11 +410,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             flSpeed.setVisibility(View.VISIBLE);
             mSwitchMapModeLayout.setVisibility(View.VISIBLE);
             mApis.getV2XListenerManager().changeTipWindowStatusForListener(ACTION_V2X_REMOVE_TIP_WINDOW);
-        }
     }
 
     private void exitVrMode() {
-        if (localIsVrMode) {
             EntranceViewHolder.getInstance().forceHideNoticeView();
             tvEnterVrMode.setVisibility(View.VISIBLE);
             mMove2CurrentLocation.setVisibility(View.VISIBLE);
@@ -443,7 +436,6 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             flSpeed.setVisibility(View.GONE);
             mSwitchMapModeLayout.setVisibility(View.GONE);
             clTrafficLight.setVisibility(View.GONE);
-        }
     }
 
     private void debugCrashWarn() {
@@ -722,29 +714,21 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         TopViewAnimHelper.getInstance().setIMogoMapUIController(mMApUIController);
         TopViewNoLinkageAnimHelper.getInstance().setIMogoMapUIController(mMApUIController);
 
-        // 进入vr模式，不可缩放地图
-        if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
-            UiThreadHandler.postDelayed(this::stepIntoVrMode, 3_500L);
-        }
-
         mClickShareVoiceStrings =
                 getContext().getResources().getStringArray(R.array.click_share_voice_guide_array);
         mInnerGuideVoiceStrings =
                 getContext().getResources().getStringArray(R.array.search_voice_guide_inner_array);
         mOuterGuideVoiceStrings =
                 getContext().getResources().getStringArray(R.array.search_voice_guide_outer_array);
-    }
 
-    /**
-     * 进入鹰眼模式，设置手势缩放地图失效
-     */
-    private void stepIntoVrMode() {
-        Logger.d(TAG, "进入vr模式");
-        MogoApisHandler.getInstance()
-                .getApis()
-                .getMapServiceApi()
-                .getMapUIController()
-                .openVrMode(false);
+        //TODO 因为衡阳6.30交付没有2D模式，临时方案，进入vr模式，不可缩放地图
+        if (DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_LENOVO) {
+            // 进入鹰眼模式，设置手势缩放地图失效
+            Logger.d(TAG, "进入vr模式");
+            mMApUIController.changeMapMode(EnumMapUI.Type_VR);
+            MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true );
+        }
+
     }
 
     @Override
diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
index 788ea3028c..7bb5d1e5a4 100644
--- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
+++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
@@ -437,7 +437,9 @@ public class MogoServices implements IMogoMapListener,
 //                            isNeedUploadCoordinatesDurationInTime() ) {  //todo 实时在线车辆需要注释，否则在2D模式下不能展示
 //                    }
                     //请求在线车辆数据，刷新地图在线车辆
-                    MapMarkerManager.getInstance().getOnlineCarDataByAutoRefreshStrategy( ro.mLonLat );
+                    if (!mLastStatusIsVr){
+                        MapMarkerManager.getInstance().getOnlineCarDataByAutoRefreshStrategy( ro.mLonLat );
+                    }
 
                     Logger.i( TAG, "刷新半径 = %s, 点 = %s, zoomLevel = %s, amount = %s", ro.mRadius, ro.mLonLat, mLastZoomLevel, ro.mAmount );
                 }
@@ -938,6 +940,8 @@ public class MogoServices implements IMogoMapListener,
 
     @Override
     public void onMapModeChanged( EnumMapUI ui ) {
+        Log.i(TAG, "onMapModeChanged:" + ui);
+        clearAllData();
         if ( ui == EnumMapUI.Type_VR ) {
             if ( !mLastStatusIsVr ) {
                 MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true );
diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java
index 34181e7e32..bfccf24afb 100644
--- a/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java
+++ b/services/mogo-service/src/main/java/com/mogo/service/impl/statusmanager/MogoStatusManager.java
@@ -159,7 +159,7 @@ public class MogoStatusManager implements IMogoStatusManager {
 
     private boolean get_bool_val(StatusDescriptor descriptor ) {
         Boolean val = mStatus.get( descriptor );
-        return val == null ? false : val;
+        return val != null && val;
     }
 
     @Override