Commit cb525120 authored by maxiaoliang's avatar maxiaoliang

1

parent 8a764fe5
...@@ -14,12 +14,14 @@ import com.test.easy.easycleanerjunk.fcm.FCMUtil ...@@ -14,12 +14,14 @@ import com.test.easy.easycleanerjunk.fcm.FCMUtil
import com.test.easy.easycleanerjunk.helps.BaseApplication import com.test.easy.easycleanerjunk.helps.BaseApplication
import com.test.easy.easycleanerjunk.helps.BlackUtils import com.test.easy.easycleanerjunk.helps.BlackUtils
import com.test.easy.easycleanerjunk.helps.ConfigHelper import com.test.easy.easycleanerjunk.helps.ConfigHelper
import com.test.easy.easycleanerjunk.helps.EventUtils
import com.test.easy.easycleanerjunk.helps.InstallHelps import com.test.easy.easycleanerjunk.helps.InstallHelps
import com.test.easy.easycleanerjunk.helps.LogEx import com.test.easy.easycleanerjunk.helps.LogEx
import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
import com.test.easy.easycleanerjunk.helps.ads.MaxAdUtils import com.test.easy.easycleanerjunk.helps.ads.MaxAdUtils
import com.test.easy.easycleanerjunk.utils.ActivityManagerUtils import com.test.easy.easycleanerjunk.utils.ActivityManagerUtils
import com.test.easy.easycleanerjunk.utils.SPUtils import com.test.easy.easycleanerjunk.utils.SPUtils
import org.json.JSONObject
import java.util.UUID import java.util.UUID
import java.util.concurrent.Executors import java.util.concurrent.Executors
...@@ -88,6 +90,7 @@ class MyApplication : BaseApplication() { ...@@ -88,6 +90,7 @@ class MyApplication : BaseApplication() {
ActionBroadcast.initBroadcast(this) ActionBroadcast.initBroadcast(this)
} }
private var lastTimePause = 0L private var lastTimePause = 0L
private var lastTimeResume = 0L private var lastTimeResume = 0L
private fun isHotLaunch(): Boolean { private fun isHotLaunch(): Boolean {
...@@ -96,6 +99,7 @@ class MyApplication : BaseApplication() { ...@@ -96,6 +99,7 @@ class MyApplication : BaseApplication() {
} }
return false return false
} }
private fun initLifeListener() { private fun initLifeListener() {
registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks { registerActivityLifecycleCallbacks(object : ActivityLifecycleCallbacks {
private var count = 0 private var count = 0
...@@ -115,17 +119,21 @@ class MyApplication : BaseApplication() { ...@@ -115,17 +119,21 @@ class MyApplication : BaseApplication() {
} else { } else {
ConfigHelper.noLoadingActivities ConfigHelper.noLoadingActivities
.all { .all {
!topActivity.localClassName.contains(it, true) } !topActivity.localClassName.contains(it, true)
}
} }
if (activity.localClassName.contains("AppLovinFullscreenActivity")) { if (activity.localClassName.contains("AppLovinFullscreenActivity")) {
flag = false flag = false
} }
if(ConfigHelper.isInterAdShow){ val obj = JSONObject()
flag=false obj.put("topActivity", topActivity?.localClassName)
obj.put("InterAdShow", "ifAdShow:" + ConfigHelper.isInterAdShow)
EventUtils.event("ifAdShow", ext = obj)
if (ConfigHelper.isInterAdShow) {
flag = false
} }
if (flag) { if (flag) {
if(ConfigHelper.admobTrueMaxFlase==0){ if (ConfigHelper.admobTrueMaxFlase == 0) {
if (MaxAdUtils.isOpenAdLoaded()) { if (MaxAdUtils.isOpenAdLoaded()) {
MaxAdUtils.showAppOpenAd(activity) MaxAdUtils.showAppOpenAd(activity)
} else { } else {
...@@ -138,7 +146,7 @@ class MyApplication : BaseApplication() { ...@@ -138,7 +146,7 @@ class MyApplication : BaseApplication() {
putExtra("type", -1) putExtra("type", -1)
}) })
} }
}else{ } else {
if (AdmobUtils.isOpenAdLoaded()) { if (AdmobUtils.isOpenAdLoaded()) {
AdmobUtils.showAppOpenAd(activity) AdmobUtils.showAppOpenAd(activity)
} else { } else {
...@@ -158,7 +166,7 @@ class MyApplication : BaseApplication() { ...@@ -158,7 +166,7 @@ class MyApplication : BaseApplication() {
} }
override fun onActivityResumed(activity: Activity) { override fun onActivityResumed(activity: Activity) {
LogEx.logDebug("glc","onActivityResumed"+activity.localClassName) LogEx.logDebug("glc", "onActivityResumed" + activity.localClassName)
PAUSED_VALUE = 1 PAUSED_VALUE = 1
} }
...@@ -166,7 +174,7 @@ class MyApplication : BaseApplication() { ...@@ -166,7 +174,7 @@ class MyApplication : BaseApplication() {
override fun onActivityPaused(activity: Activity) { override fun onActivityPaused(activity: Activity) {
PAUSED_VALUE = 2 PAUSED_VALUE = 2
lastTimePause = System.currentTimeMillis() lastTimePause = System.currentTimeMillis()
LogEx.logDebug("glc","onActivityPaused"+activity.localClassName) LogEx.logDebug("glc", "onActivityPaused" + activity.localClassName)
} }
...@@ -177,7 +185,7 @@ class MyApplication : BaseApplication() { ...@@ -177,7 +185,7 @@ class MyApplication : BaseApplication() {
override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {} override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
override fun onActivityDestroyed(activity: Activity) { override fun onActivityDestroyed(activity: Activity) {
LogEx.logDebug("glc","onActivityDestroyed"+activity.localClassName) LogEx.logDebug("glc", "onActivityDestroyed" + activity.localClassName)
ActivityManagerUtils.getInstance().removeActivity(activity) ActivityManagerUtils.getInstance().removeActivity(activity)
} }
}) })
......
package com.test.easy.easycleanerjunk.activity.batteryinfo package com.test.easy.easycleanerjunk.activity.batteryinfo
import android.annotation.SuppressLint
import android.content.Intent import android.content.Intent
import android.view.View import android.view.View
import android.widget.Toast import android.widget.Toast
...@@ -12,6 +11,7 @@ import com.test.easy.easycleanerjunk.helps.ConfigHelper ...@@ -12,6 +11,7 @@ import com.test.easy.easycleanerjunk.helps.ConfigHelper
import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
import com.test.easy.easycleanerjunk.helps.ads.MaxAdUtils import com.test.easy.easycleanerjunk.helps.ads.MaxAdUtils
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlin.random.Random import kotlin.random.Random
...@@ -21,10 +21,10 @@ class BatteryInfoAnimationActivity : BaseActivity<ActivityBatteryInfoAnimationBi ...@@ -21,10 +21,10 @@ class BatteryInfoAnimationActivity : BaseActivity<ActivityBatteryInfoAnimationBi
override val binding: ActivityBatteryInfoAnimationBinding by lazy { override val binding: ActivityBatteryInfoAnimationBinding by lazy {
ActivityBatteryInfoAnimationBinding.inflate(layoutInflater) ActivityBatteryInfoAnimationBinding.inflate(layoutInflater)
} }
private var job: Job? = null
override fun initView() { override fun initView() {
playLottie() resumeLottie()
} }
override fun initListener() { override fun initListener() {
...@@ -33,13 +33,25 @@ class BatteryInfoAnimationActivity : BaseActivity<ActivityBatteryInfoAnimationBi ...@@ -33,13 +33,25 @@ class BatteryInfoAnimationActivity : BaseActivity<ActivityBatteryInfoAnimationBi
} }
} }
@SuppressLint("SetTextI18n")
private fun playLottie() {
override fun onPause() {
super.onPause()
binding.lottie.pauseAnimation()
job?.cancel()
}
override fun onResume() {
super.onResume()
resumeLottie()
job = waitJob()
}
fun resumeLottie(){
binding.lottie.imageAssetsFolder = "battery_scan/images/" binding.lottie.imageAssetsFolder = "battery_scan/images/"
binding.lottie.setAnimation("battery_scan/data.json") binding.lottie.setAnimation("battery_scan/data.json")
binding.lottie.playAnimation() binding.lottie.playAnimation()
}
lifecycleScope.launch(Dispatchers.Main) { private fun waitJob() = lifecycleScope.launch(Dispatchers.Main) {
delay(Random.nextLong(3000, 4500)) delay(Random.nextLong(3000, 4500))
binding.lottie.visibility = View.GONE binding.lottie.visibility = View.GONE
binding.lottieCompleted.visibility = View.VISIBLE binding.lottieCompleted.visibility = View.VISIBLE
...@@ -59,9 +71,6 @@ class BatteryInfoAnimationActivity : BaseActivity<ActivityBatteryInfoAnimationBi ...@@ -59,9 +71,6 @@ class BatteryInfoAnimationActivity : BaseActivity<ActivityBatteryInfoAnimationBi
finish() finish()
} }
} }
}
} }
} }
\ No newline at end of file
...@@ -113,22 +113,5 @@ class PrepareScanActivity : BaseActivity<ActivityLayoutParepreScanBinding>() { ...@@ -113,22 +113,5 @@ class PrepareScanActivity : BaseActivity<ActivityLayoutParepreScanBinding>() {
} }
} }
private fun playLottie() {
binding.root.postDelayed({
if (ConfigHelper.admobTrueMaxFlase == 0) {
MaxAdUtils.showInterstitialAd(this) {
startActivity(Intent(this, CleanJunkActivity::class.java))
finish()
}
} else {
AdmobUtils.showInterstitialAd(this) {
startActivity(Intent(this, CleanJunkActivity::class.java))
finish()
}
}
}, kotlin.random.Random.nextLong(2000, 4500))
}
} }
\ No newline at end of file
...@@ -3,7 +3,6 @@ package com.test.easy.easycleanerjunk.helps.ads ...@@ -3,7 +3,6 @@ package com.test.easy.easycleanerjunk.helps.ads
import android.app.Activity import android.app.Activity
import android.app.Dialog import android.app.Dialog
import android.os.Bundle import android.os.Bundle
import android.util.Log
import android.view.ViewGroup import android.view.ViewGroup
import com.applovin.mediation.MaxAd import com.applovin.mediation.MaxAd
import com.applovin.mediation.MaxAdListener import com.applovin.mediation.MaxAdListener
...@@ -75,7 +74,9 @@ object MaxAdUtils { ...@@ -75,7 +74,9 @@ object MaxAdUtils {
maxAdPullReport(p0, "openAd", reqId = reqId) maxAdPullReport(p0, "openAd", reqId = reqId)
} }
override fun onAdDisplayed(p0: MaxAd) {} override fun onAdDisplayed(p0: MaxAd) {
}
override fun onAdHidden(p0: MaxAd) {} override fun onAdHidden(p0: MaxAd) {}
...@@ -85,7 +86,7 @@ object MaxAdUtils { ...@@ -85,7 +86,7 @@ object MaxAdUtils {
mOpenAd=null mOpenAd=null
onLoad?.invoke() onLoad?.invoke()
maxAdPullReport(null, "AppOpenAd", p1.message) maxAdPullReport(null, "AppOpenAd", p1.message)
Log.e("MXL", "onAdLoadFailed: " + p1) // Log.e("MXL", "onAdLoadFailed: " + p1)
AdDisplayUtils.getInstance().incrementAdRequestFailCount() AdDisplayUtils.getInstance().incrementAdRequestFailCount()
} }
...@@ -153,7 +154,7 @@ object MaxAdUtils { ...@@ -153,7 +154,7 @@ object MaxAdUtils {
obj.put("reason", p1.message) obj.put("reason", p1.message)
obj.put("ad_unit", "openAd") obj.put("ad_unit", "openAd")
EventUtils.event("ad_show_error", ext = obj) EventUtils.event("ad_show_error", ext = obj)
Log.e("MXL", "onAdDisplayFailed: "+p1.message ) // Log.e("MXL", "onAdDisplayFailed: "+p1.message )
} }
}) })
if (isOpenAdLoaded()) { if (isOpenAdLoaded()) {
...@@ -212,7 +213,7 @@ object MaxAdUtils { ...@@ -212,7 +213,7 @@ object MaxAdUtils {
} }
override fun onAdDisplayed(p0: MaxAd) { override fun onAdDisplayed(p0: MaxAd) {
isInterAdShow=true
} }
override fun onAdHidden(p0: MaxAd) { override fun onAdHidden(p0: MaxAd) {
...@@ -226,7 +227,7 @@ object MaxAdUtils { ...@@ -226,7 +227,7 @@ object MaxAdUtils {
maxAdPullReport(null, "InterstitialAd", p1.message) maxAdPullReport(null, "InterstitialAd", p1.message)
onLoad?.invoke() onLoad?.invoke()
AdDisplayUtils.getInstance().incrementAdRequestFailCount() AdDisplayUtils.getInstance().incrementAdRequestFailCount()
Log.e("MXL", "interAdLoadFailed: "+p1.message ) // Log.e("MXL", "interAdLoadFailed: "+p1.message )
// retryAttempt++ // retryAttempt++
// Handler(Looper.getMainLooper()).postDelayed({ // Handler(Looper.getMainLooper()).postDelayed({
// retryAttempt++ // retryAttempt++
......
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