From c125fc0a5ee47ef32db587899d972491231167ee Mon Sep 17 00:00:00 2001 From: yy1717 <fctom1215@outlook.com> Date: 星期四, 12 三月 2020 17:40:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) 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 69cc989..0b425f3 100644 --- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java +++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java @@ -42,9 +42,9 @@ private static List<SimulateNightBean.QuestionBean> simulate_light_tips = new ArrayList<>(); static { examPlatformStrs.put(TCP_DISCONNECT,"鏈繛鎺�"); - examPlatformStrs.put(TCP_CONNECTED,"宸茶繛鎺�"); + examPlatformStrs.put(TCP_CONNECTED,"鏈櫥褰�"); examPlatformStrs.put(DEV_NOT_REGISTERED,"鏈敞鍐�"); - examPlatformStrs.put(DEV_REGISTERED,"宸叉敞鍐�"); + examPlatformStrs.put(DEV_REGISTERED,"鏈櫥褰�"); examPlatformStrs.put(DEV_NOT_LOGIN,"鏈櫥褰�"); examPlatformStrs.put(DEV_LOGIN,"宸茬櫥褰�"); @@ -69,7 +69,8 @@ simulate_light_tips.add(new SimulateNightBean.QuestionBean(6,"闆惧ぉ琛岄┒")); simulate_light_tips.add(new SimulateNightBean.QuestionBean(7,"鎷辨ˉ銆佷汉琛岄亾")); simulate_light_tips.add(new SimulateNightBean.QuestionBean(8,"澶滈棿鍦ㄩ亾璺笂鍙戠敓鏁呴殰锛屽Θ纰嶄氦閫氬張闅句互绉诲姩")); - simulate_light_tips.add(new SimulateNightBean.QuestionBean(9," 澶滈棿閫氳繃鎬ュ集銆佸潯璺�佹嫳妗ャ�佷汉琛屾í閬撱�佹垨鑰呮病鏈変氦閫氫俊鍙风伅鎺у埗鐨勮矾鍙�")); + //銆佹嫳妗ャ�佷汉琛屾í閬撱�佹垨鑰呮病鏈変氦閫氫俊鍙风伅鎺у埗鐨勮矾鍙� + simulate_light_tips.add(new SimulateNightBean.QuestionBean(9," 澶滈棿閫氳繃鎬ュ集銆佸潯璺�")); simulate_light_tips.add(new SimulateNightBean.QuestionBean(10,"娌℃湁浜ら�氭帶鍒剁伅涔嬭矾鍙�")); simulate_light_tips.add(new SimulateNightBean.QuestionBean(11,"涓存椂鍋滆溅")); simulate_light_tips.add(new SimulateNightBean.QuestionBean(12,"瓒呰溅")); -- Gitblit v1.8.0