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

8.0.15 回退hdmap到2.0.0.18 不再给工控机传灯态信息

Browse Source
This commit is contained in:
lianglihui
2022-01-12 12:37:44 +08:00
parent 92cc44e00a
commit 4419a3156e
5 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/function-impl/mogo-core-function-autopilot/src/main/java/com/mogo/eagle/core/function/autopilot/server/AsyncDataToAutopilotServer.kt
View File

@@ -31,6 +31,6 @@ class AsyncDataToAutopilotServer private constructor() : IMoGoTrafficLightListen
override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) { override fun onTrafficLightStatus(trafficLightResult: TrafficLightResult) {
val autopilotControlCmdParameter = AutopilotControlCmdParameter("light", trafficLightResult) val autopilotControlCmdParameter = AutopilotControlCmdParameter("light", trafficLightResult)
CallerAutoPilotManager.sendDataToAutopilot(GsonUtils.toJson(autopilotControlCmdParameter)) // CallerAutoPilotManager.sendDataToAutopilot(GsonUtils.toJson(autopilotControlCmdParameter))
} }
} }

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

@@ -166,6 +166,9 @@ public class SmallMapDirectionView
@Override @Override
public void onLocationChanged(@Nullable MogoLocation location) { public void onLocationChanged(@Nullable MogoLocation location) {
//Logger.d(TAG, "onCarLocationChanged2 :" + location.getLatitude()+":"+location.getLongitude()); //Logger.d(TAG, "onCarLocationChanged2 :" + location.getLatitude()+":"+location.getLongitude());
if (location == null){
return;
}
LatLng currentLatLng = new LatLng(location.getLatitude(), location.getLongitude()); LatLng currentLatLng = new LatLng(location.getLatitude(), location.getLongitude());
//更新车辆位置 //更新车辆位置
if (mCarMarker != null) { if (mCarMarker != null) {

2
gradle.properties
View File

@@ -80,7 +80,7 @@ MOGO_TRAFFICLIVE_VERSION=1.3.15
MOGO_LOCATION_VERSION=1.3.15 MOGO_LOCATION_VERSION=1.3.15
######## MogoAiCloudSDK Version ######## ######## MogoAiCloudSDK Version ########
# 自研地图 # 自研地图
MAP_SDK_VERSION=2.0.0.20 MAP_SDK_VERSION=2.0.0.18
# websocket # websocket
WEBSOCKET_VERSION=1.1.7 WEBSOCKET_VERSION=1.1.7
## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级 ## 产品库必备配置，产品库自动对versionCode和versionName版本进行升级

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

@@ -800,18 +800,18 @@ public class AMapViewWrapper implements IMogoMapView,
} }
@Override // @Override
public void onMapInit() { // public void onMapInit() {
Logger.i(TAG, "autoop--onMapInit: "); // Logger.i(TAG, "autoop--onMapInit: ");
MogoMapListenerHandler.getInstance().onMapLoaded(); // MogoMapListenerHandler.getInstance().onMapLoaded();
} // }
@Override @Override
public void onMapLoaded() { public void onMapLoaded() {
Logger.i(TAG, "autoop--onMapLoaded: "); Logger.i(TAG, "autoop--onMapLoaded: ");
MapAutoApi.INSTANCE.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true); //修改自车模型，未来需区分车的类型 MapAutoApi.INSTANCE.getMyLocationStyle().myLocationIcon(HdMapBuildConfig.currentCarVrIconRes, true); //修改自车模型，未来需区分车的类型
//mMapView.getMapAutoViewHelper().setRenderFrequency(true, 50);// 地图刷新频率 //mMapView.getMapAutoViewHelper().setRenderFrequency(true, 50);// 地图刷新频率
//MogoMapListenerHandler.getInstance().onMapLoaded(); MogoMapListenerHandler.getInstance().onMapLoaded();
mMapLoaded = true; mMapLoaded = true;
CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition(); CameraPosition cameraPosition = mMapView.getMapAutoViewHelper().getCameraPosition();
Trace.beginSection("timer.onCameraChangeFinish"); Trace.beginSection("timer.onCameraChangeFinish");

13
modules/mogo-module-service/src/main/java/com/mogo/module/service/routeoverlay/RouteOverlayDrawer.java
View File

@@ -119,21 +119,22 @@ public class RouteOverlayDrawer {
for (MogoLatLng latLng : routeList) { for (MogoLatLng latLng : routeList) {
mPolylinePointList.add(latLng); mPolylinePointList.add(latLng);
} }
mPolylineColors.clear(); // mPolylineColors.clear();
// mPolylineColors.addAll(ColorUtils.gradientAlpha_("#FF2AAFFD", "#7b2965ED", "#002965ED", mPolylinePointList.size())); // mPolylineColors.addAll(ColorUtils.gradientAlpha_("#FF2AAFFD", "#7b2965ED", "#002965ED", mPolylinePointList.size()));
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
List<Integer> list = new ArrayList<>(); // List<Integer> list = new ArrayList<>();
// list = ColorUtils.gradientAlpha("#FF2AAFFD", "#002965ED", mPolylinePointList.size()); // list = ColorUtils.gradientAlpha("#FF2AAFFD", "#002965ED", mPolylinePointList.size());
int[] startColor = ColorUtils.hexToArgb("#FF2AAFFD"); int[] startColor = ColorUtils.hexToArgb("#FF2AAFFD");
int[] endColor = ColorUtils.hexToArgb("#002965ED"); int[] endColor = ColorUtils.hexToArgb("#002965ED");
list.add(Color.argb(startColor[0],startColor[1],startColor[2],startColor[3])); // list.add(Color.argb(startColor[0],startColor[1],startColor[2],startColor[3]));
list.add(Color.argb(endColor[0],endColor[1],endColor[2],endColor[3])); // list.add(Color.argb(endColor[0],endColor[1],endColor[2],endColor[3]));
long end = System.currentTimeMillis(); long end = System.currentTimeMillis();
Log.d("MogoRouteOverlayManager","get color cost : "+ (end-start)); Log.d("MogoRouteOverlayManager","get color cost : "+ (end-start));
mPolylineColors.addAll(list); // mPolylineColors.addAll(list);
// 线条粗细，渐变，渐变色值 // 线条粗细，渐变，渐变色值
mPolylineOptions.width(12).useGradient(true).colorValues(mPolylineColors); // mPolylineOptions.width(12).useGradient(true).colorValues(mPolylineColors);
mPolylineOptions.width(12).useGradient(false).color(Color.argb(startColor[0],startColor[1],startColor[2],startColor[3]));
if (mMoGoPolyline == null || mMoGoPolyline.isDestroyed()){ if (mMoGoPolyline == null || mMoGoPolyline.isDestroyed()){
mPolylineOptions.points(mPolylinePointList); mPolylineOptions.points(mPolylinePointList);
mMoGoPolyline = mogoOverlayManager.addPolyline(mPolylineOptions); mMoGoPolyline = mogoOverlayManager.addPolyline(mPolylineOptions);