From 9859fc6b5e4f873400fb1e7ae143f79fe32010b8 Mon Sep 17 00:00:00 2001 From: lizhanwei <Dana_Lee1016@126.com> Date: 星期六, 21 三月 2020 13:09:47 +0800 Subject: [PATCH] 提交路考地图增加触发线 --- app/src/main/java/safeluck/drive/evaluation/DB/exam_status/ExamStatusOutWorker.kt | 11 ++++------- 1 files changed, 4 insertions(+), 7 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 485910a..e1a173c 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 @@ -28,32 +28,29 @@ val TAG:String = "ExamStatusOutWorker" private var signalConfiglist: MutableList<SignalConfigRemote> = ArrayList() private val gson = Gson() - lateinit var simulateNightBean:SimulateNightBean + var simulateNightBean:SimulateNightBean=SimulateNightBean() private var singalConfigs :List<SingalConfig> = ArrayList() private val tempQs: MutableList<QuestionBean> = java.util.ArrayList() override fun doWork(): Result { val examType =WorkRoomDataBase.getWorkRoomDataBase(applicationContext).examStatusDao.startExamInt; - simulateNightBean = SimulateNightBean() simulateNightBean.setExam(0) val list = ExamPlatformData.getInstance().simulate_light_tips - simulateNightBean.setQuestion(list.subList(list.size - 2, list.size - 1)) - - - + tempQs.add(list[list.size-2])//鎻愮ず涓嬮潰灏嗚繘琛岀伅鍏夎�冭瘯 tempQs.add(list[0]) val a = Utils.getRandomInts(4, 12) for (i in a.indices) { tempQs.add(list[a[i]]) } - + tempQs.add(list[list.size-1])//鎻愮ず鐏厜鑰冭瘯缁撴潫 simulateNightBean.setQuestion(tempQs) AYSdk.getInstance().sendCmd(0x8012, gson.toJson(simulateNightBean)) MyLog.i(TAG,"鏌ュ埌鐨勮�冭瘯type="+examType) + ExamPlatformData.getInstance().examType = examType val data = Data.Builder().putInt(Constant.EXAM_STATUS_TYPE,examType).build() if (examType != safeluck.drive.evaluation.Constant.NONE_BEEN_START_EXAM) { try { -- Gitblit v1.8.0