android/app/build.gradle

@@ -38,7 +38,7 @@ android {
 
         ndk {
             //noinspection ChromeOsAbiSupport
-            abiFilters "armeabi-v7a", "arm64-v8a"
+            abiFilters /*"armeabi-v7a",*/ "arm64-v8a"
         }
     }
 

android/app/src/main/java/com/eitchsyh/instrument/eitc_erm_dental_flutter/FileController.java

@@ -284,11 +284,12 @@ public class FileController implements MethodChannel.MethodCallHandler
                                 .getContentResolver()
                                 .delete(uri, null, null);
                         Log.d(TAG, "删除的数量=" + deleted);
-                        if (deleted <= 0)
+                        //有些设备即便删除成功了也会返回0,所以去掉判断
+                        /*if (deleted <= 0)
                         {
                             result.error("304", "删除失败", new Exception("删除失败"));
                             return;
-                        }
+                        }*/
                         result.success(null);
                     }
                     //捕获权限异常,请求权限
@@ -351,14 +352,15 @@ public class FileController implements MethodChannel.MethodCallHandler
                         .getContentResolver()
                         .delete(uri, null, null);
                 Log.d(TAG, "删除的数量=" + deleted);
-                if (deleted <= 0)
+                //有些设备即便删除成功了也会返回0,所以去掉判断
+                /*if (deleted <= 0)
                 {
                     if (result != null)
                     {
                         result.error("304", "删除失败", new Exception("删除失败"));
                     }
                     return;
-                }
+                }*/
                 if (result != null)
                 {
                     result.success(null);

lib/funcs.dart

@@ -20,6 +20,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:logger/logger.dart';
 import 'package:network_info_plus/network_info_plus.dart';
 import 'package:package_info_plus/package_info_plus.dart';
@@ -287,10 +288,29 @@ Future<String?> getWifiName() async {
       logd("读取wifi名称没有位置权限且已经请求过位置权限");
       return null;
     }
-    logd("请求位置权限");
-    PermissionStatus status = await Permission.locationWhenInUse.request();
-    await SpUtil.setLocationPermissionRequested(true);
-    hasLocationPermission = status == PermissionStatus.granted;
+    if (navigatorKey.currentState!.mounted) {
+      logd("弹窗提示要请求位置权限");
+      await showDialog(
+          context: navigatorKey.currentState!.context,
+          builder: (ctx) {
+            return AlertDialog(
+              title: Text(getS().hint),
+              content: Text(getS().requestLocationHint),
+              actions: [
+                TextButton(
+                    onPressed: () =>
+                        Navigator.of(navigatorKey.currentState!.context).pop(),
+                    child: Text(getS().confirm))
+              ],
+              shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(15.r)),
+            );
+          });
+      logd("请求位置权限");
+      PermissionStatus status = await Permission.locationWhenInUse.request();
+      await SpUtil.setLocationPermissionRequested(true);
+      hasLocationPermission = status == PermissionStatus.granted;
+    }
   }
   if (!hasLocationPermission) {
     logd("读取wifi名称没有位置权限");

lib/generated/intl/messages_en.dart

@@ -224,6 +224,8 @@ class MessageLookup extends MessageLookupByLibrary {
             MessageLookupByLibrary.simpleMessage("Request a cancellation"),
         "requestGrammarError":
             MessageLookupByLibrary.simpleMessage("Request syntax error"),
+        "requestLocationHint": MessageLookupByLibrary.simpleMessage(
+            "Since the application companion instrument uses WiFi connection, you need to judge whether you have connected to the WiFi of the instrument through the location permission, and request your location permission, please click Allow in the next pop-up window."),
         "requestMethodBanned": MessageLookupByLibrary.simpleMessage(
             "The request method is prohibited"),
         "requestResourceExist": MessageLookupByLibrary.simpleMessage(

lib/generated/intl/messages_zh.dart

@@ -178,6 +178,8 @@ class MessageLookup extends MessageLookupByLibrary {
         "relation": MessageLookupByLibrary.simpleMessage("关系"),
         "requestCancel": MessageLookupByLibrary.simpleMessage("请求取消"),
         "requestGrammarError": MessageLookupByLibrary.simpleMessage("请求语法错误"),
+        "requestLocationHint": MessageLookupByLibrary.simpleMessage(
+            "因应用配套仪器使用WiFi连接，需通过位置权限判断您是否已连接仪器WiFi，请求获取您的位置权限，请在下个弹窗中点击允许。"),
         "requestMethodBanned": MessageLookupByLibrary.simpleMessage("请求方法被禁止"),
         "requestResourceExist": MessageLookupByLibrary.simpleMessage("请求资源不存在"),
         "requestTimeout": MessageLookupByLibrary.simpleMessage("请求超时"),

lib/generated/l10n.dart

@@ -1779,6 +1779,16 @@ class S {
       args: [],
     );
   }
+
+  /// `Since the application companion instrument uses WiFi connection, you need to judge whether you have connected to the WiFi of the instrument through the location permission, and request your location permission, please click Allow in the next pop-up window.`
+  String get requestLocationHint {
+    return Intl.message(
+      'Since the application companion instrument uses WiFi connection, you need to judge whether you have connected to the WiFi of the instrument through the location permission, and request your location permission, please click Allow in the next pop-up window.',
+      name: 'requestLocationHint',
+      desc: '',
+      args: [],
+    );
+  }
 }
 
 class AppLocalizationDelegate extends LocalizationsDelegate<S> {

lib/l10n/intl_en.arb

@@ -171,5 +171,6 @@
   "permissionDescDialogTitle": "User Agreement and Privacy Policy Reminder",
   "permissionDescDialogContent": "Welcome to {appName}!\n\nWe have formulated the User Agreement and Privacy Policy in accordance with relevant laws to help you understand how we collect, store and use your personal information. \n\nBased on your express authorization, we may call your device permissions, and you have the right to refuse or cancel the authorization, please refer to the \"Permission Description\" for specific permission acquisition",
   "read": "Read",
-  "agreeContinue": "Agree"
+  "agreeContinue": "Agree",
+  "requestLocationHint": "Since the application companion instrument uses WiFi connection, you need to judge whether you have connected to the WiFi of the instrument through the location permission, and request your location permission, please click Allow in the next pop-up window."
 }

lib/l10n/intl_zh.arb

@@ -171,5 +171,6 @@
   "permissionDescDialogTitle": "用户协议及隐私政策提示",
   "permissionDescDialogContent": "欢迎使用{appName}!\n\n我们根据相关法律制定了《用户协议》和《隐私政策》，帮助您了解我们如何收集、保存、使用您的个人信息，请您在同意之前仔细阅读并充分理解相关条款。\n\n基于您的明示授权，我们将可能调用您的设备权限，您有权拒绝或取消授权，具体权限获取情况详见《权限说明》",
   "read": "阅读",
-  "agreeContinue": "同意并继续"
+  "agreeContinue": "同意并继续",
+  "requestLocationHint": "因应用配套仪器使用WiFi连接，需通过位置权限判断您是否已连接仪器WiFi，请求获取您的位置权限，请在下个弹窗中点击允许。"
 }

lib/pages/history/vm/history_view_model.dart

@@ -77,9 +77,9 @@ class HistoryList extends _$HistoryList {
       return false;
     }
     bool isSuccess = true;
-    try {
-      var stream = Stream.fromIterable(list);
-      await for (HistoryItemInfo info in stream) {
+    var stream = Stream.fromIterable(list);
+    await for (HistoryItemInfo info in stream) {
+      try {
         logd("历史记录删除文件${info.path}");
         await fileChannel.invokeMethod("deleteFile", info.path);
         if (info.type == 0) {
@@ -87,10 +87,10 @@ class HistoryList extends _$HistoryList {
         } else {
           state.value!.videoList.remove(info);
         }
+      } catch (e) {
+        loge("删除单个历史文件异常", error: e);
+        isSuccess = false;
       }
-    } catch (e) {
-      loge("历史记录页面批量删除异常", error: e);
-      isSuccess = false;
     }
     ref.notifyListeners();
     ref.invalidate(historySelectedCountProvider);

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 1.0.6+7
+version: 1.0.7+8
 
 environment:
   sdk: ^3.5.1