Commit 8ce638fa authored by wanglei's avatar wanglei

...

parent f97231ab
...@@ -58,7 +58,7 @@ class AppProcessAnimationActivity : BaseActivity<ActivityAppProcessAnimationBind ...@@ -58,7 +58,7 @@ class AppProcessAnimationActivity : BaseActivity<ActivityAppProcessAnimationBind
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
if (job?.isActive == false && job == null) { if (job?.isActive == false || job == null) {
job = jumpJob() job = jumpJob()
} }
} }
......
...@@ -47,7 +47,7 @@ class PhotoManagerAnimationActivity : BaseActivity<ActivityScreenShotAnimationBi ...@@ -47,7 +47,7 @@ class PhotoManagerAnimationActivity : BaseActivity<ActivityScreenShotAnimationBi
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
if (job?.isActive == false) { if (job?.isActive == false || job == null) {
job = jumpJob() job = jumpJob()
} }
} }
...@@ -55,6 +55,7 @@ class PhotoManagerAnimationActivity : BaseActivity<ActivityScreenShotAnimationBi ...@@ -55,6 +55,7 @@ class PhotoManagerAnimationActivity : BaseActivity<ActivityScreenShotAnimationBi
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
job?.cancel() job?.cancel()
job = null
} }
} }
\ No newline at end of file
...@@ -7,6 +7,7 @@ import androidx.lifecycle.lifecycleScope ...@@ -7,6 +7,7 @@ import androidx.lifecycle.lifecycleScope
import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper
import com.base.filerecoveryrecyclebin.databinding.ActivityScreenShotAnimationBinding import com.base.filerecoveryrecyclebin.databinding.ActivityScreenShotAnimationBinding
import com.base.filerecoveryrecyclebin.help.BaseActivity import com.base.filerecoveryrecyclebin.help.BaseActivity
import com.base.filerecoveryrecyclebin.utils.LogEx
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
...@@ -14,6 +15,8 @@ import kotlin.random.Random ...@@ -14,6 +15,8 @@ import kotlin.random.Random
class ScreenShotAnimationActivity : BaseActivity<ActivityScreenShotAnimationBinding>() { class ScreenShotAnimationActivity : BaseActivity<ActivityScreenShotAnimationBinding>() {
private val TAG = "ScreenShotAnimationActivity"
override val binding: ActivityScreenShotAnimationBinding by lazy { override val binding: ActivityScreenShotAnimationBinding by lazy {
ActivityScreenShotAnimationBinding.inflate(layoutInflater) ActivityScreenShotAnimationBinding.inflate(layoutInflater)
} }
...@@ -23,7 +26,7 @@ class ScreenShotAnimationActivity : BaseActivity<ActivityScreenShotAnimationBind ...@@ -23,7 +26,7 @@ class ScreenShotAnimationActivity : BaseActivity<ActivityScreenShotAnimationBind
} }
fun jumpJob() = lifecycleScope.launch { private fun jumpJob() = lifecycleScope.launch {
delay(Random.nextLong(3000, 4500)) delay(Random.nextLong(3000, 4500))
AdmobMaxHelper.admobMaxShowInterstitialAd(this@ScreenShotAnimationActivity) { AdmobMaxHelper.admobMaxShowInterstitialAd(this@ScreenShotAnimationActivity) {
startActivity(Intent(this@ScreenShotAnimationActivity, ScreenShotActivity::class.java)) startActivity(Intent(this@ScreenShotAnimationActivity, ScreenShotActivity::class.java))
...@@ -40,13 +43,15 @@ class ScreenShotAnimationActivity : BaseActivity<ActivityScreenShotAnimationBind ...@@ -40,13 +43,15 @@ class ScreenShotAnimationActivity : BaseActivity<ActivityScreenShotAnimationBind
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
if (job?.isActive == false && job == null) { LogEx.logDebug(TAG, "onResume")
if (job?.isActive == false || job == null) {
job = jumpJob() job = jumpJob()
} }
} }
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
LogEx.logDebug(TAG, "onPause")
job?.cancel() job?.cancel()
job = null job = null
} }
......
...@@ -9,6 +9,8 @@ import androidx.lifecycle.lifecycleScope ...@@ -9,6 +9,8 @@ import androidx.lifecycle.lifecycleScope
import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper import com.base.filerecoveryrecyclebin.ads.AdmobMaxHelper
import com.base.filerecoveryrecyclebin.databinding.ActivityWhatsAppCleanerAnimationBinding import com.base.filerecoveryrecyclebin.databinding.ActivityWhatsAppCleanerAnimationBinding
import com.base.filerecoveryrecyclebin.help.BaseActivity import com.base.filerecoveryrecyclebin.help.BaseActivity
import com.base.filerecoveryrecyclebin.utils.LogEx
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
...@@ -16,6 +18,7 @@ import kotlin.random.Random ...@@ -16,6 +18,7 @@ import kotlin.random.Random
class WhatsAppCleanerAnimationActivity : BaseActivity<ActivityWhatsAppCleanerAnimationBinding>() { class WhatsAppCleanerAnimationActivity : BaseActivity<ActivityWhatsAppCleanerAnimationBinding>() {
private val TAG = "WhatsAppCleanerAnimationActivity"
override val binding: ActivityWhatsAppCleanerAnimationBinding by lazy { override val binding: ActivityWhatsAppCleanerAnimationBinding by lazy {
ActivityWhatsAppCleanerAnimationBinding.inflate(layoutInflater) ActivityWhatsAppCleanerAnimationBinding.inflate(layoutInflater)
...@@ -40,8 +43,9 @@ class WhatsAppCleanerAnimationActivity : BaseActivity<ActivityWhatsAppCleanerAni ...@@ -40,8 +43,9 @@ class WhatsAppCleanerAnimationActivity : BaseActivity<ActivityWhatsAppCleanerAni
} }
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
fun jumpJob() = lifecycleScope.launch { fun jumpJob() = lifecycleScope.launch(Dispatchers.Main) {
delay(Random.nextLong(3500, 4500)) delay(5000)
LogEx.logDebug(TAG, "delay over")
binding.lottie.cancelAnimation() binding.lottie.cancelAnimation()
binding.lottie.visibility = View.GONE binding.lottie.visibility = View.GONE
binding.lottieCompleted.visibility = View.VISIBLE binding.lottieCompleted.visibility = View.VISIBLE
...@@ -56,13 +60,15 @@ class WhatsAppCleanerAnimationActivity : BaseActivity<ActivityWhatsAppCleanerAni ...@@ -56,13 +60,15 @@ class WhatsAppCleanerAnimationActivity : BaseActivity<ActivityWhatsAppCleanerAni
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
if (job?.isActive == false && job == null) { LogEx.logDebug(TAG, "onResume")
if (job?.isActive == false || job == null) {
job = jumpJob() job = jumpJob()
} }
} }
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
LogEx.logDebug(TAG, "onPause")
job?.cancel() job?.cancel()
job = null job = null
} }
......
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