[新增]电池触发通知

app/src/main/java/com/base/appzxhy/bean/config/PopupConfigBean.kt

@@ -22,6 +22,9 @@ class PopupConfigBean(
     val alarmS: Boolean = true,//是否闹钟触发推送
     val workS: Boolean = true,//workManager触发推送
 
+    val batteryS: Boolean = true,//电池触发通知开关
+    var batteryInterval: Int = 180,//电池推送间隔 秒（推送间隔一般大于总间隔才有意义）
+
     val notifyForegroundInterval: Long = 30000L//常驻通知栏刷新通知间隔
 ) {
     companion object {

app/src/main/java/com/base/appzxhy/ui/batteryinfo/BatteryReceiver.kt

@@ -6,6 +6,23 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.os.BatteryManager
 import android.os.Build
+import com.base.appzxhy.bean.FeatureBean.Companion.BATTERY_INFO
+import com.base.appzxhy.bean.config.PopupConfigBean
+import com.base.appzxhy.bean.push.NotificationSendBean
+import com.base.appzxhy.bean.push.NotificationSendBean.Companion.POPUP_WHERE_BATTERY
+import com.base.appzxhy.business.push.notification.MyNotificationManager
+import com.base.appzxhy.utils.AppPreferences
+
+
+//电池上次推送时间
+var batteryLastPushTime = 0L
+    get() {
+        return AppPreferences.getInstance().getLong("batteryLastPushTime", field)
+    }
+    set(value) {
+        field = value
+        AppPreferences.getInstance().put("batteryLastPushTime", value, true)
+    }
 
 class BatteryReceiver(
     private val block: (() -> Unit?)? = null
@@ -71,6 +88,25 @@ class BatteryReceiver(
 
     private fun uiHandle(context: Context) {
 
+        val batteryPct = level * 100 / scale.toFloat()
+        if (batteryPct.toInt() > 21 && !isCharging) return
 
+        if (!PopupConfigBean.popupConfigBean.batteryS) return
+
+        val canSend = ((System.currentTimeMillis() - batteryLastPushTime) / 1000) >
+                PopupConfigBean.popupConfigBean.batteryInterval
+
+        MyNotificationManager.submitSendBean(
+            NotificationSendBean(
+                context,
+                where = POPUP_WHERE_BATTERY,
+                canSend = { canSend },
+                sendSuccess = {
+                    batteryLastPushTime = System.currentTimeMillis()
+                },
+            ).apply {
+                actionId = BATTERY_INFO
+            }
+        )
     }
 }
\ No newline at end of file

app/src/main/java/com/base/appzxhy/ui/recyclebin/RecycleBinDetailActivity.kt

@@ -49,12 +49,14 @@ class RecycleBinDetailActivity : BaseActivity<ActivityRecycleBinDetailBinding>(A
         binding.ivBack.setOnClickListener {
             binding.v.visibility = View.VISIBLE
             onBackPressedDispatcher.onBackPressed()
+            finish()
         }
         binding.ivDelete.setOnClickListener {
             lifecycleScope.launch {
                 recycleBinFile.deleteIfExists()
             }
             onBackPressedDispatcher.onBackPressed()
+            finish()
         }
         binding.tvRestore.setOnClickListener {
             lifecycleScope.launch {
@@ -71,6 +73,7 @@ class RecycleBinDetailActivity : BaseActivity<ActivityRecycleBinDetailBinding>(A
                         putExtra("Number", 1)
                         putExtra("ScanType", recycleBinFile.getType())
                     })
+                    finish()
                 }
             })