Commit 299bf24a authored by wanglei's avatar wanglei

...

parent 12fede31
...@@ -23,9 +23,11 @@ import com.base.datarecovery.utils.LogEx ...@@ -23,9 +23,11 @@ import com.base.datarecovery.utils.LogEx
import com.base.datarecovery.view.DialogViews.showExitFunctionDialog import com.base.datarecovery.view.DialogViews.showExitFunctionDialog
import com.base.datarecovery.view.DialogViews.showGerPermission import com.base.datarecovery.view.DialogViews.showGerPermission
import com.base.datarecovery.view.FileScanDialog import com.base.datarecovery.view.FileScanDialog
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.channels.BufferOverflow
import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.launch
/** /**
* 文件扫描,遍历文件夹的方式进行 * 文件扫描,遍历文件夹的方式进行
...@@ -111,6 +113,8 @@ class FileScanActivity : BaseActivity<ActivityFileScanBinding>() { ...@@ -111,6 +113,8 @@ class FileScanActivity : BaseActivity<ActivityFileScanBinding>() {
SCAN_VIDEOS -> ::isVideo SCAN_VIDEOS -> ::isVideo
else -> ::isImage else -> ::isImage
} }
var oneShowAd = false
val root = Environment.getExternalStorageDirectory() val root = Environment.getExternalStorageDirectory()
val pathList = arrayListOf<String>() val pathList = arrayListOf<String>()
lifecycleScope.loadFileByFilter( lifecycleScope.loadFileByFilter(
...@@ -120,6 +124,12 @@ class FileScanActivity : BaseActivity<ActivityFileScanBinding>() { ...@@ -120,6 +124,12 @@ class FileScanActivity : BaseActivity<ActivityFileScanBinding>() {
onDo = { file -> onDo = { file ->
LogEx.logDebug(TAG, "file =${file.absolutePath}") LogEx.logDebug(TAG, "file =${file.absolutePath}")
pathList.add(file.absolutePath) pathList.add(file.absolutePath)
if (!oneShowAd) {
oneShowAd = true
lifecycleScope.launch(Dispatchers.Main) {
AdmobInterstitialUtils.showInterstitialAd(this@FileScanActivity) { }
}
}
}, },
onFinish = { onFinish = {
if (pathList.isEmpty()) { if (pathList.isEmpty()) {
......
...@@ -80,6 +80,7 @@ class FileScanDialog( ...@@ -80,6 +80,7 @@ class FileScanDialog(
a1.cancel() a1.cancel()
binding.tvBtn.visibility = View.VISIBLE binding.tvBtn.visibility = View.VISIBLE
binding.iv.visibility = View.GONE binding.iv.visibility = View.GONE
binding.tvPath.visibility=View.GONE
binding.tvTitle.text = "Scan Completed" binding.tvTitle.text = "Scan Completed"
binding.tvBtn.setOnClickListener { binding.tvBtn.setOnClickListener {
activity.startActivity(Intent(activity, FileScanResultActivity::class.java).apply { activity.startActivity(Intent(activity, FileScanResultActivity::class.java).apply {
......
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:text="Scanning" android:text="Scanning"
android:textColor="@color/black"
android:textSize="18sp"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
...@@ -45,7 +47,7 @@ ...@@ -45,7 +47,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:textColor="@color/black" android:textColor="#333333"
android:textSize="15sp" android:textSize="15sp"
tools:text="Found 100 files" /> tools:text="Found 100 files" />
...@@ -75,7 +77,7 @@ ...@@ -75,7 +77,7 @@
android:layout_marginBottom="25dp" android:layout_marginBottom="25dp"
android:background="@drawable/bg_577dfd_22" android:background="@drawable/bg_577dfd_22"
android:gravity="center" android:gravity="center"
android:text="Scan Completed" android:text="Finish"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="17sp" android:textSize="17sp"
android:textStyle="bold" android:textStyle="bold"
......
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