...

app/src/androidTest/java/com/base/locationsharewhite/ExampleInstrumentedTest.kt

@@ -2,6 +2,7 @@ package com.base.locationsharewhite
 
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.base.locationsharewhite.fcm.PopupConstObject.createDefaultJson
 
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -21,4 +22,5 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.base.locationsharewhite", appContext.packageName)
     }
+
 }
\ No newline at end of file

app/src/main/java/com/base/locationsharewhite/fcm/BatteryStatusReceiver.kt

@@ -75,10 +75,12 @@ class BatteryStatusReceiver() : BroadcastReceiver() {
             val popupBatteryCount = AppPreferences.getInstance().getString(popup_battery_count, "20").toInt()
             val flag1 = todayBatteryPush <= popupBatteryCount
 
-            val default = 60 * 60 * 1000L
+            val minute = 60 * 1000L
+            val default = 60 * minute
+
             val interval = AppPreferences.getInstance().getString(popup_battery_interval, default.toString()).toLong()
             val passTime = System.currentTimeMillis() - batteryLastPushTime
-            val flag2 = batteryLastPushTime == 0L || passTime > interval
+            val flag2 = batteryLastPushTime == 0L || passTime > interval * minute
 
 
             val flag = flag1 && flag2

app/src/main/java/com/base/locationsharewhite/fcm/PackageStatusReceiver.kt

@@ -70,10 +70,11 @@ class PackageStatusReceiver() : BroadcastReceiver() {
             val popupPackageCount = AppPreferences.getInstance().getString(popup_package_count, "20").toInt()
             val flag1 = todayPackagePush <= popupPackageCount
 
-            val default = 60 * 1000L
+            val minute = 60 * 1000L
+            val default = 1 * minute
             val interval = AppPreferences.getInstance().getString(popup_package_interval, default.toString()).toLong()
             val passTime = System.currentTimeMillis() - packageLastPushTime
-            val flag2 = packageLastPushTime == 0L || passTime > interval
+            val flag2 = packageLastPushTime == 0L || passTime > interval * minute
 
 
             val flag = flag1 && flag2

app/src/main/java/com/base/locationsharewhite/fcm/PopupConstObject.kt

 package com.base.locationsharewhite.fcm
 
+import com.base.locationsharewhite.utils.LogEx
+import org.json.JSONObject
+
 object PopupConstObject {
 
     //推送触发位置
@@ -23,14 +26,13 @@ object PopupConstObject {
     const val popup_end = "popup_end"
     const val popup_interval = "popup_interval"
     const val popup_timer_interval = "popup_timber_interval"
-    const val popup_lock_interval = "popup_lock_interval"
     const val popup_fcm_interval = "popup_fcm_interval"
 
     const val popup_hover_status = "popup_hover_status"
     const val popup_hover_count = "popup_hover_count"
     const val popup_hover_delay = "popup_hover_delay"
 
-    const val lockS = "lockS"
+    //定时器
     const val timerS = "timerS"
     const val timerDelay = "timerDelay"
     const val timerInterval = "timerInterval"
@@ -44,6 +46,7 @@ object PopupConstObject {
     const val popup_package_interval = "popup_package_interval"
 
     //解锁可配置值
+    const val lockS = "lockS"
     const val popup_screen_count = "popup_screen_count"
     const val popup_screen_interval = "popup_screen_interval"
 
@@ -56,5 +59,35 @@ object PopupConstObject {
     const val ACTION_ENABLE_LOCATION = "action_enable_location"
     const val ACTION_COPY_CODE = "action_copy_code"
 
+    fun createDefaultJson() {
+        val json = JSONObject()
+
+        //通知总的条件
+        json.put(popup_status, "1")
+        json.put(popup_start, "0")
+        json.put(popup_end, "24")
+        json.put(popup_interval, "1")
+        json.put(popup_timer_interval, "7")
+        json.put(popup_fcm_interval, "1")
+
+        json.put(popup_hover_status, "1")
+        json.put(popup_hover_count, "4")
+        json.put(popup_hover_delay, "1000")
+
+        json.put(timerS, "1")
+        json.put(timerDelay, "1")
+        json.put(timerInterval, "1")
+
+        json.put(popup_battery_count, "20")
+        json.put(popup_battery_interval, "60")
+
+        json.put(popup_package_count, "20")
+        json.put(popup_package_interval, "1")
+
+        json.put(lockS, "1")
+        json.put(popup_screen_count, "20")
+        json.put(popup_screen_interval, "1")
 
+        LogEx.logDebug("createDefaultJson", "json=$json")
+    }
 }
\ No newline at end of file

app/src/main/java/com/base/locationsharewhite/fcm/ScreenStatusReceiver.kt

@@ -95,10 +95,12 @@ class ScreenStatusReceiver : BroadcastReceiver() {
             val popupScreenCount = AppPreferences.getInstance().getString(popup_screen_count, "20").toInt()
             val flag1 = todayScreenPush <= popupScreenCount
 
-            val default = 60 * 1000L
+            val minute = 60 * 1000L
+            val default = 1 * minute
+
             val interval = AppPreferences.getInstance().getString(popup_screen_interval, default.toString()).toLong()
             val passTime = System.currentTimeMillis() - screenLastPushTime
-            val flag2 = screenLastPushTime == 0L || passTime > interval
+            val flag2 = screenLastPushTime == 0L || passTime > interval * minute
 
             val flag = flag1 && flag2
 

app/src/main/java/com/base/locationsharewhite/helper/MyApplication.kt

@@ -9,6 +9,7 @@ import com.base.locationsharewhite.ads.AdsConfigBean
 import com.base.locationsharewhite.ads.AdsMgr
 import com.base.locationsharewhite.fcm.BatteryStatusReceiver
 import com.base.locationsharewhite.fcm.PackageStatusReceiver
+import com.base.locationsharewhite.fcm.PopupConstObject.createDefaultJson
 import com.base.locationsharewhite.fcm.ScreenStatusReceiver
 import com.base.locationsharewhite.fcm.alarm.AlarmUtils.startAlarm
 import com.base.locationsharewhite.helper.config.AppConfig
@@ -76,6 +77,9 @@ class MyApplication : Application() {
 
         startJob()
         startAlarm(appContext)
+
+
+        createDefaultJson()
     }
 
 

app/src/test/java/com/base/locationsharewhite/ExampleUnitTest.kt

 package com.base.locationsharewhite
 
+import com.base.locationsharewhite.fcm.PopupConstObject.createDefaultJson
 import org.junit.Test
 
 import org.junit.Assert.*
@@ -14,4 +15,5 @@ class ExampleUnitTest {
     fun addition_isCorrect() {
         assertEquals(4, 2 + 2)
     }
+
 }
\ No newline at end of file