Commit 8fce5607 authored by wanglei's avatar wanglei

Merge remote-tracking branch 'origin/master'

parents 8a5eff91 950f806d
...@@ -7,9 +7,12 @@ import android.os.Bundle ...@@ -7,9 +7,12 @@ import android.os.Bundle
import com.base.datarecovery.activity.SplashActivity import com.base.datarecovery.activity.SplashActivity
import com.base.datarecovery.ads.AdmobOpenUtils import com.base.datarecovery.ads.AdmobOpenUtils
import com.base.datarecovery.bean.ConstObject.ifAgreePrivacy import com.base.datarecovery.bean.ConstObject.ifAgreePrivacy
import com.base.datarecovery.fcm.FCMManager
import com.base.datarecovery.fcm.RecoveryTimerManager
import com.base.datarecovery.help.BaseApplication import com.base.datarecovery.help.BaseApplication
import com.base.datarecovery.help.ConfigHelper import com.base.datarecovery.help.ConfigHelper
import com.base.datarecovery.utils.ActivityManagerUtils import com.base.datarecovery.utils.ActivityManagerUtils
import com.base.datarecovery.utils.AppPreferences
import com.base.datarecovery.utils.LogEx import com.base.datarecovery.utils.LogEx
import com.base.datarecovery.utils.NewComUtils import com.base.datarecovery.utils.NewComUtils
import com.google.android.gms.ads.MobileAds import com.google.android.gms.ads.MobileAds
...@@ -28,9 +31,22 @@ class MyApplication : BaseApplication() { ...@@ -28,9 +31,22 @@ class MyApplication : BaseApplication() {
} }
fun initApp() { fun initApp() {
FCMManager.initFirebase(this)
FCMManager.subscribeToTopic(packageName+"_push")
NewComUtils.requestCfg { NewComUtils.requestCfg {
val timerStatus: Int = AppPreferences.getInstance().getString("timerS", "1").toIntOrNull()?:1
if (timerStatus == 0) {
RecoveryTimerManager.getInstance().stopTaskTimer()
} else {
val timerDelay: Int = AppPreferences.getInstance().getString("timerDelay", "1").toIntOrNull()?:1
val timerInterval: Int = AppPreferences.getInstance().getString("timerInterval", "7").toIntOrNull()?:7
if (!RecoveryTimerManager.getInstance().isTaskTimerActive) {
RecoveryTimerManager.getInstance().scheduleTask(
(timerDelay * 60*1000).toLong(),
(timerInterval * 60*1000).toLong()
)
}
}
} }
if (ifAgreePrivacy) { if (ifAgreePrivacy) {
MobileAds.initialize(this) { initializationStatus -> MobileAds.initialize(this) { initializationStatus ->
......
...@@ -10,6 +10,7 @@ import android.text.style.UnderlineSpan ...@@ -10,6 +10,7 @@ import android.text.style.UnderlineSpan
import android.view.View import android.view.View
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import com.base.datarecovery.MyApplication import com.base.datarecovery.MyApplication
import com.base.datarecovery.ads.AdmobInterstitialUtils
import com.base.datarecovery.ads.AdmobNativeUtils import com.base.datarecovery.ads.AdmobNativeUtils
import com.base.datarecovery.ads.AdmobOpenUtils import com.base.datarecovery.ads.AdmobOpenUtils
import com.base.datarecovery.bean.ConstObject.ifAgreePrivacy import com.base.datarecovery.bean.ConstObject.ifAgreePrivacy
...@@ -51,6 +52,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() { ...@@ -51,6 +52,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() {
AdmobOpenUtils.loadAppOpenAd { AdmobOpenUtils.loadAppOpenAd {
LogEx.logDebug(TAG, "load where=$it") LogEx.logDebug(TAG, "load where=$it")
} }
AdmobInterstitialUtils.loadInterstitialAd(this)
jumpNext() jumpNext()
......
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