From 99b89dc0ae4fbe90c6d629a223ad730986ffd8f3 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 10 十二月 2025 14:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/maanshan' into maanshan

---
 keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/i485/SportUtils.java |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/i485/SportUtils.java b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/i485/SportUtils.java
index 11f64e6..3d06572 100644
--- a/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/i485/SportUtils.java
+++ b/keyCabinet-android/app/src/main/java/com/doumee/keyCabinet/utils/i485/SportUtils.java
@@ -1,24 +1,19 @@
 package com.doumee.keyCabinet.utils.i485;
 
 import android.content.Context;
-import android.hardware.usb.UsbConstants;
-import android.hardware.usb.UsbDevice;
-import android.hardware.usb.UsbInterface;
-import android.hardware.usb.UsbManager;
-import android.serialport.SerialPortFinder;
-
 import java.util.ArrayList;
 import java.util.List;
+
+import android_serialport_api.SerialPortFinder;
 
 public class SportUtils {
     public static List<String> getSerialPortPaths(Context context) {
         // 鑾峰彇鎵�鏈変覆鍙h澶囪矾寰�
-        String[] devices = new SerialPortFinder().getAllDevicesPath();
+        SerialPortFinder mSerialPortFinder = new SerialPortFinder();
+        String[] entryValues = mSerialPortFinder.getAllDevicesPath();
         List<String> serialPaths = new ArrayList<>();
-        if(devices!=null){
-            for(String key:devices){
-                serialPaths.add(key);
-            }
+        for (int i = 0; i < entryValues.length; i++) {
+            serialPaths.add(entryValues[i]);
         }
         return serialPaths;
     }

--
Gitblit v1.9.3