Merge branch 'master' into dev_MogoAP_eagle-220_211207_8.0.17

# Conflicts:
#	app/src/main/java/com/mogo/launcher/MogoApplication.java
#	core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/setting/DebugSettingView.kt
#	core/function-impl/mogo-core-function-v2x/src/main/java/com/mogo/eagle/core/function/v2x/V2XProvider.kt
#	gradle.properties
#	libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
This commit is contained in:
donghongyu
2022-01-10 19:07:35 +08:00
15 changed files with 289 additions and 136 deletions

View File

@@ -743,8 +743,6 @@ public class AMapViewWrapper implements IMogoMapView,
return MapDataApi.INSTANCE.getLimitSpeed(lon, lat, angle);
}
private boolean isShowWarn;
@Override
public void onLocationChanged(@NotNull com.zhidaoauto.map.sdk.open.location.MogoLocation location) {
// Log.w("DHY-location", location.getLon() + "," + location.getLat() + " AMapViewWrapper-onLocationChangedlocation");
@@ -805,13 +803,11 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void onMapInit() {
Logger.i(TAG, "autoop--onMapInit: ");
//HdMapBuildConfig.isMapLoaded = true;
MogoMapListenerHandler.getInstance().onMapLoaded();
}
@Override
public void onMapLoaded() {
Logger.i(TAG, "autoop--onMapLoaded: ");
MapAutoApi.INSTANCE.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true); //修改自车模型,未来需区分车的类型
//mMapView.getMapAutoViewHelper().setRenderFrequency(true, 50);// 地图刷新频率
@@ -841,6 +837,7 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void onRoadLoaded(@Nullable String s) {
Logger.i(TAG, "autoop--onMapLoaded: ");
}