From f4a9980024d3da7c5cf61122570eb02615aaff66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Tue, 14 Sep 2021 20:35:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=86=E4=BD=93=E6=9C=BA?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5VR=E6=A8=A1=E5=BC=8F=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 董宏宇 <martindhy@gmail.com>
---
 app/productFlavors/fPadLenovo.gradle             |  2 ++
 .../map/impl/custom/CustomMapApiBuilder.java     | 16 ++++++++++------
 .../extensions/entrance/EntranceFragment.java    | 10 ++++------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle
index 825fa0dd8b..50d339215b 100644
--- a/app/productFlavors/fPadLenovo.gradle
+++ b/app/productFlavors/fPadLenovo.gradle
@@ -39,5 +39,7 @@ project.android.productFlavors {
         buildConfigField 'boolean', 'IS_NEED_REQUEST_FLOAT_PERMISSION', 'true'
         // GPS数据提供源： 0-Android系统，1-工控机，2-OBU
         buildConfigField 'int', 'GPS_PROVIDER', "1"
+        // 默认进入的地图模式
+        buildConfigField 'int', 'MAP_STYLE_MODE', "1"
     }
 }
\ No newline at end of file
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
index 9b2b9c47d3..e53772a855 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java
@@ -94,15 +94,19 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder {
     @Override
     public IMogoMapView getMapView( Context context ) {
         Log.d(TAG,"setDebugMode==true");
-        NavAutoApi.INSTANCE.init( context, MapParams.Companion.init()
-                .setDebugMode( false )
-//                .setDataFileSource(1)  //todo 1-使用本地地图数据，0-使用在线地图数据
+
+        MapParams mapParams =  MapParams.Companion.init();
+        mapParams.setDebugMode( false )
+                //                .setDataFileSource(1)  //todo 1-使用本地地图数据，0-使用在线地图数据
                 .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 )
                 .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D )
-//                .setZoom( 20 )
-//                .setPointToCenter( 0.734375f, 0.5f )
+                //                .setZoom( 20 )
+                //                .setPointToCenter( 0.734375f, 0.5f )
                 .setPointToCenter( 0.5f, 0.5f )  //todo 2D模式下需要注意ADAS部分遮挡
-                .setStyleMode( MapParams.MAP_STYLE_VR ), NavParams.Companion.init() );
+                .setStyleMode( MapParams.MAP_STYLE_VR );
+
+
+        NavAutoApi.INSTANCE.init( context, mapParams, NavParams.Companion.init());
         MapAutoView mapAutoView = new MapAutoView(context);
         IMogoMapView mapView = new AMapViewWrapper(mapAutoView);
         return mapView;
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 736241ed6f..6458a25ed5 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
@@ -743,12 +743,10 @@ public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresente
                 getContext().getResources().getStringArray(R.array.search_voice_guide_outer_array);
 
         //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);
-        }
+        // 进入鹰眼模式，设置手势缩放地图失效
+        Logger.d(TAG, "进入vr模式");
+        mMApUIController.changeMapMode(EnumMapUI.Type_VR);
+        MogoApisHandler.getInstance().getApis().getStatusManagerApi().setVrMode(TAG, true);
 
     }