兼容不同机型的权限申请界面跳转

yinzhengwei · May 14, 2019 · d732ab2 · d732ab2
1 parent b2f218b
commit d732ab2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ Step 2. Add the dependency
 
 dependencies {
 
-	implementation 'com.github.yinzhengwei:permissiongranted:16.0.0'
+	implementation 'com.github.yinzhengwei:permissiongranted:17.0.0'
 
 }
 

diff --git a/app/src/main/java/com/yzw/permissiongranted/PermissionUtils.kt b/app/src/main/java/com/yzw/permissiongranted/PermissionUtils.kt
@@ -155,30 +155,30 @@ object PermissionUtils {
             /**
              * 获取手机厂商
              */
-            when (android.os.Build.BRAND) {
-                "vivo", "VIVO" -> intent = context.packageManager.getLaunchIntentForPackage("com.iqoo.secure") ?: (Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+            when (android.os.Build.BRAND.toLowerCase()) {
+                "vivo" -> intent = context.packageManager.getLaunchIntentForPackage("com.iqoo.secure") ?: (Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
                     intent.data = Uri.parse("package:${context.packageName}")
                 })
-                "oppo", "OPPO" -> intent = context.packageManager.getLaunchIntentForPackage("com.oppo.safe") ?: (Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                "oppo" -> intent = context.packageManager.getLaunchIntentForPackage("com.oppo.safe") ?: (Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
                     intent.data = Uri.parse("package:${context.packageName}")
                 })
-                "HUAWEI" -> {
+                "huawei" -> {
                     intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
                     intent.component = ComponentName("com.huawei.systemmanager", "com.huawei.permissionmanager.ui.MainActivity")
                 }
-                "Meizu" -> {
+                "meizu" -> {
                     intent = Intent("com.meizu.safe.security.SHOW_APPSEC")
                     intent.addCategory(Intent.CATEGORY_DEFAULT)
                     intent.putExtra("packageName", context.packageName)
                 }
-                "Xiaomi" -> {
+                "xiaomi" -> {
                     intent.action = "miui.intent.action.APP_PERM_EDITOR"
-                    when (getMiuiVersion()) {
-                        "V6", "V7" -> {
+                    when (getMiuiVersion().toLowerCase()) {
+                        "v6", "v7" -> {
                             intent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.AppPermissionsEditorActivity")
                             intent.putExtra("extra_pkgname", context.packageName)
                         }
-                        "V8", "V9" -> {
+                        "v8", "v9" -> {
                             intent.setClassName("com.miui.securitycenter", "com.miui.permcenter.permissions.PermissionsEditorActivity")
                             intent.putExtra("extra_pkgname", context.packageName)
                         }
@@ -201,9 +201,9 @@ object PermissionUtils {
         context.startActivityForResult(intent, requestCode)
     }
 
-    private fun getMiuiVersion(): String? {
+    private fun getMiuiVersion(): String {
         val propName = "ro.miui.ui.version.name"
-        val line: String
+        var line = ""
         var input: BufferedReader? = null
         try {
             val p = Runtime.getRuntime().exec("getprop $propName")
@@ -212,7 +212,7 @@ object PermissionUtils {
             input.close()
         } catch (ex: IOException) {
             ex.printStackTrace()
-            return null
+            return ""
         } finally {
             try {
                 input!!.close()