From ea99626dc3325acd92d17a1ff784fc9594af7871 Mon Sep 17 00:00:00 2001
From: lzw <lzw@github.aaej.cn>
Date: 星期三, 28 二月 2024 10:03:21 +0800
Subject: [PATCH] 更新
---
app/src/main/java/com/fwupgrade/saymanss/deviceplug/UstorageDeviceInstance.java | 8 ++++++--
app/src/main/java/com/fwupgrade/saymanss/FwUpgradeService.java | 28 +++++++++++++++++++++++++---
2 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/com/fwupgrade/saymanss/FwUpgradeService.java b/app/src/main/java/com/fwupgrade/saymanss/FwUpgradeService.java
index 96d1100..c158385 100644
--- a/app/src/main/java/com/fwupgrade/saymanss/FwUpgradeService.java
+++ b/app/src/main/java/com/fwupgrade/saymanss/FwUpgradeService.java
@@ -6,6 +6,7 @@
import android.hardware.usb.UsbManager;
import android.os.Handler;
import android.os.IBinder;
+import android.os.Looper;
import android.os.Message;
import android.os.RemoteException;
import android.os.SystemClock;
@@ -69,6 +70,8 @@
}
};
+
+
@Nullable
@Override
public IBinder onBind(Intent intent) {
@@ -83,6 +86,8 @@
initData();
initDeviceSDK();
+
+
}
@@ -90,7 +95,8 @@
private HashMap<String, Integer> tty = new HashMap<>();
- private final Handler mHander = new Handler() {
+
+ private final Handler mHander = new Handler(Looper.getMainLooper()) {
@Override
public void dispatchMessage(Message msg) {
switch (msg.what) {
@@ -110,7 +116,16 @@
break;
case USB_DEVICE_DETACHED:
- Toast.makeText(FwUpgradeService.this, "USB璁惧宸叉嫈鍑猴紝绛夊緟璁惧鎻掑叆", Toast.LENGTH_SHORT).show();
+
+ boolean isSuccessful1 = (boolean) msg.obj;
+ if (isSuccessful1) {
+ Toast.makeText(FwUpgradeService.this, "USB璁惧鏉冮檺鐢宠鎴愬姛", Toast.LENGTH_SHORT).show();
+ } else {
+ Log.i(TAG,"鍙戦�佸け璐ョ粨鏋滃箍鎾粰椹惧煿");
+ sendToDriveTrainByBroadCast(0,1);
+ sendToNewDriveTrainByBroadCast(0,1);
+ }
+
break;
case USB_DEVICE_OPEN:
@@ -229,9 +244,16 @@
* UstorageDeviceSDK鍒濆鍖�.
*/
private void initDeviceSDK() {
- UstorageDeviceInstance.getInstance().tryAttcheDeviceHandle(FwUpgradeService.this, FwUpgradeService.this);
+ int ret = UstorageDeviceInstance.getInstance().tryAttcheDeviceHandle(FwUpgradeService.this, FwUpgradeService.this);
+ Log.i(TAG,"initDeviceSDk,ret="+ret);
+ if (ret==1){
+ Message message = Message.obtain();
+ message.obj = false;
+ message.what = USB_DEVICE_DETACHED;
+ mHander.sendMessageDelayed(message,1000);
+ }
}
@Override
diff --git a/app/src/main/java/com/fwupgrade/saymanss/deviceplug/UstorageDeviceInstance.java b/app/src/main/java/com/fwupgrade/saymanss/deviceplug/UstorageDeviceInstance.java
index 428a03c..bd86c51 100644
--- a/app/src/main/java/com/fwupgrade/saymanss/deviceplug/UstorageDeviceInstance.java
+++ b/app/src/main/java/com/fwupgrade/saymanss/deviceplug/UstorageDeviceInstance.java
@@ -62,7 +62,7 @@
/**
* 灏濊瘯鏄惁鏈夎繛鎺ヨ澶囷紙OTG锛�
*/
- public void tryAttcheDeviceHandle(Context context, IUsbDevicePlugDelegate iUsbDevicePlugDelegate) {
+ public int tryAttcheDeviceHandle(Context context, IUsbDevicePlugDelegate iUsbDevicePlugDelegate) {
Log.d("fwup","tryAttcheDeviceHandle: ");
this.iUsbDevicePlugDelegate = iUsbDevicePlugDelegate;
mUsbManager = (UsbManager) context.getSystemService(USB_SERVICE);
@@ -76,10 +76,14 @@
}*/
ArrayList<UsbDevice> devices = acceptOTGDeviceInfo(mUsbManager);
-
+ if (devices==null || devices.size()==0){
+ Log.i("fwup","devices==null");
+ return 1;
+ }
for (UsbDevice dev: devices) {
acceptLicense(context, dev);
}
+ return 0;
}
//<<<--------------------------------------- Usb 鐩稿叧澶勭悊--------------------------------------------
--
Gitblit v1.8.0