From e53d56119019c69c69c604daafcf71c29e231490 Mon Sep 17 00:00:00 2001
From: endian11 <Dana_Lee1016@126.com>
Date: 星期一, 30 十一月 2020 16:08:26 +0800
Subject: [PATCH] 根据FingerPrint区分自己的设备和别家设备，来进行发送规则参数和允许sd权限后，发送地图；
---
app/src/main/java/safeluck/drive/evaluation/MainActivity.java | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
index ed7a761..3303434 100644
--- a/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
+++ b/app/src/main/java/safeluck/drive/evaluation/MainActivity.java
@@ -218,7 +218,7 @@
authMapViewmodel.getAuthValue().observe(this, new Observer<Integer>() {
@Override
public void onChanged(Integer integer) {
- Log.i(TAG,"AuthMapViewmodel auth="+integer);
+ Log.i(TAG,"AuthMapViewmodel auth="+integer.intValue());
if (integer.intValue() == Constant.BLUETOOTH_CONNECT){
MyLog.i(TAG,"Bluetooth connected锛宎uth permission and sn != null");
String sn = ExamPlatformData.getInstance().getMcuSN();
@@ -287,15 +287,16 @@
mPermissionsManager = new PermissionManager(this) {
@Override
public void authorized(int requestCode) {
- Log.d(TAG, "requestCode = " + requestCode);
+ Log.d(TAG, "requestCode = " + requestCode+Build.VERSION.SDK_INT);
permissionCount++;
- if (permissionCount == PERMISSIONS.length){
- ExamPlatformData.getInstance().setCanWriteSD(true);
- //鍙app涓嶉攢姣侊紙閲嶅惎锛夊彧浼氳姹備竴娆★紝浣嗘槸纭繚PERMISSIONS鏈�鍚庝竴涓厓绱犳槸writeSD
- CThreadPoolExecutor.runInBackground(()->{
- MyLog.i(TAG,"鏉冮檺鍏佽锛屽紑濮嬪彂閫侀厤缃弬鏁�");
- sendJudgeArgs();
- });
+ Log.i(TAG,"fingerPrint="+Build.FINGERPRINT);
+ if (Build.FINGERPRINT.contains(Constant.OUR_SYS_IMAGE)){
+ MyLog.i(TAG,"鑷繁鐨勭郴缁�");
+ setSDAuthAndSendJudgeArg();
+ return;
+ }
+ if (permissionCount == PERMISSIONS.length-1){
+ setSDAuthAndSendJudgeArg();
}
}
@@ -332,6 +333,15 @@
}
+ 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());
--
Gitblit v1.8.0