From 3f6400b0bc975a5d8cdc38bec75f6c83468b2a49 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Tue, 23 Feb 2021 16:24:56 +0800
Subject: [PATCH] bugfix

---
 app/build.gradle                                            | 4 ++--
 .../src/main/java/com/mogo/commons/debug/DebugConfig.java   | 6 ++++++
 .../java/com/mogo/map/impl/custom/MapStyleController.java   | 6 ++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index fe07695ae3..665155a4d3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -123,7 +123,7 @@ android {
             // 是否基于地图
             buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
             // 是否加载引导模块
-            buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true'
+            buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false'
             // 分享时是否隐藏 adas
             buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
             // 是否需要实时上报坐标
@@ -151,7 +151,7 @@ android {
             // 是否基于地图
             buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
             // 是否加载引导模块
-            buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'true'
+            buildConfigField 'boolean', 'IS_NEED_LOAD_GUIDE_MODULE', 'false'
             // 分享时是否隐藏 adas
             buildConfigField 'boolean', 'IS_NEED_HIDE_ADAS_WHEN_SHARE', 'false'
             // 是否需要实时上报坐标
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
index 12d823c3e1..f3df396ed5 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java
@@ -1,5 +1,7 @@
 package com.mogo.commons.debug;
 
+import android.text.TextUtils;
+
 /**
  * @author congtaowang
  * @since 2019-12-23
@@ -413,4 +415,8 @@ public class DebugConfig {
     public static void setNotSmooth( boolean sIsNotSmooth ) {
         DebugConfig.sIsNotSmooth = sIsNotSmooth;
     }
+
+    public static boolean isOCHModule(){
+        return sProductFlavor != null && sProductFlavor.startsWith( "foch" );
+    }
 }
diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/MapStyleController.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/MapStyleController.java
index 43d2cc140b..ca3077c901 100644
--- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/MapStyleController.java
+++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/MapStyleController.java
@@ -1,6 +1,7 @@
 package com.mogo.map.impl.custom;
 
 
+import com.mogo.commons.debug.DebugConfig;
 import com.zhidaoauto.map.sdk.open.location.MogoLocation;
 
 import java.util.ArrayList;
@@ -52,6 +53,11 @@ class MapStyleController {
             return;
         }
 
+        // 网约车不自动切换vr、2d模式
+        if ( DebugConfig.isOCHModule() ) {
+            return;
+        }
+
         boolean isInVrMode = false;
         for ( VrAreaFilter vrAreaFilter : mVrAreaFilters ) {
             if ( vrAreaFilter == null ) {