endian11
2021-01-19 4483eb437ebf0a0212235e954a262fbe62b82789
修改结束灯光考试,发送负值,关闭所有灯光
2个文件已修改
70 ■■■■ 已修改文件
app/src/main/assets/lightallanswers.json 57 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
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);