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/DB/rtktb/RTKConfigUpdateWorker.kt | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt b/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt
index 1b235ae..cc5a890 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt
@@ -32,6 +32,7 @@
import safeluck.drive.evaluation.util.CThreadPoolExecutor
import safeluck.drive.evaluation.util.FileUtil
import java.io.IOException
+import java.net.URLDecoder
class RTKConfigUpdateWorker(context:Context, workerParams: WorkerParameters) :Worker(context, workerParams){
@@ -98,7 +99,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" ->{
@@ -110,6 +111,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 + "/"
+ applicationContext.getPackageName() + "/" + fileName)
CThreadPoolExecutor.runInBackground(Runnable {
@@ -130,9 +133,13 @@
val yard = gson.fromJson<HttpYardRsp>(str,HttpYardRsp::class.java)
if (yard.isResult){
if (yard.data !=null){
- mapInfoHead.version = yard.data.version
Log.i(TAG,"yard====")
+ mapInfoHead.version = yard.data.version
+ mapInfoHead.gps_moinitor_url = URLDecoder.decode(yard.data.gps_monitor_url,"UTF-8")
+ Log.i(PlatFormConstant.HTTPTAG,"gps="+mapInfoHead.gps_moinitor_url)
+
mapInfoHead.str = yard.data.map_json.name
+ mapInfoHead.arcgis_url = yard.data.map_url
ExamPlatformData.getInstance().setNewMapPath(Environment.getExternalStorageDirectory().absolutePath + "/"
+ applicationContext.getPackageName() + "/"+fileName)
CThreadPoolExecutor.runInBackground(Runnable{
@@ -150,8 +157,14 @@
if (car.isResult){
if (car.data !=null){
+ if (car.data.version != null){
+
mapInfoHead.version = car.data.version
- mapInfoHead.str = car.data.map_json.name
+ }
+ if (car.data.map_json!= null){
+ mapInfoHead.str = car.data.map_json.name
+ }
+
ExamPlatformData.getInstance().carModelPath = Environment.getExternalStorageDirectory().absolutePath + "/" +
applicationContext.getPackageName() + "/"+fileName
--
Gitblit v1.8.0