...

app/src/main/java/com/base/locationsharewhite/ads/AdsConfigBean.kt

@@ -25,11 +25,11 @@ data class AdsConfigBean(
             val adsConfigBean = AdsConfigBean()
             adsConfigBean.apply {
                 isInBlackList = AppPreferences.getInstance().getBoolean("isInBlackList", false)
-                numDisplayLimit = AppPreferences.getInstance().getInt("numDisplayLimit", -1)
-                numRequestLimit = AppPreferences.getInstance().getInt("numRequestLimit", -1)
-                numClickLimit = AppPreferences.getInstance().getInt("numClickLimit", -1)
-                timeInterval = AppPreferences.getInstance().getInt("timeInterval", 1)
-                openAdLoading = AppPreferences.getInstance().getInt("openAdLoading", 15)
+                numDisplayLimit = AppPreferences.getInstance().getString("numDisplayLimit", "-1").toInt()
+                numRequestLimit = AppPreferences.getInstance().getString("numRequestLimit", "-1").toInt()
+                numClickLimit = AppPreferences.getInstance().getString("numClickLimit", "-1").toInt()
+                timeInterval = AppPreferences.getInstance().getString("timeInterval", "1").toInt()
+                openAdLoading = AppPreferences.getInstance().getString("openAdLoading", "15").toInt()
             }
             return adsConfigBean
         }

app/src/main/java/com/base/locationsharewhite/ads/admob/LimitUtils.kt

@@ -12,13 +12,13 @@ import com.base.locationsharewhite.utils.KotlinExt.toFormatTime4
  *
  */
 object LimitUtils {
-    const val NUM_DISPLAY = "numDisplayLimit"
+    const val NUM_DISPLAY = "local_numDisplayLimit"
 
-    const val NUM_REQUEST = "numRequestLimit"
+    const val NUM_REQUEST = "local_numRequestLimit"
 
-    const val NUM_CLICK = "numClickLimit"
+    const val NUM_CLICK = "local_numClickLimit"
 
-    const val SAVE_DATE = "SAVE_DATE"
+    const val SAVE_DATE = "local_SAVE_DATE"
 
     /**
      * 保存的时间，用来判断是否是当天，不是当天要重置计数次数

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 {
@@ -59,7 +58,7 @@ object PopupConstObject {
     const val ACTION_ENABLE_LOCATION = "action_enable_location"
     const val ACTION_COPY_CODE = "action_copy_code"
 
-    fun createDefaultPopupJson() {
+    fun createDefaultPopupJson(): JSONObject {
         val json = JSONObject()
 
         //通知总的条件
@@ -88,6 +87,6 @@ object PopupConstObject {
         json.put(popup_screen_count, "20")
         json.put(popup_screen_interval, "1")
 
-        LogEx.logDebug("createDefaultJson", "json=$json")
+        return json
     }
 }
\ No newline at end of file

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

 package com.base.locationsharewhite.helper
 
+import FCMManager
 import android.app.Activity
 import android.app.Application
 import android.content.Intent
@@ -9,7 +10,6 @@ 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.createDefaultPopupJson
 import com.base.locationsharewhite.fcm.ScreenStatusReceiver
 import com.base.locationsharewhite.fcm.alarm.AlarmUtils.startAlarm
 import com.base.locationsharewhite.helper.config.AppConfig
@@ -79,7 +79,11 @@ class MyApplication : Application() {
         startAlarm(appContext)
 
 
-        createDefaultPopupJson()
+//        val popupJson = createDefaultPopupJson()
+//        val adJson = createDefaultAdJson()
+//        val allJons = adJson.pullAll(popupJson)
+//        LogEx.logDebug(TAG, "allJons=$allJons")
+
     }
 
 

app/src/main/java/com/base/locationsharewhite/utils/JsonUtils.kt

+package com.base.locationsharewhite.utils
+
+import org.json.JSONObject
+
+object JsonUtils {
+
+    fun JSONObject.pullAll(jsonObject: JSONObject): JSONObject {
+
+        for (key in jsonObject.keys()) {
+            this.put(key, jsonObject.get(key))
+        }
+        return this
+    }
+}
\ No newline at end of file