From 524763aa48d11019112a8b1c61e03029817e5a85 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 09 四月 2020 11:41:47 +0800
Subject: [PATCH] 非训练模式和考试模式10s发一次0206消息
---
app/src/main/java/safeluck/drive/evaluation/app.java | 21 ++++++++++
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 15 ++++++-
app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java | 33 ++++------------
app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage8201.java | 2
app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java | 2
5 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index bbda144..bb630a5 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -25,6 +25,7 @@
import androidx.work.WorkManager;
import me.yokeyword.fragmentation.SupportActivity;
+import safeluck.drive.evaluation.DB.exam_status.ExamStatusViewModel;
import safeluck.drive.evaluation.DB.rtktb.RTKConfig;
import safeluck.drive.evaluation.DB.rtktb.RTKConfigViewModel;
import safeluck.drive.evaluation.DB.signalConfigdb.SignalConfigViewModel;
@@ -46,6 +47,9 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import safeluck.drive.evaluation.im.IMSClientBootstrap;
import safeluck.drive.evaluation.im.MessageProcessor;
@@ -58,6 +62,7 @@
import safeluck.drive.evaluation.util.SPUtils;
import safeluck.drive.evaluation.util.Utils;
import safeluck.drive.evaluation.viewmodels.ExamPlatformModel;
+import safeluck.drive.evaluation.viewmodels.TimeViewModel;
public class MainActivity extends SupportActivity implements IMSConnectStatusCallback {
@@ -69,7 +74,9 @@
private Gson gson = new Gson();
String[] PERMISSIONS = new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.CAMERA};
RTKConfigViewModel rtkConfigViewModel;
+ public ExamPlatformModel examPlatformModel;
+ private ScheduledExecutorService scheduledExecutorService = Executors.newSingleThreadScheduledExecutor();
private ICEventListener icEventListener = new ICEventListener() {
@Override
@@ -98,7 +105,6 @@
private List<SignalConfigRemote> signalConfiglist = new ArrayList<>();
-public ExamPlatformModel examPlatformModel;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -133,7 +139,12 @@
}
});
-
+ scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
+ @Override
+ public void run() {
+ ExamPlatformData.getInstance().setTimeArrive_10s(true);
+ }
+ },10,10, TimeUnit.SECONDS);
rtkConfigViewModel = ViewModelProviders.of(this).get(RTKConfigViewModel.class);
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index d2537bd..fc8f0ed 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -79,6 +79,7 @@
import safeluck.drive.evaluation.util.SPUtils;
import safeluck.drive.evaluation.util.SystemUtil;
import safeluck.drive.evaluation.util.Utils;
+import safeluck.drive.evaluation.viewmodels.TimeViewModel;
import safeluck.drive.evaluation.worker.MCUUpgradeWorker;
import safeluck.drive.evaluation.worker.TTSWorker;
@@ -438,7 +439,27 @@
}
jkMessage0206.attachInfo = attachInfo;
+ if (ExamPlatformData.getInstance().getTrainingMode()==ExamPlatformData.MODE_NONE){
+ Log.i(TAG,"闈炶缁冨拰鑰冭瘯");
+ //鍒ゆ柇10s鏃堕棿鏄惁鍒�
+ if (ExamPlatformData.getInstance().isTimeArrive_10s()){
+ Log.i(TAG,"闈炶缁冨拰鑰冭瘯10s鍒�");
+ //鍒颁簡 灏辫蛋涓嬮潰鍙戦��0206娑堟伅
+ MessageProcessor.getInstance().sendMessage(jkMessage0206);
+ //閲嶇疆鏍囪
+ ExamPlatformData.getInstance().setTimeArrive_10s(false);
+ }else{
+ //娌″埌锛屽氨涓嶈蛋涓嬮潰 涓嶅彂閫�0206锛岀洿鎺eturn
+ return;
+ }
+
+
+ }else{
MessageProcessor.getInstance().sendMessage(jkMessage0206);
+ }
+
+
+
} catch (JSONException e) {
e.printStackTrace();
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 02232d2..cbae843 100644
--- a/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
+++ b/app/src/main/java/safeluck/drive/evaluation/bean/ExamPlatformData.java
@@ -50,9 +50,13 @@
public static final int DEV_NOT_LOGIN = 5;
public static final int DEV_LOGIN = 6;
- private int trainingMode = 0;//鍗充笉鏄缁冩ā寮忎篃鏄�冭瘯妯″紡
+ private int trainingMode = 0;//鍗充笉鏄缁冩ā寮忎篃涓嶆槸鑰冭瘯妯″紡
public static final int EXAMING_MODE =1;
public static final int TRAINING_MODE =2;
+
+
+ //涓昏鏄负浜嗘帶鍒舵棦涓嶆槸鑰冭瘯妯″紡涔熶笉鏄缁冩ā寮忎笅 0206娑堟伅鐨勫彂閫侊紝10s涓�娆″彂閫�
+ private boolean timeArrive_10s = false;
private static HashMap<Integer,String> examPlatformStrs = new HashMap<>();
private List<Integer> sns =new ArrayList<>();//淇濆瓨鎵�鏈夊け璐ラ」鐩殑sn
@@ -314,31 +318,12 @@
return simulate_light_tips;
}
- public List<Integer> getSns() {
-// if (sns.size()<=0){
-// String snsstr = (String) SPUtils.get(app.getAppContext(),SPUtils.FAIL_PROJ_SNS,"");
-// if (!TextUtils.isEmpty(snsstr)){
-// String[] strings=snsstr.split("#");
-// for (int i = 0; i < strings.length; i++) {
-// Log.i(TAG, String.format("strings[%d]=%s",i,strings[i]));
-// if (!TextUtils.isEmpty(strings[i]))
-// sns.add(Integer.parseInt(strings[i]));
-// }
-// }
-// }
- return sns;
-
+ public boolean isTimeArrive_10s() {
+ return timeArrive_10s;
}
- public void addSn(int sn) {
-// stringBuffer.append("#"+String.valueOf(sn));
-// SPUtils.put(app.getAppContext(),SPUtils.FAIL_PROJ_SNS,stringBuffer.toString());
- this.sns.add(sn);
- }
-
- public void clearSns() {
-// SPUtils.clear(app.getAppContext());
- sns.clear();
+ public void setTimeArrive_10s(boolean timeArrive_10s) {
+ this.timeArrive_10s = timeArrive_10s;
}
public void setRTKPort(int port) {
diff --git a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
index 68acffa..801c873 100644
--- a/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
+++ b/app/src/main/java/safeluck/drive/evaluation/im/MessageProcessor.java
@@ -180,7 +180,7 @@
}
}else{
- //鑰冭瘯妯″紡涓嬪叏閮ㄩ兘鍙互鍙戦��
+ //鑰冭瘯妯″紡涓� 鍜屼粈涔堟ā寮忛兘涓嶆槸鐘舵�� 鍏ㄩ儴閮藉彲浠ュ彂閫�
return true;
}
diff --git a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage8201.java b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage8201.java
index 3b4c3d8..b75bdc3 100644
--- a/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage8201.java
+++ b/app/src/main/java/safeluck/drive/evaluation/platformMessage/JKMessage8201.java
@@ -15,7 +15,7 @@
@Ascii
public String name;
- //TODO Length(0) 琛ㄧず浠�涔堟剰鎬�
+
@Order(4)
@Length(0)
@Ascii
--
Gitblit v1.8.0