From c0d5b628f971563730ec06a979aac62fa5e047d7 Mon Sep 17 00:00:00 2001
From: Lihongda <963140097@qq.com>
Date: Sat, 6 Jan 2024 19:39:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=80=BB=E8=BE=91=EF=BC=8C?=
 =?UTF-8?q?=E7=BD=91=E7=BB=9C=E8=AF=B7=E6=B1=82=E5=85=BC=E5=AE=B9android12?=
 =?UTF-8?q?+?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 iFish7/src/main/AndroidManifest.xml                        | 6 +++---
 .../src/main/java/com/ifish/fragment/DeviceFragment.java   | 7 ++++---
 iFish7/src/main/java/com/ifish/push/AlipushReceiver.java   | 1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/iFish7/src/main/AndroidManifest.xml b/iFish7/src/main/AndroidManifest.xml
index 7694f1aaa..c699c5502 100644
--- a/iFish7/src/main/AndroidManifest.xml
+++ b/iFish7/src/main/AndroidManifest.xml
@@ -139,9 +139,9 @@
         android:name="android.permission.READ_EXTERNAL_STORAGE"
         android:maxSdkVersion="32" />
     <uses-permission
-        android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32"
-        tools:ignore="ScopedStorage" />
+        android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"
+        tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
     <!--在SDCard中创建与删除文件权限-->
diff --git a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
index c267235a7..199011d9a 100644
--- a/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
+++ b/iFish7/src/main/java/com/ifish/fragment/DeviceFragment.java
@@ -675,9 +675,10 @@ public class DeviceFragment extends BaseV4Fragment implements ObservableScrollVi
         boolean hasPermission = PermissionHelper.checkFilePermission(getActivity());
         LogUtils.d("LHD 是否具有文件管理权限：" + hasPermission);
         if (!hasPermission) {
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                LogUtils.d("LHD android 13不需要请求");
-            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+//            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+//                LogUtils.d("LHD android 13不需要请求");
+//            } else
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                 //请求文件系统权限
                 LogUtils.d("LHD 请求MANAGE_EXTERNAL_STORAGE权限");
                 Intent intent = new Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION);
diff --git a/iFish7/src/main/java/com/ifish/push/AlipushReceiver.java b/iFish7/src/main/java/com/ifish/push/AlipushReceiver.java
index d8d5589c4..5e19a24b1 100644
--- a/iFish7/src/main/java/com/ifish/push/AlipushReceiver.java
+++ b/iFish7/src/main/java/com/ifish/push/AlipushReceiver.java
@@ -7,7 +7,6 @@ import android.util.Log;
 import com.alibaba.sdk.android.push.MessageReceiver;
 import com.alibaba.sdk.android.push.notification.CPushMessage;
 import com.ifish.activity.RecentContactsActivity;
-import com.ifish.utils.AnimationUtil;
 
 import java.util.Map;