1.Android 12 蓝牙权限适配

朱显松
1 parent 453e7daf
Showing 3 changed files with 20 additions and 6 deletions
config.gradle
module_xiaojiaSoundBox/src/main/AndroidManifest.xml
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep2Activity.java
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "0.5.0",
+            version: "0.5.1",
             //Lib库前缀
             packeg : "com.cnlive.module",
             //Lib库名称
@@ -11,8 +11,14 @@
     <uses-permission
         android:name="android.permission.WRITE_SECURE_SETTINGS"
         tools:ignore="ProtectedPermissions" /> <!-- 蓝牙 -->
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <!-- wifi和蓝牙都要 -->
+    <uses-permission android:name="android.permission.BLUETOOTH"
+        android:maxSdkVersion="30"/>
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30"/><!-- wifi和蓝牙都要 -->
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
@@ -10,6 +10,7 @@ import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import androidx.databinding.DataBindingUtil;
 import android.net.Uri;
+import android.os.Build;
 import android.provider.Settings;
 import androidx.annotation.NonNull;
 import androidx.core.app.ActivityCompat;
@@ -143,9 +144,16 @@ public class BlueToothStep2Activity extends AppCompatActivity {
                 .withActivity(BlueToothStep2Activity.this)
                 .getPermissions(BlueToothStep2Activity.this
                         , 100
-                        , Manifest.permission.INTERNET
-                        , Manifest.permission.ACCESS_FINE_LOCATION
-                        , Manifest.permission.ACCESS_COARSE_LOCATION
+                        , Build.VERSION.SDK_INT > 30 ?
+                                new String[]{
+                                        Manifest.permission.INTERNET,
+                                        Manifest.permission.BLUETOOTH_SCAN,
+                                        Manifest.permission.BLUETOOTH_ADVERTISE,
+                                        Manifest.permission.BLUETOOTH_CONNECT} :
+                                new String[]{
+                                        Manifest.permission.INTERNET,
+                                        Manifest.permission.ACCESS_FINE_LOCATION,
+                                        Manifest.permission.ACCESS_COARSE_LOCATION}
                 );
 //                .getPermissionsWithTips(MainActivity.this
 //                        ,100