Merge remote-tracking branch 'origin/quick-phone-clean' into quick-phone-clean

app/src/main/AndroidManifest.xml

@@ -20,6 +20,9 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
+
 
     <queries>
         <intent>
@@ -189,6 +192,7 @@
                 <data android:scheme="file" />
             </intent-filter>
         </receiver>
+        ``
 
         <service
             android:name=".business.service.StayJobService"

app/src/main/java/com/ritoq/quickphone/bean/config/PopupConfigBean.kt

@@ -2,7 +2,7 @@ package com.ritoq.quickphone.bean.config
 
 class PopupConfigBean(
 
-    var popupStatus: Boolean = false,//推送总开关
+    var popupStatus: Boolean = true,//推送总开关
     var popupForegroundCanPush: Boolean = false,//前台是否可以推送
     var popupCount: Int = 500,//推送总次数
     var isDifferNotificationId: Boolean = true,//推送使用不同的通知ID
@@ -14,13 +14,13 @@ class PopupConfigBean(
     var popupHoverCount: Int = 5,
     var popupHoverDelay: Int = 5000,
 
-    var timerS: Boolean = false,//定时器触发推送
+    var timerS: Boolean = true,//定时器触发推送
     var timerDelay: Int = 60,//定时器执行延迟 秒
     var timerInterval: Int = 7,//定时器执行间隔 分钟
 
-    val screenS: Boolean = false,//解锁触发推送
-    val alarmS: Boolean = false,//是否闹钟触发推送
-    val workS: Boolean = false,//workManager触发推送
+    val screenS: Boolean = true,//解锁触发推送
+    val alarmS: Boolean = true,//是否闹钟触发推送
+    val workS: Boolean = true,//workManager触发推送
 
     val batteryS: Boolean = true,//电池触发通知开关
     var batteryInterval: Int = 180,//电池推送间隔 秒（推送间隔一般大于总间隔才有意义）

app/src/main/java/com/ritoq/quickphone/business/push/notification/MyNotificationManager.kt

@@ -41,7 +41,6 @@ object MyNotificationManager {
     private var sendBeanBlockingQueue = ArrayBlockingQueue<NotificationSendBean>(10)
 
     fun submitSendBean(bean: NotificationSendBean) {
-        return
         //测试哪些位置触发
         if (BuildConfig.DEBUG) {
             if (!testWhere.contains(bean.where)) return

app/src/main/java/com/ritoq/quickphone/business/push/notification/NotificationUiUtil.kt

@@ -48,7 +48,8 @@ object NotificationUiUtil {
         intent.putExtra("notificationId", sendBean.notificationId)
         sendBean.intent = intent
 
-        val testNotificationId = if (BuildConfig.DEBUG) "${sendBean.notificationId}_${sendBean.actionId}_" else ""
+//        val testNotificationId = if (BuildConfig.DEBUG) "${sendBean.notificationId}_${sendBean.actionId}_" else ""
+        val testNotificationId = ""
         var debugAction: (remoteViews: RemoteViews) -> Unit = { remoteViews ->
             if (BuildConfig.DEBUG) {
                 remoteViews.setTextViewText(R.id.tv_btn, sendBean.where)