From 91bb7b8a153546114e67847fd77423b1a63f1669 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期一, 22 二月 2021 13:33:28 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt | 8 ++++----
1 files changed, 4 insertions(+), 4 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 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