From 8ee5db35d4b70cd13ca31d3783f427208aa8c0a4 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期五, 04 十二月 2020 11:36:56 +0800
Subject: [PATCH] 重构发送初始数据 ，改在蓝牙连接状态之后发送初始数据和考试状态
---
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 53 ++++++++++++++---------------------------------------
1 files changed, 14 insertions(+), 39 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 3303434..9815907 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -37,6 +37,7 @@
import safeluck.drive.evaluation.DB.rtktb.RTKConfigUpdateWorker;
import safeluck.drive.evaluation.DB.rtktb.RTKConfigViewModel;
import safeluck.drive.evaluation.DB.signalConfigdb.SignalConfigViewModel;
+import safeluck.drive.evaluation.bean.AbsInitialData;
import safeluck.drive.evaluation.bean.ExamPlatformData;
import safeluck.drive.evaluation.bean.SignalConfigRemote;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
@@ -64,6 +65,7 @@
import safeluck.drive.evaluation.platformMessage.JKMessage0101;
import safeluck.drive.evaluation.platformMessage.PlatFormConstant;
import safeluck.drive.evaluation.util.CThreadPoolExecutor;
+import safeluck.drive.evaluation.util.DataInitKt;
import safeluck.drive.evaluation.util.FileUtil;
import safeluck.drive.evaluation.util.PermissionManager;
import safeluck.drive.evaluation.util.SPUtils;
@@ -130,12 +132,14 @@
break;
case 1:
des ="钃濈墮鎵撳紑";
+
break;
case 2:
des ="钃濈墮鏈繛鎺�";
break;
case 3:
- authMapViewmodel.setAuthValue(3);
+ //闇�瑕佸欢杩熷啀鍙戦�侊紝鍥犱负鍙戦�佽摑鐗欏凡杩炴帴鍦ㄥ墠锛屾敹鍒皊n鍦ㄥ悗锛屾墍浠ュ欢杩熷彂閫�3 锛屽彲浠ュ彇寰梥n
+ scheduledExecutorService.schedule(()->{ authMapViewmodel.setAuthValue(3);},1,TimeUnit.SECONDS);
des ="钃濈墮杩炴帴";
String mac = jsonObject.getString("bluetooth_addr");
SPUtils.put(getApplicationContext(),SPUtils.BLUETOOTH_MAC,mac);
@@ -222,10 +226,14 @@
if (integer.intValue() == Constant.BLUETOOTH_CONNECT){
MyLog.i(TAG,"Bluetooth connected锛宎uth permission and sn != null");
String sn = ExamPlatformData.getInstance().getMcuSN();
- MyLog.i(TAG,"鏉冮檺鍏佽锛岃幏寰楀埌鐨剆n="+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(getApplicationContext()).enqueue(rtkConfigUpdateWorker);
+ if (!TextUtils.isEmpty(sn)){
+
+ MyLog.i(TAG,"鏉冮檺鍏佽,钃濈墮宸茶繛鎺ワ紝鑾峰緱鍒扮殑sn="+sn);
+ AbsInitialData.getInstance().sendInitialData();
+ }else{
+ MyLog.i(TAG,"鏉冮檺鍏佽,钃濈墮宸茶繛鎺ワ紝鑾峰緱鍒扮殑sn=null,涓嶈兘鍙戦�佸垵濮嬫暟鎹�");
+ }
+
}
}
});
@@ -336,42 +344,9 @@
private void setSDAuthAndSendJudgeArg() {
ExamPlatformData.getInstance().setCanWriteSD(true);
//鍙app涓嶉攢姣侊紙閲嶅惎锛夊彧浼氳姹備竴娆★紝浣嗘槸纭繚PERMISSIONS鏈�鍚庝竴涓厓绱犳槸writeSD
- CThreadPoolExecutor.runInBackground(()->{
- MyLog.i(TAG,"鏉冮檺鍏佽锛屽紑濮嬪彂閫侀厤缃弬鏁�");
- sendJudgeArgs();
- });
+
}
- private void sendJudgeArgs() {
- FileUtil.createdirs(getApplicationContext());
- File dir = new File(Environment.getExternalStorageDirectory().getAbsolutePath()+File.separator+getPackageName());
-
- List<String> names = ExamPlatformData.getRulesettingFilesName();
- for (int i = 0; i < names.size(); i++) {
- File settFile = new File(dir,names.get(i));
- if (settFile.exists() ){
- Log.i(TAG,settFile.getName()+"瀛樺湪涓嶅鍒�");
- }else{
- Log.i(TAG,settFile.getName()+"涓嶅瓨鍦紝澶嶅埗...");
- FileUtil.copyAssertFileToSD(getApplicationContext(),names.get(i));
- }
- }
-
- if (dir.exists()){
- File[] files = dir.listFiles();
- for (int i = 0; i < files.length; i++) {
- Log.i(TAG,files[i].getName());
- if (names.contains(files[i].getName())){
-
-
- byte[] buffer = FileUtil.readFile(files[i].getAbsolutePath());
- AYSdk.getInstance().sendCmd(Constant.ID_judge_args,new String(buffer).trim());
- }else{
-
- }
- }
- }
- }
@Override
protected void onDestroy() {
super.onDestroy();
--
Gitblit v1.8.0