From 1871d1c453f82ddce868c8a3d3179b98d151138a Mon Sep 17 00:00:00 2001 From: yuqian Date: Fri, 9 Jan 2026 11:39:29 +0800 Subject: [PATCH] check wifi permission --- .../xyzshell/myphoneinfo/custom/PermissionChecker.kt | 11 +++++++---- .../xyzshell/myphoneinfo/dashboard/NetworkFragment.kt | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/custom/PermissionChecker.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/custom/PermissionChecker.kt index 1cc6080..63ada71 100644 --- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/custom/PermissionChecker.kt +++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/custom/PermissionChecker.kt @@ -5,6 +5,7 @@ import android.app.Activity import android.content.Context import android.content.pm.PackageManager import android.os.Build +import android.util.Log import androidx.core.app.ActivityCompat import androidx.core.content.ContextCompat @@ -43,9 +44,11 @@ object PermissionChecker { /** * 检查所有权限 */ - fun hasWifiAndPhonePermissions(context: Context): Boolean { - return hasWifiPermission(context) && hasPhonePermission(context) - } +// fun hasWifiAndPhonePermissions(context: Context): Boolean { +// return hasWifiPermission(context) && hasPhonePermission(context) +// } + + /** * 获取缺少的权限列表 */ @@ -67,7 +70,7 @@ object PermissionChecker { if (!hasPermission(context, Manifest.permission.READ_PHONE_STATE)) { permissions.add(Manifest.permission.READ_PHONE_STATE) } - + Log.d("PermissionChecker", "missingPermissions: $permissions") return permissions } fun requestSimple( diff --git a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/NetworkFragment.kt b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/NetworkFragment.kt index af2ac31..45ae415 100644 --- a/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/NetworkFragment.kt +++ b/myphoneinfo/src/main/java/com/xyzshell/myphoneinfo/dashboard/NetworkFragment.kt @@ -36,7 +36,7 @@ private lateinit var binding:FragmentNetworkBinding override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - if(!PermissionChecker.hasWifiAndPhonePermissions(context = requireContext())){ + if(PermissionChecker.getMissingPermissions(context = requireContext()).isNotEmpty()){ PermissionChecker.requestSimple( requireActivity(), onGranted = {