diff --git a/app/build.gradle b/app/build.gradle index 97d4dd9b17..f3e22def1b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -195,6 +195,12 @@ android { } // f系列-分体机 f80x { + android{ + defaultConfig { + minSdkVersion rootProject.ext.android.minSdkVersion + targetSdkVersion rootProject.ext.android.targetSdkVersion + } + } // 应用包名 applicationId rootProject.ext.android.fLauncherApplicationId dimension "product" 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..1c4221b20e 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 @@ -299,13 +299,13 @@ public class SnapshotSetDataDrawer extends BaseDrawer implements IMogoMarkerClic lastLat = lastPosition.getWgslat(); } - double[] matchLonLat = getMatchLonLat(cloudRoadData.getUuid(), cloudRoadData.getWgslon(), cloudRoadData.getWgslat(), cloudRoadData.getHeading(), lastLon, lastLat); +// 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]); - SocketDownData.CloudRoadDataProto.Builder builder = cloudRoadData.toBuilder(); - builder.setWgslon(matchLonLat[0]); - builder.setWgslat(matchLonLat[1]); - - cloudRoadData = builder.build(); //todo 验证值是否改变 +// cloudRoadData = builder.build(); //todo 验证值是否改变 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.addAll(in); } 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 e3f6abd710..b454ccb12d 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 @@ -92,6 +92,7 @@ public class TimeDelayUploadManager implements IMogoOnMessageListener map = new HashMap<>(); map.put("sn", MoGoAiCloudClientConfig.getInstance().getSn()); map.put("data", GsonUtil.jsonFromObject(mockSocketSendData)); - Logger.d(TAG, "mockSocketSendData : " + GsonUtil.jsonFromObject(mockSocketSendData)); Logger.d(TAG, "data uuid : " + result.getUuid() + " duration : " + (System.currentTimeMillis() - result.getSatelliteTime())); timeDelayApiService.uploadDelayData(map) .subscribeOn(Schedulers.io())