From a5625e706ff7ef0375c3e596cabf7f9511aa754c Mon Sep 17 00:00:00 2001
From: Developer <91611@user.local>
Date: Fri, 8 May 2026 16:20:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(usb):=20=E8=A7=A3=E5=86=B3USB=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=8B=92=E7=BB=9D=E6=97=B6=E8=AE=BE=E5=A4=87=E5=AF=B9?=
 =?UTF-8?q?=E8=B1=A1=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加设备对象空值检查避免空指针异常
- 在设备对象为空时记录调试日志
- 确保权限拒绝回调只在设备对象有效时触发
- 保持原有的USB连接处理器回调逻辑
---
 .../src/main/java/com/xiarui/zhiwen/UsbController.java   | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/android/src/main/java/com/xiarui/zhiwen/UsbController.java b/android/src/main/java/com/xiarui/zhiwen/UsbController.java
index f79eefd..addf2a7 100644
--- a/android/src/main/java/com/xiarui/zhiwen/UsbController.java
+++ b/android/src/main/java/com/xiarui/zhiwen/UsbController.java
@@ -142,8 +142,13 @@ public class UsbController {
             if (intent.getAction().equals(ACTION_USB_PERMISSION)) {
                 if (!intent.getBooleanExtra(
                         UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
-                    mPermissionListener.onPermissionDenied(intent
-                            .getParcelableExtra(UsbManager.EXTRA_DEVICE));
+                    UsbDevice device = intent
+                            .getParcelableExtra(UsbManager.EXTRA_DEVICE);
+                    if (device != null) {
+                        mPermissionListener.onPermissionDenied(device);
+                    } else {
+                        l("Permission denied (device extra is null)");
+                    }
 
                     mConnectionHandler.onUsbPermissionDenied();
                 } else {