From 3be3637ae5a3e763ba99c8f6a1bb0cb144b7647f Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 25 八月 2020 17:21:12 +0800
Subject: [PATCH] 查看地图改为web 新增gps_monitor_url
---
app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
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 ca4620d..ba565c5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
@@ -18,6 +18,7 @@
import retrofit2.Call
import retrofit2.Callback
import retrofit2.Response
+import retrofit2.http.Url
import safeluck.drive.evaluation.Constant
import safeluck.drive.evaluation.DB.WorkRoomDataBase
import safeluck.drive.evaluation.DB.rtktb.RTKConfig
@@ -33,6 +34,8 @@
import safeluck.drive.evaluation.worker.MCUUpgradeWorker
import java.io.IOException
import java.io.InputStreamReader
+import java.net.URL
+import java.net.URLDecoder
import java.nio.charset.Charset
/**
@@ -241,7 +244,7 @@
jsonObject1 = JSONObject(str)
val result = jsonObject1!!.getBoolean("result")
if (result) {
- var mapInfoHead: MapInfoHead = MapInfoHead("","", BaseDataUIBean.TYPE_.car)
+ var mapInfoHead: MapInfoHead = MapInfoHead("","", BaseDataUIBean.TYPE_.car,"","")
when(type){
"road" ->{
@@ -253,6 +256,8 @@
if (map.data.map_json.type.equals("road")) {
mapInfoHead.str = map.data.map_json.name
+ mapInfoHead.gps_moinitor_url = URLDecoder.decode( map.data.gps_monitor_url,"UTF-8")
+ mapInfoHead.arcgis_url = map.data.map_url
ExamPlatformData.getInstance().setNewRoadMapPath(Environment.getExternalStorageDirectory().absolutePath + "/"
+ app.getAppContext().getPackageName() + "/" + fileName)
CThreadPoolExecutor.runInBackground(Runnable {
@@ -274,11 +279,14 @@
if (yard.isResult){
if (yard.data !=null){
mapInfoHead.version = yard.data.version
+ mapInfoHead.gps_moinitor_url = URLDecoder.decode(yard.data.gps_monitor_url,"UTF-8")
+
mapInfoHead.str = yard.data.map_json.name
+ mapInfoHead.arcgis_url = yard.data.map_url
ExamPlatformData.getInstance().setNewMapPath(Environment.getExternalStorageDirectory().absolutePath + "/"
+ app.getAppContext().getPackageName() + "/"+fileName)
CThreadPoolExecutor.runInBackground(Runnable{
- MyLog.i(PlatFormConstant.HTTPTAG,"绉戜笁鍦哄湴鍦板浘淇濆瓨鎴愬姛")
+ MyLog.i(PlatFormConstant.HTTPTAG,"鍦哄湴鍦板浘淇濆瓨鎴愬姛")
str = gson.toJson(yard.data.map_json)
FileUtil.writeTxtFileToSD(app.getAppContext(),fileName,str,"")
sendMapInfo()
--
Gitblit v1.8.0