Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/src/main/java/com/zxdemo/notity/NotificationUtils.kt
#	app/src/main/java/com/zxdemo/utils/GlobalTimer.kt

app/src/main/AndroidManifest.xml

@@ -22,7 +22,7 @@
     </queries>
 
     <application
-        android:name="com.tool.zxdemo.ZxApplication"
+        android:name="com.zxdemo.ZxApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"

app/src/main/java/com/zxdemo/notity/NotificationUtils.kt

-package com.tool.zxdemo.notity
-
+package com.zxdemo.notity
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
@@ -20,6 +19,9 @@ import com.swiftcleaner.chovey.view.MainActivity
 //import com.tool.zxdemo.ZxApplication.Companion.isAppInForeground
 //import com.tool.zxdemo.ZxApplication.Companion.isDeviceLocked
 //import com.tool.zxdemo.ZxApplication.Companion.isScreenOn
+import com.zxdemo.ZxApplication.Companion.isAppInForeground
+import com.zxdemo.ZxApplication.Companion.isDeviceLocked
+import com.zxdemo.ZxApplication.Companion.isScreenOn
 import com.zxdemo.ZxApplication
 import com.zxdemo.ZxApplication.Companion.isAppInForeground
 import com.zxdemo.ZxApplication.Companion.isDeviceLocked
@@ -74,7 +76,7 @@ object NotificationUtils {
         bigRemoteViews: RemoteViews?,
         smallRemoteViews: RemoteViews?,
         title: String,
-        action:String,
+        action: String,
         value: String,
         isStay: Boolean? = false
     ) {
@@ -202,7 +204,7 @@ object NotificationUtils {
                     }
                 }, time)
             }
-        }else{
+        } else {
             sendNotification(
                 context,
                 intent,

app/src/main/java/com/zxdemo/receiver/AppInstallReceiver.kt

@@ -6,7 +6,7 @@ import android.content.IntentFilter
 import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
-import com.tool.zxdemo.notity.NotificationUtils
+import com.zxdemo.notity.NotificationUtils
 import com.zxdemo.utils.SpUtils
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter

app/src/main/java/com/zxdemo/receiver/BatteryStatusReceiver.kt

@@ -7,7 +7,7 @@ import android.os.BatteryManager
 import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
-import com.tool.zxdemo.notity.NotificationUtils
+import com.zxdemo.notity.NotificationUtils
 import com.zxdemo.utils.SpUtils
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter

app/src/main/java/com/zxdemo/receiver/UnlockReceiver.kt

@@ -6,8 +6,8 @@ import android.content.IntentFilter
 import android.os.Build
 import android.util.Log
 import androidx.annotation.RequiresApi
-import com.tool.zxdemo.notity.NotificationUtils
 import com.zxdemo.ZxApplication
+import com.zxdemo.notity.NotificationUtils
 import com.zxdemo.utils.SpUtils
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter

app/src/main/java/com/zxdemo/service/FcmService.kt

@@ -2,9 +2,9 @@ package com.zxdemo.service
 import android.util.Log
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
-import com.tool.zxdemo.notity.NotificationUtils
 import com.zxdemo.ZxApplication
 import com.zxdemo.http.ZxHttp
+import com.zxdemo.notity.NotificationUtils
 
 class FcmService : FirebaseMessagingService() {
     override fun onMessageReceived(message: RemoteMessage) {

app/src/main/java/com/zxdemo/utils/GlobalTimer.kt

@@ -4,6 +4,10 @@ import android.util.Log
 //import com.tool.zxdemo.ZxApplication.Companion.isDeviceLocked
 //import com.tool.zxdemo.ZxApplication.Companion.isScreenOn
 import com.tool.zxdemo.notity.NotificationUtils
+import com.zxdemo.ZxApplication.Companion.isAppInForeground
+import com.zxdemo.ZxApplication.Companion.isDeviceLocked
+import com.zxdemo.ZxApplication.Companion.isScreenOn
+import com.zxdemo.notity.NotificationUtils
 import com.zxdemo.ZxApplication
 import com.zxdemo.ZxApplication.Companion.isAppInForeground
 import com.zxdemo.ZxApplication.Companion.isDeviceLocked