From e0618ee7479520eef6bdaeac968437afd34265ed Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Mon, 25 Sep 2023 15:16:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=B8=BA=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83-=E5=BF=83?= =?UTF-8?q?=E6=A6=95=E8=87=AA=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 077a97f..473a068 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -2,8 +2,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 IP0 = "http://dtxbmaps.navinfo.com/dtxb/dev/m4";//开发接口-外网 - public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/test/m4";//测试接口-外网 + public static final String IP = "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 IP4 = "http://10.130.23.166/dtxb/jinshan/m4";//心榕给的测试地址 public static final String USER_PATH = "/user/";//我的 From 8a778538885bb73ea4aecff960d8675019813fc7 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Tue, 26 Sep 2023 13:48:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9poi=E5=BD=95?= =?UTF-8?q?=E5=83=8F=E5=92=8C=E9=81=93=E8=B7=AF=E4=BB=BB=E5=8A=A1=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E6=95=B0=E6=8D=AE=E6=97=B6=E8=AE=B0=E5=BD=95=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/outdoor/fragment/PoiVideoFragment.java | 8 ++++++++ .../java/com/navinfo/outdoor/fragment/RoadFragment.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java index a7beeaf..d630b47 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/PoiVideoFragment.java @@ -592,6 +592,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick httpParams.put("taskId", poiEntity.getTaskId()); httpParams.put("name", poiEntity.getName()); httpParams.put("address", poiEntity.getAddress()); + httpParams.put("geo", poiEntity.getGeoWkt()); // httpParams.put("workType", 1); httpParams.put("memo", poiEntity.getMemo()); httpParams.put("score", poiEntity.getScore()); @@ -659,6 +660,7 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick httpParams.put("taskId", poiEntity.getTaskId()); httpParams.put("name", poiEntity.getName()); httpParams.put("address", poiEntity.getAddress()); + httpParams.put("geo", poiEntity.getGeoWkt()); // httpParams.put("workType", 1); httpParams.put("memo", poiEntity.getMemo()); httpParams.put("score", poiEntity.getScore()); @@ -895,6 +897,12 @@ public class PoiVideoFragment extends BaseDrawerFragment implements View.OnClick poiEntity.setCreateTime(format); poiEntity.setChecked(false); poiEntity.setType(3); + if (latLng != null) { + String encode = Geohash.getInstance().encode(latLng.latitude, latLng.longitude); + poiEntity.setGeoWkt(encode); + poiEntity.setX(String.valueOf(latLng.longitude)); + poiEntity.setY(String.valueOf(latLng.latitude)); + } if (showPoiEntity.getId() != null) { List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); if (fileListByUUID != null&&!fileListByUUID.isEmpty()) { diff --git a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java index aea14dd..aba1661 100644 --- a/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java +++ b/app/src/main/java/com/navinfo/outdoor/fragment/RoadFragment.java @@ -697,6 +697,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList httpParams.put("taskId", poiEntity.getTaskId()); httpParams.put("name", poiEntity.getName()); httpParams.put("address", poiEntity.getAddress()); + httpParams.put("geo", poiEntity.getGeoWkt()); // httpParams.put("workType", 0); httpParams.put("memo", poiEntity.getMemo()); // 增加对应九天平台的参数 @@ -768,6 +769,7 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList httpParams.put("taskId", poiEntity.getTaskId()); httpParams.put("name", poiEntity.getName()); httpParams.put("address", poiEntity.getAddress()); + httpParams.put("geo", poiEntity.getGeoWkt()); // httpParams.put("workType", 0); httpParams.put("memo", poiEntity.getMemo()); // 增加对应九天平台的参数 @@ -1006,6 +1008,12 @@ public class RoadFragment extends BaseDrawerFragment implements View.OnClickList poiEntity.setType(4); poiEntity.setChecked(false); poiEntity.setExistence(existence); + if (latLng != null) { + String encode = Geohash.getInstance().encode(latLng.latitude, latLng.longitude); + poiEntity.setGeoWkt(encode); + poiEntity.setX(String.valueOf(latLng.longitude)); + poiEntity.setY(String.valueOf(latLng.latitude)); + } if (showPoiEntity.getId() != null) { List fileListByUUID = AWMp4ParserHelper.getInstance().getFileListByUUID(showPoiEntity.getId()); if (fileListByUUID != null&&!fileListByUUID.isEmpty()) {