From b213c3e542fc71b31b6ad1e9da6958eaec6d5b41 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期三, 13 一月 2021 09:24:09 +0800
Subject: [PATCH] 修改评判表数据库，只能rtkconfig sn变化的时候发送一次initdata
---
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index 20c1463..a924128 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -42,6 +42,7 @@
import safeluck.drive.evaluation.bean.SignalConfigRemote;
import safeluck.drive.evaluation.cEventCenter.CEventCenter;
import safeluck.drive.evaluation.cEventCenter.ICEventListener;
+import safeluck.drive.evaluation.customview.MyDialog;
import safeluck.drive.evaluation.fragment.HomeFragment;
import com.anyun.exam.lib.AYSdk;
@@ -161,6 +162,7 @@
}
};
+ private boolean hasSendInitData;
private List<SignalConfigRemote> signalConfiglist = new ArrayList<>();
private int permissionCount = 0;
@Override
@@ -204,7 +206,7 @@
ExamPlatformData.getInstance().getExamplatformStatus()
)));
tv_sat_num.setText(String.valueOf(appStatus.getSat_num()).length()==1?"0"+appStatus.getSat_num():String.valueOf(appStatus.getSat_num()));
- tv_qf.setText(getResources().getStringArray(R.array.qf_status)[appStatus.getQf()]);
+ tv_qf.setText(getResources().getStringArray(R.array.qf_status)[appStatus.getQf()<5?appStatus.getQf():0]);
}
}
});
@@ -219,6 +221,8 @@
authMapViewmodel = ViewModelProviders.of(this).get(AuthMapViewmodel.class);
authMapViewmodel.getAuthValue().observe(this, new Observer<Integer>() {
+
+
@Override
public void onChanged(Integer integer) {
Log.i(TAG,"AuthMapViewmodel auth="+integer.intValue());
@@ -227,10 +231,12 @@
String sn = ExamPlatformData.getInstance().getMcuSN();
if (!TextUtils.isEmpty(sn)){
- MyLog.i(TAG,"鏉冮檺鍏佽,钃濈墮宸茶繛鎺ワ紝鑾峰緱鍒扮殑sn="+sn);
+ MyLog.i("鏉冮檺鍏佽,钃濈墮宸茶繛鎺ワ紝鑾峰緱鍒扮殑sn="+sn+" sendInitData");
+ hasSendInitData = true;
AbsInitialData.getInstance().sendInitialData();
}else{
MyLog.i(TAG,"鏉冮檺鍏佽,钃濈墮宸茶繛鎺ワ紝鑾峰緱鍒扮殑sn=null,涓嶈兘鍙戦�佸垵濮嬫暟鎹�");
+ hasSendInitData= false;
}
}
@@ -279,6 +285,11 @@
mRTKConfig = rtkConfig;
synchronized (MainActivity.this){
+ if (ExamPlatformData.getInstance().isCanWriteSD()){
+ AbsInitialData.getInstance().resethasSendInitData();
+ AbsInitialData.getInstance().sendInitialData();
+ MyLog.i("rtkConfig 鏇存柊sn鍚庡彂閫佸垵濮嬫暟鎹�");
+ }
// if (onlySendOnceRTKConfig){
// MyLog.i(TAG,"杩涘叆 synchronized (MainActivity.this)");
// onlySendOnceRTKConfig = false;
--
Gitblit v1.8.0