merge

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

@@ -206,7 +206,7 @@ public class AMapViewWrapper implements IMogoMapView,
         mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_ZOOM);
         mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_ROTATE);
         mMapView.registerListener(this, MapAutoApi.LISTENER_TYPE_3D);
-        mMapView.setMOnCameraChangeListener(this);
+        mMapView.setOnCameraChangeListener(this);
         mMapView.setOnMapStyleListener(this);
         mMapView.setOnMapViewVisualAngleChangeListener(this);
         Logger.d(TAG, "styleop - initListeners - setOnMapStyleListener - view %s", mMapView);
@@ -271,7 +271,7 @@ public class AMapViewWrapper implements IMogoMapView,
             mMapView.setOnMapTouchListener(null);
             mMapView.setOnMapClickListener(null);
             mMapView.getLocationClient().unRegisterListener(this);
-            mMapView.setMOnCameraChangeListener(null);
+            mMapView.setOnCameraChangeListener(null);
             mSelfMarker = null;
             Logger.d(TAG, "map onDestroy");
         }
@@ -746,6 +746,8 @@ public class AMapViewWrapper implements IMogoMapView,
         return getMap().getUIController().getTileId(lon, lat);
     }
 
+    private boolean isShowWarn;
+
     @Override
     public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) {
         Location sysLocation = new Location(location.getProvider());
@@ -786,18 +788,20 @@ public class AMapViewWrapper implements IMogoMapView,
             }
         } else {
 //          通过不同的方向类型来改变车模，目前暂定三种模型，drawlevel 1 绿,2 黄,3 红，绿色的时候需要把相应的切换为默认模型
-//            Logger.d("liyz", " mAdasResult.drawlevel = " + mAdasResult.drawlevel);
 //            if (mAdasResult != null) {
-//                if (mAdasResult.drawlevel == 1) {
+//                Logger.d("liyz", " mAdasResult.drawlevel = " + mAdasResult.drawlevel);
+//                if (mAdasResult.drawlevel == 1 && isShowWarn) {
 //                    mSelfMarker.marker3DIcon(R.raw.car);
+//                    isShowWarn = false;
 //                } else if (mAdasResult.drawlevel == 2) { //不处理
 //
-//                } else if (mAdasResult.drawlevel == 3) {
+//                } else if (mAdasResult.drawlevel == 3 && !isShowWarn) {
 //                    //继续判断相应的方位，目前是只有 前方 TODO
-//                    mSelfMarker.marker3DIcon(R.raw.car);
+//                    mSelfMarker.marker3DIcon(R.raw.qfpz);
+//                    isShowWarn = true;
 //                }
 //            } else {
-//                mSelfMarker.marker3DIcon(R.raw.car);
+////                mSelfMarker.marker3DIcon(R.raw.car);
 //            }
         }