修复部分设备Mac地址获取不到（失败），文件管理文件路径问题

Mr-lidajun · Aug 1, 2022 · 4714521 · 4714521
1 parent 06b99cd
commit 4714521
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/lib/page/feature_page/feature_view_model.dart b/lib/page/feature_page/feature_view_model.dart
@@ -456,13 +456,24 @@ class FeatureViewModel extends BaseViewModel with PackageHelpMixin {
 
   /// 查看设备Mac地址
   Future<void> getDeviceMac() async {
+    // 感谢简书网友：北京朝阳区精神病院院长 的分享BUG以及优化方案。
+    // 查看设备Mac地址
+    // 提供两种获取 设备Mac方法
+    // adb shell ip address show wlan0 | grep "link/ether" | awk '{printf $2}'
+    // adb -s deviceId shell "ip addr show wlan0 | grep 'link/ether '| cut -d' ' -f6"
     var result = await execAdb([
       '-s',
       deviceId,
       'shell',
-      'cat',
-      '/sys/class/net/wlan0/address',
+      "ip addr show wlan0 | grep 'link/ether '| cut -d' ' -f6",
     ]);
+    // var result = await execAdb([
+    //   '-s',
+    //   deviceId,
+    //   'shell',
+    //   'cat',
+    //   '/sys/class/net/wlan0/address',
+    // ]);
     showResultDialog(
       content: result != null && result.exitCode == 0 ? result.stdout : "获取失败",
     );

diff --git a/lib/page/flie_manager/file_manager_view_model.dart b/lib/page/flie_manager/file_manager_view_model.dart
@@ -60,6 +60,12 @@ class FileManagerViewModel extends BaseViewModel {
           typeLinkFile,
           Icons.attach_file,
         ));
+      } else if (value.endsWith("*")) {
+        files.add(FileModel(
+          value.substring(0, value.length - 1),
+          typeFile,
+          Icons.insert_drive_file,
+        ));
       } else {
         files.add(FileModel(
           value,