From b2a03b8d8bb1f85c904416b773cd93fb4272728e Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Thu, 17 Nov 2022 14:24:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=8A=A8=E5=8C=B9=E9=85=8D?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=AF=E5=BE=84=E8=A7=84=E5=88=92=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../outdoor/activity/AutoTakePictureActivity.java    |  2 +-
 .../navinfo/outdoor/fragment/TreasureFragment.java   |  2 +-
 .../java/com/navinfo/outdoor/http/HttpInterface.java |  4 ++--
 .../java/com/navinfo/outdoor/util/NaviUtils.java     | 12 ++++++------
 4 files changed, 10 insertions(+), 10 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 112d4eb..68ccb3c 100644
--- a/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
+++ b/app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
@@ -877,7 +877,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
                                             // 转换geo
                                             Geometry geometry1 = GeometryTools.createGeometry(Geohash.getInstance().decode(bean1.getGeo()));
                                             Geometry geometry2 = GeometryTools.createGeometry(Geohash.getInstance().decode(bean2.getGeo()));
-                                            if (currentGeometry.distance(geometry1)<currentGeometry.distance(geometry2)) {
+                                            if (currentGeometry.distance(geometry1)>currentGeometry.distance(geometry2)) {
                                                 return 1;
                                             } else if (currentGeometry.distance(geometry1)<currentGeometry.distance(geometry2)) {
                                                 return -1;
diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
index d23ddce..67be0da 100644
--- a/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
+++ b/app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
@@ -406,7 +406,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
             // 转换geo
             Geometry geometry1 = GeometryTools.createGeometry(Geohash.getInstance().decode(bean1.getGeo()));
             Geometry geometry2 = GeometryTools.createGeometry(Geohash.getInstance().decode(bean2.getGeo()));
-            if (currentGeometry.distance(geometry1)<currentGeometry.distance(geometry2)) {
+            if (currentGeometry.distance(geometry1)>currentGeometry.distance(geometry2)) {
                 return 1;
             } else if (currentGeometry.distance(geometry1)<currentGeometry.distance(geometry2)) {
                 return -1;
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/";//登录
diff --git a/app/src/main/java/com/navinfo/outdoor/util/NaviUtils.java b/app/src/main/java/com/navinfo/outdoor/util/NaviUtils.java
index 4a7741a..f5af4b4 100644
--- a/app/src/main/java/com/navinfo/outdoor/util/NaviUtils.java
+++ b/app/src/main/java/com/navinfo/outdoor/util/NaviUtils.java
@@ -479,14 +479,14 @@ public class NaviUtils {
             try {
                 // 自动开始导航
                 if (Constant.currentNaviType == Constant.NAV_TYPE.CAR) {
-//                    ((TencentCarNaviManager)naviManager).startNavi(0);
-                    ((TencentCarNaviManager)naviManager).startSimulateNavi(0);
+                    ((TencentCarNaviManager)naviManager).startNavi(0);
+//                    ((TencentCarNaviManager)naviManager).startSimulateNavi(0);
                 } else if (Constant.currentNaviType == Constant.NAV_TYPE.RIDE) {
-//                    ((TencentRideNaviManager)naviManager).startNavi(0);
-                    ((TencentRideNaviManager)naviManager).startSimulateNavi(0);
+                    ((TencentRideNaviManager)naviManager).startNavi(0);
+//                    ((TencentRideNaviManager)naviManager).startSimulateNavi(0);
                 } else {
-//                    ((TencentWalkNaviManager)naviManager).startNavi(0);
-                    ((TencentWalkNaviManager)naviManager).startSimulateNavi(0);
+                    ((TencentWalkNaviManager)naviManager).startNavi(0);
+//                    ((TencentWalkNaviManager)naviManager).startSimulateNavi(0);
                 }
             } catch (Exception e) {