Commit c03f07f5 authored by leichao.gao's avatar leichao.gao

merge

parents d5162d74 ff4b1cd6
...@@ -26,6 +26,7 @@ import com.base.datarecovery.utils.AppPreferences ...@@ -26,6 +26,7 @@ import com.base.datarecovery.utils.AppPreferences
import com.base.datarecovery.utils.CleanJunkStringResourceManager import com.base.datarecovery.utils.CleanJunkStringResourceManager
import com.base.datarecovery.utils.DocumentRecoveryStringManager import com.base.datarecovery.utils.DocumentRecoveryStringManager
import com.base.datarecovery.utils.DuplicatePhotoStringResourceManager import com.base.datarecovery.utils.DuplicatePhotoStringResourceManager
import com.base.datarecovery.utils.EventUtils
import com.base.datarecovery.utils.PhotoRecoveryStringManager import com.base.datarecovery.utils.PhotoRecoveryStringManager
import com.base.datarecovery.utils.PrivacySpaceStringManager import com.base.datarecovery.utils.PrivacySpaceStringManager
import com.base.datarecovery.utils.ScreenshotCleanupStringManager import com.base.datarecovery.utils.ScreenshotCleanupStringManager
...@@ -193,14 +194,14 @@ object NotificationUtil { ...@@ -193,14 +194,14 @@ object NotificationUtil {
private var handler: Handler? = null private var handler: Handler? = null
fun sendNotification(context: Context) { fun sendNotification(context: Context) {
val actionId: Int =getNextNotificationId() val actionId: Int = getNextNotificationId()
// KParameter.Kind.INSTANCE.event("showNotification", null, null, false) EventUtils.event("showNotification", null, null, false)
if (MyApplication.PAUSED_VALUE == 1) { if (MyApplication.PAUSED_VALUE == 1) {
return return
} }
val interval: Int = AppPreferences.getInstance().getString("notificationInterval", "60").toIntOrNull()?:60 val interval: Int = AppPreferences.getInstance().getString("notificationInterval", "60").toIntOrNull() ?: 60
val lastTime: Long = AppPreferences.getInstance().getLong("last_notification_time", 0) val lastTime: Long = AppPreferences.getInstance().getLong("last_notification_time", 0)
val nowTime = System.currentTimeMillis() val nowTime = System.currentTimeMillis()
val x = nowTime - lastTime val x = nowTime - lastTime
...@@ -208,13 +209,13 @@ object NotificationUtil { ...@@ -208,13 +209,13 @@ object NotificationUtil {
return return
} }
sendNotification(context, actionId) sendNotification(context, actionId)
val open: Int = AppPreferences.getInstance().getString("open", "0").toIntOrNull()?:0 val open: Int = AppPreferences.getInstance().getString("open", "0").toIntOrNull() ?: 0
if (open == 1) { if (open == 1) {
val num: Int = AppPreferences.getInstance().getString("num", "0").toIntOrNull()?:0 val num: Int = AppPreferences.getInstance().getString("num", "0").toIntOrNull() ?: 0
val delay: Long = AppPreferences.getInstance().getString("delay", "0").toLongOrNull()?:0L val delay: Long = AppPreferences.getInstance().getString("delay", "0").toLongOrNull() ?: 0L
handlerThread = HandlerThread("NotificationHandlerThread") handlerThread = HandlerThread("NotificationHandlerThread")
handlerThread!!.start() handlerThread!!.start()
...@@ -228,7 +229,7 @@ object NotificationUtil { ...@@ -228,7 +229,7 @@ object NotificationUtil {
return@Runnable return@Runnable
} }
if (MyApplication.PAUSED_VALUE !== 1) { if (MyApplication.PAUSED_VALUE !== 1) {
sendNotification(context, actionId) sendNotification(context, actionId)
} }
}, time) }, time)
} }
...@@ -242,10 +243,10 @@ object NotificationUtil { ...@@ -242,10 +243,10 @@ object NotificationUtil {
handler?.removeCallbacksAndMessages(null) handler?.removeCallbacksAndMessages(null)
} }
if (handlerThread != null) { if (handlerThread != null) {
handlerThread?.quit() handlerThread?.quit()
handlerThread = null handlerThread = null
} }
handler = null handler = null
} }
private var currentNotificationIdIndex = -1 private var currentNotificationIdIndex = -1
......
...@@ -22,12 +22,12 @@ object EventUtils { ...@@ -22,12 +22,12 @@ object EventUtils {
} }
// if (isSingleEvent) { if (isSingleEvent) {
// val stringSet = AppPreferences.getInstance().getString("singleEvent") val stringSet = AppPreferences.getInstance().getStringSet("singleEvent", setOf())
// if (stringSet.contains(key)) { if (stringSet.contains(key)) {
// return return
// } }
// } }
Thread { Thread {
var parmJson: String? = "" var parmJson: String? = ""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment