[弹窗]权限申请弹窗封装

Peakmain · Nov 21, 2024 · 0a59794 · 0a59794
1 parent 6570202
commit 0a59794
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/app/src/main/java/com/peakmain/basiclibary/activity/BehaviorActivity.kt b/app/src/main/java/com/peakmain/basiclibary/activity/BehaviorActivity.kt
@@ -26,7 +26,7 @@ import com.peakmain.ui.widget.ShapeTextView
  * describe：
  */
 class BehaviorActivity : AppCompatActivity() {
-    var locationListener: IPermissionPopupListener = AtPermissionUtils(this).cameraListener
+    var locationListener: IPermissionPopupListener = AtPermissionUtils(this).locationListener
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_behavior)
@@ -42,22 +42,26 @@ class BehaviorActivity : AppCompatActivity() {
             }
 
         })
-        PermissionHandlerManager.instance.registerListener(PermissionMapConstants.PermissionTag.CAMERA,locationListener)
+        val GROUP_LOCATION_BELOW_Q = arrayOf(
+            Manifest.permission.ACCESS_FINE_LOCATION,
+            Manifest.permission.ACCESS_COARSE_LOCATION
+        )
+        PermissionHandlerManager.instance.registerListener(PermissionMapConstants.PermissionTag.LOCATION,locationListener)
         findViewById<ShapeTextView>(R.id.stv_use_point).setOnClickListener {
             //behaviorHelper.toggle()
 
-            if (PkPermission.isGranted(Manifest.permission.CAMERA)) {
+            if (PkPermission.isGranted(GROUP_LOCATION_BELOW_Q)) {
                 Log.e("TAG", "授予了权限:${Manifest.permission.CAMERA}")
             } else {
                 if (PkPermission.shouldShowRequestPermissionRationale(
                         this,
-                        arrayOf(Manifest.permission.CAMERA)
+                        GROUP_LOCATION_BELOW_Q
                     )
                 ) {
                     //拒绝了权限，但是没有选择"Never ask again"
                     PkPermission.request(
                         this,
-                        Manifest.permission.CAMERA,
+                        GROUP_LOCATION_BELOW_Q,
                         object : OnPermissionCallback {
                             override fun onGranted(permissions: Array<String>) {
                                 Log.e("TAG", "授予了权限:Manifest.permission.CAMERA")
@@ -82,7 +86,7 @@ class BehaviorActivity : AppCompatActivity() {
                      }*/
                     PkPermission.request(
                         this,
-                        Manifest.permission.CAMERA,
+                        GROUP_LOCATION_BELOW_Q,
                         object : OnPermissionCallback {
                             override fun onGranted(permissions: Array<String>) {
                                 Log.e("TAG", "授予了权限:Manifest.permission.CAMERA")

diff --git a/basicLibrary/src/main/java/com/peakmain/basiclibrary/viewmodel/PkPermissionViewModel.kt b/basicLibrary/src/main/java/com/peakmain/basiclibrary/viewmodel/PkPermissionViewModel.kt
@@ -98,9 +98,8 @@ internal class PkPermissionViewModel : BaseViewModel() {
         block: ((String) -> Boolean),
         requestPermission: (() -> Unit)?
     ) {
-
+        PermissionHandlerManager.instance.removeAllMessages()
         if (it.containsValue(false)) {
-            PermissionHandlerManager.instance.removeAllMessages()
             val deniedList = mutableListOf<String>()
             for (entry in it.entries) if (!entry.value) deniedList.add(entry.key)
             val shouldPermissionList = deniedList.filter { permission ->