From b2fe9c4f073523284c671bf8895a8412cd269518 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 19 一月 2021 15:06:34 +0800
Subject: [PATCH] 完成灯光发送
---
app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 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 0998d35..ea06495 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
@@ -23,6 +23,7 @@
import safeluck.drive.evaluation.DB.signalConfigdb.SingalConfig
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
@@ -78,19 +79,39 @@
val examType = ExamPlatformData.getInstance().examType
simulateNightBean.setExam(0)
- val list = ExamPlatformData.getInstance().simulate_light_tips
+ tempQs.clear()
+ val list = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).lightUseQuestionsDao.lightUseQuestionsNoLive()
+ Log.i("AYJiaKao",list.size.toString())
+ tempQs.add(QuestionBean(100, "涓嬮潰灏嗚繘琛屾ā鎷熷闂磋椹跺満鏅伅鍏変娇鐢ㄧ殑鑰冭瘯锛岃鎸夎闊虫寚浠ゅ湪5绉掑唴鍋氬嚭鐩稿簲鐨勭伅鍏夋搷浣�"))//鎻愮ず涓嬮潰灏嗚繘琛岀伅鍏夎�冭瘯
- tempQs.add(list[list.size-2])//鎻愮ず涓嬮潰灏嗚繘琛岀伅鍏夎�冭瘯
- tempQs.add(list[0])
- val a = Utils.getRandomInts(4, 10)
- for (i in a.indices) {
- tempQs.add(list[a[i]])
+ if (list.size>5){
+ var questbean = QuestionBean(list[0].id,list[0].question)
+ questbean.parseSolutionAndProcess(list[0].answer)
+ tempQs.add(questbean)
+ val a = Utils.getRandomInts(4, list.size)
+ for (i in a.indices) {
+ var te = list[a[i]]
+ Log.i("AYJiaKao",te.toString())
+ var questbean = QuestionBean(te.id,te.question)
+ questbean.parseSolutionAndProcess(te.answer)
+ tempQs.add(questbean)
+
+ }
+ }else{
+ for (i in list.indices){
+
+ var questbean = QuestionBean(list[i].id,list[i].question)
+ questbean.parseSolutionAndProcess(list[i].answer)
+ tempQs.add(questbean)
}
- tempQs.add(list[list.size-1])//鎻愮ず鐏厜鑰冭瘯缁撴潫
+ }
+
+ tempQs.add(QuestionBean(101, "妯℃嫙澶滈棿鑰冭瘯瀹屾垚璇峰叧闂墍鏈夌伅鍏夛紝璇疯捣姝ョ户缁畬鎴愯�冭瘯"))//鎻愮ず鐏厜鑰冭瘯缁撴潫
simulateNightBean.setQuestion(tempQs)
MyLog.i("寮�濮嬪彂閫佺伅鍏�,鑰冭瘯椤瑰叡鏈�"+simulateNightBean.question.size)
- AYSdk.getInstance().sendCmd(0x8012, gson.toJson(simulateNightBean))
+ MyLog.i("寮�濮嬪彂閫佺伅鍏�,gson="+gson.toJson(simulateNightBean))
+// AYSdk.getInstance().sendCmd(0x8012, gson.toJson(simulateNightBean))
//鍙戦�佽�冭瘯鐘舵��
MyLog.i("鏌ュ埌鐨勮�冭瘯type=$examType")
--
Gitblit v1.8.0