From 507242abe645ce3017118dfbcadaa7d0cfada053 Mon Sep 17 00:00:00 2001
From: lizhanwei <Dana_Lee1016@126.com>
Date: 星期四, 12 三月 2020 16:11:15 +0800
Subject: [PATCH] "联网考试“去掉由程序主动结束考试；可以一直考试；修改地图，可以一次性加载场考所有地图，然后车移动到某个项目地图，单独显示项目地图；修改map.json;信号配置，只在ExamStatusOutWorker里面收到ndk_start的时候进行发送；
---
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 35 +++++++++++++++++------------------
1 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 3987355..3eca6b0 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -104,7 +104,6 @@
if (msgCode == Constant.NDK_START){
MyLog.i(TAG,"NDK_start,鍙戦�丷TK閰嶇疆");
sendRtkConfigInfo();
- sendSignalConfigsToRemote();
sendMcuUprgrade();
}
}
@@ -214,23 +213,23 @@
});
- signalConfigViewModel = ViewModelProviders.of(this).get(SignalConfigViewModel.class);
- signalConfigViewModel.getSignalConfigs().observe(this, new Observer<List<SingalConfig>>() {
- @Override
- public void onChanged(List<SingalConfig> singalConfigs) {
- signalConfiglist.clear();
- MyLog.i(TAG, "淇″彿閰嶇疆鍙戠敓鍙樺寲");
-
- for (int i = 0; i < singalConfigs.size(); i++) {
- SignalConfigRemote signalConfigRemote = new SignalConfigRemote();
- signalConfigRemote.setFunc_id(i);
- signalConfigRemote.setGpio_num(singalConfigs.get(i).getIndex());
- signalConfigRemote.setLevel(singalConfigs.get(i).getHighLevel());
- signalConfiglist.add(signalConfigRemote);
- }
- sendSignalConfigsToRemote();
- }
- });
+// signalConfigViewModel = ViewModelProviders.of(this).get(SignalConfigViewModel.class);
+// signalConfigViewModel.getSignalConfigs().observe(this, new Observer<List<SingalConfig>>() {
+// @Override
+// public void onChanged(List<SingalConfig> singalConfigs) {
+// signalConfiglist.clear();
+// MyLog.i(TAG, "淇″彿閰嶇疆鍙戠敓鍙樺寲");
+//
+// for (int i = 0; i < singalConfigs.size(); i++) {
+// SignalConfigRemote signalConfigRemote = new SignalConfigRemote();
+// signalConfigRemote.setFunc_id(i);
+// signalConfigRemote.setGpio_num(singalConfigs.get(i).getIndex());
+// signalConfigRemote.setLevel(singalConfigs.get(i).getHighLevel());
+// signalConfiglist.add(signalConfigRemote);
+// }
+// sendSignalConfigsToRemote();
+// }
+// });
mPermissionsManager = new PermissionManager(this) {
@Override
--
Gitblit v1.8.0