杨帅 / XiaojiaSoundBox · Commits

Commit 05bd3c6e68120fe31ae7afe19ada1664f6cabb54

Authored by 朱显松
1 parent 453e7daf

1.Android 12 蓝牙权限适配

Inline Side-by-side
Showing 3 changed files with 20 additions and 6 deletions
config.gradle
  View file @05bd3c6
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "0.5.0",
  24 + version: "0.5.1",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.module",
27 27 //Lib库名称
... ...
module_xiaojiaSoundBox/src/main/AndroidManifest.xml
  View file @05bd3c6
... ... @@ -11,8 +11,14 @@
11 11 <uses-permission
12 12 android:name="android.permission.WRITE_SECURE_SETTINGS"
13 13 tools:ignore="ProtectedPermissions" /> <!-- 蓝牙 -->
14   - <uses-permission android:name="android.permission.BLUETOOTH" />
15   - <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <!-- wifi和蓝牙都要 -->
  14 + <uses-permission android:name="android.permission.BLUETOOTH"
  15 + android:maxSdkVersion="30"/>
  16 + <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"
  17 + android:maxSdkVersion="30"/><!-- wifi和蓝牙都要 -->
  18 + <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
  19 + <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
  20 + <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
  21 +
16 22 <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
17 23 <uses-permission android:name="android.permission.INTERNET" />
18 24  
... ...
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/ui/activity/BlueToothStep2Activity.java
  View file @05bd3c6
... ... @@ -10,6 +10,7 @@ import android.content.IntentFilter;
10 10 import android.content.pm.PackageManager;
11 11 import androidx.databinding.DataBindingUtil;
12 12 import android.net.Uri;
  13 +import android.os.Build;
13 14 import android.provider.Settings;
14 15 import androidx.annotation.NonNull;
15 16 import androidx.core.app.ActivityCompat;
... ... @@ -143,9 +144,16 @@ public class BlueToothStep2Activity extends AppCompatActivity {
143 144 .withActivity(BlueToothStep2Activity.this)
144 145 .getPermissions(BlueToothStep2Activity.this
145 146 , 100
146   - , Manifest.permission.INTERNET
147   - , Manifest.permission.ACCESS_FINE_LOCATION
148   - , Manifest.permission.ACCESS_COARSE_LOCATION
  147 + , Build.VERSION.SDK_INT > 30 ?
  148 + new String[]{
  149 + Manifest.permission.INTERNET,
  150 + Manifest.permission.BLUETOOTH_SCAN,
  151 + Manifest.permission.BLUETOOTH_ADVERTISE,
  152 + Manifest.permission.BLUETOOTH_CONNECT} :
  153 + new String[]{
  154 + Manifest.permission.INTERNET,
  155 + Manifest.permission.ACCESS_FINE_LOCATION,
  156 + Manifest.permission.ACCESS_COARSE_LOCATION}
149 157 );
150 158 // .getPermissionsWithTips(MainActivity.this
151 159 // ,100
... ...