From dfb5309210d0c2f10002d98b6482e8938c6cbb88 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Tue, 29 Dec 2020 15:58:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                                            | 1 -
 config.gradle                                               | 2 +-
 gradle.properties                                           | 2 +-
 .../main/java/com/mogo/map/impl/custom/AMapViewWrapper.java | 1 +
 .../src/main/java/com/mogo/module/main/MainActivity.java    | 6 ++++++
 .../src/main/java/com/mogo/module/map/MapFragment.java      | 4 ----
 .../mogo/module/obu/crashwarn/CrashWarningProvider.kt       | 2 +-
 settings.gradle                                             | 2 +-
 8 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 426ff6b360..5974cf305a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -59,7 +59,6 @@
             <option value="$PROJECT_DIR$/modules/mogo-module-splash-noop" />
             <option value="$PROJECT_DIR$/modules/mogo-module-v2x" />
             <option value="$PROJECT_DIR$/modules/mogo-module-widgets" />
-            <option value="$PROJECT_DIR$/modules/mogo-modules-mvision" />
             <option value="$PROJECT_DIR$/services" />
             <option value="$PROJECT_DIR$/services/mogo-service" />
             <option value="$PROJECT_DIR$/services/mogo-service-api" />
diff --git a/config.gradle b/config.gradle
index c15cb61257..8fe1a4d1ca 100644
--- a/config.gradle
+++ b/config.gradle
@@ -217,7 +217,7 @@ ext {
             ttszhi                     : "com.mogo.tts:tts-zhi:${TTS_ZHI_VERSION}",
             ttsnoop                    : "com.mogo.tts:tts-noop:${TTS_NOOP_VERSION}",
 
-            mogomodulemachinevision    : "com.mogo.module:module-machine-vision:${MOGO_MODULES_MVISION_VERSION}",
+//            mogomodulemachinevision    : "com.mogo.module:module-machine-vision:${MOGO_MODULES_MVISION_VERSION}",
 
 
             httpdnsbase                : "com.mogo.httpdns:httpdns-base:${HTTPDNS_BASE_VERSION}",
diff --git a/gradle.properties b/gradle.properties
index 02f2b63fe2..29181c377e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -129,7 +129,7 @@ TTS_ZHI_VERSION=2.0.12
 TTS_NOOP_VERSION=2.0.12
 # 自研地图
 MAP_CUSTOM_VERSION=2.0.12
-MOGO_MODULES_MVISION_VERSION=2.0.12
+#MOGO_MODULES_MVISION_VERSION=2.0.12
 MOGO_MODULES_SMALL_MAP=1.0.0
 # httpdns
 HTTPDNS_TENCENT_VERSION = 2.0.12
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 aec9e0f31a..09633693d8 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
@@ -313,6 +313,7 @@ public class AMapViewWrapper implements IMogoMapView,
         if ( ui == null ) {
             return;
         }
+        Logger.d( TAG, "ui = %s", ui );
         if ( checkAMapView() ) {
             switch ( ui ) {
                 case CarUp_2D:
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 953c9ba0a0..8fba0ea186 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -172,6 +172,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
             EventDispatchCenter.getInstance().setMapLoadedCallback( () -> {
                 Logger.d( TAG, "map loaded." + Thread.currentThread().getName() );
                 resetMapCenterPoint();
+                resetMapUiStyle();
                 loadOthersModules();
                 Log.i( "timer", "cost " + ( System.currentTimeMillis() - start ) + "ms" );
             } );
@@ -193,6 +194,11 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
 
     }
 
+    private void resetMapUiStyle(){
+        final EnumMapUI mapUI = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getCurrentSkinMode();
+        mServiceApis.getMapServiceApi().getMapUIController().changeMapMode( mapUI );
+    }
+
     private void resetMapCenterPoint() {
         // 右移地图中心点
         MapCenterPointStrategy.init();
diff --git a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
index 626d665366..9940ca26a2 100644
--- a/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
+++ b/modules/mogo-module-map/src/main/java/com/mogo/module/map/MapFragment.java
@@ -154,10 +154,6 @@ public class MapFragment extends MvpFragment< MapView, MapPresenter > implements
             if ( mMogoMap.getUIController() != null ) {
                 mMogoMap.getUIController().changeMapMode( EnumMapUI.CarUp_2D );
             }
-
-
-            final EnumMapUI mapUI = MogoApisHandler.getInstance().getApis().getAdasControllerApi().getCurrentSkinMode();
-            getUIController().changeMapMode( mapUI );
         }
     }
 
diff --git a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt
index 1e8e831acb..3338f6bddf 100644
--- a/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt
+++ b/modules/mogo-module-obu/src/main/java/com/zhidao/mogo/module/obu/crashwarn/CrashWarningProvider.kt
@@ -17,7 +17,7 @@ import com.zhidao.manager.ts.TsThreshold
  * @author tongchenfei
  */
 @Route(path = MogoServicePaths.PATH_CRASH_WARNING)
-class CrashWarningProvider:IMogoCrashWarnProvider {
+class  CrashWarningProvider:IMogoCrashWarnProvider {
     companion object{
         const val TAG = "CrashWarningProvider"
     }
diff --git a/settings.gradle b/settings.gradle
index f81b1af9eb..2cc68fa093 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -4,7 +4,7 @@ include ':app2'
 include ':foudations:httpdns-base'
 include ':foudations:httpdns-tencent'
 include ':foudations:httpdns-noop'
-include ':modules:mogo-modules-mvision'
+//include ':modules:mogo-modules-mvision'
 include ':foudations:mogo-base-websocket-sdk'
 include ':tts:tts-base'
 include ':tts:tts-di'