From 477f4981e83f586c4b45add0f04a919e1fc57493 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Mon, 3 Apr 2023 10:27:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7=E5=92=8C=E8=AF=B7=E6=B1=82=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1ec9712..ca763ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 24 targetSdkVersion 30 - versionCode 50 - versionName "8.230328-开发版" + versionCode 51 + versionName "8.230331-正式版" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { diff --git a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java index 3862823..e9a998b 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -2,9 +2,9 @@ package com.navinfo.outdoor.http; public class HttpInterface { // public static final String IP = "http://172.23.138.133:9999/m4";//测试接口-IP - public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网 + public static final String IP0 = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网 public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 - public static final String IP2 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 public static final String USER_PATH = "/user/";//我的 public static final String MSG_LIST_PATH = "/msgList/";//发现 public static final String USER_LOGIN_PATH = "/userlogin/";//登录 From ac2beb5370a50a24b39de87cee597cac11ce336d Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Wed, 19 Apr 2023 15:01:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=81=9C=E8=BD=A6?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=A0=B9=E6=8D=AE=E5=8D=AB=E6=98=9F=E9=A2=97?= =?UTF-8?q?=E6=95=B0=E5=AF=BC=E8=87=B4=E9=9A=A7=E9=81=93=E5=86=85=E4=B8=8D?= =?UTF-8?q?=E6=8B=8D=E6=91=84=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=A4=9A=E7=BA=BF=E6=95=B0=E6=8D=AE=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E9=97=AA=E9=80=80=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../activity/AutoTakePictureActivity.java | 18 +++++++++++------- .../navinfo/outdoor/util/PicturesSpeedCheck.kt | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ca763ad..fde656f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 24 targetSdkVersion 30 - versionCode 51 - versionName "8.230331-正式版" + versionCode 53 + versionName "8.230419-正式版" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" ndk { 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 5cd2b34..3c94a2f 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java @@ -584,7 +584,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; } @@ -748,13 +748,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; // 计算前两个点的坐标角度 // 获取当前数据的前两个点的方向 @@ -775,8 +775,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 }