diff --git a/app/build.gradle b/app/build.gradle index 8038040..af9164c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -37,7 +37,7 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 24 targetSdkVersion 30 - versionCode 52 + versionCode 54 versionName "8.230418-正式环境-测试版" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java index 751b086..8f132d9 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java @@ -583,7 +583,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic // 道路任务增加检查 // 检测到当前车辆未移动,则无需进行拍摄 - if (!speedCheck.checkIsMove(LocationLifeCycle.getInstance().getMainLocation(), GPSUtils.getInstance(AutoTakePictureActivity.this).getSateliteCount())) { + if (!speedCheck.checkIsMove(LocationLifeCycle.getInstance().getMainLocation(), LocationLifeCycle.getInstance().getTencentLocation().getGPSRssi())) { com.github.lazylibrary.util.ToastUtils.showToast(AutoTakePictureActivity.this, "车辆静止中,暂停拍摄!"); return; } @@ -747,13 +747,13 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic it -> { String geometryStr = Geohash.getInstance().decode(it.getGeo()); Geometry geometry = GeometryTools.createGeometry(geometryStr); - RoadMatchEntity roadMatchEntity = new RoadMatchEntity(); - roadMatchEntity.setId(it.getId()); - roadMatchEntity.setDataDetail(it); - roadMatchEntity.setGeometry((LineString) geometry); -// roadMatchEntity.setBuffer(geometry.buffer(MATCH_BUFFER_DISTANCE).toString()); // 实时设置当前任务的起始角度 if (geometry instanceof LineString) { + RoadMatchEntity roadMatchEntity = new RoadMatchEntity(); + roadMatchEntity.setId(it.getId()); + roadMatchEntity.setDataDetail(it); + roadMatchEntity.setGeometry((LineString) geometry); +// roadMatchEntity.setBuffer(geometry.buffer(MATCH_BUFFER_DISTANCE).toString()); LineString lineString = (LineString) geometry; // 计算前两个点的坐标角度 // 获取当前数据的前两个点的方向 @@ -774,8 +774,12 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic } roadMatchEntity.setsPoint(lineString.getStartPoint().toString()); roadMatchEntity.setePoint(lineString.getEndPoint().toString()); + roadLinkEntityList.add(roadMatchEntity); + } else { + com.github.lazylibrary.util.ToastUtils.showToast(AutoTakePictureActivity.this, "当前界面存在多线任务,已自动过滤!"); + systemTTS.playText("存在多线任务!"); + XLog.e("存在多线任务:"+it.getId()+"-"+it.getName()); } - roadLinkEntityList.add(roadMatchEntity); } ); // 如果当前自动规划打开且没有正在匹配的任务,自动规划下一条最近的任务 diff --git a/app/src/main/java/com/navinfo/outdoor/util/PicturesSpeedCheck.kt b/app/src/main/java/com/navinfo/outdoor/util/PicturesSpeedCheck.kt index 94ec038..e2de604 100644 --- a/app/src/main/java/com/navinfo/outdoor/util/PicturesSpeedCheck.kt +++ b/app/src/main/java/com/navinfo/outdoor/util/PicturesSpeedCheck.kt @@ -19,7 +19,7 @@ class PicturesSpeedCheck { pointList.removeAt(0) } - if (sateliteCount<=3) { // 卫星颗数小于等于3,说明当前卫星信号弱,则忽略距离因素,认为车辆在移动中 + if (sateliteCount<3) { // 腾讯定位信号强度不是“强”,则忽略速度判定 return true }