杨帅 / XiaojiaSoundBox · Commits

Commit 6c4769729e8bb411d7b8a8037624db7472ccd6e4

Authored by 朱显松
1 parent 482524a1

1.Android 12 通知栏适配

Inline Side-by-side
Showing 3 changed files with 9 additions and 4 deletions
config.gradle
  View file @6c47697
@@ -21,7 +21,7 @@ ext { @@ -21,7 +21,7 @@ ext {
21 //编译方式 21 //编译方式
22 debug : false, 22 debug : false,
23 //版本号 23 //版本号
24 - version: "0.4.5", 24 + version: "0.4.6",
25 //Lib库前缀 25 //Lib库前缀
26 packeg : "com.cnlive.module", 26 packeg : "com.cnlive.module",
27 //Lib库名称 27 //Lib库名称
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/subutil/util/DangerousUtils.java
  View file @6c47697
@@ -317,7 +317,8 @@ public class DangerousUtils { @@ -317,7 +317,8 @@ public class DangerousUtils {
317 @RequiresPermission(SEND_SMS) 317 @RequiresPermission(SEND_SMS)
318 public static void sendSmsSilent(final String phoneNumber, final String content) { 318 public static void sendSmsSilent(final String phoneNumber, final String content) {
319 if (TextUtils.isEmpty(content)) return; 319 if (TextUtils.isEmpty(content)) return;
320 - PendingIntent sentIntent = PendingIntent.getBroadcast(Utils.getApp(), 0, new Intent("send"), 0); 320 + PendingIntent sentIntent = PendingIntent.getBroadcast(Utils.getApp(), 0, new Intent("send"),
  321 + Build.VERSION.SDK_INT >= 31 ? PendingIntent.FLAG_IMMUTABLE : 0);
321 SmsManager smsManager = SmsManager.getDefault(); 322 SmsManager smsManager = SmsManager.getDefault();
322 if (content.length() >= 70) { 323 if (content.length() >= 70) {
323 List<String> ms = smsManager.divideMessage(content); 324 List<String> ms = smsManager.divideMessage(content);
module_xiaojiaSoundBox/src/main/java/com/cnlive/strike/xiaojiaspeaker/util/utilcode/util/NotificationUtils.java
  View file @6c47697
@@ -5,6 +5,8 @@ import android.app.NotificationManager; @@ -5,6 +5,8 @@ import android.app.NotificationManager;
5 import android.app.PendingIntent; 5 import android.app.PendingIntent;
6 import android.content.Context; 6 import android.content.Context;
7 import android.content.Intent; 7 import android.content.Intent;
  8 +import android.os.Build;
  9 +
8 import androidx.annotation.Nullable; 10 import androidx.annotation.Nullable;
9 import androidx.core.app.NotificationCompat; 11 import androidx.core.app.NotificationCompat;
10 import androidx.core.app.NotificationManagerCompat; 12 import androidx.core.app.NotificationManagerCompat;
@@ -28,7 +30,8 @@ public class NotificationUtils { @@ -28,7 +30,8 @@ public class NotificationUtils {
28 (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); 30 (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
29 31
30 // Intent para disparar o broadcast 32 // Intent para disparar o broadcast
31 - PendingIntent p = PendingIntent.getActivity(Utils.getApp(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT); 33 + PendingIntent p = PendingIntent.getActivity(Utils.getApp(), 0, intent,
  34 + Build.VERSION.SDK_INT >= 31 ? PendingIntent.FLAG_IMMUTABLE : PendingIntent.FLAG_UPDATE_CURRENT);
32 35
33 // Cria a notification 36 // Cria a notification
34 NotificationCompat.Builder builder = new NotificationCompat.Builder(context) 37 NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
@@ -48,7 +51,8 @@ public class NotificationUtils { @@ -48,7 +51,8 @@ public class NotificationUtils {
48 (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); 51 (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
49 52
50 // Intent para disparar o broadcast 53 // Intent para disparar o broadcast
51 - PendingIntent p = intent != null ? PendingIntent.getActivity(Utils.getApp(), 0, intent, PendingIntent.FLAG_UPDATE_CURRENT) : null; 54 + PendingIntent p = intent != null ? PendingIntent.getActivity(Utils.getApp(), 0, intent,
  55 + Build.VERSION.SDK_INT >= 31 ? PendingIntent.FLAG_IMMUTABLE : PendingIntent.FLAG_UPDATE_CURRENT) : null;
52 56
53 // Cria a notification 57 // Cria a notification
54 NotificationCompat.Builder builder = new NotificationCompat.Builder(context) 58 NotificationCompat.Builder builder = new NotificationCompat.Builder(context)