BaseView/ViewPublicEventChange.patch at master · sHadowLess-LhQ/BaseView · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
diff --git a/app/src/main/java/cn/com/shadowless/baseview/event/ViewPublicEvent.java b/app/src/main/java/cn/com/shadowless/baseview/event/ViewPublicEvent.java
index 01c5698..1d6cafb 100644
--- a/app/src/main/java/cn/com/shadowless/baseview/event/ViewPublicEvent.java
+++ b/app/src/main/java/cn/com/shadowless/baseview/event/ViewPublicEvent.java
@@ -177,26 +177,14 @@ public interface ViewPublicEvent {
          */
         void initViewListener();

-        /**
-         * 强制数据获取执行所需权限
-         * <p>
-         * 返回强制执行数据初始化所需的权限列表。
-         * </p>
-         *
-         * @return 强制权限列表
-         */
-        default List<IPermission> isForcePermissionToInitData() {
-            return null;
-        }
-
         /**
          * 获取被永久拒绝的权限
          * <p>
          * 从被拒绝的权限列表中筛选出被永久拒绝的权限。
          * </p>
          *
-         * @param activity    当前Activity
-         * @param deniedList  被拒绝的权限列表
+         * @param activity   当前Activity
+         * @param deniedList 被拒绝的权限列表
          * @return 被永久拒绝的权限列表
          */
         default List<IPermission> getDoNotAskAgainPermission(Activity activity, List<IPermission> deniedList) {
@@ -209,29 +197,6 @@ public interface ViewPublicEvent {
             return doNotAskAgainList;
         }

-        /**
-         * 判断强制执行initData所需权限是否涵盖
-         * <p>
-         * 检查已授予的权限是否涵盖了强制执行数据初始化所需的权限。
-         * </p>
-         *
-         * @param grantedList 已授予的权限列表
-         * @return 如果权限涵盖返回true，否则返回false
-         */
-        default boolean isAllCoverForcePermission(List<IPermission> grantedList) {
-            boolean isAllCover = true;
-            List<IPermission> temp = isForcePermissionToInitData();
-            if (temp != null && !temp.isEmpty()) {
-                for (IPermission permission : temp) {
-                    if (!XXPermissions.containsPermission(grantedList, permission)) {
-                        isAllCover = false;
-                        break;
-                    }
-                }
-            }
-            return isAllCover;
-        }
-
         /**
          * 权限请求结果回调接口
          */
@@ -588,12 +553,8 @@ public interface ViewPublicEvent {
          * @param callBack    the call back
          */
         default void dealPermission(FragmentActivity activity, List<IPermission> permissions, OnPermissionInterceptor interceptor, OnPermissionResult callBack) {
-            if (XXPermissions.isGrantedPermissions(activity, permissions)) {
-                initDataByPermission();
-                return;
-            }
             XXPermissions.with(activity).permissions(permissions).interceptor(interceptor).request((grantedList, deniedList) -> {
-                if (isAllCoverForcePermission(grantedList)) {
+                if (deniedList.isEmpty()) {
                     initDataByPermission();
                 }
                 if (callBack == null) {
@@ -633,12 +594,8 @@ public interface ViewPublicEvent {
          * @param callBack    the call back
          */
         default void dealPermission(Fragment fragment, List<IPermission> permissions, OnPermissionInterceptor interceptor, OnPermissionResult callBack) {
-            if (XXPermissions.isGrantedPermissions(fragment.requireContext(), permissions)) {
-                initDataByPermission();
-                return;
-            }
             XXPermissions.with(fragment).permissions(permissions).interceptor(interceptor).request((grantedList, deniedList) -> {
-                if (isAllCoverForcePermission(grantedList)) {
+                if (deniedList.isEmpty()) {
                     initDataByPermission();
                 }
                 if (callBack == null) {
@@ -731,12 +688,8 @@ public interface ViewPublicEvent {
          * @param callBack    the call back
          */
         default void dealPermission(FragmentActivity activity, List<IPermission> permissions, OnPermissionInterceptor interceptor, OnPermissionResult callBack) {
-            if (XXPermissions.isGrantedPermissions(activity, permissions)) {
-                initModelDataByPermission();
-                return;
-            }
             XXPermissions.with(activity).permissions(permissions).interceptor(interceptor).request((grantedList, deniedList) -> {
-                if (isAllCoverForcePermission(grantedList)) {
+                if (deniedList.isEmpty()) {
                     initModelDataByPermission();
                 }
                 if (callBack == null) {
@@ -776,12 +729,8 @@ public interface ViewPublicEvent {
          * @param callBack    the call back
          */
         default void dealPermission(Fragment fragment, List<IPermission> permissions, OnPermissionInterceptor interceptor, OnPermissionResult callBack) {
-            if (XXPermissions.isGrantedPermissions(fragment.requireContext(), permissions)) {
-                initModelDataByPermission();
-                return;
-            }
             XXPermissions.with(fragment).permissions(permissions).interceptor(interceptor).request((grantedList, deniedList) -> {
-                if (isAllCoverForcePermission(grantedList)) {
+                if (deniedList.isEmpty()) {
                     initModelDataByPermission();
                 }
                 if (callBack == null) {