From fa5539f691ada017d50dd31fb0f441a04ba3a1d0 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期二, 10 三月 2020 15:21:48 +0800
Subject: [PATCH] 修改rtkconfig为空判断

---
 app/src/main/java/safeluck/drive/evaluation/MainActivity.java           |    1 
 app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java  |   19 +++++++++
 app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java |   56 ++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 0 deletions(-)

diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 8eac5e6..bcc5755 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -198,6 +198,7 @@
 
                 MyLog.i(TAG, "RTKConfig Changed: " + (rtkConfig != null ? rtkConfig.toString() : "null"));
                 mRTKConfig = rtkConfig;
+                if (rtkConfig != null)
                 ExamPlatformData.getInstance().setPhone(rtkConfig.getPhone());
                 synchronized (MainActivity.this){
                     if (onlySendOnceRTKConfig){
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
index d0b8154..81acc8d 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -12,7 +12,9 @@
 import com.anyun.exam.lib.MyLog;
 import com.anyun.exam.lib.util.Speaker;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Random;
 
 import safeluck.drive.evaluation.Constant;
@@ -37,6 +39,7 @@
     public static final int DEV_LOGIN = 6;
     private static HashMap<Integer,String> examPlatformStrs = new HashMap<>();
     private static HashMap<Integer,String> enter_exit_item_tts = new HashMap<>();
+    private static List<String> simulate_light_tips = new ArrayList<>();
     static {
         examPlatformStrs.put(TCP_DISCONNECT,"鏈繛鎺�");
         examPlatformStrs.put(TCP_CONNECTED,"宸茶繛鎺�");
@@ -56,6 +59,22 @@
         enter_exit_item_tts.put(3,"渚ф柟鍋滆溅");
         enter_exit_item_tts.put(4,"鏇茬嚎琛岄┒");
         enter_exit_item_tts.put(5,"鐩磋杞集");
+
+
+        simulate_light_tips.add("寮�鍚墠鐓х伅");
+        simulate_light_tips.add("寮�鍚墠鐓х伅");
+        simulate_light_tips.add("寮�鍚墠鐓х伅");
+        simulate_light_tips.add("寮�鍚墠鐓х伅");
+        simulate_light_tips.add("寮�鍚墠鐓х伅");
+        simulate_light_tips.add("寮�鍚墠鐓х伅");
+        simulate_light_tips.add("寮�鍚墠鐓х伅");
+        simulate_light_tips.add("寮�鍚墠鐓х伅");
+        simulate_light_tips.add("寮�鍚墠鐓х伅");
+        simulate_light_tips.add("寮�鍚墠鐓х伅");
+
+
+
+
     }
     private static final String WORK_PLATFORM_STATUS = " work_platform";
 
diff --git a/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java b/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java
new file mode 100644
index 0000000..eed0667
--- /dev/null
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java
@@ -0,0 +1,56 @@
+package safeluck.drive.evaluation.bean;
+
+import java.util.List;
+
+public class SimulateNightBean {
+
+    /**
+     * exam : 0
+     * question : [{"item":1,"tts":"鎵撳紑杞︾伅"},{"item":2,"tts":"閫氳繃浜鸿閬�"}]
+     */
+
+    private int exam;
+    private List<QuestionBean> question;
+
+    public int getExam() {
+        return exam;
+    }
+
+    public void setExam(int exam) {
+        this.exam = exam;
+    }
+
+    public List<QuestionBean> getQuestion() {
+        return question;
+    }
+
+    public void setQuestion(List<QuestionBean> question) {
+        this.question = question;
+    }
+
+    public static class QuestionBean {
+        /**
+         * item : 1
+         * tts : 鎵撳紑杞︾伅
+         */
+
+        private int item;
+        private String tts;
+
+        public int getItem() {
+            return item;
+        }
+
+        public void setItem(int item) {
+            this.item = item;
+        }
+
+        public String getTts() {
+            return tts;
+        }
+
+        public void setTts(String tts) {
+            this.tts = tts;
+        }
+    }
+}

--
Gitblit v1.8.0