From 4fe4322f46c97e0e30b1e0bb777ce3e879651ef3 Mon Sep 17 00:00:00 2001 From: xiaoyan-5800X Date: Tue, 13 Dec 2022 11:29:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=97=A7=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E7=82=B9=E8=8E=B7=E5=8F=96=E4=B8=8D=E5=88=B0=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/outdoor/activity/AutoTakePictureActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 5813e5c..00f8df9 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java @@ -753,7 +753,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic .filter(it-> { if (startMatchEnableDirection) { double dataBearing = it.getAngle(); - if (currentBearing!=0&&(Math.abs(dataBearing-currentBearing)<=90 || Math.abs(dataBearing-currentBearing)>=270)) { + if (Math.abs(dataBearing-currentBearing)<=90 || Math.abs(dataBearing-currentBearing)>=270) { return true; } else { // 根据方向判定无法匹配 @@ -2088,8 +2088,8 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic double geometry = GeometryTools.distanceToDouble(startLatLng, endLatLng);//米 speed = (float) (geometry * 3600 / 1000); } - oldCurrentLocation = currentPoint; } + oldCurrentLocation = currentPoint; speedAndBearing[0] = speed; speedAndBearing[1] = bearing; From 00b8dc27d1545cde52cdbafcb2c1a5d98da3559f Mon Sep 17 00:00:00 2001 From: xiaoyan-5800X Date: Tue, 13 Dec 2022 14:01:45 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= 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 b199dff..02c8ded 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 23 targetSdkVersion 30 - versionCode 36 - versionName "8.221207" + versionCode 37 + versionName "8.221213" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { 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 720779c..e73822a 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -3,8 +3,8 @@ 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 IPm = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网 - public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 - public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + public static final String IP1 = "http://dtxbmaps.navinfo.com/dtxb/test/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 60bc4a2569ea9196bf306f225970db7b808385b8 Mon Sep 17 00:00:00 2001 From: xiaoyan-5800X Date: Thu, 15 Dec 2022 14:59:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=8D=95=E6=8D=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../navinfo/outdoor/activity/AutoTakePictureActivity.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 02c8ded..58c1a2b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,8 +12,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 23 targetSdkVersion 30 - versionCode 37 - versionName "8.221213" + versionCode 38 + versionName "8.221214" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { 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 00f8df9..cf1ceb5 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java @@ -1431,7 +1431,10 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic * 开始记录位置信息 * */ private void startRecordLocation() { - handler.sendEmptyMessage(0x101); + // 只有以前不记录照片，此刻才需要发送新的消息开始拍摄 + if (!handler.hasMessages(0x101)) { + handler.sendEmptyMessage(0x101); + } } /** * 停止记录位置信息