Commit 471f1154 authored by wanghai's avatar wanghai

fix

parent a1701937
...@@ -281,7 +281,8 @@ object NotificationUtils { ...@@ -281,7 +281,8 @@ object NotificationUtils {
type: String, type: String,
) { ) {
if (CleanApplication.APP_STATE == 1) return if (CleanApplication.APP_STATE == 1) return
val open = SPUtils.getInstance().getInt("NotificationStayStatus")
if (open != 1) return
val key = "${NOTIFICATION_CURRENT}_${context.toDate()}" val key = "${NOTIFICATION_CURRENT}_${context.toDate()}"
val notificationCount = SPUtils.getInstance().getInt("notificationCount", 100) val notificationCount = SPUtils.getInstance().getInt("notificationCount", 100)
val current = SPUtils.getInstance().getInt(key) val current = SPUtils.getInstance().getInt(key)
......
...@@ -3,10 +3,12 @@ package com.swiftcleaner.chovey.view.activity ...@@ -3,10 +3,12 @@ package com.swiftcleaner.chovey.view.activity
import android.Manifest import android.Manifest
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.Activity import android.app.Activity
import android.app.Dialog
import android.content.ActivityNotFoundException import android.content.ActivityNotFoundException
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.graphics.Color
import android.net.Uri import android.net.Uri
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
...@@ -17,6 +19,8 @@ import android.view.View ...@@ -17,6 +19,8 @@ import android.view.View
import android.widget.CompoundButton import android.widget.CompoundButton
import android.widget.Toast import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.AppCompatButton
import androidx.cardview.widget.CardView
import androidx.core.app.ActivityCompat import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
...@@ -30,6 +34,7 @@ import com.swiftcleaner.chovey.business.newAdmob.AdmobHelps.isShowAdInter ...@@ -30,6 +34,7 @@ import com.swiftcleaner.chovey.business.newAdmob.AdmobHelps.isShowAdInter
import com.swiftcleaner.chovey.business.newAdmob.AdmobHelps.showInterstitialAd import com.swiftcleaner.chovey.business.newAdmob.AdmobHelps.showInterstitialAd
import com.swiftcleaner.chovey.business.newAdmob.AdmobHelps.showNativeAd import com.swiftcleaner.chovey.business.newAdmob.AdmobHelps.showNativeAd
import com.swiftcleaner.chovey.databinding.ActivitySimilarPhotosBinding import com.swiftcleaner.chovey.databinding.ActivitySimilarPhotosBinding
import com.swiftcleaner.chovey.model.bean.CleanFileBean
import com.swiftcleaner.chovey.model.bean.ImageHelpers import com.swiftcleaner.chovey.model.bean.ImageHelpers
import com.swiftcleaner.chovey.model.bean.SimilarBean import com.swiftcleaner.chovey.model.bean.SimilarBean
import com.swiftcleaner.chovey.model.tool.FileHelps import com.swiftcleaner.chovey.model.tool.FileHelps
...@@ -38,11 +43,9 @@ import com.swiftcleaner.chovey.model.tool.ToastUtil ...@@ -38,11 +43,9 @@ import com.swiftcleaner.chovey.model.tool.ToastUtil
import com.swiftcleaner.chovey.model.util.FinishMain.finishToMain import com.swiftcleaner.chovey.model.util.FinishMain.finishToMain
import com.swiftcleaner.chovey.view.MainActivity import com.swiftcleaner.chovey.view.MainActivity
import com.swiftcleaner.chovey.view.adapter.SimilarPhotosAdapter import com.swiftcleaner.chovey.view.adapter.SimilarPhotosAdapter
import com.swiftcleaner.chovey.view.adapter.SimilarPhotosAdapter.OnItemClick
import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog import com.swiftcleaner.chovey.view.dialog.CustomScoreDialog
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async import kotlinx.coroutines.async
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import java.text.DecimalFormat import java.text.DecimalFormat
...@@ -78,7 +81,9 @@ class SimilarPhotosActivity : AppCompatActivity() { ...@@ -78,7 +81,9 @@ class SimilarPhotosActivity : AppCompatActivity() {
val selectedItems = similarPhotosAdapter.selectedItems val selectedItems = similarPhotosAdapter.selectedItems
if (selectedItems.size == 0) { if (selectedItems.size == 0) {
ToastUtil.showLongToast(this, "Please check the file to be deleted") ToastUtil.showLongToast(this, "Please check the file to be deleted")
} else cleanFiles(selectedItems) } else {
showCustomDialog(selectedItems)
}
Log.d("selectedItems", "selectedItems=" + selectedItems.size) Log.d("selectedItems", "selectedItems=" + selectedItems.size)
} }
binding.switchId.setOnCheckedChangeListener(CompoundButton.OnCheckedChangeListener { compoundButton, isChecked -> binding.switchId.setOnCheckedChangeListener(CompoundButton.OnCheckedChangeListener { compoundButton, isChecked ->
...@@ -249,6 +254,7 @@ class SimilarPhotosActivity : AppCompatActivity() { ...@@ -249,6 +254,7 @@ class SimilarPhotosActivity : AppCompatActivity() {
private fun cleanFiles(selectedFiles: List<SimilarBean>) { private fun cleanFiles(selectedFiles: List<SimilarBean>) {
// 更新媒体库 // 更新媒体库
Log.d("selectedFiles", "更新媒体库") Log.d("selectedFiles", "更新媒体库")
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
val paths = selectedFiles.map { it.url }.toTypedArray() val paths = selectedFiles.map { it.url }.toTypedArray()
paths.forEach { FileHelps.deleteFile(it) } paths.forEach { FileHelps.deleteFile(it) }
...@@ -264,6 +270,26 @@ class SimilarPhotosActivity : AppCompatActivity() { ...@@ -264,6 +270,26 @@ class SimilarPhotosActivity : AppCompatActivity() {
} }
} }
private fun showCustomDialog(selectedFiles: List<SimilarBean>) {
val dialog = Dialog(this, R.style.TransparentDialogTheme)
dialog.setContentView(R.layout.dialog_delete)
val dialogDeleteCancel = dialog.findViewById<AppCompatButton>(R.id.dialog_delete_cancel)
val dialogDeleteOk = dialog.findViewById<AppCompatButton>(R.id.dialog_delete_ok)
val cardView = dialog.findViewById<CardView>(R.id.cardview)
cardView.setCardBackgroundColor(Color.TRANSPARENT)
dialogDeleteCancel.setOnClickListener { v: View? -> dialog.dismiss() }
dialogDeleteOk.setOnClickListener { v: View? ->
dialog.dismiss()
cleanFiles(selectedFiles)
}
dialog.setCanceledOnTouchOutside(false)
dialog.show()
}
private fun initBar() { private fun initBar() {
ImmersionBar.with(this) ImmersionBar.with(this)
.transparentStatusBar() // 透明状态栏 .transparentStatusBar() // 透明状态栏
......
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