=======================同步到5.18号主包==================

app/src/main/java/com/zxhyis/toolss/FileApp.kt

@@ -35,7 +35,6 @@ import com.zxhyis.toolss.notification.broadcast.NotificationBroadcast
 import com.zxhyis.toolss.notification.broadcast.PackageBroadcast.Companion.newInitBroadcast
 import com.zxhyis.toolss.notification.provider.MyContentProviderUtils
 import com.zxhyis.toolss.ui.page.SplashActivity
-import com.zxhyis.toolss.ui.receiver.BatteryReceiver
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
@@ -86,9 +85,6 @@ class FileApp : Application() {
 
                 initEvenParams()
 
-                registerReceiver(BatteryReceiver(), IntentFilter().apply {
-                    addAction("android.intent.action.BATTERY_CHANGED")
-                })
                 registerReceiver(NotificationBroadcast(), IntentFilter().apply {
                     addAction(NotificationBroadcast.action)
                 })

app/src/main/java/com/zxhyis/toolss/notification/broadcast/ActionBroadcast.kt

@@ -15,7 +15,6 @@ import com.zxhyis.toolss.ad.queryDataStoreBlock
 import com.zxhyis.toolss.logic.LogEx
 import com.zxhyis.toolss.notification.NotificationHelper.postActionNotification
 import com.zxhyis.toolss.notification.NotificationUtils
-import com.zxhyis.toolss.ui.receiver.BatteryReceiver
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.DurationUnit
 
@@ -81,14 +80,14 @@ class ActionBroadcast : BroadcastReceiver() {
             }
 
             Intent.ACTION_BATTERY_CHANGED -> {//电量改变
-//                lowBattery()
+                lowBattery(intent)
             }
 
         }
     }
 
-    fun lowBattery() {
-        val level = BatteryReceiver.level
+    fun lowBattery(intent: Intent?) {
+        val level = intent?.getIntExtra("level", 0) ?: 0
         LogEx.logDebug(TAG, "电量改变 level=$level", isMust = true)
         if (level < 50) {
 

app/src/main/java/com/zxhyis/toolss/ui/home/NewHomeFragment.kt

@@ -38,7 +38,6 @@ import com.zxhyis.toolss.ui.page.notifaction.NotificationCleanActivity
 import com.zxhyis.toolss.ui.page.notifaction.NotificationGuestActivity
 import com.zxhyis.toolss.ui.page.photocompress.photo.StartCompressionPhotoActivity
 import com.zxhyis.toolss.ui.page.recentusage.RecentAppActivity
-import com.zxhyis.toolss.ui.receiver.BatteryReceiver
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.delay
@@ -81,27 +80,27 @@ class NewHomeFragment : TopFragment<FragmentHomeBinding>() {
         }
         mK.idCleanJunk.setOnClick(javaClass.simpleName) {
             startActivity(Intent(requireActivity(), PrepareScanActivity::class.java))
-            saveDian("dianJunk")
+//            saveDian("dianJunk")
         }
         mK.idAntivirus.setOnClick(javaClass.simpleName) {
             startActivity(Intent(requireActivity(), VirusActivity::class.java))
-            saveDian("dianAntivirus")
+//            saveDian("dianAntivirus")
         }
         mK.idNetworkTraffic.setOnClick(javaClass.simpleName) {
             startActivity(Intent(requireActivity(), NetWorkActivity::class.java))
-            saveDian("dianNetworkTraffic")
+//            saveDian("dianNetworkTraffic")
         }
         mK.idRecentApp.setOnClick(javaClass.simpleName) {
             startActivity(Intent(requireActivity(), RecentAppActivity::class.java))
-            saveDian("dianRecentApp")
+//            saveDian("dianRecentApp")
         }
         mK.idAppManager.setOnClick(javaClass.simpleName) {
             startActivity(Intent(requireActivity(), AppManager2Activity::class.java))
-            saveDian("dianAppManager")
+//            saveDian("dianAppManager")
         }
         mK.idBatteryInfo.setOnClick(javaClass.simpleName) {
             startActivity(Intent(requireActivity(), BatteryInfoActivity::class.java))
-            saveDian("dianBatteryInfo")
+//            saveDian("dianBatteryInfo")
         }
         mK.idNotificationCleaner.setOnClick(javaClass.simpleName) {
             if (SPUtils.getInstance().getBoolean("notification_guest", false)) {
@@ -139,11 +138,11 @@ class NewHomeFragment : TopFragment<FragmentHomeBinding>() {
         }
         lifecycleScope.launch(Dispatchers.Main) {
             launch {
-                while (true) {
-                    val percent = BatteryReceiver.level / BatteryReceiver.scale.toFloat()
-                    mK.idDcDl.text = "${(percent * 100).toInt()}%"
-                    delay(10000)
-                }
+//                while (true) {
+//                    val percent = BatteryReceiver.level / BatteryReceiver.scale.toFloat()
+//                    mK.idDcDl.text = "${(percent * 100).toInt()}%"
+//                    delay(10000)
+//                }
             }
             launch {
                 while (true) {

app/src/main/java/com/zxhyis/toolss/ui/receiver/BatteryReceiver.kt

-package com.zxhyis.toolss.ui.receiver
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.os.BatteryManager
-
-class BatteryReceiver : BroadcastReceiver() {
-    companion object {
-        var level = 0
-        var scale = 0
-        var voltage = 0
-        var temperature = 0
-        var mAh = 0f
-        var health = 0
-        var status = 0
-        var technology = "" //获取电池技术支持
-    }
-
-    override fun onReceive(context: Context, intent: Intent) {
-        if (intent.action == Intent.ACTION_BATTERY_CHANGED) {
-            level = intent.getIntExtra("level", 0)
-            scale = intent.getIntExtra("scale", 0)
-            voltage = intent.getIntExtra("voltage", 0)
-            temperature = intent.getIntExtra("temperature", 0)
-            technology = intent.getStringExtra("technology").toString()
-            status = intent.getIntExtra("status", BatteryManager.BATTERY_STATUS_UNKNOWN)
-            health = intent.getIntExtra("health", BatteryManager.BATTERY_HEALTH_UNKNOWN)
-
-            val batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as? BatteryManager ?: return
-            val chargeCounter = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CHARGE_COUNTER)
-            val propertyCapacity = batteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CAPACITY)
-            if (chargeCounter != Int.MIN_VALUE && propertyCapacity != Int.MIN_VALUE) {
-                mAh = (chargeCounter / (propertyCapacity.toFloat() / 100f)) / 1000f
-            }
-        }
-    }
-}
\ No newline at end of file

app/src/main/res/layout/activity_big_file_clean.xml

@@ -194,6 +194,7 @@
                 android:layout_marginTop="8dp"
                 android:layout_marginBottom="30dp"
                 android:background="@drawable/bg_corners_bfbfbf_26"
+                android:enabled="false"
                 android:gravity="center"
                 android:text="@string/delete"
                 android:textColor="@color/white"

app/src/main/res/layout/fragment_home.xml

@@ -286,6 +286,7 @@
                         android:paddingVertical="2dp"
                         android:textColor="@color/white"
                         android:textSize="12sp"
+                        android:visibility="gone"
                         app:bl_corners_radius="5dp"
                         app:bl_solid_color="#01AF4B"
                         app:layout_constraintEnd_toEndOf="parent"