From c32f79fc7ed1b6f14c5c2340fc96557f38279753 Mon Sep 17 00:00:00 2001
From: Admin <Dana_Lee1016@126.com>
Date: 星期一, 22 二月 2021 10:51:44 +0800
Subject: [PATCH] 不用拷贝giscar到本地了。改为从平台获取，保存至本地，然后进行读取
---
app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt | 8
app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragmentMMPK.java | 5
app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java | 41 +++
app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpGisCarRespBean.java | 538 +++++++++++++++++++++++++++++++++++++++++++++++++++++
app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java | 4
5 files changed, 584 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
index 8d62c10..feabb12 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragment.java
@@ -33,10 +33,14 @@
import com.esri.arcgisruntime.geometry.SpatialReference;
import com.esri.arcgisruntime.layers.ArcGISMapImageLayer;
import com.esri.arcgisruntime.layers.ArcGISTiledLayer;
+import com.esri.arcgisruntime.loadable.LoadStatus;
import com.esri.arcgisruntime.mapping.ArcGISMap;
+import com.esri.arcgisruntime.mapping.MobileMapPackage;
import com.esri.arcgisruntime.mapping.view.DefaultMapViewOnTouchListener;
import com.esri.arcgisruntime.mapping.view.Graphic;
import com.esri.arcgisruntime.mapping.view.GraphicsOverlay;
+import com.esri.arcgisruntime.mapping.view.MapScaleChangedEvent;
+import com.esri.arcgisruntime.mapping.view.MapScaleChangedListener;
import com.esri.arcgisruntime.mapping.view.MapView;
import com.esri.arcgisruntime.symbology.SimpleFillSymbol;
import com.esri.arcgisruntime.symbology.SimpleLineSymbol;
@@ -46,6 +50,7 @@
import org.json.JSONException;
import org.json.JSONObject;
+import java.io.File;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;
@@ -117,13 +122,18 @@
ExamStatus examStatus = (ExamStatus)obj;
if (examStatus.getMap_id()>-1){
if (examStatus.getEnter()==ENTER){
- MyLog.i(TAG,String.format("杩涘叆[%d] map",examStatus.getMap_id()));
double scale = mMapView.getMapScale();
- mMapView.setViewpointScaleAsync(scale * 0.2*0.2);
+ MyLog.i(TAG,String.format("杩涘叆[%d] map,scale=%f",examStatus.getMap_id(),scale));
+ mMapView.setViewpointScaleAsync(scale * 0.2);
+
+
+
}else{
- MyLog.i(TAG,String.format("閫�鍑篬%d] map",examStatus.getMap_id()));
double scale = mMapView.getMapScale();
- mMapView.setViewpointScaleAsync(scale * 5*5);
+ MyLog.i(TAG,String.format("閫�鍑篬%d] map,scale=%f",examStatus.getMap_id(),scale));
+
+ mMapView.setViewpointScaleAsync(scale * 5);
+
}
}
}
@@ -177,6 +187,12 @@
View view = inflater.inflate(R.layout.layout_arc_gis,container,false);
mMapView = view.findViewById(R.id.mapView);
+ mMapView.addMapScaleChangedListener(new MapScaleChangedListener() {
+ @Override
+ public void mapScaleChanged(MapScaleChangedEvent mapScaleChangedEvent) {
+ Log.i(TAG,"mapscaleChangelistenre");
+ }
+ });
view.findViewById(R.id.btn_change_map).setOnClickListener(this);
mSurfaceView = view.findViewById(R.id.surfaceview_arcgis);
@@ -258,6 +274,18 @@
addTrailheadsLayer();
+// url = Environment.getExternalStorageDirectory().getAbsolutePath()+ File.separator+_mActivity.getPackageName()+"/shoufei0220.mmpk";
+// Log.i(TAG,"url ========="+url);
+// final MobileMapPackage mobileMapPackage = new MobileMapPackage(url);
+// mobileMapPackage.loadAsync();
+// mobileMapPackage.addDoneLoadingListener(()->{
+// LoadStatus loadStatus = mobileMapPackage.getLoadStatus();
+// if (loadStatus==LoadStatus.LOADED){
+// List<ArcGISMap> mainArcGisMapL = mobileMapPackage.getMaps();
+// ArcGISMap mainArcGismapMMPK = mainArcGisMapL.get(0);
+// mMapView.setMap(mainArcGismapMMPK);
+// }
+// });
return view;
}
@@ -705,7 +733,7 @@
// create an empty map instance
ArcGISMap map = new ArcGISMap();
Log.i(TAG,String.format("map.getMiniScale=%f",map.getMinScale()));
- map.setMinScale(1000.0);
+ map.setMinScale(400.0);
// add map image layer as operational layer
map.getOperationalLayers().add(mapImageLayer);
mMapView.setMap(map);
@@ -769,8 +797,9 @@
}
private void readGisCar() {
- String carFilePath = Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+_mActivity.getPackageName()+"/lianfang_giscar.json";
+ String carFilePath = Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+_mActivity.getPackageName()+"/gisvehiclemodel.json";
if (TextUtils.isEmpty(carFilePath)){
+ Toast.makeText(_mActivity, "杞﹁締妯″瀷鏂囦欢涓嶅瓨鍦�", Toast.LENGTH_SHORT).show();
MyLog.i (TAG, "GISCar杞﹁締妯″瀷鏂囦欢涓嶅瓨鍦�");
return ;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragmentMMPK.java b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragmentMMPK.java
index 6e19331..29744f1 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragmentMMPK.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/ArcGisMapFragmentMMPK.java
@@ -173,7 +173,7 @@
- url = Environment.getExternalStorageDirectory().getAbsolutePath()+ File.separator+_mActivity.getPackageName()+"/lianfang.mmpk";
+ url = Environment.getExternalStorageDirectory().getAbsolutePath()+ File.separator+_mActivity.getPackageName()+"/shoufei0220.mmpk";
Log.i(TAG,"url ========="+url);
final MobileMapPackage mobileMapPackage = new MobileMapPackage(url);
mobileMapPackage.loadAsync();
@@ -332,9 +332,10 @@
}
private void readGisCar() {
- String carFilePath = Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+_mActivity.getPackageName()+"/lianfang_giscar.json";
+ String carFilePath = Environment.getExternalStorageDirectory().getAbsolutePath()+"/"+_mActivity.getPackageName()+"/gisvehiclemodel.json";
if (TextUtils.isEmpty(carFilePath)){
MyLog.i (TAG, "GISCar杞﹁締妯″瀷鏂囦欢涓嶅瓨鍦�");
+ Toast.makeText(_mActivity, "杞﹁締妯″瀷鏂囦欢涓嶅瓨鍦�", Toast.LENGTH_SHORT).show();
return ;
}
byte[] fileContentBytes= FileUtil.readFile(carFilePath);
diff --git a/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java b/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java
index 90c2ac0..a4334b9 100644
--- a/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java
+++ b/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java
@@ -3,6 +3,7 @@
import java.util.List;
public class HttpCarRespBean {
+
/**
* result : true
* data : {"server":"gps.safeluck.com","port":"3301","gps_monitor_url":"https%3A%2F%2Ftrainsim.aaej.cn%2F%23%2Fvisitor%2Fmonitor%3Fdevice_id%3D0314200100000004%26area_type%3Dcar","map_json":{"left_front_tire":[9,10],"main_ant":[428984.9367,3291974.6021],"type":"car","body":[0,1,2,3,4,5,6,7,8,13,14,15,16,17,18,19,20,21],"ground_height":229.8357,"version":"0.1","point":[428984.1653,3291977.6796,428983.7684,3291977.5547,428983.498,3291977.0243,428983.5552,3291976.6508,428983.8355,3291975.483,428984.0438,3291974.7034,428984.1558,3291974.1226,428984.5245,3291973.295,428984.8693,3291973.2598,428983.5944,3291976.6639,428983.769,3291976.6702,428984.203,3291974.1338,428984.342,3291974.1803,428985.23,3291973.3175,428985.6473,3291973.4636,428985.8995,3291973.6719,428985.8234,3291974.5267,428985.6107,3291975.3336,428985.4377,3291976.0995,428985.1876,3291977.0475,428984.9813,3291977.5092,428984.5666,3291977.7383,428985.1356,3291977.0333,428984.9657,3291976.9994,428985.785,3291974.5007,428985.6423,3291974.4559],"axial":[0,13],"ant_pitch":0.081,"ant_height":231.2434,"right_front_tire":[22,23],"right_rear_tire":[24,25],"name":"娑櫟浜ら�氶┚鏍�","left_rear_tire":[11,12]},"version":"0.1","pzh":"璞獷8000娴�"}
@@ -237,4 +238,7 @@
}
}
}
+
+
+
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpGisCarRespBean.java b/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpGisCarRespBean.java
new file mode 100644
index 0000000..19b5631
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpGisCarRespBean.java
@@ -0,0 +1,538 @@
+package safeluck.drive.evaluation.httpmodule;
+
+import java.util.List;
+
+public class HttpGisCarRespBean {
+ /**
+ * result : true
+ * data : {"server":"gps.safeluck.com","port":"3301","gps_monitor_url":"https%3A%2F%2Ftrainsim.aaej.cn%2F%23%2Fvisitor%2Fmonitor%3Fdevice_id%3D0314200100000003%26area_type%3Dcar","map_json":{"left_front_tire":[12,13],"main_ant":[642214.3436,3270761.9102],"right_rear_glass":[58,59,60,61],"body":[0,1,2,3,4,5,6,7,8,9,10,11,32,33,34,35,36,37,38,39,40,41,42,43],"ground_height":331.6199,"type":"car","version":"1.0","point":[642216.5511,3270759.543,642216.7239,3270759.7759,642216.8133,3270759.8769,642216.859,3270760.3094,642216.7995,3270760.4553,642216.5513,3270760.7819,642216.242,3270761.0874,642215.5468,3270761.8527,642214.7732,3270762.7061,642214.483,3270762.97,642214.1131,3270763.2124,642213.7448,3270763.0632,642216.5364,3270760.7594,642216.4056,3270760.6352,642214.763,3270762.684,642214.6482,3270762.5763,642216.0948,3270760.559,642216.2863,3270760.9176,642215.5665,3270761.3672,642215.3224,3270761.075,642215.8444,3270760.2702,642216.0948,3270760.559,642216.1878,3270761.022,642214.5299,3270762.782,642214.7092,3270762.266,642215.5793,3270761.43,642213.9578,3270762.621,642214.4689,3270762.846,642214.6577,3270762.255,642214.3621,3270762.0998,642214.242,3270762.0047,642214.3621,3270762.0098,642213.4524,3270762.8314,642213.2324,3270762.5872,642213.0537,3270762.2115,642213.3048,3270761.7942,642213.5453,3270761.5047,642214.2823,3270760.7212,642215.0634,3270759.9012,642215.346,3270759.5816,642215.6092,3270759.3543,642215.7336,3270759.2982,642216.2033,3270759.2972,642216.3468,3270759.4079,642215.3611,3270759.6032,642215.4909,3270759.7158,642213.5608,3270761.519,642213.6874,3270761.6509,642213.4249,3270761.767,642215.0934,3270759.996,642214.7549,3270760.717,642213.9469,3270761.587,642215.0584,3270760.8537,642214.8047,3270760.7012,642215.1958,3270759.8877,642215.6907,3270760.1429,642215.8444,3270760.2702,642216.0948,3270760.559,642214.1323,3270761.8943,642213.9566,3270761.6397,642213.3781,3270761.8166,642213.5721,3270762.2307,642214.3621,3270762.0998],"ant_pitch":0.602,"axial":[0,32],"ant_height":333.0715,"left_rear_glass":[26,27,28,29],"right_front_tire":[44,45],"right_rear_tire":[46,47],"right_front_glass":[52,53,54,55],"name":"棣栭椹炬牎鑱旇姵杞︽ā鍨�","left_rear_tire":[14,15],"left_front_glass":[16,17,18,19],"left_center_glass":[22,23,24,25],"right_center_glass":[48,49,50,51]},"version":"1.0","pzh":"璞獷2000娴�"}
+ */
+
+ private boolean result;
+ private DataBean data;
+
+ public boolean isResult() {
+ return result;
+ }
+
+ public void setResult(boolean result) {
+ this.result = result;
+ }
+
+ public DataBean getData() {
+ return data;
+ }
+
+ public void setData(DataBean data) {
+ this.data = data;
+ }
+
+ public static class DataBean {
+ /**
+ * server : gps.safeluck.com
+ * port : 3301
+ * gps_monitor_url : https%3A%2F%2Ftrainsim.aaej.cn%2F%23%2Fvisitor%2Fmonitor%3Fdevice_id%3D0314200100000003%26area_type%3Dcar
+ * map_json : {"left_front_tire":[12,13],"main_ant":[642214.3436,3270761.9102],"right_rear_glass":[58,59,60,61],"body":[0,1,2,3,4,5,6,7,8,9,10,11,32,33,34,35,36,37,38,39,40,41,42,43],"ground_height":331.6199,"type":"car","version":"1.0","point":[642216.5511,3270759.543,642216.7239,3270759.7759,642216.8133,3270759.8769,642216.859,3270760.3094,642216.7995,3270760.4553,642216.5513,3270760.7819,642216.242,3270761.0874,642215.5468,3270761.8527,642214.7732,3270762.7061,642214.483,3270762.97,642214.1131,3270763.2124,642213.7448,3270763.0632,642216.5364,3270760.7594,642216.4056,3270760.6352,642214.763,3270762.684,642214.6482,3270762.5763,642216.0948,3270760.559,642216.2863,3270760.9176,642215.5665,3270761.3672,642215.3224,3270761.075,642215.8444,3270760.2702,642216.0948,3270760.559,642216.1878,3270761.022,642214.5299,3270762.782,642214.7092,3270762.266,642215.5793,3270761.43,642213.9578,3270762.621,642214.4689,3270762.846,642214.6577,3270762.255,642214.3621,3270762.0998,642214.242,3270762.0047,642214.3621,3270762.0098,642213.4524,3270762.8314,642213.2324,3270762.5872,642213.0537,3270762.2115,642213.3048,3270761.7942,642213.5453,3270761.5047,642214.2823,3270760.7212,642215.0634,3270759.9012,642215.346,3270759.5816,642215.6092,3270759.3543,642215.7336,3270759.2982,642216.2033,3270759.2972,642216.3468,3270759.4079,642215.3611,3270759.6032,642215.4909,3270759.7158,642213.5608,3270761.519,642213.6874,3270761.6509,642213.4249,3270761.767,642215.0934,3270759.996,642214.7549,3270760.717,642213.9469,3270761.587,642215.0584,3270760.8537,642214.8047,3270760.7012,642215.1958,3270759.8877,642215.6907,3270760.1429,642215.8444,3270760.2702,642216.0948,3270760.559,642214.1323,3270761.8943,642213.9566,3270761.6397,642213.3781,3270761.8166,642213.5721,3270762.2307,642214.3621,3270762.0998],"ant_pitch":0.602,"axial":[0,32],"ant_height":333.0715,"left_rear_glass":[26,27,28,29],"right_front_tire":[44,45],"right_rear_tire":[46,47],"right_front_glass":[52,53,54,55],"name":"棣栭椹炬牎鑱旇姵杞︽ā鍨�","left_rear_tire":[14,15],"left_front_glass":[16,17,18,19],"left_center_glass":[22,23,24,25],"right_center_glass":[48,49,50,51]}
+ * version : 1.0
+ * pzh : 璞獷2000娴�
+ */
+
+ private String server;
+ private String port;
+ private String gps_monitor_url;
+ private MapJsonBean map_json;
+ private String version;
+ private String pzh;
+
+ public String getServer() {
+ return server;
+ }
+
+ public void setServer(String server) {
+ this.server = server;
+ }
+
+ public String getPort() {
+ return port;
+ }
+
+ public void setPort(String port) {
+ this.port = port;
+ }
+
+ public String getGps_monitor_url() {
+ return gps_monitor_url;
+ }
+
+ public void setGps_monitor_url(String gps_monitor_url) {
+ this.gps_monitor_url = gps_monitor_url;
+ }
+
+ public MapJsonBean getMap_json() {
+ return map_json;
+ }
+
+ public void setMap_json(MapJsonBean map_json) {
+ this.map_json = map_json;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getPzh() {
+ return pzh;
+ }
+
+ public void setPzh(String pzh) {
+ this.pzh = pzh;
+ }
+
+ public static class MapJsonBean {
+ /**
+ * left_front_tire : [12,13]
+ * main_ant : [642214.3436,3270761.9102]
+ * right_rear_glass : [58,59,60,61]
+ * body : [0,1,2,3,4,5,6,7,8,9,10,11,32,33,34,35,36,37,38,39,40,41,42,43]
+ * ground_height : 331.6199
+ * type : car
+ * version : 1.0
+ * point : [642216.5511,3270759.543,642216.7239,3270759.7759,642216.8133,3270759.8769,642216.859,3270760.3094,642216.7995,3270760.4553,642216.5513,3270760.7819,642216.242,3270761.0874,642215.5468,3270761.8527,642214.7732,3270762.7061,642214.483,3270762.97,642214.1131,3270763.2124,642213.7448,3270763.0632,642216.5364,3270760.7594,642216.4056,3270760.6352,642214.763,3270762.684,642214.6482,3270762.5763,642216.0948,3270760.559,642216.2863,3270760.9176,642215.5665,3270761.3672,642215.3224,3270761.075,642215.8444,3270760.2702,642216.0948,3270760.559,642216.1878,3270761.022,642214.5299,3270762.782,642214.7092,3270762.266,642215.5793,3270761.43,642213.9578,3270762.621,642214.4689,3270762.846,642214.6577,3270762.255,642214.3621,3270762.0998,642214.242,3270762.0047,642214.3621,3270762.0098,642213.4524,3270762.8314,642213.2324,3270762.5872,642213.0537,3270762.2115,642213.3048,3270761.7942,642213.5453,3270761.5047,642214.2823,3270760.7212,642215.0634,3270759.9012,642215.346,3270759.5816,642215.6092,3270759.3543,642215.7336,3270759.2982,642216.2033,3270759.2972,642216.3468,3270759.4079,642215.3611,3270759.6032,642215.4909,3270759.7158,642213.5608,3270761.519,642213.6874,3270761.6509,642213.4249,3270761.767,642215.0934,3270759.996,642214.7549,3270760.717,642213.9469,3270761.587,642215.0584,3270760.8537,642214.8047,3270760.7012,642215.1958,3270759.8877,642215.6907,3270760.1429,642215.8444,3270760.2702,642216.0948,3270760.559,642214.1323,3270761.8943,642213.9566,3270761.6397,642213.3781,3270761.8166,642213.5721,3270762.2307,642214.3621,3270762.0998]
+ * ant_pitch : 0.602
+ * axial : [0,32]
+ * ant_height : 333.0715
+ * left_rear_glass : [26,27,28,29]
+ * right_front_tire : [44,45]
+ * right_rear_tire : [46,47]
+ * right_front_glass : [52,53,54,55]
+ * name : 棣栭椹炬牎鑱旇姵杞︽ā鍨�
+ * left_rear_tire : [14,15]
+ * left_front_glass : [16,17,18,19]
+ * left_center_glass : [22,23,24,25]
+ * right_center_glass : [48,49,50,51]
+ */
+
+ private double ground_height;
+ private String type;
+ private String version;
+ private double ant_pitch;
+ private double ant_height;
+ private String name;
+ private List<Double> left_front_tire;
+ private List<Double> main_ant;
+ private List<Double> right_rear_glass;
+ private List<Double> body;
+ private List<Double> point;
+ private List<Double> axial;
+ private List<Double> left_rear_glass;
+ private List<Double> right_front_tire;
+ private List<Double> right_rear_tire;
+ private List<Double> right_front_glass;
+ private List<Double> left_rear_tire;
+ private List<Double> left_front_glass;
+ private List<Double> left_center_glass;
+ private List<Double> right_center_glass;
+
+ public double getGround_height() {
+ return ground_height;
+ }
+
+ public void setGround_height(double ground_height) {
+ this.ground_height = ground_height;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public double getAnt_pitch() {
+ return ant_pitch;
+ }
+
+ public void setAnt_pitch(double ant_pitch) {
+ this.ant_pitch = ant_pitch;
+ }
+
+ public double getAnt_height() {
+ return ant_height;
+ }
+
+ public void setAnt_height(double ant_height) {
+ this.ant_height = ant_height;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public List<Double> getLeft_front_tire() {
+ return left_front_tire;
+ }
+
+ public void setLeft_front_tire(List<Double> left_front_tire) {
+ this.left_front_tire = left_front_tire;
+ }
+
+ public List<Double> getMain_ant() {
+ return main_ant;
+ }
+
+ public void setMain_ant(List<Double> main_ant) {
+ this.main_ant = main_ant;
+ }
+
+ public List<Double> getRight_rear_glass() {
+ return right_rear_glass;
+ }
+
+ public void setRight_rear_glass(List<Double> right_rear_glass) {
+ this.right_rear_glass = right_rear_glass;
+ }
+
+ public List<Double> getBody() {
+ return body;
+ }
+
+ public void setBody(List<Double> body) {
+ this.body = body;
+ }
+
+ public List<Double> getPoint() {
+ return point;
+ }
+
+ public void setPoint(List<Double> point) {
+ this.point = point;
+ }
+
+ public List<Double> getAxial() {
+ return axial;
+ }
+
+ public void setAxial(List<Double> axial) {
+ this.axial = axial;
+ }
+
+ public List<Double> getLeft_rear_glass() {
+ return left_rear_glass;
+ }
+
+ public void setLeft_rear_glass(List<Double> left_rear_glass) {
+ this.left_rear_glass = left_rear_glass;
+ }
+
+ public List<Double> getRight_front_tire() {
+ return right_front_tire;
+ }
+
+ public void setRight_front_tire(List<Double> right_front_tire) {
+ this.right_front_tire = right_front_tire;
+ }
+
+ public List<Double> getRight_rear_tire() {
+ return right_rear_tire;
+ }
+
+ public void setRight_rear_tire(List<Double> right_rear_tire) {
+ this.right_rear_tire = right_rear_tire;
+ }
+
+ public List<Double> getRight_front_glass() {
+ return right_front_glass;
+ }
+
+ public void setRight_front_glass(List<Double> right_front_glass) {
+ this.right_front_glass = right_front_glass;
+ }
+
+ public List<Double> getLeft_rear_tire() {
+ return left_rear_tire;
+ }
+
+ public void setLeft_rear_tire(List<Double> left_rear_tire) {
+ this.left_rear_tire = left_rear_tire;
+ }
+
+ public List<Double> getLeft_front_glass() {
+ return left_front_glass;
+ }
+
+ public void setLeft_front_glass(List<Double> left_front_glass) {
+ this.left_front_glass = left_front_glass;
+ }
+
+ public List<Double> getLeft_center_glass() {
+ return left_center_glass;
+ }
+
+ public void setLeft_center_glass(List<Double> left_center_glass) {
+ this.left_center_glass = left_center_glass;
+ }
+
+ public List<Double> getRight_center_glass() {
+ return right_center_glass;
+ }
+
+ public void setRight_center_glass(List<Double> right_center_glass) {
+ this.right_center_glass = right_center_glass;
+ }
+ }
+ }
+// /**
+// * result : true
+// * data : {"server":"gps.safeluck.com","port":"3301","gps_monitor_url":"https%3A%2F%2Ftrainsim.aaej.cn%2F%23%2Fvisitor%2Fmonitor%3Fdevice_id%3D0314200100000004%26area_type%3Dcar","map_json":{"left_front_tire":[9,10],"main_ant":[428984.9367,3291974.6021],"type":"car","body":[0,1,2,3,4,5,6,7,8,13,14,15,16,17,18,19,20,21],"ground_height":229.8357,"version":"0.1","point":[428984.1653,3291977.6796,428983.7684,3291977.5547,428983.498,3291977.0243,428983.5552,3291976.6508,428983.8355,3291975.483,428984.0438,3291974.7034,428984.1558,3291974.1226,428984.5245,3291973.295,428984.8693,3291973.2598,428983.5944,3291976.6639,428983.769,3291976.6702,428984.203,3291974.1338,428984.342,3291974.1803,428985.23,3291973.3175,428985.6473,3291973.4636,428985.8995,3291973.6719,428985.8234,3291974.5267,428985.6107,3291975.3336,428985.4377,3291976.0995,428985.1876,3291977.0475,428984.9813,3291977.5092,428984.5666,3291977.7383,428985.1356,3291977.0333,428984.9657,3291976.9994,428985.785,3291974.5007,428985.6423,3291974.4559],"axial":[0,13],"ant_pitch":0.081,"ant_height":231.2434,"right_front_tire":[22,23],"right_rear_tire":[24,25],"name":"娑櫟浜ら�氶┚鏍�","left_rear_tire":[11,12]},"version":"0.1","pzh":"璞獷8000娴�"}
+// */
+//
+//
+// private boolean result;
+// private DataBean data;
+//
+// public boolean isResult() {
+// return result;
+// }
+//
+// public void setResult(boolean result) {
+// this.result = result;
+// }
+//
+// public DataBean getData() {
+// return data;
+// }
+//
+// public void setData(DataBean data) {
+// this.data = data;
+// }
+//
+// public static class DataBean {
+// /**
+// * server : gps.safeluck.com
+// * port : 3301
+// * map_json : {"axial":[0,12],"left_front_tire":[8,9],"main_ant":[-9151.5063,13030.5118],"right_front_tire":[20,21],"right_rear_tire":[22,23],"name":"绉戜簩鍦鸿�冭溅妯″瀷","left_rear_tire":[10,11],"type":"car","body":[0,1,2,3,4,5,6,7,12,13,14,15,16,17,18,19],"point":[-9149.6063,13033.0768,-9149.9978,13033.3124,-9150.3258,13033.3485,-9150.8341,13032.8985,-9151.7318,13031.6639,-9152.3573,13030.83,-9152.5214,13030.5639,-9152.602,13030.3105,-9150.8053,13032.8843,-9150.6537,13032.7602,-9152.3352,13030.8124,-9152.221,13030.7008,-9152.092,13029.7892,-9151.4638,13029.4333,-9151.2111,13029.568,-9150.9808,13029.8341,-9150.3546,13030.6796,-9149.458,13031.8642,-9149.1611,13032.4276,-9149.2827,13032.7653,-9149.4842,13031.8708,-9149.6176,13031.9937,-9151.0011,13029.8717,-9151.1367,13029.9878]}
+// * pzh : 璞獷8000娴�
+// */
+//
+// private String server;
+// private String port;
+// private String version;
+//
+// public String getGps_monitor_url() {
+// return gps_monitor_url;
+// }
+//
+// public void setGps_monitor_url(String gps_monitor_url) {
+// this.gps_monitor_url = gps_monitor_url;
+// }
+//
+// private String gps_monitor_url;
+// private MapJsonBean map_json;
+// private String pzh;
+//
+// public String getServer() {
+// return server;
+// }
+//
+// public String getVersion() {
+// return version;
+// }
+//
+// public void setVersion(String version) {
+// this.version = version;
+// }
+//
+//
+//
+// public void setServer(String server) {
+// this.server = server;
+// }
+//
+// public String getPort() {
+// return port;
+// }
+//
+// public void setPort(String port) {
+// this.port = port;
+// }
+//
+// public MapJsonBean getMap_json() {
+// return map_json;
+// }
+//
+// public void setMap_json(MapJsonBean map_json) {
+// this.map_json = map_json;
+// }
+//
+// public String getPzh() {
+// return pzh;
+// }
+//
+// public void setPzh(String pzh) {
+// this.pzh = pzh;
+// }
+//
+// public static class MapJsonBean {
+// /**
+// * axial : [0,12]
+// * left_front_tire : [8,9]
+// * main_ant : [-9151.5063,13030.5118]
+// * right_front_tire : [20,21]
+// * right_rear_tire : [22,23]
+// * name : 绉戜簩鍦鸿�冭溅妯″瀷
+// * left_rear_tire : [10,11]
+// * type : car
+// * body : [0,1,2,3,4,5,6,7,12,13,14,15,16,17,18,19]
+// * point : [-9149.6063,13033.0768,-9149.9978,13033.3124,-9150.3258,13033.3485,-9150.8341,13032.8985,-9151.7318,13031.6639,-9152.3573,13030.83,-9152.5214,13030.5639,-9152.602,13030.3105,-9150.8053,13032.8843,-9150.6537,13032.7602,-9152.3352,13030.8124,-9152.221,13030.7008,-9152.092,13029.7892,-9151.4638,13029.4333,-9151.2111,13029.568,-9150.9808,13029.8341,-9150.3546,13030.6796,-9149.458,13031.8642,-9149.1611,13032.4276,-9149.2827,13032.7653,-9149.4842,13031.8708,-9149.6176,13031.9937,-9151.0011,13029.8717,-9151.1367,13029.9878]
+// */
+//
+// private String name;
+// private String type;
+// private List<Integer> axial;
+// private List<Integer> left_front_tire;
+// private List<Double> main_ant;
+// private List<Integer> right_front_tire;
+// private List<Integer> right_rear_tire;
+// private List<Integer> left_rear_tire;
+// private List<Integer> body;
+// private List<Double> point;
+//
+// private double ground_height;
+// private String version;
+// private double ant_pitch;
+// private double ant_height;
+//
+// public String getName() {
+// return name;
+// }
+//
+// public void setName(String name) {
+// this.name = name;
+// }
+//
+// public String getType() {
+// return type;
+// }
+//
+// public void setType(String type) {
+// this.type = type;
+// }
+//
+// public List<Integer> getAxial() {
+// return axial;
+// }
+//
+//
+// public double getGround_height() {
+// return ground_height;
+// }
+//
+// public void setGround_height(double ground_height) {
+// this.ground_height = ground_height;
+// }
+//
+// public String getVersion() {
+// return version;
+// }
+//
+// public void setVersion(String version) {
+// this.version = version;
+// }
+//
+// public double getAnt_pitch() {
+// return ant_pitch;
+// }
+//
+// public void setAnt_pitch(double ant_pitch) {
+// this.ant_pitch = ant_pitch;
+// }
+//
+// public double getAnt_height() {
+// return ant_height;
+// }
+//
+// public void setAnt_height(double ant_height) {
+// this.ant_height = ant_height;
+// }
+// public void setAxial(List<Integer> axial) {
+// this.axial = axial;
+// }
+//
+// public List<Integer> getLeft_front_tire() {
+// return left_front_tire;
+// }
+//
+// public void setLeft_front_tire(List<Integer> left_front_tire) {
+// this.left_front_tire = left_front_tire;
+// }
+//
+// public List<Double> getMain_ant() {
+// return main_ant;
+// }
+//
+// public void setMain_ant(List<Double> main_ant) {
+// this.main_ant = main_ant;
+// }
+//
+// public List<Integer> getRight_front_tire() {
+// return right_front_tire;
+// }
+//
+// public void setRight_front_tire(List<Integer> right_front_tire) {
+// this.right_front_tire = right_front_tire;
+// }
+//
+// public List<Integer> getRight_rear_tire() {
+// return right_rear_tire;
+// }
+//
+// public void setRight_rear_tire(List<Integer> right_rear_tire) {
+// this.right_rear_tire = right_rear_tire;
+// }
+//
+// public List<Integer> getLeft_rear_tire() {
+// return left_rear_tire;
+// }
+//
+// public void setLeft_rear_tire(List<Integer> left_rear_tire) {
+// this.left_rear_tire = left_rear_tire;
+// }
+//
+// public List<Integer> getBody() {
+// return body;
+// }
+//
+// public void setBody(List<Integer> body) {
+// this.body = body;
+// }
+//
+// public List<Double> getPoint() {
+// return point;
+// }
+//
+// public void setPoint(List<Double> point) {
+// this.point = point;
+// }
+// }
+// }
+
+
+
+}
diff --git a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
index d3e5108..85633f0 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
@@ -24,10 +24,7 @@
import safeluck.drive.evaluation.app
import safeluck.drive.evaluation.bean.*
import safeluck.drive.evaluation.bean.SimulateNightBean.QuestionBean
-import safeluck.drive.evaluation.httpmodule.HttpCarRespBean
-import safeluck.drive.evaluation.httpmodule.HttpRequetBean
-import safeluck.drive.evaluation.httpmodule.HttpRoadMapRsp
-import safeluck.drive.evaluation.httpmodule.HttpYardRsp
+import safeluck.drive.evaluation.httpmodule.*
import safeluck.drive.evaluation.httpmodule.RetrofitCreator.Companion.getRestService
import safeluck.drive.evaluation.platformMessage.PlatFormConstant
import java.io.File
@@ -326,6 +323,7 @@
else ->{
mapInfoHead.type = BaseDataUIBean.TYPE_.car
val car = gson.fromJson<HttpCarRespBean>(str,HttpCarRespBean::class.java)
+ val gcar = gson.fromJson<HttpGisCarRespBean>(str, HttpGisCarRespBean::class.java)
// car.isResult = false
if (car.isResult){
if (car.data !=null){
@@ -337,8 +335,10 @@
// Log.i(TAG, "瑙ｆ瀽涔嬪悗鐨勮溅妯″瀷=$str")
CThreadPoolExecutor.runInBackground(Runnable{
str = gson.toJson(car.data.map_json)
+ var giscarStr = gson.toJson(gcar.data.map_json)
MyLog.i(PlatFormConstant.HTTPTAG,"杞﹁締妯″瀷淇濆瓨鎴愬姛")
FileUtil.writeTxtFileToSD(app.getAppContext(),fileName,str,"")
+ FileUtil.writeTxtFileToSD(app.getAppContext(),"gis"+fileName,giscarStr,"")
sendVehicleInfo()
})
--
Gitblit v1.8.0