Commit 5c8e3b0d authored by wanglei's avatar wanglei

....

parent 2669553d
......@@ -31,6 +31,7 @@ class FileRecoveredActivity : BaseActivity<ActivityFileRecoveredBinding>() {
val number = intent.extras?.getInt("Number") ?: 0
val scanType = intent.extras?.getInt("ScanType")
val path: String? = intent.extras?.getString("Path")
binding.tvNumber.text = number.toString()
val type = when (scanType) {
......@@ -42,7 +43,7 @@ class FileRecoveredActivity : BaseActivity<ActivityFileRecoveredBinding>() {
}
binding.tvType.text = type
val appName = this.resources.getString(R.string.app_name).replace("/", " ")
val appName = path ?: this.resources.getString(R.string.app_name).replace("/", " ")
val appDir = File(Environment.getExternalStorageDirectory(), appName)
binding.tvDir.text = "Recovered in $appDir"
}
......
......@@ -13,6 +13,7 @@ import com.base.filerecoveryrecyclebin.activity.ResultActivity
import com.base.filerecoveryrecyclebin.activity.recovery.FileRecoveredActivity
import com.base.filerecoveryrecyclebin.activity.recyclebin.RecycleBinFileEx.findRecycleBinFile
import com.base.filerecoveryrecyclebin.activity.recyclebin.RecycleBinFileEx.findRecycleBinJsonFile
import com.base.filerecoveryrecyclebin.bean.ConstObject
import com.base.filerecoveryrecyclebin.bean.ConstObject.RECYCLE_BIN
import com.base.filerecoveryrecyclebin.bean.RecycleBinBean
import com.base.filerecoveryrecyclebin.databinding.ActivityRecycleBinDetailBinding
......@@ -86,10 +87,21 @@ class RecycleBinDetailActivity : BaseActivity<ActivityRecycleBinDetailBinding>()
val binFile = File(bean.backupPath)
runCatching {
binFile.copyTo(file, true)
binFile.delete()
recoveryFile(bean.name)
}
}
startActivity(Intent(this, FileRecoveredActivity::class.java).apply {
recycleBinBean?.let { bean ->
if (mImageStr.contains("." + bean.mimeType)) {
putExtra("ScanType", ConstObject.SCAN_PHOTOS)
}
if (mVideoStr.contains("." + bean.mimeType)) {
putExtra("ScanType", ConstObject.SCAN_VIDEOS)
}
putExtra("Path", bean.path)
}
putExtra("Number", 1)
})
finish()
}
......
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