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

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

View File

@ -33,7 +33,7 @@
<!--相机-->
<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.READ_MEDIA_IMAGES" />
<uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />

View File

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