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/MainActivity.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 0cda1f6..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();
}
}
@@ -165,7 +164,7 @@
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(R.layout.activity_main);
//鍒濆鍖杢ts
- ExamPlatformData.getInstance().initTTS(this);
+ ExamPlatformData.getInstance().initTTS(getApplicationContext());
// TODO
// 杩涜tcp杩炴帴
final String userId = "100002";
@@ -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