diff --git a/app/build.gradle b/app/build.gradle index 7707216..550a867 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.navinfo.outdoor" minSdkVersion 22 targetSdkVersion 30 - versionCode 14 - versionName "8.220308" + versionCode 16 + versionName "8.220310" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } lintOptions { diff --git a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java index 76fd80c..678397e 100644 --- a/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java +++ b/app/src/main/java/com/navinfo/outdoor/activity/PicturesActivity.java @@ -75,6 +75,8 @@ import com.tencent.tencentmap.mapsdk.maps.model.PolylineOptions; import com.umeng.commonsdk.internal.crash.UMCrashManager; import com.umeng.umcrash.UMCrash; import com.vividsolutions.jts.geom.Geometry; +import com.vividsolutions.jts.geom.LineString; +import com.vividsolutions.jts.geom.MultiLineString; import com.wanghong.webpnative.WebPNative; import org.greenrobot.eventbus.EventBus; @@ -452,18 +454,27 @@ public class PicturesActivity extends BaseActivity implements View.OnClickListen private void initLine() { if (geoWkt != null) { + List lineStringList = new ArrayList<>(); String geo = Geohash.getInstance().decode(geoWkt); Geometry geometry = GeometryTools.createGeometry(geo); - if (geometry.getGeometryType().equals("LineString")) {//线 - BitmapDescriptor bitmapLine = null; - if (type != 0) { - if (type == 3) {//poi录像 - bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows); - } else if (type == 4) {//道路录像 - bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows); - } + if ("MultiLineString".equals(geometry.getGeometryType())) { + MultiLineString multiLineString = (MultiLineString) geometry; + for (int i = 0; i < multiLineString.getNumGeometries(); i++) { + lineStringList.add((LineString) multiLineString.getGeometryN(i)); } - List latLineString = GeometryTools.getLatLags(geo); + } else { + lineStringList.add((LineString) geometry); + } + BitmapDescriptor bitmapLine = null; + if (type != 0) { + if (type == 3) {//poi录像 + bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.road_arrows); + } else if (type == 4) {//道路录像 + bitmapLine = BitmapDescriptorFactory.fromResource(R.drawable.poi_video_arrows); + } + } + for (LineString lineString: lineStringList) { + List latLineString = GeometryTools.getLatLags(lineString.toString()); assert latLineString != null; startLatLine = latLineString.get(0); endLatLine = latLineString.get(latLineString.size() - 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 aa3af86..f55f7f9 100644 --- a/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java +++ b/app/src/main/java/com/navinfo/outdoor/http/HttpInterface.java @@ -1,8 +1,8 @@ package com.navinfo.outdoor.http; public class HttpInterface { - public static final String IP1 = "http://172.23.139.127:9999/m4";//测试接口 - public static final String IP = "http://dtxbmaps.navinfo.com/dtxb/m4";//正式接口 + public static final String IP = "http://172.23.139.129:9999/m4";//测试接口 + public static final String IP1 = "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/";//登录