sky/app-starlock
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop_liyi

Browse Source
This commit is contained in:
liyi 2025-03-10 17:39:15 +08:00
commit 8fae519072
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/AndroidManifest.xml
View File

@ -33,7 +33,7 @@
<!--相机--> <!--相机-->
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" /> <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />

7
lib/widget/permission/permission_dialog.dart
View File

@ -1,3 +1,4 @@
import 'package:device_info_plus/device_info_plus.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:permission_handler/permission_handler.dart'; import 'package:permission_handler/permission_handler.dart';
@ -109,8 +110,9 @@ class PermissionDialog {
if (Get.context == null) { if (Get.context == null) {
return false; return false;
} }
final AndroidDeviceInfo androidInfo = await DeviceInfoPlugin().androidInfo;
final bool isAndroid33 = final bool isAndroid33 =
AppPlatform.isAndroid && AppPlatform.getSdkIntValue() >= 33; AppPlatform.isAndroid && androidInfo.version.sdkInt >= 33;
//通用的局部函数 //通用的局部函数
List<Permission> requestPermission() { List<Permission> requestPermission() {
@ -197,8 +199,9 @@ class PermissionDialog {
if (Get.context == null) { if (Get.context == null) {
return false; return false;
} }
final AndroidDeviceInfo androidInfo = await DeviceInfoPlugin().androidInfo;
final bool isAndroid33 = final bool isAndroid33 =
AppPlatform.isAndroid && AppPlatform.getSdkIntValue() >= 33; AppPlatform.isAndroid && androidInfo.version.sdkInt >= 33;
//通用的局部函数 //通用的局部函数
List<Permission> requestPermission() { List<Permission> requestPermission() {