From d03184f15cd0b8ae073a33f964915b120f2eb7a1 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 19 一月 2021 16:21:19 +0800
Subject: [PATCH] 增加wrong_code
---
app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt | 6 ++
app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java | 10 ++++
app/src/main/assets/lightAlldefault.json | 51 +++++++++++++++++--------
app/src/main/java/safeluck/drive/evaluation/DB/lightdb/LightQuestion.java | 8 ++++
4 files changed, 56 insertions(+), 19 deletions(-)
diff --git a/app/src/main/assets/lightAlldefault.json b/app/src/main/assets/lightAlldefault.json
index 60a1bc0..80d7f43 100644
--- a/app/src/main/assets/lightAlldefault.json
+++ b/app/src/main/assets/lightAlldefault.json
@@ -4,91 +4,108 @@
"id":0,
"question": "璇峰紑鍚墠鐓х伅",
- "flag":1
+ "flag":1,
+ "wrong_code":41701
},
{
"id":1,
"question": "澶滈棿鍦ㄦ病鏈夎矾鐏紝鐓ф槑涓嶈壇鏉′欢涓嬭椹�",
- "flag":0
+ "flag":0,
+ "wrong_code":41709
},
{
"id":2,
"question": "璇峰皢鍓嶇収鐏彉鎹㈡垚杩滃厜",
- "flag":0
+ "flag":0,
+ "wrong_code":41701
},
{
"id":3,
"question": "澶滈棿鍦ㄧ獎璺笌闈炴満鍔ㄨ溅浼氳溅",
- "flag":0
+ "flag":0,
+ "wrong_code":41704
},
{
"id":4,
"question": "澶滈棿鍚屾柟鍚戣繎璺濈璺熻溅琛岄┒",
- "flag":0
+ "flag":0,
+ "wrong_code":41702
},
{
"id":5,
"question": "澶滈棿鍦ㄩ亾璺笂鍙戠敓鏁呴殰锛屽Θ纰嶄氦閫氬張闅句互绉诲姩",
- "flag":0
+ "flag":0,
+ "wrong_code":41701
},
{
"id":6,
"question": "澶滈棿鍦ㄧ獎妗ヤ笌闈炴満鍔ㄨ溅浼氳溅",
- "flag":0
+ "flag":0,
+ "wrong_code":41704
},
{
"id":7,
"question": "闆惧ぉ琛岄┒",
- "flag":0
+ "flag":0,
+ "wrong_code":41709
},
{
"id":8,
"question": "澶滈棿涓庢満鍔ㄨ溅浼氳溅",
- "flag":0
+ "flag":0,
+ "wrong_code":41704
},
{
"id":9,
"question": "澶滈棿閫氳繃娌℃湁浜ら�氫俊鍙风伅鎺у埗鐨勮矾鍙�",
- "flag":0
+ "flag":0,
+ "wrong_code":41703
},
{
"id":10,
"question": "澶滈棿閫氳繃鎬ュ集銆佸潯璺�",
- "flag":0
+ "flag":0,
+ "wrong_code":41703
},
{
"id":11,
"question": "澶滈棿瓒呰秺鍓嶆柟杞﹁締",
- "flag":0
+ "flag":0,
+ "wrong_code":41706
},
{
"id":12,
"question": "鍦ㄨ矾杈逛复鏃跺仠杞�",
- "flag":0
+ "flag":0,
+ "wrong_code":41708
},
{
"id":13,
"question": "澶滈棿璺彛宸﹁浆寮�",
- "flag":0
+ "flag":0,
+ "wrong_code":41701
},
{
"id":14,
"question": "澶滈棿璺彛鍙宠浆寮�",
- "flag":0
+ "flag":0,
+ "wrong_code":41701
},
{
"id":15,
"question": "澶滈棿鍦ㄧ収鏄庤壇濂界殑閬撹矾涓婅椹�",
- "flag":0
+ "flag":0,
+ "wrong_code":41701
},
{
"id":16,
"question": "澶滈棿鐩磋閫氳繃璺彛",
- "flag":0
+ "flag":0,
+ "wrong_code":41705
}
]
\ No newline at end of file
diff --git a/app/src/main/java/safeluck/drive/evaluation/DB/lightdb/LightQuestion.java b/app/src/main/java/safeluck/drive/evaluation/DB/lightdb/LightQuestion.java
index b28cc79..9dc2191 100644
--- a/app/src/main/java/safeluck/drive/evaluation/DB/lightdb/LightQuestion.java
+++ b/app/src/main/java/safeluck/drive/evaluation/DB/lightdb/LightQuestion.java
@@ -18,6 +18,8 @@
private int flag;
+ private int wrong_code;
+
public int getId() {
return id;
}
@@ -34,7 +36,13 @@
this.question = question;
}
+ public int getWrong_code() {
+ return wrong_code;
+ }
+ public void setWrong_code(int wrong_code) {
+ this.wrong_code = wrong_code;
+ }
public int getFlag() {
return flag;
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java b/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java
index 40dbf3e..1029eb8 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java
@@ -40,7 +40,7 @@
private String tts;
private List<Integer> process;
private List<Integer> solution;
-
+ private int wrong_code;
public QuestionBean(int i, String s) {
this.item =i;
this.tts = s;
@@ -66,6 +66,14 @@
}
+ public int getWrong_code() {
+ return wrong_code;
+ }
+
+ public void setWrong_code(int wrong_code) {
+ this.wrong_code = wrong_code;
+ }
+
public void parseSolutionAndProcess(String content){
solution.clear();
process.clear();
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 ea06495..f2fd3d4 100644
--- a/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
+++ b/app/src/main/java/safeluck/drive/evaluation/util/DataInit.kt
@@ -81,12 +81,14 @@
tempQs.clear()
val list = WorkRoomDataBase.getWorkRoomDataBase(applicationContext).lightUseQuestionsDao.lightUseQuestionsNoLive()
+ val listQuests=WorkRoomDataBase.getWorkRoomDataBase(applicationContext).lightAllQuestionsDao.allLightQuestions
Log.i("AYJiaKao",list.size.toString())
tempQs.add(QuestionBean(100, "涓嬮潰灏嗚繘琛屾ā鎷熷闂磋椹跺満鏅伅鍏変娇鐢ㄧ殑鑰冭瘯锛岃鎸夎闊虫寚浠ゅ湪5绉掑唴鍋氬嚭鐩稿簲鐨勭伅鍏夋搷浣�"))//鎻愮ず涓嬮潰灏嗚繘琛岀伅鍏夎�冭瘯
if (list.size>5){
var questbean = QuestionBean(list[0].id,list[0].question)
questbean.parseSolutionAndProcess(list[0].answer)
+ questbean.wrong_code = listQuests[list[0].id].wrong_code
tempQs.add(questbean)
val a = Utils.getRandomInts(4, list.size)
for (i in a.indices) {
@@ -94,6 +96,7 @@
Log.i("AYJiaKao",te.toString())
var questbean = QuestionBean(te.id,te.question)
questbean.parseSolutionAndProcess(te.answer)
+ questbean.wrong_code = listQuests[te.id].wrong_code
tempQs.add(questbean)
}
@@ -102,6 +105,7 @@
var questbean = QuestionBean(list[i].id,list[i].question)
questbean.parseSolutionAndProcess(list[i].answer)
+ questbean.wrong_code = listQuests[i].wrong_code
tempQs.add(questbean)
}
}
@@ -111,7 +115,7 @@
MyLog.i("寮�濮嬪彂閫佺伅鍏�,鑰冭瘯椤瑰叡鏈�"+simulateNightBean.question.size)
MyLog.i("寮�濮嬪彂閫佺伅鍏�,gson="+gson.toJson(simulateNightBean))
-// AYSdk.getInstance().sendCmd(0x8012, gson.toJson(simulateNightBean))
+ AYSdk.getInstance().sendCmd(0x8012, gson.toJson(simulateNightBean))
//鍙戦�佽�冭瘯鐘舵��
MyLog.i("鏌ュ埌鐨勮�冭瘯type=$examType")
--
Gitblit v1.8.0