Skip to content

D
Data Recovery White
Commit 2d549bc6 authored by wanglei's avatar wanglei
Browse files
Options

...

parent 2bff3d79
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 85 deletions
app/src/main/java/com/base/datarecovery/activity/recovery/FileRecoveryActivity.kt
View file @ 2d549bc6
...@@ -119,7 +119,7 @@ class FileRecoveryActivity : BaseActivity<ActivityFileRecoveryBinding>() { ...@@ -119,7 +119,7 @@ class FileRecoveryActivity : BaseActivity<ActivityFileRecoveryBinding>() {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
} }
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMain() finish()
} }
binding.switchThumbnails.setOnCheckedChangeListener { buttonView, isChecked -> binding.switchThumbnails.setOnCheckedChangeListener { buttonView, isChecked ->
adapter.toggleThumbnails(isChecked) adapter.toggleThumbnails(isChecked)
......
app/src/main/java/com/base/datarecovery/activity/recovery/FileScanActivity.kt
View file @ 2d549bc6
...@@ -80,16 +80,9 @@ class FileScanActivity : BaseActivity<ActivityFileScanBinding>() { ...@@ -80,16 +80,9 @@ class FileScanActivity : BaseActivity<ActivityFileScanBinding>() {
binding.flFanhui.setOnClickListener { binding.flFanhui.setOnClickListener {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
} }
// binding.tvScan.setOnClickListener {
// if (checkStorePermission()) {
// binding.llFile.visibility = View.VISIBLE
// beginScan()
// } else {
// requestPermission()
// }
// }
} }
@SuppressLint("SetTextI18n")
private fun beginScan() { private fun beginScan() {
if (scanOnce) if (scanOnce)
return return
...@@ -129,9 +122,12 @@ class FileScanActivity : BaseActivity<ActivityFileScanBinding>() { ...@@ -129,9 +122,12 @@ class FileScanActivity : BaseActivity<ActivityFileScanBinding>() {
pathList.add(file.absolutePath) pathList.add(file.absolutePath)
}, },
onFinish = { onFinish = {
if (pathList.isEmpty()) { if (pathList.isEmpty()) {
scanDialog.dismiss() scanDialog.dismiss()
binding.tvBtn.text = "Finish"
binding.tvBtn.setOnClickListener {
onBackPressedDispatcher.onBackPressed()
}
} else { } else {
dialogClass.stopScan(scanType, pathList) dialogClass.stopScan(scanType, pathList)
} }
......
app/src/main/java/com/base/datarecovery/activity/recovery/FileScanResultActivity.kt
View file @ 2d549bc6
...@@ -5,6 +5,7 @@ import android.content.Intent ...@@ -5,6 +5,7 @@ import android.content.Intent
import android.graphics.Color import android.graphics.Color
import androidx.activity.addCallback import androidx.activity.addCallback
import com.base.datarecovery.adapter.FileFolderAdapter import com.base.datarecovery.adapter.FileFolderAdapter
import com.base.datarecovery.ads.AdmobInterstitialUtils
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
...@@ -15,6 +16,7 @@ import com.base.datarecovery.databinding.ActivityFileScanResultBinding ...@@ -15,6 +16,7 @@ import com.base.datarecovery.databinding.ActivityFileScanResultBinding
import com.base.datarecovery.help.BaseActivity import com.base.datarecovery.help.BaseActivity
import com.base.datarecovery.utils.BarUtils import com.base.datarecovery.utils.BarUtils
import com.base.datarecovery.utils.LogEx import com.base.datarecovery.utils.LogEx
import com.base.datarecovery.view.DialogViews.showExitFunctionDialog
import com.google.gson.Gson import com.google.gson.Gson
import java.io.File import java.io.File
import java.util.HashMap import java.util.HashMap
...@@ -75,7 +77,11 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() { ...@@ -75,7 +77,11 @@ class FileScanResultActivity : BaseActivity<ActivityFileScanResultBinding>() {
onBackPressedDispatcher.onBackPressed() onBackPressedDispatcher.onBackPressed()
} }
onBackPressedDispatcher.addCallback { onBackPressedDispatcher.addCallback {
finishToMain() showExitFunctionDialog {
AdmobInterstitialUtils.showInterstitialAd(this@FileScanResultActivity) {
finishToMain()
}
}
} }
} }
......
app/src/main/java/com/base/datarecovery/view/FileScanDialog.kt
View file @ 2d549bc6
...@@ -25,14 +25,14 @@ class FileScanDialog( ...@@ -25,14 +25,14 @@ class FileScanDialog(
private val TAG = "FileScanDialog" private val TAG = "FileScanDialog"
private val a1 = ValueAnimator.ofFloat(0f, -360f) private val a1 = ValueAnimator.ofFloat(0f, -360f)
private val dialog = AlertDialog.Builder(activity).create() private val dialog = AlertDialog.Builder(activity).create()
private lateinit var btn: TextView private val binding = DialogFileScanBinding.inflate(LayoutInflater.from(activity))
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
fun showFileScanDialog( fun showFileScanDialog(
sharedFlow: SharedFlow<String>, sharedFlow: SharedFlow<String>,
foundFlow: SharedFlow<Int> foundFlow: SharedFlow<Int>
): AlertDialog { ): AlertDialog {
val binding = DialogFileScanBinding.inflate(LayoutInflater.from(activity))
dialog?.setView(binding.root) dialog?.setView(binding.root)
dialog?.setCanceledOnTouchOutside(false) dialog?.setCanceledOnTouchOutside(false)
...@@ -71,16 +71,18 @@ class FileScanDialog( ...@@ -71,16 +71,18 @@ class FileScanDialog(
binding.tvFoundNumber.text = "Found $it files" binding.tvFoundNumber.text = "Found $it files"
} }
} }
btn = binding.tvBtn
return dialog return dialog
} }
@SuppressLint("SetTextI18n")
fun stopScan(scanType: Int, pathList: ArrayList<String>) { fun stopScan(scanType: Int, pathList: ArrayList<String>) {
a1.cancel() a1.cancel()
btn.visibility = View.VISIBLE binding.tvBtn.visibility = View.VISIBLE
btn.setOnClickListener { binding.iv.visibility = View.GONE
binding.tvTitle.text = "Scan Completed"
binding.tvBtn.setOnClickListener {
activity.startActivity(Intent(activity, FileScanResultActivity::class.java).apply { activity.startActivity(Intent(activity, FileScanResultActivity::class.java).apply {
putExtra("ScanType", scanType) putExtra("ScanType", scanType)
putExtra("PathList", pathList.toTypedArray()) putExtra("PathList", pathList.toTypedArray())
......
app/src/main/res/layout/activity_file_scan.xml
View file @ 2d549bc6
...@@ -66,69 +66,69 @@ ...@@ -66,69 +66,69 @@
tools:ignore="ContentDescription" tools:ignore="ContentDescription"
tools:src="@mipmap/tu_photos_scan" /> tools:src="@mipmap/tu_photos_scan" />
<!-- <TextView--> <TextView
<!-- android:id="@+id/tv_scan"--> android:id="@+id/tv_btn"
<!-- android:layout_width="240dp"--> android:layout_width="240dp"
<!-- android:layout_height="35dp"--> android:layout_height="35dp"
<!-- android:layout_gravity="center"--> android:layout_gravity="center"
<!-- android:layout_marginTop="40dp"--> android:layout_marginTop="40dp"
<!-- android:background="@drawable/bg_567dfd_15"--> android:background="@drawable/bg_567dfd_15"
<!-- android:elevation="5dp"--> android:elevation="5dp"
<!-- android:gravity="center"--> android:gravity="center"
<!-- android:text="SCAN"--> android:text="SCAN"
<!-- android:textColor="@color/white"--> android:textColor="@color/white"
<!-- tools:ignore="HardcodedText" />--> tools:ignore="HardcodedText" />
<!-- <TextView--> <!-- <TextView-->
<!-- android:id="@+id/tv_tip"--> <!-- android:id="@+id/tv_tip"-->
<!-- android:layout_width="wrap_content"--> <!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center_horizontal"--> <!-- android:layout_gravity="center_horizontal"-->
<!-- android:layout_marginTop="20dp"--> <!-- android:layout_marginTop="20dp"-->
<!-- android:text="Tap to start scanning"--> <!-- android:text="Tap to start scanning"-->
<!-- android:textColor="#999999"--> <!-- android:textColor="#999999"-->
<!-- tools:ignore="HardcodedText" />--> <!-- tools:ignore="HardcodedText" />-->
<!-- <LinearLayout--> <!-- <LinearLayout-->
<!-- android:id="@+id/ll_file"--> <!-- android:id="@+id/ll_file"-->
<!-- android:layout_width="match_parent"--> <!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginHorizontal="16dp"--> <!-- android:layout_marginHorizontal="16dp"-->
<!-- android:layout_marginTop="20dp"--> <!-- android:layout_marginTop="20dp"-->
<!-- android:orientation="vertical"--> <!-- android:orientation="vertical"-->
<!-- android:visibility="gone">--> <!-- android:visibility="gone">-->
<!-- <LinearLayout--> <!-- <LinearLayout-->
<!-- android:layout_width="wrap_content"--> <!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content">--> <!-- android:layout_height="wrap_content">-->
<!-- <ProgressBar--> <!-- <ProgressBar-->
<!-- android:layout_width="35dp"--> <!-- android:layout_width="35dp"-->
<!-- android:layout_height="35dp" />--> <!-- android:layout_height="35dp" />-->
<!-- <TextView--> <!-- <TextView-->
<!-- android:layout_width="wrap_content"--> <!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center_vertical"--> <!-- android:layout_gravity="center_vertical"-->
<!-- android:layout_marginStart="8dp"--> <!-- android:layout_marginStart="8dp"-->
<!-- android:text="Scanning..."--> <!-- android:text="Scanning..."-->
<!-- android:textColor="@color/black"--> <!-- android:textColor="@color/black"-->
<!-- android:textSize="16sp"--> <!-- android:textSize="16sp"-->
<!-- android:textStyle="bold"--> <!-- android:textStyle="bold"-->
<!-- tools:ignore="HardcodedText" />--> <!-- tools:ignore="HardcodedText" />-->
<!-- </LinearLayout>--> <!-- </LinearLayout>-->
<!-- <TextView--> <!-- <TextView-->
<!-- android:id="@+id/tv_path"--> <!-- android:id="@+id/tv_path"-->
<!-- android:layout_width="match_parent"--> <!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"--> <!-- android:layout_height="wrap_content"-->
<!-- android:ellipsize="middle"--> <!-- android:ellipsize="middle"-->
<!-- android:singleLine="true"--> <!-- android:singleLine="true"-->
<!-- android:textSize="14sp"--> <!-- android:textSize="14sp"-->
<!-- tools:text="............." />--> <!-- tools:text="............." />-->
<!-- </LinearLayout>--> <!-- </LinearLayout>-->
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/dialog_file_scan.xml
View file @ 2d549bc6
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android" <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="300dp" android:layout_width="300dp"
xmlns:app="http://schemas.android.com/apk/res-auto"
app:cardCornerRadius="10dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
app:cardCornerRadius="10dp">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:text="Scan" android:text="Scanning"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,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:textSize="15sp" android:textSize="15sp"
tools:text="Found 100 files" /> tools:text="Found 100 files" />
...@@ -54,15 +55,17 @@ ...@@ -54,15 +55,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginHorizontal="15dp" android:layout_marginHorizontal="15dp"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
android:layout_marginBottom="25dp"
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:textColor="#666666"
android:textSize="12sp" /> android:textSize="12sp" />
<FrameLayout <FrameLayout
android:id="@+id/fl_ad" android:id="@+id/fl_ad"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginVertical="25dp" /> android:layout_marginBottom="8dp" />
<TextView <TextView
android:id="@+id/tv_btn" android:id="@+id/tv_btn"
...@@ -76,6 +79,7 @@ ...@@ -76,6 +79,7 @@
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="17sp" android:textSize="17sp"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone"
tools:ignore="HardcodedText" /> tools:ignore="HardcodedText" />
</LinearLayout> </LinearLayout>
......
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