From c73a6318cb54e1bd16f6f1f2e432c2ed0ab4f594 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期一, 24 八月 2020 18:01:53 +0800
Subject: [PATCH] SharedPrefernce增加保存hashmap ；设置界面增加车辆模型、地图信息展示（名字、版本）和版本更新功能，点击之后进行http请求，请求完成后发送地图、车辆给移动站服务；设置界面信息展示增加TypeCount，展示地图简要信息
---
app/src/main/java/safeluck/drive/evaluation/DB/rtktb/RTKConfigUpdateWorker.kt | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 7501015..1b235ae 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
@@ -19,7 +19,9 @@
import safeluck.drive.evaluation.DB.Constant
import safeluck.drive.evaluation.DB.WorkRoomDataBase
import safeluck.drive.evaluation.app
+import safeluck.drive.evaluation.bean.BaseDataUIBean
import safeluck.drive.evaluation.bean.ExamPlatformData
+import safeluck.drive.evaluation.bean.MapInfoHead
import safeluck.drive.evaluation.httpmodule.HttpCarRespBean
import safeluck.drive.evaluation.httpmodule.HttpRequetBean
import safeluck.drive.evaluation.httpmodule.HttpRoadMapRsp
@@ -96,12 +98,18 @@
jsonObject1 = JSONObject(str)
val result = jsonObject1!!.getBoolean("result")
if (result) {
+ var mapInfoHead:MapInfoHead = MapInfoHead("","",BaseDataUIBean.TYPE_.car)
+
when(type){
"road" ->{
+ mapInfoHead.type = BaseDataUIBean.TYPE_.road
val map = gson.fromJson<HttpRoadMapRsp>(str, HttpRoadMapRsp::class.java)
if (map.isResult) {
if (map.data != null) {
+ mapInfoHead.version = map.data.version
+
if (map.data.map_json.type.equals("road")) {
+ mapInfoHead.str = map.data.map_json.name
ExamPlatformData.getInstance().setNewRoadMapPath(Environment.getExternalStorageDirectory().absolutePath + "/"
+ applicationContext.getPackageName() + "/" + fileName)
CThreadPoolExecutor.runInBackground(Runnable {
@@ -118,10 +126,13 @@
}}
"yard" ->{
+ mapInfoHead.type = BaseDataUIBean.TYPE_.yard
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.str = yard.data.map_json.name
ExamPlatformData.getInstance().setNewMapPath(Environment.getExternalStorageDirectory().absolutePath + "/"
+ applicationContext.getPackageName() + "/"+fileName)
CThreadPoolExecutor.runInBackground(Runnable{
@@ -134,10 +145,13 @@
}
}
else ->{
+ mapInfoHead.type = BaseDataUIBean.TYPE_.car
val car = gson.fromJson<HttpCarRespBean>(str,HttpCarRespBean::class.java)
if (car.isResult){
if (car.data !=null){
+ mapInfoHead.version = car.data.version
+ mapInfoHead.str = car.data.map_json.name
ExamPlatformData.getInstance().carModelPath = Environment.getExternalStorageDirectory().absolutePath + "/" +
applicationContext.getPackageName() + "/"+fileName
@@ -153,7 +167,7 @@
}
}
}
-
+ ExamPlatformData.getInstance().setMapHeadInfo(mapInfoHead)
} else {
// Toast.makeText(applicationContext, jsonObject1!!.getString("data"), Toast.LENGTH_SHORT).show()
}
--
Gitblit v1.8.0