From 9efba3e1d69fb7540707f8f7293714c3a319766e Mon Sep 17 00:00:00 2001
From: lzw <lzw@github.aaej.cn>
Date: 星期二, 27 二月 2024 16:10:09 +0800
Subject: [PATCH] 更新
---
app/src/main/java/com/fwupgrade/saymanss/FwUpgradeService.java | 38 ++++++++++++++++++++++++++------------
1 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/com/fwupgrade/saymanss/FwUpgradeService.java b/app/src/main/java/com/fwupgrade/saymanss/FwUpgradeService.java
index dd3af01..96d1100 100644
--- a/app/src/main/java/com/fwupgrade/saymanss/FwUpgradeService.java
+++ b/app/src/main/java/com/fwupgrade/saymanss/FwUpgradeService.java
@@ -12,7 +12,7 @@
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.Log;
-import android.view.View;
+
import android.widget.Toast;
import com.fwupgrade.saymanss.deviceplug.IUsbDevicePlugDelegate;
@@ -152,17 +152,10 @@
if (succ_num + fail_num == tty.size()) {
Log.d(TAG, "Upgrade Finish!");
- Intent intent = new Intent();
- intent.putExtra("result", succ_num == tty.size()? 0 : 1);
- intent.setAction("com.fwupgrade.saymanss.UPGRADE_COMPLETE");
- intent.setPackage("safeluck.drive.training");
- sendBroadcast(intent);
- intent = new Intent();
- intent.putExtra("result", succ_num == tty.size()? 0 : 1);
- intent.setAction("com.fwupgrade.saymanss.UPGRADE_COMPLETE");
- intent.setPackage("demo1.tech.anyun.com.myapplication");
- sendBroadcast(intent);
+ sendToNewDriveTrainByBroadCast(succ_num,tty.size());
+ sendToDriveTrainByBroadCast(succ_num,tty.size());
+
// System.exit(0);
@@ -175,6 +168,22 @@
}
}
};
+
+ private void sendToNewDriveTrainByBroadCast(int succ_num,int ttySize) {
+ Intent intent = new Intent();
+ intent.putExtra("result", succ_num == ttySize? 0 : 1); //0-鎴愬姛
+ intent.setAction("com.fwupgrade.saymanss.UPGRADE_COMPLETE");
+ intent.setPackage("safeluck.drive.training");
+ sendBroadcast(intent);
+ }
+ private void sendToDriveTrainByBroadCast(int succ_num,int ttySize) {
+ Intent intent = new Intent();
+ intent.putExtra("result", succ_num == ttySize? 0 : 1);
+ intent.setAction("com.fwupgrade.saymanss.UPGRADE_COMPLETE");
+ intent.setPackage("demo1.tech.anyun.com.myapplication");
+ sendBroadcast(intent);
+ }
+
// 姣忔鍗囩骇璺緞鍊兼渶灏忕殑
private void initTarget() {
ArrayList<UsbDevice> targets = UstorageDeviceInstance.getInstance().acceptOTGDeviceInfo((UsbManager) getSystemService(USB_SERVICE));
@@ -192,7 +201,7 @@
* 鑾峰彇fw鍒楄〃
*/
private void acceptFwList() {
- Log.d("fwup","acceptFwList: ");
+ Log.d(TAG,"acceptFwList: ");
File file = new File(AppPathInfo.getFwSavePath());
File[] files = file.listFiles();
if (files != null && files.length > 0) {
@@ -240,6 +249,9 @@
Log.d(TAG,"permissionFinish:" + isSuccessful);
if (isSuccessful && ctrlBlock != null) {
initFwUpgrade(ctrlBlock);
+ }else{
+ sendToDriveTrainByBroadCast(0,1);
+ sendToNewDriveTrainByBroadCast(0,1);
}
}
}
@@ -275,6 +287,8 @@
if (!isTarget) {
Log.d(TAG,"Not sonixCam, close");
ctrlBlock.close();
+ sendToDriveTrainByBroadCast(0,1);
+ sendToNewDriveTrainByBroadCast(0,1);
return;
}
--
Gitblit v1.8.0