Commit 587feb3f authored by wanglei's avatar wanglei

....

parent 58312eb6
...@@ -56,10 +56,10 @@ class RecycleBinDetailActivity : BaseActivity<ActivityRecycleBinDetailBinding>() ...@@ -56,10 +56,10 @@ class RecycleBinDetailActivity : BaseActivity<ActivityRecycleBinDetailBinding>()
LogEx.logDebug(TAG, "json=$json") LogEx.logDebug(TAG, "json=$json")
recycleBinBean = Gson().fromJson(json, RecycleBinBean::class.java) recycleBinBean = Gson().fromJson(json, RecycleBinBean::class.java)
recycleBinBean?.let { bean -> recycleBinBean?.let { bean ->
if (mImageStr.contains("."+bean.mimeType)) { if (mImageStr.contains("." + bean.mimeType)) {
binding.ivBofang.visibility = View.GONE binding.ivBofang.visibility = View.GONE
} }
if (mVideoStr.contains("."+bean.mimeType)) { if (mVideoStr.contains("." + bean.mimeType)) {
binding.ivBofang.visibility = View.VISIBLE binding.ivBofang.visibility = View.VISIBLE
} }
...@@ -81,12 +81,10 @@ class RecycleBinDetailActivity : BaseActivity<ActivityRecycleBinDetailBinding>() ...@@ -81,12 +81,10 @@ class RecycleBinDetailActivity : BaseActivity<ActivityRecycleBinDetailBinding>()
binding.tvRestore.setOnClickListener { binding.tvRestore.setOnClickListener {
recycleBinBean?.let { bean -> recycleBinBean?.let { bean ->
val file = File(bean.path) val file = File(bean.path)
val binFile = findRecycleBinFile(file.name) val binFile = File(bean.backupPath)
val binJsonFile = findRecycleBinJsonFile(file.name) // val binJsonFile = findRecycleBinJsonFile(file.name)
runCatching { runCatching {
binFile?.copyTo(File(bean.path), true) binFile.copyTo(file, true)
binFile?.delete()
binJsonFile?.delete()
} }
} }
startActivity(Intent(this, ResultActivity::class.java).apply { startActivity(Intent(this, ResultActivity::class.java).apply {
......
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