Commit a8e584df authored by wanglei's avatar wanglei

...

parent 01673468
...@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity ...@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.core.view.ViewCompat import androidx.core.view.ViewCompat
import androidx.core.view.WindowInsetsCompat import androidx.core.view.WindowInsetsCompat
import com.base.datarecovery.R import com.base.datarecovery.R
import com.base.datarecovery.ads.AdmobMaxHelper
import com.base.datarecovery.bean.ConstObject.SCAN_DOCUMENTS import com.base.datarecovery.bean.ConstObject.SCAN_DOCUMENTS
import com.base.datarecovery.bean.ConstObject.SCAN_PHOTOS import com.base.datarecovery.bean.ConstObject.SCAN_PHOTOS
import com.base.datarecovery.bean.ConstObject.SCAN_VIDEOS import com.base.datarecovery.bean.ConstObject.SCAN_VIDEOS
...@@ -54,10 +55,14 @@ class FileRecoveredActivity : BaseActivity<ActivityFileRecoveredBinding>() { ...@@ -54,10 +55,14 @@ class FileRecoveredActivity : BaseActivity<ActivityFileRecoveredBinding>() {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
} }
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMain() AdmobMaxHelper.admobMaxShowInterstitialAd(this@FileRecoveredActivity) {
finishToMain()
}
} }
binding.tvContinue.setOnClickListener { binding.tvContinue.setOnClickListener {
finish() AdmobMaxHelper.admobMaxShowInterstitialAd(this) {
finish()
}
} }
binding.tvFinish.setOnClickListener { binding.tvFinish.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
......
...@@ -28,6 +28,7 @@ import com.base.datarecovery.utils.TimeUtils.isWithinSixMonths ...@@ -28,6 +28,7 @@ import com.base.datarecovery.utils.TimeUtils.isWithinSixMonths
import com.base.datarecovery.utils.TimeUtils.isWithinTwentyFourMonths import com.base.datarecovery.utils.TimeUtils.isWithinTwentyFourMonths
import com.base.datarecovery.view.DialogViews.showRecoveringDialog import com.base.datarecovery.view.DialogViews.showRecoveringDialog
import com.google.gson.Gson import com.google.gson.Gson
import kotlinx.coroutines.launch
import java.io.File import java.io.File
class FileRecoveryActivity : BaseActivity<ActivityFileRecoveryBinding>() { class FileRecoveryActivity : BaseActivity<ActivityFileRecoveryBinding>() {
...@@ -108,9 +109,11 @@ class FileRecoveryActivity : BaseActivity<ActivityFileRecoveryBinding>() { ...@@ -108,9 +109,11 @@ class FileRecoveryActivity : BaseActivity<ActivityFileRecoveryBinding>() {
filterDismiss(bean) filterDismiss(bean)
} }
binding.rvFilter.adapter = filterAdapter binding.rvFilter.adapter = filterAdapter
}
override fun onResume() {
super.onResume()
initData() initData()
} }
override fun initListener() { override fun initListener() {
...@@ -161,7 +164,6 @@ class FileRecoveryActivity : BaseActivity<ActivityFileRecoveryBinding>() { ...@@ -161,7 +164,6 @@ class FileRecoveryActivity : BaseActivity<ActivityFileRecoveryBinding>() {
showRecoveringDialog(lifecycleScope, list, dir, copyProgressAction = { showRecoveringDialog(lifecycleScope, list, dir, copyProgressAction = {
}, finish = { }, finish = {
adapter.toggleAllSelect(false)
startActivity(Intent(this, FileRecoveredActivity::class.java).apply { startActivity(Intent(this, FileRecoveredActivity::class.java).apply {
putExtra("Number", list.size) putExtra("Number", list.size)
putExtra("ScanType", scanType) putExtra("ScanType", scanType)
......
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