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 0516941c01..1c905e167e 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 @@ -290,6 +290,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic */ private void renderSnapshotOneFrame(IMogoMarker marker, String uniqueKey, SocketDownData.CloudRoadDataProto cloudRoadData, Map newSnapshotCaches) { + Logger.d(TAG,"renderSnapshotOneFrame"); final long start = System.currentTimeMillis(); SocketDownData.CloudRoadDataProto lastPosition = mLastPositions.remove(uniqueKey); @@ -306,12 +307,6 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic SocketDownData.CloudRoadDataProto.Builder builder = cloudRoadData.toBuilder(); builder.setWgslon(matchLonLat[0]); builder.setWgslat(matchLonLat[1]); -// builder.setWgslon(56.0); -// builder.setWgslat(57.0); - -// double lon = cloudRoadData.getWgslon(); -// Log.d(TAG, "test lon : " + lon); - cloudRoadData = builder.build(); @@ -343,8 +338,7 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic */ private void prepareData(List in, List out) { filterData(in); - foreCastPoint(in); - out.addAll(in); + foreCastPoint(in, out); } /** @@ -378,7 +372,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(); @@ -386,6 +380,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(); @@ -407,6 +402,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); } } } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java index a8be006855..7ebd23a1f1 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/timedelay/TimeDelayUploadManager.java @@ -155,7 +155,7 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener map = new HashMap<>(); map.put("sn", MoGoAiCloudClientConfig.getInstance().getSn()); map.put("data", GsonUtil.jsonFromObject(mockSocketSendData));