From 4295780bfe6e49c383a4a6740014b8edee45fab2 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Wed, 2 Jun 2021 15:53:55 +0800 Subject: [PATCH 01/15] revert code --- .../drawer/AdasRecognizedResultDrawer.java | 16 ++-- .../mogo/module/common/drawer/BaseDrawer.java | 73 ++++++++++--------- .../common/drawer/SnapshotSetDataDrawer.java | 30 +++----- .../service/marker/MapMarkerManager.java | 8 +- 4 files changed, 62 insertions(+), 65 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java index e019b5ca82..3d63facadf 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java @@ -20,8 +20,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static com.mogo.cloud.socket.entity.SocketDownDataHelper.FROM_ADAS; - public /** * @author congtaowang @@ -258,7 +256,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { } /** - * 绘制某个物体的一个数据 + * 绘制某个物体的一个数据 todo 缓存问题 * * @param recognizedListResult {@link ADASRecognizedResult} * @param newAdasRecognizedMarkersCaches @@ -291,14 +289,16 @@ class AdasRecognizedResultDrawer extends BaseDrawer { final MogoLatLng renderLoc = new MogoLatLng(recognizedListResult.lat, recognizedListResult.lon); long cost = System.currentTimeMillis() - start; final long intervalRef = interval - cost; +// SimpleHandlerThreadPool.getInstance().postRender(() -> { marker.addDynamicAnchorPosition(renderLoc, (float) recognizedListResult.heading, intervalRef); +// }); } else { marker.setRotateAngle(((float) recognizedListResult.heading)); marker.setPosition(recognizedListResult.lat, recognizedListResult.lon); } String carColor = recognizedListResult.color; if (TextUtils.isEmpty(carColor)) { - carColor = getModelRenderColor(recognizedListResult.type, FROM_ADAS, recognizedListResult.speed, recognizedListResult.lon, recognizedListResult.lat, recognizedListResult.heading); + carColor = getModelRenderColor(recognizedListResult.type, recognizedListResult.speed, recognizedListResult.lon, recognizedListResult.lat, recognizedListResult.heading); } marker.setAnchorColor(carColor); @@ -323,10 +323,10 @@ class AdasRecognizedResultDrawer extends BaseDrawer { String carColor = recognizedListResult.color; if (TextUtils.isEmpty(carColor)) { - carColor = getModelRenderColor(recognizedListResult.type, FROM_ADAS, recognizedListResult.speed, recognizedListResult.lon, recognizedListResult.lat, recognizedListResult.heading); + carColor = getModelRenderColor(recognizedListResult.type, recognizedListResult.speed, recognizedListResult.lon, recognizedListResult.lat, recognizedListResult.heading); } MogoMarkerOptions options = new MogoMarkerOptions() - .owner(DataTypes.TYPE_MARKER_MERGE) + .owner(DataTypes.TYPE_MARKER_ADAS) .anchor(0.5f, 0.5f) .set3DMode(true) .gps(true) @@ -336,7 +336,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { .icon3DRes(resId) .rotate((float) recognizedListResult.heading) .position(new MogoLatLng(recognizedListResult.lat, recognizedListResult.lon)); - IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(DataTypes.TYPE_MARKER_MERGE, options); + IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(DataTypes.TYPE_MARKER_ADAS, options); cacheMarkerIconResMd5Val(resIdVal, marker); return marker; } @@ -358,6 +358,6 @@ class AdasRecognizedResultDrawer extends BaseDrawer { if (mLastPositions != null) { mLastPositions.clear(); } - sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_MERGE); + sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_ADAS); } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 4789fa73c3..af0347fb43 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -26,7 +26,9 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import static com.mogo.cloud.socket.entity.SocketDownDataHelper.FROM_ADAS; -import static com.mogo.cloud.socket.entity.SocketDownDataHelper.FROM_ROAD_UNIT; +import static com.mogo.cloud.socket.entity.SocketDownDataHelper.FROM_MY_LOCATION; +import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_ADAS; +import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_CLOUD_DATA; import static java.lang.Math.PI; public @@ -206,47 +208,39 @@ class BaseDrawer { * @param lat 纬度 * @return 实际车辆颜色 */ - protected String getModelRenderColor(int type, int fromType, double speed, double lon, double lat, double angle) { + protected String getModelRenderColor(int type, double speed, double lon, double lat, double angle) { AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type); if (recognizedType == AdasRecognizedType.classIdTrafficBus) { return "#D8D8D8FF"; } - if (recognizedType == AdasRecognizedType.classIdUnKnow) { + if (recognizedType == AdasRecognizedType.classIdUnKnow) { //todo unKnow颜色绘制 return Car3DModelColor.Normal.color; } - // 距离策略 todo 此处两种策略是临时方案 -// double[] coordinates = getCurCoordinates(); -// double distance = CoordinateUtils.calculateLineDistance(lon, lat, coordinates[0], coordinates[1]) * 100; -// if (distance < 50) { -// return Car3DModelColor.Dangerous.color; -// } else if (distance < 100 && distance >= 50) { -// return Car3DModelColor.Warming.color; -// } -// -//// 他车车速和自车车速对比速度策略 -//// 自车速度 >= 50% 危险 -//// 10% < 自车速度 < 50% 警告 -// double curSpeed = getCurSpeed(); -// if (curSpeed > 0 && speed > curSpeed) { -// double rate = ((speed - curSpeed) / curSpeed) * 100; -// if (rate >= 50) { -// return Car3DModelColor.Dangerous.color; -// } else if (rate > 10 && rate < 50) { -// return Car3DModelColor.Warming.color; -// } -// } + // 距离策略 + double[] coordinates = getCurCoordinates(); + double distance = CoordinateUtils.calculateLineDistance(lon, lat, coordinates[0], coordinates[1]) * 100; + if (distance < 50) { + return Car3DModelColor.Dangerous.color; + } else if (distance < 100 && distance >= 50) { + return Car3DModelColor.Warming.color; + } + +// 他车车速和自车车速对比速度策略 +// 自车速度 >= 50% 危险 +// 10% < 自车速度 < 50% 警告 + double curSpeed = getCurSpeed(); + if (curSpeed > 0 && speed > curSpeed) { + double rate = ((speed - curSpeed) / curSpeed) * 100; + if (rate >= 50) { + return Car3DModelColor.Dangerous.color; + } else if (rate > 10 && rate < 50) { + return Car3DModelColor.Warming.color; + } + } // 默认颜色 - switch (fromType) { - case FROM_ADAS: - return Car3DModelColor.Normal_Visual.color; - case FROM_ROAD_UNIT: - return Car3DModelColor.Normal_Cloud.color; - default: - return Car3DModelColor.Normal.color; - } -// return Car3DModelColor.Normal.color; + return Car3DModelColor.Normal.color; } /** @@ -298,9 +292,6 @@ class BaseDrawer { public enum Car3DModelColor { Normal("#D8D8D8FF"), - Normal_Visual("#D8CFF8BD"), - Normal_Cloud("#D8F8D69B"), - Warming("#FFD53EFF"), Dangerous("#FF3C45FF"); @@ -476,4 +467,14 @@ class BaseDrawer { return new double[]{lon, lat}; } + protected String getDataTypes(int fromType) { + switch (fromType) { + case FROM_MY_LOCATION: + return TYPE_MARKER_CLOUD_DATA; + case FROM_ADAS: + return TYPE_MARKER_ADAS; + default: + return TYPE_MARKER_CLOUD_DATA; + } + } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 91123607f8..20bc6015f9 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -34,8 +34,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import static com.mogo.module.common.constants.DataTypes.TYPE_MARKER_MERGE; - /** * @author congtaowang * @since 2020/10/28 @@ -122,7 +120,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic } mMarkersCaches.clear(); mLastPositions.clear(); - sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_MERGE); + sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_CLOUD_DATA); return true; } if (data == null || ( @@ -132,7 +130,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic mMarkersCaches.clear(); } mLastPositions.clear(); - sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_MERGE); + sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_CLOUD_DATA); return true; } return false; @@ -246,7 +244,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic } private void removeUselessLastRecord() { // todo 最好重新设计一个数据结构，用于多线程数据过期失效的场景，参见redis数据过期 - if (mLastPositions.isEmpty()) { + if (mLastPositions == null || mLastPositions.isEmpty()) { return; } IMogoADASController adasControllerApi = MogoApisHandler.getInstance().getApis().getAdasControllerApi(); @@ -304,16 +302,10 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic double[] matchLonLat = getMatchLonLat(cloudRoadData.getUuid(), cloudRoadData.getWgslon(), cloudRoadData.getWgslat(), cloudRoadData.getHeading(), lastLon, lastLat); SocketDownData.CloudRoadDataProto.Builder builder = cloudRoadData.toBuilder(); -// builder.setWgslon(matchLonLat[0]); -// builder.setWgslat(matchLonLat[1]); - builder.setWgslon(56.0); - builder.setWgslat(57.0); + builder.setWgslon(matchLonLat[0]); + builder.setWgslat(matchLonLat[1]); - double lon = cloudRoadData.getWgslon(); - Log.d(TAG, "test lon : " + lon); - - -// cloudRoadData = builder.build(); + cloudRoadData = builder.build(); //todo 验证值是否改变 mLastPositions.put(uniqueKey, cloudRoadData); @@ -329,7 +321,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic marker.setRotateAngle(((float) cloudRoadData.getHeading())); marker.setPosition(cloudRoadData.getWgslat(), cloudRoadData.getWgslon()); } - marker.setAnchorColor(getModelRenderColor(cloudRoadData.getType(), cloudRoadData.getFromType(), cloudRoadData.getSpeed(), cloudRoadData.getWgslon(), cloudRoadData.getWgslat(), cloudRoadData.getHeading())); + marker.setAnchorColor(getModelRenderColor(cloudRoadData.getType(), cloudRoadData.getSpeed(), cloudRoadData.getWgslon(), cloudRoadData.getWgslat(), cloudRoadData.getHeading())); if (shouldShowSpeed(cloudRoadData.getType())) { showSelfSpeed(marker, cloudRoadData.getSpeed(), cloudRoadData.getUuid(), cloudRoadData.getType(), MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()); } @@ -433,7 +425,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic } MogoMarkerOptions options = new MogoMarkerOptions() - .owner(TYPE_MARKER_MERGE) + .owner(getDataTypes(data.getFromType())) .anchor(0.5f, 0.5f) .rotate((float) data.getHeading()) .object(data) @@ -443,7 +435,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic String resIdVal; if (MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()) { options.set3DMode(true); - options.anchorColor(getModelRenderColor(data.getType(), data.getFromType(), data.getSpeed(), data.getWgslon(), data.getWgslat(), data.getHeading())); + options.anchorColor(getModelRenderColor(data.getType(), data.getSpeed(), data.getWgslon(), data.getWgslat(), data.getHeading())); int resId = getModelRes(data.getType()); resIdVal = resId + ""; options.resName(mMarkerCachesResMd5Values.get(resIdVal)); @@ -454,7 +446,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic options.icon(view); resIdVal = view.getId() + ""; } - IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(TYPE_MARKER_MERGE, options); + IMogoMarker marker = MogoApisHandler.getInstance().getApis().getMapServiceApi().getMarkerManager(mContext).addMarker(getDataTypes(data.getFromType()), options); cacheMarkerIconResMd5Val(resIdVal, marker); if (!TextUtils.isEmpty(data.getSn())) { @@ -510,7 +502,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic } /** - * 展示用户信息面版 + * 展示用户信息米娜版 * * @param data 道路数据 */ diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 4535a2c389..ee1aa969d7 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -2,6 +2,8 @@ package com.mogo.module.service.marker; import android.content.Context; import android.graphics.Rect; +import android.os.Handler; +import android.os.Message; import android.text.TextUtils; import com.mogo.cloud.socket.entity.SocketDownData; @@ -36,11 +38,13 @@ import com.mogo.module.service.network.RefreshModel; import com.mogo.realtime.api.MoGoAiCloudRealTime; import com.mogo.realtime.socket.IMogoCloudOnMsgListener; import com.mogo.service.adas.IMogoADASControlStatusChangedListener; +import com.mogo.service.adas.entity.ADASRecognizedResult; import com.mogo.service.module.IMogoBizActionDoneListener; import com.mogo.utils.ResourcesHelper; import com.mogo.utils.ThreadPoolService; import com.mogo.utils.UiThreadHandler; import com.mogo.utils.ViewUtils; +import com.mogo.utils.WorkThreadHandler; import com.mogo.utils.logger.Logger; import com.zhidao.carchattingprovider.ICallChatResponse; @@ -144,7 +148,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, @Override public void onMsgReceived(SocketDownData.LauncherSnapshotProto mogoSnapshotSetData) { DebugConfig.setStatus(DebugConfig.sDownloadSnapshot, true); - SnapshotSetDataDrawer.getInstance().renderSnapshotData(mogoSnapshotSetData); //todo 6月4号 提测版本中去掉云端下发数据展示 +// SnapshotSetDataDrawer.getInstance().renderSnapshotData(mogoSnapshotSetData); //todo 6月4号 提测版本中去掉云端下发数据展示 // Message msg = mSnapshotHandler.obtainMessage(); // msg.obj = mogoSnapshotSetData; // msg.what = MSG_SNAPSHOT; @@ -154,11 +158,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener, // adas 每隔一定频率传递过来的数据 MarkerServiceHandler.getApis().getAdasControllerApi().addAdasRecognizedDataCallback(resultList -> { - AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult(resultList); // Message msg = mSnapshotHandler.obtainMessage(); // msg.obj = resultList; // msg.what = MSG_ADAS; // msg.sendToTarget(); + AdasRecognizedResultDrawer.getInstance().renderAdasRecognizedResult(resultList); //添加自车的定位图标，碰撞只有一个预警,还需要和adas 联调， // for ( ADASRecognizedResult result : resultList) { From 0ecfcba90f18738f72d171ea93ce731ba6574190 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 3 Jun 2021 09:36:24 +0800 Subject: [PATCH 02/15] upgrade the map version to 8.5.38 --- libraries/map-custom/build.gradle | 2 +- libraries/map-custom/map-version-update | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index ce9057bea4..6617543da1 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.36' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.38' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } diff --git a/libraries/map-custom/map-version-update b/libraries/map-custom/map-version-update index d0be4e1b6a..620971b894 100644 --- a/libraries/map-custom/map-version-update +++ b/libraries/map-custom/map-version-update @@ -69,3 +69,6 @@ mapAutoView.getMapAutoViewHelper()?.setNearViewAnglePosition（LonLatPoint(112.5 暂时对sdk去掉混淆，方便crash定位 解决bugly #304037 问题 +8.5.38 +修改崩溃bug +更换最新的摄像头和红绿灯 \ No newline at end of file From 68f4ac1bed25cd4161bafa0b6fb5e04ec29d4e31 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 3 Jun 2021 15:33:28 +0800 Subject: [PATCH 03/15] renote the showMarkerView and replace the track to bus --- .../module/common/drawer/AdasRecognizedResultDrawer.java | 6 +++--- .../java/com/mogo/module/common/drawer/BaseDrawer.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java index 3d63facadf..071b317008 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java @@ -302,9 +302,9 @@ class AdasRecognizedResultDrawer extends BaseDrawer { } marker.setAnchorColor(carColor); - if (shouldShowSpeed(recognizedListResult.type)) { - showSelfSpeed(marker, recognizedListResult.speed, recognizedListResult.uuid, recognizedListResult.type, MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()); - } +// if (shouldShowSpeed(recognizedListResult.type)) { +// showSelfSpeed(marker, recognizedListResult.speed, recognizedListResult.uuid, recognizedListResult.type, MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()); +// } //todo 6月4号演示关闭 } /** diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index af0347fb43..12222351bb 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -182,10 +182,10 @@ class BaseDrawer { */ public int getModelRes(int type) { AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type); - if (recognizedType == AdasRecognizedType.classIdCar + if (recognizedType == AdasRecognizedType.classIdCar) { + return R.raw.othercar; + } else if (recognizedType == AdasRecognizedType.classIdTrafficBus || recognizedType == AdasRecognizedType.classIdTrafficTruck) { - return R.raw.othercar; //todo otherCar be replacing tache for now to test,remember to fix - } else if (recognizedType == AdasRecognizedType.classIdTrafficBus) { return R.raw.bus; } else if (recognizedType == AdasRecognizedType.classIdBicycle || recognizedType == AdasRecognizedType.classIdMoto) { @@ -194,7 +194,7 @@ class BaseDrawer { return R.raw.stopline; } else if (recognizedType == AdasRecognizedType.classIdWarningArrows) { return R.raw.arraw; - } else if (recognizedType == AdasRecognizedType.classIdUnKnow) { //todo unKnow物体3D模型 + } else if (recognizedType == AdasRecognizedType.classIdUnKnow) { return R.raw.tache; } return R.raw.people; From 484e06e2d6b82a25f194c833063ae2cf081387ff Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 3 Jun 2021 16:10:35 +0800 Subject: [PATCH 04/15] change the dangerous speed show --- .../main/java/com/mogo/module/common/drawer/BaseDrawer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 12222351bb..049d8d7962 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -220,9 +220,9 @@ class BaseDrawer { // 距离策略 double[] coordinates = getCurCoordinates(); double distance = CoordinateUtils.calculateLineDistance(lon, lat, coordinates[0], coordinates[1]) * 100; - if (distance < 50) { + if (distance < 15) { return Car3DModelColor.Dangerous.color; - } else if (distance < 100 && distance >= 50) { + } else if (distance < 50 && distance >= 15) { return Car3DModelColor.Warming.color; } From 37d9ec08a13cac78e5c8491b61f264f8439506bf Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 3 Jun 2021 16:39:46 +0800 Subject: [PATCH 05/15] remove truck color problem and add note --- .../drawer/AdasRecognizedResultDrawer.java | 14 ++---- .../mogo/module/common/drawer/BaseDrawer.java | 49 +++++++++---------- .../common/drawer/SnapshotSetDataDrawer.java | 17 ++++--- 3 files changed, 38 insertions(+), 42 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java index 071b317008..8ffb085347 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/AdasRecognizedResultDrawer.java @@ -256,10 +256,10 @@ class AdasRecognizedResultDrawer extends BaseDrawer { } /** - * 绘制某个物体的一个数据 todo 缓存问题 + * 绘制某个物体的一个数据 * * @param recognizedListResult {@link ADASRecognizedResult} - * @param newAdasRecognizedMarkersCaches + * @param newAdasRecognizedMarkersCaches 缓存集合 */ private void renderAdasOneFrame(IMogoMarker marker, String uniqueKey, @@ -289,9 +289,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { final MogoLatLng renderLoc = new MogoLatLng(recognizedListResult.lat, recognizedListResult.lon); long cost = System.currentTimeMillis() - start; final long intervalRef = interval - cost; -// SimpleHandlerThreadPool.getInstance().postRender(() -> { marker.addDynamicAnchorPosition(renderLoc, (float) recognizedListResult.heading, intervalRef); -// }); } else { marker.setRotateAngle(((float) recognizedListResult.heading)); marker.setPosition(recognizedListResult.lat, recognizedListResult.lon); @@ -310,8 +308,8 @@ class AdasRecognizedResultDrawer extends BaseDrawer { /** * 绘制 marker * - * @param recognizedListResult - * @return + * @param recognizedListResult {@link ADASRecognizedResult} + * @return {@link IMogoMarker} */ private IMogoMarker drawAdasRecognizedDataMarker(ADASRecognizedResult recognizedListResult) { if (recognizedListResult == null) { @@ -355,9 +353,7 @@ class AdasRecognizedResultDrawer extends BaseDrawer { if (mMarkersCaches != null) { mMarkersCaches.clear(); } - if (mLastPositions != null) { - mLastPositions.clear(); - } + mLastPositions.clear(); sendMessage(MSG_REMOVE_DIRTY_MARKERS, DataTypes.TYPE_MARKER_ADAS); } } diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index 049d8d7962..b41a5c2613 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -211,10 +211,7 @@ class BaseDrawer { protected String getModelRenderColor(int type, double speed, double lon, double lat, double angle) { AdasRecognizedType recognizedType = AdasRecognizedType.valueFrom(type); - if (recognizedType == AdasRecognizedType.classIdTrafficBus) { - return "#D8D8D8FF"; - } - if (recognizedType == AdasRecognizedType.classIdUnKnow) { //todo unKnow颜色绘制 + if (recognizedType == AdasRecognizedType.classIdUnKnow) { return Car3DModelColor.Normal.color; } // 距离策略 @@ -355,8 +352,8 @@ class BaseDrawer { /** * 缓存绘制 marker 的 id 和 marker 资源缓存的 md5 的关系 * - * @param id - * @param marker + * @param id 缓存资源ID + * @param marker {@link IMogoMarker} */ protected static void cacheMarkerIconResMd5Val(String id, IMogoMarker marker) { if (marker == null || marker.isDestroyed()) { @@ -372,11 +369,11 @@ class BaseDrawer { /** * 道路匹配到车道中心点 * - * @param lon - * @param lat - * @param angle - * @param isRtk - * @return + * @param lon 经度 + * @param lat 纬度 + * @param angle 方向角 + * @param isRtk 是否是RTK + * @return 匹配经纬度值 */ public double[] matchRoad(String id, double lon, double lat, double angle, boolean isRtk) { final long start = System.currentTimeMillis(); @@ -392,20 +389,20 @@ class BaseDrawer { /** * 清理缓存路段数据 * - * @param id + * @param id 缓存数据Key */ public static void clearRoadCacheById(String id) { MogoApisHandler.getInstance().getApis().getMapServiceApi().getMapUIController().clearRoadCacheById(id); } /** - * 使用系统时间或卫星时间计算出动画的运动时间 + * 使用系统时间或卫星时间计算出动画的运动时间，最小值45，防止两个点距离过近设置的最小动画执行时间 * - * @param lastSystemTime - * @param curSystemTime - * @param lastSatelliteTime - * @param curSatelliteTime - * @return + * @param lastSystemTime 上一个点系统时间，误差值 + * @param curSystemTime 当前点系统时间，误差值 + * @param lastSatelliteTime 上一个点SNTP时间，精确值 + * @param curSatelliteTime 当前点SNTP时间，精确值 + * @return 动画运动时间 */ public long computeAnimDuration(long lastSystemTime, long curSystemTime, long lastSatelliteTime, long curSatelliteTime) { long systemTimeInterval = curSystemTime - lastSystemTime; @@ -420,13 +417,13 @@ class BaseDrawer { /** * 根据位置信息、车头朝向计算道路吸附 * - * @param id - * @param lon - * @param lat - * @param heading - * @param lastLon - * @param lastLat - * @return + * @param id UUID + * @param lon 经度 + * @param lat 纬度 + * @param heading 方向角 + * @param lastLon 上一个点经度 + * @param lastLat 上一个点纬度 + * @return 匹配经纬度 */ protected double[] getMatchLonLat(String id, double lon, double lat, double heading, double lastLon, double lastLat) { double[] matchedPoint = matchRoad(id, lon, @@ -435,7 +432,7 @@ class BaseDrawer { true ); - boolean match = false; + boolean match; if (matchedPoint != null) { // Logger.d( TAG, "matchPoint %s distance = %s",lineCounter, matchedPoint[2] ); match = matchedPoint[2] < 1 && matchedPoint[2] > 0; diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java index 20bc6015f9..f1f366ea44 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/SnapshotSetDataDrawer.java @@ -225,8 +225,8 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic /** * todo 后面涉及到此类变化的数据均改动 * - * @param marker - * @param cloudRoadDataProto + * @param marker {@link IMogoMarker} + * @param cloudRoadDataProto {@link SocketDownData.CloudRoadDataProto} */ private void updateCacheMarkerRes(IMogoMarker marker, SocketDownData.CloudRoadDataProto cloudRoadDataProto) { String resIdVal; @@ -244,7 +244,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic } private void removeUselessLastRecord() { // todo 最好重新设计一个数据结构，用于多线程数据过期失效的场景，参见redis数据过期 - if (mLastPositions == null || mLastPositions.isEmpty()) { + if (mLastPositions.isEmpty()) { return; } IMogoADASController adasControllerApi = MogoApisHandler.getInstance().getApis().getAdasControllerApi(); @@ -305,7 +305,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic builder.setWgslon(matchLonLat[0]); builder.setWgslat(matchLonLat[1]); - cloudRoadData = builder.build(); //todo 验证值是否改变 + cloudRoadData = builder.build(); mLastPositions.put(uniqueKey, cloudRoadData); @@ -335,7 +335,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic */ private void prepareData(List in, List out) { filterData(in); - foreCastPoint(in); +// foreCastPoint(in, out); out.addAll(in); } @@ -370,7 +370,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic * * @param in 数据源 */ - private void foreCastPoint(List in) { + private void foreCastPoint(List in, List out) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { for (SocketDownData.CloudRoadDataProto proto : in) { SocketDownData.CloudRoadDataProto.Builder builder = proto.toBuilder(); @@ -378,6 +378,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic long internal = getCurSatelliteTime() - builder.getSatelliteTime(); if (internal <= 0) { Log.d(FORECAST, "time internal less than 0 , uuid : " + proto.getUuid()); + out.add(proto); continue; } long startTime = System.currentTimeMillis(); @@ -399,6 +400,8 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic builder.setWgslon(foreCastMogoLatLon.getLon()); builder.setSatelliteTime(getCurSatelliteTime() - foreCastInternal); builder.setDistance(distanceFromSelf); + proto = builder.build(); + out.add(proto); } } } @@ -502,7 +505,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic } /** - * 展示用户信息米娜版 + * 展示用户信息面版 * * @param data 道路数据 */ From e010444ca41c717e56a78a6b880f4493bd8c902f Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 3 Jun 2021 18:33:51 +0800 Subject: [PATCH 06/15] note the navi when call voice --- .../java/com/mogo/module/navi/ui/search/SearchFragment.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchFragment.java b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchFragment.java index 3fdf6f4bbf..98afe4fefd 100644 --- a/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchFragment.java +++ b/modules/mogo-module-search/src/main/java/com/mogo/module/navi/ui/search/SearchFragment.java @@ -14,6 +14,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.mogo.commons.voice.AIAssist; import com.mogo.commons.voice.IMogoVoiceCmdCallBack; import com.mogo.map.search.inputtips.MogoTip; +import com.mogo.module.common.MogoApisHandler; import com.mogo.module.navi.R; import com.mogo.module.navi.bean.EntityConvertUtils; import com.mogo.module.navi.bean.SearchPoi; @@ -424,6 +425,9 @@ public class SearchFragment extends BaseSearchFragment SearchApisHolder.getSearchManager().goHome(); break; case NAVI_SETTING_CMD: + if(MogoApisHandler.getInstance().getApis().getStatusManagerApi().isVrMode()){ + return; + } goSetting(); break; case PARK_CMD: From 5dcdad58ce0689b64912430a03930955cb1e9eb6 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 3 Jun 2021 19:42:14 +0800 Subject: [PATCH 07/15] update map verison to 8.5.40 --- libraries/map-custom/build.gradle | 2 +- libraries/map-custom/map-version-update | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 6617543da1..908f75aede 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.38' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.40' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } diff --git a/libraries/map-custom/map-version-update b/libraries/map-custom/map-version-update index 620971b894..796c7a7670 100644 --- a/libraries/map-custom/map-version-update +++ b/libraries/map-custom/map-version-update @@ -71,4 +71,9 @@ mapAutoView.getMapAutoViewHelper()?.setNearViewAnglePosition（LonLatPoint(112.5 8.5.38 修改崩溃bug -更换最新的摄像头和红绿灯 \ No newline at end of file +更换最新的摄像头和红绿灯 + +8.5.40 +修改崩溃bug +更新路牌数据 +修改近视角切换 \ No newline at end of file From f97cb139458fc91c37b16de20b0bb57b005c40da Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 3 Jun 2021 20:13:06 +0800 Subject: [PATCH 08/15] note the speed color --- .../mogo/module/common/drawer/BaseDrawer.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index b41a5c2613..dd4f233938 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -226,15 +226,15 @@ class BaseDrawer { // 他车车速和自车车速对比速度策略 // 自车速度 >= 50% 危险 // 10% < 自车速度 < 50% 警告 - double curSpeed = getCurSpeed(); - if (curSpeed > 0 && speed > curSpeed) { - double rate = ((speed - curSpeed) / curSpeed) * 100; - if (rate >= 50) { - return Car3DModelColor.Dangerous.color; - } else if (rate > 10 && rate < 50) { - return Car3DModelColor.Warming.color; - } - } +// double curSpeed = getCurSpeed(); +// if (curSpeed > 0 && speed > curSpeed) { +// double rate = ((speed - curSpeed) / curSpeed) * 100; +// if (rate >= 50) { +// return Car3DModelColor.Dangerous.color; +// } else if (rate > 10 && rate < 50) { +// return Car3DModelColor.Warming.color; +// } +// } // 默认颜色 return Car3DModelColor.Normal.color; From 62bc28abd4d34255425ba27dbc5b095204d6eb4f Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 3 Jun 2021 20:46:28 +0800 Subject: [PATCH 09/15] add log --- .../service/impl/adas/MogoADASController.java | 75 ++++++++++--------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java index 5e29d66c06..8e1e48a70d 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/adas/MogoADASController.java @@ -15,7 +15,6 @@ import com.mogo.cloud.passport.MoGoAiCloudClientConfig; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.network.SubscribeImpl; -import com.mogo.commons.network.Utils; import com.mogo.map.uicontroller.EnumMapUI; import com.mogo.module.adas.AdasDataListener; import com.mogo.module.adas.AdasProvider; @@ -49,7 +48,6 @@ import com.zhidao.adasconfig.common.config.EnumCarChatIncognitoMode; import com.zhidao.adasconfig.common.config.EnumCarHeading; import com.zhidao.adasconfig.common.config.EnumSkinStyle; import com.zhidao.autopilot.support.api.AutopilotServiceManage; -import com.zhidao.autopilot.support.api.IAutopolitDataCallBack; import com.zhidao.autopilotservice.model.AdasAIDLAutopilotArriveModel; import com.zhidao.autopilotservice.model.AdasAIDLAutopilotStateModel; import com.zhidao.autopilotservice.model.AdasAIDLOwnerCarRectModel; @@ -126,12 +124,12 @@ public class MogoADASController implements IMogoADASController { */ private final Handler mAdasRecognizedRecHandler = new Handler(WorkThreadHandler.newInstance("AdasRecognizedRecThread").getLooper()) { @Override - public void handleMessage( Message msg ) { - super.handleMessage( msg ); - if ( msg.obj instanceof List ) { - mAdasDataListener.notifyOwnerCarRect( ( List< AdasAIDLOwnerCarRectModel > ) msg.obj ); - } else if(msg.obj == null ){ - mAdasDataListener.notifyOwnerCarRect( null ); + public void handleMessage(Message msg) { + super.handleMessage(msg); + if (msg.obj instanceof List) { + mAdasDataListener.notifyOwnerCarRect((List) msg.obj); + } else if (msg.obj == null) { + mAdasDataListener.notifyOwnerCarRect(null); } } }; @@ -186,7 +184,14 @@ public class MogoADASController implements IMogoADASController { model.setYt(bean.getYt()); model.setDistance_x(bean.getDistance_x()); model.setDistance_y(bean.getDistance_y()); - model.setType(bean.getType()); + String type; + if (TextUtils.isEmpty(bean.getType())) { + type = "100"; + Logger.d(TAG, " === ADAS 返回结果出现 type 为 null情况 ===="); + } else { + type = bean.getType(); + } + model.setType(type); model.setLat(bean.getLat()); model.setLon(bean.getLon()); model.setHeading(bean.getHeading()); @@ -203,8 +208,8 @@ public class MogoADASController implements IMogoADASController { data.add(model); - Log.d("ADAS数据延时", "uuid : " + bean.getUuid() + " type : " + bean.getType() + "systemTime : " + System.currentTimeMillis() + " GPS time" + Long.parseLong(bean.getSystemTime()) - + " timeDelay : " + (System.currentTimeMillis() - Long.parseLong(bean.getSystemTime()))); + Log.d("ADAS数据延时", "uuid : " + bean.getUuid() + " type : " + bean.getType() + "systemTime : " + System.currentTimeMillis() + " GPS time" + Long.parseLong(bean.getSystemTime()) + + " timeDelay : " + (System.currentTimeMillis() - Long.parseLong(bean.getSystemTime()))); // Log.d("ADAS原始数据", "uuid : " + bean.getUuid() + " type : " + bean.getType()); Logger.d(TAG, "识别距离：x = %s, y = %s", model.getDistance_x(), model.getDistance_y()); @@ -312,33 +317,33 @@ public class MogoADASController implements IMogoADASController { if (SingletonsHolder.get(IMogoStatusManager.class).isVrMode()) { return; } - Logger.d( TAG, Log.getStackTraceString( new Throwable() ) ); - init( AbsMogoApplication.getApp() ); + Logger.d(TAG, Log.getStackTraceString(new Throwable())); + init(AbsMogoApplication.getApp()); adasProvider.addAdasStatusListener(new AdasStatusListener() { @Override public void onServiceConnected() { super.onServiceConnected(); - Logger.d( TAG, "adas statuslistener connected & send sn"); - BasicInfo info=new BasicInfo(); - info.setSn(MoGoAiCloudClientConfig.getInstance().getSn()+"xavier"); + Logger.d(TAG, "adas statuslistener connected & send sn"); + BasicInfo info = new BasicInfo(); + info.setSn(MoGoAiCloudClientConfig.getInstance().getSn() + "xavier"); AdasManager.getInstance().setBasicInfo(info); invokeShowADASOperation(); } @Override public void onServiceDisconnected() { - Logger.d( TAG, "adas statuslistener disconnected"); + Logger.d(TAG, "adas statuslistener disconnected"); super.onServiceDisconnected(); } }); invokeShowADASOperation(); - if ( mAdasDataListener == null ) { + if (mAdasDataListener == null) { mAdasDataListener = new AdasDataListener() { @Override - public void sendMsg( String msg ) { - Logger.d( TAG, "adas AdasDataListener sendmsg " + msg); - for ( IMogoAdasDataCallback callback : mAdasDataCallbackList ) { + public void sendMsg(String msg) { + Logger.d(TAG, "adas AdasDataListener sendmsg " + msg); + for (IMogoAdasDataCallback callback : mAdasDataCallbackList) { try { callback.onAdasDataCallback(msg); } catch (Exception e) { @@ -348,8 +353,8 @@ public class MogoADASController implements IMogoADASController { } @Override - public void cameraEyeDetectResult( String detectResult ) { - Logger.d( TAG, "detectResult " + detectResult); + public void cameraEyeDetectResult(String detectResult) { + Logger.d(TAG, "detectResult " + detectResult); try { JSONObject jsonObjectWs = new JSONObject(detectResult); String action = jsonObjectWs.optString("action"); @@ -375,9 +380,9 @@ public class MogoADASController implements IMogoADASController { @Override public void requestGetCarModelListInfo() { - Logger.d( TAG, "requestGetCarModelListInfo "); - if ( DebugConfig.isMapBased() ) { - Logger.d( TAG, "requestGetCarModelListInfo" ); + Logger.d(TAG, "requestGetCarModelListInfo "); + if (DebugConfig.isMapBased()) { + Logger.d(TAG, "requestGetCarModelListInfo"); // 向adas发送车模list String carModelList = SharedPrefsMgr.getInstance(context).getString("CAR_MODEL_LIST", ""); if (carModelList != null && !carModelList.isEmpty()) { @@ -404,9 +409,9 @@ public class MogoADASController implements IMogoADASController { } @Override - public void autopilotArrive( AdasAIDLAutopilotArriveModel autopilotArriveModel ) { - Logger.d( TAG, "autopilotArriveModel " + autopilotArriveModel); - if ( autopilotArriveModel == null ) { + public void autopilotArrive(AdasAIDLAutopilotArriveModel autopilotArriveModel) { + Logger.d(TAG, "autopilotArriveModel " + autopilotArriveModel); + if (autopilotArriveModel == null) { return; } if (mAdasOCHCallback != null) { @@ -419,16 +424,16 @@ public class MogoADASController implements IMogoADASController { } @Override - public void ownerCarStateInfo( String ownerCarStateInfo ) { - Logger.d( TAG, "ownerCarStateInfo " + ownerCarStateInfo); + public void ownerCarStateInfo(String ownerCarStateInfo) { + Logger.d(TAG, "ownerCarStateInfo " + ownerCarStateInfo); Message message = mAdasLocationRecHandler.obtainMessage(); message.obj = ownerCarStateInfo; message.sendToTarget(); } @Override - public void notifyOwnerCarState( AdasAIDLOwnerCarStateModel ownerCarStateModel ) { - Logger.d( TAG, "AdasAIDLOwnerCarStateModel " + ownerCarStateModel); + public void notifyOwnerCarState(AdasAIDLOwnerCarStateModel ownerCarStateModel) { + Logger.d(TAG, "AdasAIDLOwnerCarStateModel " + ownerCarStateModel); ADASCarStateInfo stateInf = new ADASCarStateInfo(); stateInf.setAction("state"); ADASCarStateInfo.ValuesBean bean = new ADASCarStateInfo.ValuesBean(); @@ -880,7 +885,7 @@ public class MogoADASController implements IMogoADASController { } @Override - public void mockAdasRecognized( String json ) { - mAdasDataListener.cameraEyeDetectResult( json ); + public void mockAdasRecognized(String json) { + mAdasDataListener.cameraEyeDetectResult(json); } } From 1324952393dc38f848c39a0a1da8a556ab3f0105 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 3 Jun 2021 20:52:24 +0800 Subject: [PATCH 10/15] reset distance of renderColor --- .../main/java/com/mogo/module/common/drawer/BaseDrawer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java index dd4f233938..f223cb5dfc 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/drawer/BaseDrawer.java @@ -217,9 +217,9 @@ class BaseDrawer { // 距离策略 double[] coordinates = getCurCoordinates(); double distance = CoordinateUtils.calculateLineDistance(lon, lat, coordinates[0], coordinates[1]) * 100; - if (distance < 15) { + if (distance < 50) { return Car3DModelColor.Dangerous.color; - } else if (distance < 50 && distance >= 15) { + } else if (distance < 100 && distance >= 50) { return Car3DModelColor.Warming.color; } From ae1671e22e2ab00dc15b21bb70b19315786f0495 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 3 Jun 2021 21:37:30 +0800 Subject: [PATCH 11/15] update map version --- libraries/map-custom/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 908f75aede..6649dd1376 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.40' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.42' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } From 6cd1ef497132c65d3f6a3368d8091930ef4c930f Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 3 Jun 2021 22:19:29 +0800 Subject: [PATCH 12/15] update map version to 8.5.43 --- libraries/map-custom/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index 6649dd1376..c18960aa5d 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.42' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.43' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } From fed96047edd42f865fc4cc37a185f5cc7a6b52ae Mon Sep 17 00:00:00 2001 From: zhongchao Date: Thu, 3 Jun 2021 23:27:38 +0800 Subject: [PATCH 13/15] use local map data --- .../main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java index b2eaad0e6d..95ed880304 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java @@ -96,6 +96,7 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { Log.d(TAG,"setDebugMode==true"); NavAutoApi.INSTANCE.init( context, MapParams.Companion.init() .setDebugMode( false ) + .setDataFileSource(1) //todo 使用本地地图数据 .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D ) .setZoom( 20 ) From 34d01f136d32cc8a121110b73fa10c800ecbcdf3 Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 4 Jun 2021 17:29:34 +0800 Subject: [PATCH 14/15] upgrade the map version to 8.5.44 --- libraries/map-custom/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/map-custom/build.gradle b/libraries/map-custom/build.gradle index c18960aa5d..f3410ff59f 100644 --- a/libraries/map-custom/build.gradle +++ b/libraries/map-custom/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation project(':foudations:mogo-commons') } - implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.43' + implementation 'com.zhidaoauto.machine:map:1.0.0-vr-8.5.44' // implementation 'com.zhidaoauto.machine:map:1.0.0-vr-test-3.4' } From 89e0a4d824bbb0c359571810fe386c341deff65d Mon Sep 17 00:00:00 2001 From: zhongchao Date: Fri, 4 Jun 2021 17:32:30 +0800 Subject: [PATCH 15/15] open the map log --- .../main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java index 95ed880304..013ab37442 100644 --- a/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java +++ b/libraries/map-custom/src/main/java/com/mogo/map/impl/custom/CustomMapApiBuilder.java @@ -95,7 +95,7 @@ class CustomMapApiBuilder implements IMogoMapApiBuilder { public IMogoMapView getMapView( Context context ) { Log.d(TAG,"setDebugMode==true"); NavAutoApi.INSTANCE.init( context, MapParams.Companion.init() - .setDebugMode( false ) + .setDebugMode( true ) .setDataFileSource(1) //todo 使用本地地图数据 .setCoordinateType( MapParams.COORDINATETYPE_GCJ02 ) .setPerspectiveMode( MapParams.MAP_PERSPECTIVE_2D )