lizhanwei
2020-03-10 fa5539f691ada017d50dd31fb0f441a04ba3a1d0
修改rtkconfig为空判断
2个文件已修改
1个文件已添加
76 ■■■■■ 已修改文件
app/src/main/java/safeluck/drive/evaluation/MainActivity.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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){
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";
app/src/main/java/safeluck/drive/evaluation/bean/SimulateNightBean.java
New file
@@ -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;
        }
    }
}