Commit 9dcda932 authored by wanglei's avatar wanglei

...

parent db0fdd7d
...@@ -47,6 +47,7 @@ import com.base.datarecovery.utils.BarUtils ...@@ -47,6 +47,7 @@ import com.base.datarecovery.utils.BarUtils
import com.base.datarecovery.utils.LogEx import com.base.datarecovery.utils.LogEx
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job import kotlinx.coroutines.Job
import kotlinx.coroutines.cancel
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.SharedFlow
...@@ -129,6 +130,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() { ...@@ -129,6 +130,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() {
if (it >= 100) { if (it >= 100) {
job?.cancel() job?.cancel()
jumpNext() jumpNext()
this.cancel()
} }
} }
} }
......
...@@ -84,7 +84,7 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() { ...@@ -84,7 +84,7 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() {
if (checkStorePermission()) { if (checkStorePermission()) {
beginScan() beginScan()
} else { } else {
showGerPermission() { showGerPermission(null, deny = { finishToMain() }) {
requestStorePermission(launcher, result = { requestStorePermission(launcher, result = {
if (it) beginScan() else finishToMain() if (it) beginScan() else finishToMain()
}) })
......
...@@ -30,10 +30,10 @@ object AdMaxInit { ...@@ -30,10 +30,10 @@ object AdMaxInit {
initConfigBuilder.mediationProvider = AppLovinMediationProvider.MAX initConfigBuilder.mediationProvider = AppLovinMediationProvider.MAX
// Enable test mode by default for the current device. Cannot be run on the main thread. // Enable test mode by default for the current device. Cannot be run on the main thread.
val currentGaid = AdvertisingIdClient.getAdvertisingIdInfo(this).id // val currentGaid = AdvertisingIdClient.getAdvertisingIdInfo(this).id
if (currentGaid != null) { // if (currentGaid != null) {
initConfigBuilder.testDeviceAdvertisingIds = Collections.singletonList(currentGaid) // initConfigBuilder.testDeviceAdvertisingIds = Collections.singletonList(currentGaid)
} // }
// Initialize the AppLovin SDK // Initialize the AppLovin SDK
val sdk = AppLovinSdk.getInstance(this) val sdk = AppLovinSdk.getInstance(this)
......
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