merge och

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java

@@ -1054,4 +1054,8 @@ public class AMapNaviViewWrapper implements IMogoMapView,
         return getMap().getUIController().getTileId(lon, lat);
     }
 
+    @Override
+    public void setAdasRecognizedResult(int drawlevel) {
+
+    }
 }

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapViewWrapper.java

@@ -825,4 +825,8 @@ public class AMapViewWrapper implements IMogoMapView,
         return getMap().getUIController().getTileId(lon,lat);
     }
 
+    @Override
+    public void setAdasRecognizedResult(int drawlevel) {
+
+    }
 }

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/uicontroller/AMapUIController.java

@@ -304,9 +304,16 @@ public class AMapUIController implements IMogoMapUIController {
     }
 
     @Override
-    public void changeBearing(float bearing) {
-        if (mClient != null) {
-            mClient.changeBearing(bearing);
+    public void changeBearing( float bearing ) {
+        if ( mClient != null ) {
+            mClient.changeBearing( bearing );
+        }
+    }
+
+    @Override
+    public void setAdasRecognizedResult(int drawlevel) {
+        if ( mClient != null ) {
+            mClient.setAdasRecognizedResult(drawlevel);
         }
     }
 

libraries/map-custom/build.gradle

@@ -67,7 +67,7 @@ dependencies {
         implementation project(':foudations:mogo-commons')
     }
 
-    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.33'
+    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.35'
 //    implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4'
 }
 

libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java

@@ -794,34 +794,37 @@ public class AMapViewWrapper implements IMogoMapView,
             }
         } else {
 //          通过不同的方向类型来改变车模，目前暂定三种模型，drawlevel 1 绿,2 黄,3 红，绿色的时候需要把相应的切换为默认模型
-//            if (mAdasResult != null) {
-//                Logger.d("liyz", " mAdasResult.drawlevel = " + mAdasResult.drawlevel);
-//                if (mAdasResult.drawlevel == 1 && isShowWarn) {
-//                    mSelfMarker.marker3DIcon(R.raw.car);
-//                    isShowWarn = false;
-//                } else if (mAdasResult.drawlevel == 2) { //不处理
+//            Logger.d("liyz", " mDrawlevel = " + mDrawlevel);
+//            if (mDrawlevel == 1 && isShowWarn) {
+//                mSelfMarker.marker3DIcon(R.raw.car);
+//                isShowWarn = false;
+//            } else if (mDrawlevel == 2) { //不处理
 //
-//                } else if (mAdasResult.drawlevel == 3 && !isShowWarn) {
-//                    //继续判断相应的方位，目前是只有 前方 TODO
-//                    mSelfMarker.marker3DIcon(R.raw.qfpz);
-//                    isShowWarn = true;
-//                }
-//            } else {
-////                mSelfMarker.marker3DIcon(R.raw.car);
+//            } else if (mDrawlevel == 3 && !isShowWarn) {
+//                //继续判断相应的方位，目前是只有 前方 TODO
+//                mSelfMarker.marker3DIcon(R.raw.qfpz);
+//                isShowWarn = true;
 //            }
-
-//            UiThreadHandler.postDelayed( () -> {
+//
+//            UiThreadHandler.postDelayed(() -> {
 //                if (!isShowWarn) {
 //                    mSelfMarker.marker3DIcon(R.raw.qfpz);
 //                    isShowWarn = true;
 //                }
-//            }, 6_000L );
+//            }, 6_000L);
 
         }
-
         showSelfSpeed(location.getSpeed());
     }
 
+    private int mDrawlevel;
+
+    @Override
+    public void setAdasRecognizedResult(int drawlevel) {
+        mDrawlevel = drawlevel;
+    }
+
+
     private TextView mSpeedView = null;
     private int mLastYOffset = 20;
 

libraries/map-custom/src/main/java/com/mogo/map/impl/custom/uicontroller/AMapUIController.java

@@ -374,4 +374,10 @@ public class AMapUIController implements IMogoMapUIController {
         }
     }
 
+    @Override
+    public void setAdasRecognizedResult(int drawlevel) {
+        if (mClient != null) {
+            mClient.setAdasRecognizedResult(drawlevel);
+        }
+    }
 }

libraries/mogo-map-api/src/main/java/com/mogo/map/uicontroller/IMogoMapUIController.java

@@ -250,6 +250,8 @@ public interface IMogoMapUIController {
      */
     void changeBearing(float bearing);
 
+    void setAdasRecognizedResult(int drawlevel);
+
     /**
      * 获取瓦片id
      *

libraries/mogo-map/src/main/java/com/mogo/map/MogoMapUIController.java

@@ -420,4 +420,11 @@ public class MogoMapUIController implements IMogoMapUIController {
         }
     }
 
+    @Override
+    public void setAdasRecognizedResult(int drawlevel) {
+        initDelegate();
+        if (mDelegate != null) {
+            mDelegate.setAdasRecognizedResult(drawlevel);
+        }
+    }
 }