lzw
2024-02-28 ea99626dc3325acd92d17a1ff784fc9594af7871
更新
2个文件已修改
36 ■■■■ 已修改文件
app/src/main/java/com/fwupgrade/saymanss/FwUpgradeService.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
app/src/main/java/com/fwupgrade/saymanss/deviceplug/UstorageDeviceInstance.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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
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 相关处理--------------------------------------------