From d3d72dec2879658cd05dd07a6380b7b83f0ed2e5 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 25 May 2021 16:12:25 +0800
Subject: [PATCH] hide 2d mode

---
 .../extensions/entrance/EntranceFragment.java | 24 ++++++++++++++++---
 .../com/mogo/module/service/MogoServices.java |  4 ++--
 .../small/map/SmallMapDirectionView.java      | 21 +++++++++-------
 .../layout/view_event_panel_history_count.xml |  1 +
 4 files changed, 36 insertions(+), 14 deletions(-)

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 d9ef4ba560..3aac00d62d 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
@@ -181,6 +181,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
 
     private boolean isShowGuide;
 
+    //远景和中景的切换
     private ImageView mSwitchMapModeImage;
     private FrameLayout mSwitchMapModeLayout;
 
@@ -377,6 +378,8 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         mSwitchMapModeImage = (ImageView) findViewById(R.id.module_switch_model_icon);
         mSwitchMapModeImage.setOnClickListener(clickListener);
 
+        //TODO
+        enterVrMode();
     }
 
     private int debugPanelClickCount = 0;
@@ -386,7 +389,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
     private Group groupFix;
 
     private void enterVrMode() {
-        if (!localIsVrMode) {
+//        if (!localIsVrMode) {
             tvEnterVrMode.setVisibility(View.GONE);
             mMove2CurrentLocation.setVisibility(View.GONE);
             mUploadRoadCondition.setVisibility(View.GONE);
@@ -410,7 +413,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
             flSpeed.setVisibility(View.VISIBLE);
             mSwitchMapModeLayout.setVisibility(View.VISIBLE);
           //  clTrafficLight.setVisibility(View.VISIBLE);
-        }
+//        }
     }
 
     private void exitVrMode() {
@@ -717,6 +720,9 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
         TopViewAnimHelper.getInstance().setIMogoMapUIController(mMApUIController);
         TopViewNoLinkageAnimHelper.getInstance().setIMogoMapUIController(mMApUIController);
 
+        // 进入vr模式，不可缩放地图
+        UiThreadHandler.postDelayed(this::stepIntoVrMode, 3_000L );
+
         mClickShareVoiceStrings =
                 getContext().getResources().getStringArray(R.array.click_share_voice_guide_array);
         mInnerGuideVoiceStrings =
@@ -725,6 +731,18 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                 getContext().getResources().getStringArray(R.array.search_voice_guide_outer_array);
     }
 
+    /**
+     * 进入鹰眼模式，设置手势缩放地图失效
+     */
+    private void stepIntoVrMode(){
+        Logger.d( TAG, "进入vr模式" );
+        MogoApisHandler.getInstance()
+                .getApis()
+                .getMapServiceApi()
+                .getMapUIController()
+                .openVrMode(false);
+    }
+
     @Override
     public void onResume() {
         super.onResume();
@@ -898,7 +916,7 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                 if (isTrue) {
                     enterVrMode();
                 } else {
-                    exitVrMode();
+//                    exitVrMode();
                 }
             } catch (Exception e) {
                 e.printStackTrace();
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 94c099f9b2..3b4777419f 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
@@ -940,7 +940,7 @@ public class MogoServices implements IMogoMapListener,
                 MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, true );
                 MapCenterPointStrategy.resetByChangeMode();
                 MapMarkerManager.getInstance().redrawMarkerByStyleChanged();
-                AIAssist.getInstance( mContext ).speakTTSVoice( "已开启鹰眼模式" );
+//                AIAssist.getInstance( mContext ).speakTTSVoice( "已开启鹰眼模式" );
                 mLastStatusIsVr = true;
             }
         } else {
@@ -949,7 +949,7 @@ public class MogoServices implements IMogoMapListener,
                 MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode( TAG, false );
                 MapCenterPointStrategy.resetByChangeMode();
                 MapMarkerManager.getInstance().redrawMarkerByStyleChanged();
-                AIAssist.getInstance( mContext ).speakTTSVoice( "已退出鹰眼模式" );
+//                AIAssist.getInstance( mContext ).speakTTSVoice( "已退出鹰眼模式" );
             }
         }
     }
diff --git a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
index f43ed66f30..c0a3c3650d 100644
--- a/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
+++ b/modules/mogo-module-smp/src/main/java/com/mogo/module/small/map/SmallMapDirectionView.java
@@ -19,6 +19,7 @@ import com.amap.api.maps.UiSettings;
 import com.amap.api.navi.AMapNaviView;
 import com.amap.api.navi.AMapNaviViewOptions;
 import com.mogo.commons.AbsMogoApplication;
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.module.common.MogoApisHandler;
 import com.mogo.module.common.view.RoundLayout;
 import com.mogo.utils.FileUtils;
@@ -215,15 +216,17 @@ public class SmallMapDirectionView extends RelativeLayout {
 
 
         setOnClickListener(view -> {
-            MogoApisHandler.getInstance().getApis()
-                    .getMapServiceApi()
-                    .getMapUIController()
-                    .changeMapMode(
-                            MogoApisHandler.getInstance()
-                                    .getApis()
-                                    .getAdasControllerApi()
-                                    .getCurrentSkinMode()
-                    );
+            if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_LENOVO ) {
+                MogoApisHandler.getInstance().getApis()
+                        .getMapServiceApi()
+                        .getMapUIController()
+                        .changeMapMode(
+                                MogoApisHandler.getInstance()
+                                        .getApis()
+                                        .getAdasControllerApi()
+                                        .getCurrentSkinMode()
+                        );
+            }
         });
     }
 
diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml
index 52b241ea7d..5d49257034 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/view_event_panel_history_count.xml
@@ -5,6 +5,7 @@
     android:id="@+id/llEventMore"
     android:layout_width="@dimen/module_v2x_panel_width"
     android:layout_height="@dimen/module_v2x_panel_width"
+    android:visibility="gone"
     android:background="@drawable/module_ext_drawable_shadow_bg"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent">