yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Fix]

Browse Source 
修复小地图样式偶现不加载问题

Signed-off-by: donghongyu <donghongyu@zhidaoauto.com>
This commit is contained in:
donghongyu
2022-01-10 17:57:47 +08:00
parent 421b1d6ea2
commit b40d73f6ae
3 changed files with 103 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
core/function-impl/mogo-core-function-smp/src/main/java/com/mogo/eagle/core/function/smp/SmallMapDirectionView.java
View File

@@ -125,24 +125,15 @@ public class SmallMapDirectionView
.icon(BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_dir_start)));
mEndMarker = mAMap.addMarker(new MarkerOptions()
.icon(BitmapDescriptorFactory.fromResource(R.drawable.module_small_map_view_dir_end)));
new Thread(() -> {
try {
Thread.sleep(1000L);
} catch (InterruptedException e) {
e.printStackTrace();
}
mAMap.setCustomMapStyle(
new CustomMapStyleOptions()
.setEnable(true)
.setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext()))
.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext()))
);
//设置希望展示的地图缩放级别
mAMap.moveCamera(mCameraUpdate);
}).start();
// 加载自定义样式
CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions()
.setEnable(true)
.setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext()))
.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext()));
// 设置自定义样式
mAMap.setCustomMapStyle(customMapStyleOptions);
//设置希望展示的地图缩放级别
mAMap.moveCamera(mCameraUpdate);
// 设置地图的样式
UiSettings uiSettings = mAMap.getUiSettings();
uiSettings.setZoomControlsEnabled(false);// 地图缩放级别的交换按钮
@@ -152,6 +143,14 @@ public class SmallMapDirectionView
mAMap.setOnMapLoadedListener(new AMap.OnMapLoadedListener() {
@Override
public void onMapLoaded() {
Logger.d(TAG, "smp---onMapLoaded");
// 加载自定义样式
CustomMapStyleOptions customMapStyleOptions = new CustomMapStyleOptions()
.setEnable(true)
.setStyleData(MapAssetStyleUtils.getAssetsStyle(getContext()))
.setStyleExtraData(MapAssetStyleUtils.getAssetsExtraStyle(getContext()));
// 设置自定义样式
mAMap.setCustomMapStyle(customMapStyleOptions);
mAMapNaviView.getMap().setPointToCenter(mAMapNaviView.getWidth() / 2, mAMapNaviView.getHeight() / 2);
}
});
@@ -202,10 +201,10 @@ public class SmallMapDirectionView
clearPolyline();
mCoordinatesLatLng.clear();
}
cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build();
cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build();
} else {
//设置希望展示的地图缩放级别
cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build();
cameraPosition = new CameraPosition.Builder().target(mCarMarker.getPosition()).tilt(0).bearing(location.getBearing()).zoom(zoomLevel).build();
// mAMap.moveCamera(CameraUpdateFactory.newLatLngZoom(currentLatLng, zoomLevel));
}
mAMap.moveCamera(CameraUpdateFactory.newCameraPosition(cameraPosition));

154
gradle.properties
View File

@@ -37,7 +37,7 @@ kapt.include.compile.classpath=false
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true
android.jetifier.blacklist=module-service-2.1.15.4.aar
android.jetifier.blacklist=module-service-2.1.15.7.aar
## maven 配置
RELEASE_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-releases/
SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/
@@ -89,102 +89,102 @@ applicationName=IntelligentPilot
versionCode=80007
versionName=8.0.15
################# 新架构模块Maven版本管理 #################
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.57.4
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.57.4
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.57.4
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.57.4
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.57.4
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.57.4
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.57.4
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.57.4
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.57.4
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.57.4
MOGO_CORE_DATA_VERSION=0.0.57.4
MOGO_CORE_FUNCTION_API_VERSION=0.0.57.4
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.57.4
MOGO_CORE_RES_VERSION=0.0.57.4
MOGO_CORE_UTILS_VERSION=0.0.57.4
MOGO_CORE_NETWORK_VERSION=0.0.57.4
MOGO_CORE_FUNCTION_AUTOPILOT_VERSION=0.0.57.7
MOGO_CORE_FUNCTION_CHECK_VERSION=0.0.57.7
MOGO_CORE_FUNCTION_HMI_VERSION=0.0.57.7
MOGO_CORE_FUNCTION_MAIN_VERSION=0.0.57.7
MOGO_CORE_FUNCTION_MAP_VERSION=0.0.57.7
MOGO_CORE_FUNCTION_MONITORING_VERSION=0.0.57.7
MOGO_CORE_FUNCTION_NOTICE_VERSION=0.0.57.7
MOGO_CORE_FUNCTION_OBU_MOGO_VERSION=0.0.57.7
MOGO_CORE_FUNCTION_SMP_VERSION=0.0.57.7
MOGO_CORE_FUNCTION_V2X_VERSION=0.0.57.7
MOGO_CORE_DATA_VERSION=0.0.57.7
MOGO_CORE_FUNCTION_API_VERSION=0.0.57.7
MOGO_CORE_FUNCTION_CALL_VERSION=0.0.57.7
MOGO_CORE_RES_VERSION=0.0.57.7
MOGO_CORE_UTILS_VERSION=0.0.57.7
MOGO_CORE_NETWORK_VERSION=0.0.57.7
################# 旧版本架构模块版本 #################
## 工程内模块
MOGO_COMMONS_VERSION=2.1.15.4
MOGO_UTILS_VERSION=2.1.15.4
MAP_AMAP_VERSION=2.1.15.4
MAP_AUTONAVI_VERSION=2.1.15.4
MOGO_MAP_VERSION=2.1.15.4
MOGO_MAP_API_VERSION=2.1.15.4
MOGO_SERVICE_VERSION=2.1.15.4
MOGO_SERVICE_API_VERSION=2.1.15.4
MOGO_CONNECTION_VERSION=2.1.15.4
MOGO_MODULE_APPS_VERSION=2.1.15.4
MOGO_MODULE_NAVI_VERSION=2.1.15.4
MOGO_MODULE_SHARE_VERSION=2.1.15.4
MOGO_MODULE_COMMON_VERSION=2.1.15.4
MOGO_MODULE_MAIN_VERSION=2.1.15.4
MOGO_MODULE_MAP_VERSION=2.1.15.4
MOGO_MODULE_SERVICE_VERSION=2.1.15.4
MOGO_MODULE_EXTENSIONS_VERSION=2.1.15.4
MOGO_MODULE_SEARCH_VERSION=2.1.15.4
MOGO_MODULE_BACK_VERSION=2.1.15.4
MOGO_MODULE_V2X_VERSION=2.1.15.4
MOGO_COMMONS_VERSION=2.1.15.7
MOGO_UTILS_VERSION=2.1.15.7
MAP_AMAP_VERSION=2.1.15.7
MAP_AUTONAVI_VERSION=2.1.15.7
MOGO_MAP_VERSION=2.1.15.7
MOGO_MAP_API_VERSION=2.1.15.7
MOGO_SERVICE_VERSION=2.1.15.7
MOGO_SERVICE_API_VERSION=2.1.15.7
MOGO_CONNECTION_VERSION=2.1.15.7
MOGO_MODULE_APPS_VERSION=2.1.15.7
MOGO_MODULE_NAVI_VERSION=2.1.15.7
MOGO_MODULE_SHARE_VERSION=2.1.15.7
MOGO_MODULE_COMMON_VERSION=2.1.15.7
MOGO_MODULE_MAIN_VERSION=2.1.15.7
MOGO_MODULE_MAP_VERSION=2.1.15.7
MOGO_MODULE_SERVICE_VERSION=2.1.15.7
MOGO_MODULE_EXTENSIONS_VERSION=2.1.15.7
MOGO_MODULE_SEARCH_VERSION=2.1.15.7
MOGO_MODULE_BACK_VERSION=2.1.15.7
MOGO_MODULE_V2X_VERSION=2.1.15.7
# 探路
MOGO_MODULE_TANLU_VERSION=2.1.15.4
MOGO_MODULE_TANLU_VERSION=2.1.15.7
# 推送
MOGO_MODULE_PUSH_VERSION=2.1.15.4
MOGO_MODULE_PUSH_BASE_VERSION=2.1.15.4
MOGO_MODULE_PUSH_NOOP_VERSION=2.1.15.4
MOGO_MODULE_PUSH_VERSION=2.1.15.7
MOGO_MODULE_PUSH_BASE_VERSION=2.1.15.7
MOGO_MODULE_PUSH_NOOP_VERSION=2.1.15.7
# 探路上报和分享模块
TANLULIB_VERSION=2.1.15.4
MOGO_TANLU_API_VERSION=2.1.15.4
TANLULIB_VERSION=2.1.15.7
MOGO_TANLU_API_VERSION=2.1.15.7
#左侧面板模块
MOGO_MODULE_LEFT_PANEL_VERSION=2.1.15.4
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.15.4
MOGO_MODULE_LEFT_PANEL_VERSION=2.1.15.7
MOGO_MODULE_LEFT_PANEL_NOOP_VERSION=2.1.15.7
# 小控件
MOGO_MODULE_WIDGETS_VERSION=2.1.15.4
MOGO_MODULE_WIDGETS_VERSION=2.1.15.7
# obu
MOGO_MODULE_OBU_VERSION=2.1.15.4
MOGO_MODULE_OBU_MOGO_VERSION=2.1.15.4
MOGO_MODULE_OBU_VERSION=2.1.15.7
MOGO_MODULE_OBU_MOGO_VERSION=2.1.15.7
# monitor
MOGO_MODULE_MONITOR_VERSION=2.1.15.4
MOGO_MODULE_MONITOR_VERSION=2.1.15.7
# bugly
CRASHREPORT_VERSION=2.1.15.4
CRASHREPORT_BUGLY_VERSION=2.1.15.4
CRASHREPORT_NOOP_VERSION=2.1.15.4
CRASHREPORT_UPGRADE_VERSION=2.1.15.4
CRASHREPORT_VERSION=2.1.15.7
CRASHREPORT_BUGLY_VERSION=2.1.15.7
CRASHREPORT_NOOP_VERSION=2.1.15.7
CRASHREPORT_UPGRADE_VERSION=2.1.15.7
## tts
TTS_BASE_VERSION=2.1.15.4
TTS_DI_VERSION=2.1.15.4
TTS_ZHI_VERSION=2.1.15.4
TTS_PAD_VERSION=2.1.15.4
TTS_NOOP_VERSION=2.1.15.4
TTS_BASE_VERSION=2.1.15.7
TTS_DI_VERSION=2.1.15.7
TTS_ZHI_VERSION=2.1.15.7
TTS_PAD_VERSION=2.1.15.7
TTS_NOOP_VERSION=2.1.15.7
# 自研地图
MAP_CUSTOM_VERSION=2.1.15.4
MOGO_MODULE_ADAS_VERSION=2.1.15.4
MAP_CUSTOM_VERSION=2.1.15.7
MOGO_MODULE_ADAS_VERSION=2.1.15.7
# 基础服务实现：passport、socket、location
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.15.4
MOGO_BASE_SERVICES_APK_VERSION=2.1.15.4
MOGO_BASE_SERVICES_SDK_VERSION=2.1.15.4
MOGO_MODULE_CHAT_VERSION=2.1.15.4
MOGO_BASE_WEBSOCKET_SDK_VERSION=2.1.15.7
MOGO_BASE_SERVICES_APK_VERSION=2.1.15.7
MOGO_BASE_SERVICES_SDK_VERSION=2.1.15.7
MOGO_MODULE_CHAT_VERSION=2.1.15.7
# 车聊聊
MOGO_MODULE_CARCHATTING_VERSION=2.1.15.4
MOGO_MODULE_CARCHATTING_VERSION=2.1.15.7
# 车聊聊接口
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.15.4
MOGO_MODULE_CARCHATTINGPROVIDER_VERSION=2.1.15.7
# 皮肤
MOGO_SKIN_SUPPORT_VERSION=2.1.15.4
MOGO_SKIN_LIGHT_VERSION=2.1.15.4
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.15.4
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.15.4
SKIN_SUPPORT_VERSION=2.1.15.4
SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.15.4
SKIN_SUPPORT_CARDVIEW_VERSION=2.1.15.4
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.15.4
SKIN_SUPPORT_DESIGN_VERSION=2.1.15.4
MOGO_SKIN_SUPPORT_VERSION=2.1.15.7
MOGO_SKIN_LIGHT_VERSION=2.1.15.7
MOGO_SKIN_SUPPORT_IMPL_VERSION=2.1.15.7
MOGO_SKIN_SUPPORT_NOOP_VERSION=2.1.15.7
SKIN_SUPPORT_VERSION=2.1.15.7
SKIN_SUPPORT_APPCOMPAT_VERSION=2.1.15.7
SKIN_SUPPORT_CARDVIEW_VERSION=2.1.15.7
SKIN_SUPPORT_CONSTRAINT_LAYOUT_VERSION=2.1.15.7
SKIN_SUPPORT_DESIGN_VERSION=2.1.15.7
# OCH
MOGO_OCH_VERSION=2.1.15.4-test
MOGO_OCH_VERSION=2.1.15.7-test
MOGO_OCH_BUS_VERSION=2.0.66
MOGO_OCH_NOOP_VERSION=2.0.66
MOGO_OCH_TAXI_VERSION=2.0.66
# mogoAiCloud sdk services
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.15.4
MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.15.7
################# 旧版本架构模块版本 #################

21
libraries/map-custom/src/main/java/com/mogo/map/impl/custom/AMapViewWrapper.java
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-onLocationChanged：location");
@@ -802,20 +800,18 @@ public class AMapViewWrapper implements IMogoMapView,
}
// @Override
// public void onMapInit() {
// Logger.i(TAG, "autoop--onMapInit: ");
// HdMapBuildConfig.isMapLoaded = true;
// MogoMapListenerHandler.getInstance().onMapLoaded();
// }
@Override
public void onMapInit() {
Logger.i(TAG, "autoop--onMapInit: ");
MogoMapListenerHandler.getInstance().onMapLoaded();
}
@Override
public void onMapLoaded() {
Logger.i(TAG, "autoop--onMapLoaded: ");
MapAutoApi.INSTANCE.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true); //修改自车模型，未来需区分车的类型
//mMapView.getMapAutoViewHelper().setRenderFrequency(true, 50);// 地图刷新频率
MogoMapListenerHandler.getInstance().onMapLoaded();
//MogoMapListenerHandler.getInstance().onMapLoaded();
mMapLoaded = true;
CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition();
Trace.beginSection("timer.onCameraChangeFinish");
@@ -841,6 +837,7 @@ public class AMapViewWrapper implements IMogoMapView,
@Override
public void onRoadLoaded(@Nullable String s) {
Logger.i(TAG, "autoop--onMapLoaded: ");
}
@@ -1144,8 +1141,4 @@ public class AMapViewWrapper implements IMogoMapView,
ResIdCache.putVal(speedVal, val);
}
@Override
public void onMapInit() {
}
}