Commit f60cbf70 authored by wanglei's avatar wanglei

...

parent da0caede
...@@ -21,6 +21,7 @@ import com.base.filerecoveryrecyclebin.bean.ConstObject.PRIVACY_SPACE ...@@ -21,6 +21,7 @@ import com.base.filerecoveryrecyclebin.bean.ConstObject.PRIVACY_SPACE
import com.base.filerecoveryrecyclebin.bean.ConstObject.RECOVERY_DOCUMENTS import com.base.filerecoveryrecyclebin.bean.ConstObject.RECOVERY_DOCUMENTS
import com.base.filerecoveryrecyclebin.bean.ConstObject.RECOVERY_PHOTOS import com.base.filerecoveryrecyclebin.bean.ConstObject.RECOVERY_PHOTOS
import com.base.filerecoveryrecyclebin.bean.ConstObject.RECOVERY_VIDEOS import com.base.filerecoveryrecyclebin.bean.ConstObject.RECOVERY_VIDEOS
import com.base.filerecoveryrecyclebin.bean.ConstObject.RECYCLE_BIN
import com.base.filerecoveryrecyclebin.bean.ConstObject.REPEAT_PHOTOS import com.base.filerecoveryrecyclebin.bean.ConstObject.REPEAT_PHOTOS
import com.base.filerecoveryrecyclebin.bean.ConstObject.SCAN_DOCUMENTS import com.base.filerecoveryrecyclebin.bean.ConstObject.SCAN_DOCUMENTS
import com.base.filerecoveryrecyclebin.bean.ConstObject.SCAN_PHOTOS import com.base.filerecoveryrecyclebin.bean.ConstObject.SCAN_PHOTOS
...@@ -106,6 +107,10 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() { ...@@ -106,6 +107,10 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
AppPreferences.getInstance().put("last_use_junk_cleaner", System.currentTimeMillis()) AppPreferences.getInstance().put("last_use_junk_cleaner", System.currentTimeMillis())
} }
RECYCLE_BIN -> {
binding.tvInfo.text = "Restore Success."
}
else -> {} else -> {}
} }
from?.let { from?.let {
...@@ -116,7 +121,7 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() { ...@@ -116,7 +121,7 @@ class ResultActivity : BaseActivity<ActivityLayoutResultBinding>() {
onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) { onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
override fun handleOnBackPressed() { override fun handleOnBackPressed() {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@ResultActivity){ AdmobMaxHelper.admobMaxShowInterstitialAd(this@ResultActivity) {
finishToMain() finishToMain()
} }
} }
......
package com.base.filerecoveryrecyclebin.activity.recyclebin package com.base.filerecoveryrecyclebin.activity.recyclebin
import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.os.Build import android.os.Build
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import com.base.filerecoveryrecyclebin.activity.ResultActivity
import com.base.filerecoveryrecyclebin.activity.recyclebin.MyFileObserver.Companion.findRecycleBinFile import com.base.filerecoveryrecyclebin.activity.recyclebin.MyFileObserver.Companion.findRecycleBinFile
import com.base.filerecoveryrecyclebin.activity.recyclebin.MyFileObserver.Companion.findRecycleBinJsonFile
import com.base.filerecoveryrecyclebin.bean.ConstObject.RECYCLE_BIN
import com.base.filerecoveryrecyclebin.bean.RecycleBinBean import com.base.filerecoveryrecyclebin.bean.RecycleBinBean
import com.base.filerecoveryrecyclebin.databinding.ActivityRecycleBinDetailBinding import com.base.filerecoveryrecyclebin.databinding.ActivityRecycleBinDetailBinding
import com.base.filerecoveryrecyclebin.help.BaseActivity import com.base.filerecoveryrecyclebin.help.BaseActivity
...@@ -32,9 +36,15 @@ class RecycleBinDetailActivity : BaseActivity<ActivityRecycleBinDetailBinding>() ...@@ -32,9 +36,15 @@ class RecycleBinDetailActivity : BaseActivity<ActivityRecycleBinDetailBinding>()
if (bean.mimeType == "image/jpeg") { if (bean.mimeType == "image/jpeg") {
val file = File(bean.path) val file = File(bean.path)
val binFile = findRecycleBinFile(file.name) val binFile = findRecycleBinFile(file.name)
binFile?.let { path -> val binJsonFile = findRecycleBinJsonFile(file.name)
Glide.with(this).load(path).centerCrop().into(binding.iv) if (binFile != null && binJsonFile != null) {
showRecycleBinDetailDialog(bean, binFile) Glide.with(this).load(binFile.absoluteFile).centerCrop().into(binding.iv)
showRecycleBinDetailDialog(bean, binFile, binJsonFile) {
startActivity(Intent(this, ResultActivity::class.java).apply {
putExtra("from", RECYCLE_BIN)
})
finish()
}
} }
} }
if (bean.mimeType == "") { if (bean.mimeType == "") {
......
...@@ -20,6 +20,7 @@ object ConstObject { ...@@ -20,6 +20,7 @@ object ConstObject {
const val PHOTO_COMPRESS = "Photo Compress" const val PHOTO_COMPRESS = "Photo Compress"
const val SCREENSHOT_CLEANER = "Screenshot Cleaner" const val SCREENSHOT_CLEANER = "Screenshot Cleaner"
const val PRIVACY_SPACE = "Privacy Space" const val PRIVACY_SPACE = "Privacy Space"
const val RECYCLE_BIN = "Recycle Bin"
const val SCAN_PHOTOS = 1 const val SCAN_PHOTOS = 1
const val SCAN_DOCUMENTS = 2 const val SCAN_DOCUMENTS = 2
......
...@@ -281,7 +281,7 @@ object DialogViews { ...@@ -281,7 +281,7 @@ object DialogViews {
} }
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
fun Context.showRecycleBinDetailDialog(bean: RecycleBinBean, binFile: File) { fun Context.showRecycleBinDetailDialog(bean: RecycleBinBean, binFile: File, binJsonFile: File, action: () -> Unit) {
val binding = DialogRecyclebinFileRestoreBinding.inflate(LayoutInflater.from(this)) val binding = DialogRecyclebinFileRestoreBinding.inflate(LayoutInflater.from(this))
val dialog = AlertDialog.Builder(this).create() val dialog = AlertDialog.Builder(this).create()
dialog.setView(binding.root) dialog.setView(binding.root)
...@@ -297,12 +297,18 @@ object DialogViews { ...@@ -297,12 +297,18 @@ object DialogViews {
dialog.window?.setBackgroundDrawableResource(android.R.color.transparent) dialog.window?.setBackgroundDrawableResource(android.R.color.transparent)
dialog.window?.attributes = params dialog.window?.attributes = params
binding.tvName.text = File(bean.path).name binding.tvName.text = bean.path
binding.tvSize.text = bean.size.toFormatSize() binding.tvSize.text = bean.size.toFormatSize()
binding.tvTime.text = "Delete time:${bean.deleteTime.toFormatTime()}" binding.tvTime.text = "Delete time:${bean.deleteTime.toFormatTime()}"
binding.tvRestore.setOnClickListener { binding.tvRestore.setOnClickListener {
dialog.dismiss()
runCatching {
binFile.copyTo(File(bean.path), true)
binFile.delete()
binJsonFile.delete()
}
action.invoke()
} }
} }
......
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