diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index c9c51f6503..64a0875647 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -52,7 +52,7 @@ public class MogoApplication extends AbsMogoApplication { MogoModulePaths.addModule(new MogoModule(PATH_GUIDE_FRAGMENT, PATH_GUIDE_MODULE_NAME)); MogoModulePaths.addModule(new MogoModule(PATH_AGREEMENT_FRAGMENT, PATH_AGREEMENT_MODULE_NAME)); - MogoModulePaths.addModule(new MogoModule(GuideShowProviderConstant.PATH_GUIDE_SHOW_FRAGMENT, GuideShowProviderConstant.PATH_GUIDE_SHOW_MODULE_NAME)); +// MogoModulePaths.addModule(new MogoModule(GuideShowProviderConstant.PATH_GUIDE_SHOW_FRAGMENT, GuideShowProviderConstant.PATH_GUIDE_SHOW_MODULE_NAME)); //运营位卡片，需要默认显示，放在第一个加载 MogoModulePaths.addModule(new MogoModule(AdCardConstants.TAG, AdCardConstants.MODULE_NAME)); diff --git a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java index 0ce72713b0..5701f3f316 100644 --- a/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java +++ b/libraries/map-amap/src/main/java/com/mogo/map/impl/amap/AMapNaviViewWrapper.java @@ -32,7 +32,6 @@ import com.amap.api.navi.AMapNaviView; import com.amap.api.navi.AMapNaviViewListener; import com.amap.api.navi.AMapNaviViewOptions; import com.amap.api.navi.enums.AMapNaviViewShowMode; -import com.amap.api.navi.enums.AimLessMode; import com.amap.api.navi.model.NaviInfo; import com.mogo.commons.debug.DebugConfig; import com.mogo.map.IMogoMap; @@ -83,7 +82,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, // 自定义定位源的回调信息，前瞻线 private LocationSource.OnLocationChangedListener mOnLocationChangedListener; - private boolean mIsCarLockced = false; + private boolean mIsCarLocked = false; private float mDefaultZoomLevel = 16.0f; @@ -337,7 +336,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, @Override public void onLockMap( boolean isLock ) { Logger.d( TAG, "lock status = %s", isLock ); - mIsCarLockced = isLock; + mIsCarLocked = isLock; Trace.beginSection( "timer.onCameraChangeFinish" ); MogoMapListenerHandler.getInstance().onLockMap( isLock ); Trace.endSection(); @@ -384,14 +383,14 @@ public class AMapNaviViewWrapper implements IMogoMapView, @Override public void changeZoom( boolean zoom ) { if ( checkAMapView() ) { - mDefaultZoomLevel = getMap().getZoomLevel(); + mDefaultZoomLevel = ( int ) ( getMap().getZoomLevel() + 0.5f ); if ( zoom ) { - mDefaultZoomLevel += 1.5f; + mDefaultZoomLevel += 2f; if ( mDefaultZoomLevel > 20 ) { mDefaultZoomLevel = 20; } } else { - mDefaultZoomLevel -= 1.5f; + mDefaultZoomLevel -= 2f; if ( mDefaultZoomLevel < 1 ) { mDefaultZoomLevel = 1; } @@ -561,6 +560,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, } Logger.d( TAG, "锁车" ); mMapView.recoverLockMode(); + mIsCarLocked = true; } } @@ -571,6 +571,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, } Logger.d( TAG, "解锁锁车" ); mockTouchEvent(); + mIsCarLocked = false; } /** @@ -592,7 +593,7 @@ public class AMapNaviViewWrapper implements IMogoMapView, if ( DebugConfig.isDebug() ) { Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); } - Logger.d( TAG, "锁定锁车比例尺" ); + Logger.d( TAG, "Zoom锁定锁车比例尺 %s", var1 ); mMapView.setLockZoom( var1 ); } } @@ -814,6 +815,6 @@ public class AMapNaviViewWrapper implements IMogoMapView, @Override public synchronized boolean isCarLocked() { - return mIsCarLockced; + return mIsCarLocked; } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java index 3f6bbb1d80..6060810e56 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java @@ -34,4 +34,6 @@ public interface MarkerPoiTypeEnum { public String FOURS_PARKING = "10012"; //事故 public String FOURS_ACCIDENT = "10013"; + //身边 + public String FOURS_NEALY = "10014"; } \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java index 7e59c35e56..9aaa8a4801 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java @@ -170,6 +170,11 @@ public class MapMarkerInfoView extends MapMarkerBaseView { ivIcon.setImageResource(R.drawable.module_service_ic_rc_accident2); clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_red_info); ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_red); + case MarkerPoiTypeEnum.FOURS_NEALY: + // TODO: 2020-03-30 + ivIcon.setImageResource(R.drawable.module_service_ic_rc_accident2); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_red_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_red); break; default: ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java index 5e0539fb57..3db36ba9a3 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java @@ -142,6 +142,10 @@ public class MapMarkerView extends MapMarkerBaseView { case MarkerPoiTypeEnum.FOURS_ACCIDENT: ivBg.setImageResource(R.drawable.module_service_ic_rc_accident); break; + case MarkerPoiTypeEnum.FOURS_NEALY: + // TODO: 2020-03-30 + ivBg.setImageResource(R.drawable.module_service_ic_rc_accident); + break; default: ivIcon.setImageResource(R.drawable.icon_map_marker_shear_news); ivBg.setImageResource(R.drawable.bg_map_marker_blue_dark);