From 95536f28dec044a7632115e02348399359ddfc23 Mon Sep 17 00:00:00 2001
From: Admin <Dana_Lee1016@126.com>
Date: 星期三, 14 四月 2021 11:00:32 +0800
Subject: [PATCH] 直接使用http下来的giscar
---
app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt | 5 ++
app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java | 2 +
app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java | 56 +++++++++++++++++++++++++++
3 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
index e08c3ec..f308d8e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
+++ b/app/src/main/java/safeluck/drive/evaluation/fragment/TrainFragment.java
@@ -847,8 +847,10 @@
}
private void startArcGisMapFragment(String url) {
+ if (TextUtils.isEmpty(url)){
url = "http://arcgis.aaej.cn/arcgis/rest/services/楂樺簷鏉戦椋為┚鏍＄浜屽湴鍥�/MapServer";
+ }
if (!TextUtils.isEmpty(url)) {
ArcGisMapFragment jiaXiaoFragment = findFragment(ArcGisMapFragment.class);
if (jiaXiaoFragment == null) {
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 a4334b9..3075ade 100644
--- a/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java
+++ b/app/src/main/java/safeluck/drive/evaluation/httpmodule/HttpCarRespBean.java
@@ -118,9 +118,63 @@
private List<Integer> right_rear_tire;
private List<Integer> left_rear_tire;
private List<Integer> body;
+ private List<Integer> left_front_glass;
+ private List<Integer> right_front_glass;
+ private List<Integer> left_center_glass;
+ private List<Integer> right_center_glass;
+ private List<Integer> left_rear_glass;
+ private List<Integer> right_rear_glass;
private List<Double> point;
- private double ground_height;
+ public List<Integer> getLeft_front_glass() {
+ return left_front_glass;
+ }
+
+ public void setLeft_front_glass(List<Integer> left_front_glass) {
+ this.left_front_glass = left_front_glass;
+ }
+
+ public List<Integer> getRight_front_glass() {
+ return right_front_glass;
+ }
+
+ public void setRight_front_glass(List<Integer> right_front_glass) {
+ this.right_front_glass = right_front_glass;
+ }
+
+ public List<Integer> getLeft_center_glass() {
+ return left_center_glass;
+ }
+
+ public void setLeft_center_glass(List<Integer> left_center_glass) {
+ this.left_center_glass = left_center_glass;
+ }
+
+ public List<Integer> getRight_center_glass() {
+ return right_center_glass;
+ }
+
+ public void setRight_center_glass(List<Integer> right_center_glass) {
+ this.right_center_glass = right_center_glass;
+ }
+
+ public List<Integer> getLeft_rear_glass() {
+ return left_rear_glass;
+ }
+
+ public void setLeft_rear_glass(List<Integer> left_rear_glass) {
+ this.left_rear_glass = left_rear_glass;
+ }
+
+ public List<Integer> getRight_rear_glass() {
+ return right_rear_glass;
+ }
+
+ public void setRight_rear_glass(List<Integer> right_rear_glass) {
+ this.right_rear_glass = right_rear_glass;
+ }
+
+ private double ground_height;
private String version;
private double ant_pitch;
private double ant_height;
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 1d0ceb8..cd5b4a2 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
@@ -307,7 +307,12 @@
mapInfoHead.gps_moinitor_url = URLDecoder.decode(yard.data.gps_monitor_url,"UTF-8")
mapInfoHead.str = yard.data.map_json.name
+ if(yard.data!=null && !TextUtils.isEmpty(yard.data.map_url)){
+
mapInfoHead.arcgis_url = yard.data.map_url
+ }else{
+ mapInfoHead.arcgis_url=""
+ }
ExamPlatformData.getInstance().setNewMapPath(Environment.getExternalStorageDirectory().absolutePath + "/"
+ app.getAppContext().getPackageName() + "/"+fileName)
CThreadPoolExecutor.runInBackground(Runnable{
--
Gitblit v1.8.0