From 4483eb437ebf0a0212235e954a262fbe62b82789 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期二, 19 一月 2021 15:48:22 +0800
Subject: [PATCH] 修改结束灯光考试，发送负值，关闭所有灯光
---
app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java | 13 +++++-
app/src/main/assets/lightallanswers.json | 57 +++++++++++++---------------
2 files changed, 36 insertions(+), 34 deletions(-)
diff --git a/app/src/main/assets/lightallanswers.json b/app/src/main/assets/lightallanswers.json
index de5a303..bbfbe08 100644
--- a/app/src/main/assets/lightallanswers.json
+++ b/app/src/main/assets/lightallanswers.json
@@ -6,141 +6,136 @@
"answer": "寮�鍚ぇ鐏紝娉ㄦ剰鏄繎鍏�",
"choose":1
},
+
{
"id":1,
- "question_id":0,
- "answer": "寮�鍚ぇ鐏紝杩溿�佽繎鍏夌伅閮藉彲浠�",
- "choose":0
- },
- {
- "id":2,
"question_id":1,
"answer": "寮�鍚繙鍏夌伅",
"choose":1
},
{
- "id":3,
+ "id":2,
"question_id":2,
"answer": "寮�鍚繙鍏夌伅",
"choose":1
},
{
- "id":4,
+ "id":3,
"question_id":3,
"answer": "寮�鍚繎鍏夌伅",
"choose":1
},
{
- "id":5,
+ "id":4,
"question_id":4,
"answer": "寮�鍚繎鍏夌伅",
"choose":1
},
{
- "id":6,
+ "id":5,
"question_id":5,
"answer": "绀哄鐏�+鍗遍櫓璀︾ず鐏�",
"choose":1
},
{
- "id":7,
+ "id":6,
"question_id":5,
"answer": "寮�鍚嵄闄╄绀虹伅",
"choose":0
},
{
- "id":8,
+ "id":7,
"question_id":6,
"answer": "寮�鍚繎鍏夌伅",
"choose":1
},
{
- "id":9,
+ "id":8,
"question_id":7,
"answer": "澶х伅(杩戝厜鐏級+鍗遍櫓璀︾ず鐏�+闆剧伅",
"choose":1
},
{
- "id":10,
+ "id":9,
"question_id":7,
"answer": "灏忕伅(绀哄鐏級+鍗遍櫓璀︾ず鐏�+闆剧伅",
"choose":0
},
{
- "id":11,
+ "id":10,
"question_id":8,
"answer": "寮�鍚繎鍏夌伅",
"choose":1
},
{
- "id":12,
+ "id":11,
"question_id":9,
"answer": "鍙樻崲杩滆繎鍏夌伅锛屽畬鎴愭搷浣滃悗浠嶄负杩戝厜",
"choose":1
},
{
- "id":13,
+ "id":12,
"question_id":10,
+ "answer": "鍙樻崲杩滆繎鍏夌伅锛屽畬鎴愭搷浣滃悗浠嶄负杩戝厜",
+ "choose":1
+ },
+ {
+ "id":13,
+ "question_id":11,
"answer": "鍙樻崲杩滆繎鍏夌伅锛屽畬鎴愭搷浣滃悗浠嶄负杩戝厜",
"choose":1
},
{
"id":14,
"question_id":11,
- "answer": "鍙樻崲杩滆繎鍏夌伅锛屽畬鎴愭搷浣滃悗浠嶄负杩戝厜",
- "choose":1
- },
- {
- "id":15,
- "question_id":11,
"answer": "鍏堝紑宸﹁浆鍚戠伅锛屽悗鍙樻崲杩滆繎鍏夌伅",
"choose":0
},
{
- "id":16,
+ "id":15,
"question_id":12,
"answer": "寮�鍚皬鐏�(绀哄鐏級+鍗遍櫓璀︾ず鐏�",
"choose":1
},
{
- "id":17,
+ "id":16,
"question_id":13,
"answer": "寮�鍚皬鐏�(绀哄鐏級+宸﹁浆鍚戠伅",
"choose":1
},
{
- "id":18,
+ "id":17,
"question_id":13,
"answer": "寮�鍚繎鍏夌伅",
"choose":0
},
{
- "id":19,
+ "id":18,
"question_id":14,
"answer": "寮�鍚皬鐏�(绀哄鐏級+鍙宠浆鍚戠伅",
"choose":1
},
{
- "id":20,
+ "id":19,
"question_id":14,
"answer": "寮�鍚繎鍏夌伅",
"choose":0
},
{
- "id":21,
+ "id":20,
"question_id":15,
"answer": "寮�鍚繎鍏夌伅",
"choose":1
},
{
- "id":22,
+ "id":21,
"question_id":16,
"answer": "寮�鍚繎鍏夌伅",
"choose":1
},
{
- "id":23,
+ "id":22,
"question_id":16,
"answer": "鍙樻崲杩滆繎鍏夌伅锛屽畬鎴愭搷浣滃悗浠嶄负杩戝厜",
"choose":0
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 abfa37b..40dbf3e 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java
@@ -44,17 +44,24 @@
public QuestionBean(int i, String s) {
this.item =i;
this.tts = s;
- if (i>=100){
+ if (i==100){
}else{
if (process == null){
this.process = new ArrayList<>();
}
- this.process.add(-1);
+
if (solution == null){
this.solution = new ArrayList<>();
}
this.solution.add(-1);
+ this.solution.add(-2);
+ this.solution.add(-3);
+ this.solution.add(-4);
+ this.solution.add(-5);
+ this.solution.add(-6);
+ this.solution.add(-7);
+ this.solution.add(-8);
}
}
@@ -95,7 +102,7 @@
}else if (content.equalsIgnoreCase("寮�鍚繎鍏夌伅")){
solution.add(1);
}else if (content.contains("杩溿�佽繎鍏夌伅")){
- solution.add(1);
+ process.add(1);
solution.add(2);
}else if (content.contains("娉ㄦ剰鏄繎鍏�")){
solution.add(1);
--
Gitblit v1.8.0