From 70174da77a07dfa477dd3ff33077965edc09ff03 Mon Sep 17 00:00:00 2001
From: yy1717 <fctom1215@outlook.com>
Date: 星期四, 23 七月 2020 10:15:06 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/endian11/DriveJudge
---
app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
index dd422ce..e2f6007 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt
@@ -52,7 +52,7 @@
}
tempQs.add(list[list.size-1])//鎻愮ず鐏厜鑰冭瘯缁撴潫
simulateNightBean.setQuestion(tempQs)
- AYSdk.getInstance().sendCmd(0x8012, gson.toJson(simulateNightBean))
+
if (inputData.getInt(safeluck.drive.evaluation.Constant.NEED_MAPS_CAR,0)==1){
sendMapInfo()
sendVehicleInfo()
@@ -65,7 +65,7 @@
var rtk = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).rtkConfigDao._getRtkConfig()
if (rtk == null){
try {
- MyLog.i("璇绘枃浠跺彂閫丷TK閰嶇疆")
+ MyLog.i(TAG,"璇绘枃浠跺彂閫丷TK閰嶇疆")
val inputStream = applicationContext.assets.open(safeluck.drive.evaluation.Constant.RTK_CONFIG_JSON)
val inputStreamReader = InputStreamReader(inputStream)
val jsonReader = JsonReader(inputStreamReader)
@@ -80,9 +80,11 @@
}
sendRtkConfigInfo(rtk)
+ MyLog.i(TAG,"寮�濮嬪彂閫佺伅鍏�,鑰冭瘯椤瑰叡鏈�"+simulateNightBean.question.size)
+ AYSdk.getInstance().sendCmd(0x8012, gson.toJson(simulateNightBean))
singalConfigs = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).signalConfigDao._getSignalConfigs()
if (singalConfigs ==null){
- MyLog.i("璇绘枃浠跺彂閫佷俊鍙烽厤缃�")
+ MyLog.i(TAG,"璇绘枃浠跺彂閫佷俊鍙烽厤缃�")
try {
val inputStream = applicationContext.assets.open("signal_config_file.json")
val inputStreamReader = InputStreamReader(inputStream)
@@ -133,7 +135,7 @@
private fun sendSignalConfigsToRemote(indexs: List<Int>) {
if (signalConfiglist.size > 0) {
if (listContainsSameValue(indexs)) {
- Log.i(TAG, "sendSignalConfigsToRemote: 鏈夌浉鍚岀殑index锛屼笉鑳藉彂閫�" + gson.toJson(signalConfiglist))
+ MyLog.i(TAG, "sendSignalConfigsToRemote: 鏈夌浉鍚岀殑index锛屼笉鑳藉彂閫�" + gson.toJson(signalConfiglist))
} else {
AYSdk.getInstance().sendCmd(safeluck.drive.evaluation.Constant.SEND_CONFIG_SIGNAL, gson.toJson(signalConfiglist))
}
--
Gitblit v1.8.0