xiaoyan159/NavinfoOutDoor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 自动匹配增加路径规划功能

Browse Source
This commit is contained in:
xiaoyan 2022-11-17 14:24:57 +08:00
parent 98829d9e9e
commit b2a03b8d8b
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/navinfo/outdoor/activity/AutoTakePictureActivity.java
View File

@ -877,7 +877,7 @@ public class AutoTakePictureActivity extends BaseActivity implements View.OnClic
// 转换geo // 转换geo
Geometry geometry1 = GeometryTools.createGeometry(Geohash.getInstance().decode(bean1.getGeo())); Geometry geometry1 = GeometryTools.createGeometry(Geohash.getInstance().decode(bean1.getGeo()));
Geometry geometry2 = GeometryTools.createGeometry(Geohash.getInstance().decode(bean2.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; return 1;
} else if (currentGeometry.distance(geometry1)<currentGeometry.distance(geometry2)) { } else if (currentGeometry.distance(geometry1)<currentGeometry.distance(geometry2)) {
return -1; return -1;

2
app/src/main/java/com/navinfo/outdoor/fragment/TreasureFragment.java
View File

@ -406,7 +406,7 @@ public class TreasureFragment extends BaseFragment implements View.OnClickListen
// 转换geo // 转换geo
Geometry geometry1 = GeometryTools.createGeometry(Geohash.getInstance().decode(bean1.getGeo())); Geometry geometry1 = GeometryTools.createGeometry(Geohash.getInstance().decode(bean1.getGeo()));
Geometry geometry2 = GeometryTools.createGeometry(Geohash.getInstance().decode(bean2.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; return 1;
} else if (currentGeometry.distance(geometry1)<currentGeometry.distance(geometry2)) { } else if (currentGeometry.distance(geometry1)<currentGeometry.distance(geometry2)) {
return -1; return -1;

4
app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java
View File

@ -3,8 +3,8 @@ package com.navinfo.outdoor.http;
public class HttpInterface { public class HttpInterface {
// public static final String IP = "http://172.23.138.133:9999/m4";//测试接口-IP // 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 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/test/m4";//测试接口-外网
public static final String IP1 = "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 USER_PATH = "/user/";//我的
public static final String MSG_LIST_PATH = "/msgList/";//发现 public static final String MSG_LIST_PATH = "/msgList/";//发现
public static final String USER_LOGIN_PATH = "/userlogin/";//登录 public static final String USER_LOGIN_PATH = "/userlogin/";//登录

12
app/src/main/java/com/navinfo/outdoor/util/NaviUtils.java
View File

@ -479,14 +479,14 @@ public class NaviUtils {
try { try {
// 自动开始导航 // 自动开始导航
if (Constant.currentNaviType == Constant.NAV_TYPE.CAR) { if (Constant.currentNaviType == Constant.NAV_TYPE.CAR) {
// ((TencentCarNaviManager)naviManager).startNavi(0); ((TencentCarNaviManager)naviManager).startNavi(0);
((TencentCarNaviManager)naviManager).startSimulateNavi(0); // ((TencentCarNaviManager)naviManager).startSimulateNavi(0);
} else if (Constant.currentNaviType == Constant.NAV_TYPE.RIDE) { } else if (Constant.currentNaviType == Constant.NAV_TYPE.RIDE) {
// ((TencentRideNaviManager)naviManager).startNavi(0); ((TencentRideNaviManager)naviManager).startNavi(0);
((TencentRideNaviManager)naviManager).startSimulateNavi(0); // ((TencentRideNaviManager)naviManager).startSimulateNavi(0);
} else { } else {
// ((TencentWalkNaviManager)naviManager).startNavi(0); ((TencentWalkNaviManager)naviManager).startNavi(0);
((TencentWalkNaviManager)naviManager).startSimulateNavi(0); // ((TencentWalkNaviManager)naviManager).startSimulateNavi(0);
} }
} catch (Exception e) { } catch (Exception e) {