From 62c8dc6e87f7fc344cc3233bd2f3a08b6a8ee871 Mon Sep 17 00:00:00 2001
From: wangcongtao <wangcongtao@zhidaoauto.com>
Date: Tue, 5 Jan 2021 10:41:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9C=B0=E5=9B=BEsdk?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libraries/map-custom/build.gradle             |  2 +-
 .../mogo/map/impl/custom/AMapViewWrapper.java | 28 +++++++++++++++----
 .../uicontroller/IMogoMapUIController.java    | 11 +++++++-
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle
index cbfaae21ac..6c0a079e2e 100644
--- a/libraries/map-custom/build.gradle
+++ b/libraries/map-custom/build.gradle
@@ -67,7 +67,7 @@ dependencies {
         implementation project(':foudations:mogo-commons')
     }
 
-    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.6.9'
+    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.7.2'
 //    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-7.4.5-log-1'
 }
 
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 f2d51a005a..7bbcb3930d 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
@@ -26,6 +26,7 @@ import com.mogo.map.uicontroller.EnumMapUI;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.uicontroller.MapCameraPosition;
 import com.mogo.map.uicontroller.MapControlResult;
+import com.mogo.utils.TipToast;
 import com.mogo.utils.UiThreadHandler;
 import com.mogo.utils.logger.Logger;
 import com.zhidaoauto.map.sdk.open.MapAutoApi;
@@ -811,12 +812,13 @@ public class AMapViewWrapper implements IMogoMapView,
     }
 
     //目前切换完vr之后，会立即回调其他样式，这里做一个判断
-    private boolean mVrModeAutoChangedFlag = false;
+//    private boolean mVrModeAutoChangedFlag = false;
 
     @Override
     public void onChangeMapStyle( int i ) {
 
         EnumMapUI last = mCurrentUI;
+        Logger.d( TAG, "currentMapStyle = %s", i );
 
         if ( i == MapAutoApi.MAP_STYLE_DAY
                 || i == MapAutoApi.MAP_STYLE_DAY_NAV ) {
@@ -834,6 +836,7 @@ public class AMapViewWrapper implements IMogoMapView,
 //        }
 
         if ( last == mCurrentUI ) {
+            Logger.d( TAG, "currentUI is same as last = %s", mCurrentUI );
             return;
         }
 
@@ -843,10 +846,10 @@ public class AMapViewWrapper implements IMogoMapView,
                 changeMapMode( EnumMapUI.Type_Light );
                 return;
             }
-            if ( mVrModeAutoChangedFlag ) {
-                mVrModeAutoChangedFlag = false;
-                return;
-            }
+//            if ( mVrModeAutoChangedFlag ) {
+//                mVrModeAutoChangedFlag = false;
+//                return;
+//            }
         }
         Logger.d( TAG, Log.getStackTraceString( new Throwable() ) );
         if ( mCurrentUI != null ) {
@@ -871,7 +874,7 @@ public class AMapViewWrapper implements IMogoMapView,
         if ( isVrMode ) {
             if ( mCurrentUI != EnumMapUI.Type_VR ) {
                 Logger.d( TAG, "自动切换为vr模式" );
-                mVrModeAutoChangedFlag = true;
+//                mVrModeAutoChangedFlag = true;
                 changeMapMode( EnumMapUI.Type_VR );
             }
         } else {
@@ -885,4 +888,17 @@ public class AMapViewWrapper implements IMogoMapView,
             }
         }
     }
+
+    private boolean mMatchRoadEnable = false;
+
+    @Override
+    public void matchRoadEnable( boolean enable ) {
+        try {
+            mMatchRoadEnable = !mMatchRoadEnable;
+            TipToast.shortTip( mMatchRoadEnable ? "已开启道路匹配" : "已关闭道路匹配" );
+            mMapView.getLocationClient().matchRoadEnable( mMatchRoadEnable );
+        } catch ( Exception e ) {
+            Logger.e( TAG, e, "matchRoadEnable" );
+        }
+    }
 }
diff --git a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
index a0ccbae772..aba1a2844b 100644
--- a/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
+++ b/libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java
@@ -238,7 +238,16 @@ public interface IMogoMapUIController {
 
     }
 
-    default void testGpsData(){
+    default void testGpsData() {
+
+    }
+
+    /**
+     * 自研地图是否匹配道路
+     *
+     * @param enable
+     */
+    default void matchRoadEnable( boolean enable ) {
 
     }
 }