From 5f41a352c2bc933b3595a5c7c63f7f67c8ee5280 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期三, 25 十一月 2020 15:42:46 +0800
Subject: [PATCH] 修改app类，把发送规则参数改为权限允许之后（7.0）；获取地图先要获取sn改到mainActvity里面，蓝牙连接且sn不为空，权限允许
---
app/src/main/java/safeluck/drive/evaluation/app.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/app.java b/app/src/main/java/safeluck/drive/evaluation/app.java
index cb30234..787ad71 100644
--- a/app/src/main/java/safeluck/drive/evaluation/app.java
+++ b/app/src/main/java/safeluck/drive/evaluation/app.java
@@ -68,6 +68,7 @@
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
import safeluck.drive.evaluation.util.DataInitKt;
import safeluck.drive.evaluation.util.FileUtil;
+import safeluck.drive.evaluation.util.SPUtils;
import safeluck.drive.evaluation.util.SystemUtil;
import safeluck.drive.evaluation.util.Utils;
@@ -134,7 +135,13 @@
// OneTimeWorkRequest mcuUpgradeWorker = OneTimeWorkRequest.from(MCUUpgradeWorker.class);
// WorkManager.getInstance(getApplicationContext()).beginWith(examStatausOutWorker).then(mcuUpgradeWorker).enqueue();
- sendJudgeArgs();
+ //鍙戦�佽摑鐗欓厤缃秷鎭�
+ String mac= (String) SPUtils.get(getAppContext(),SPUtils.BLUETOOTH_MAC,"");
+ if (!TextUtils.isEmpty(mac)){
+
+ AYSdk.getInstance().sendCmd(Constant.ID_MS_BLUETOOTH_NAME,mac);
+ }
+
});
@@ -524,9 +531,10 @@
return;
}
lastSn = sn;
- Data data = new Data.Builder().putString(safeluck.drive.evaluation.DB.Constant.RTK_CONFIG_UPDATE_JSON,sn).build();
- OneTimeWorkRequest rtkConfigUpdateWorker= new OneTimeWorkRequest.Builder(RTKConfigUpdateWorker.class).setInputData(data).build();
- WorkManager.getInstance(getAppContext()).enqueue(rtkConfigUpdateWorker);
+ ExamPlatformData.getInstance().setMcuSN(sn);
+// Data data = new Data.Builder().putString(safeluck.drive.evaluation.DB.Constant.RTK_CONFIG_UPDATE_JSON,sn).build();
+// OneTimeWorkRequest rtkConfigUpdateWorker= new OneTimeWorkRequest.Builder(RTKConfigUpdateWorker.class).setInputData(data).build();
+// WorkManager.getInstance(getAppContext()).enqueue(rtkConfigUpdateWorker);
}
CEventCenter.dispatchEvent(Constant.BIND_MCUINFO_TOPIC,cmd,0,json);
break;
--
Gitblit v1.8.0