Skip to content

F
File Recovery RecycleBin
Commit b128354b authored by 周文华's avatar 周文华
Browse files
Options

【调整】调整部分请求报错问题

parent 467cee2b
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 28 deletions
app/src/main/java/com/base/filerecoveryrecyclebin/activity/junkclean/CleanJunkActivity.kt
View file @ b128354b
......@@ -50,7 +50,7 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
// binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
AdmobMaxHelper.admobMaxShowNativeAd(this,binding.idFlNative)
AdmobMaxHelper.admobMaxShowNativeAd(this, binding.idFlNative)
junkExpandAdapter = JunkExpandAdapter { size ->
if (size == 0L) {
binding.tvBtn.text = "Got it"
......@@ -97,7 +97,10 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
override fun handleOnBackPressed() {
showExitFunctionDialog(this@CleanJunkActivity) {
if (it) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@CleanJunkActivity, isLoading = false) {
AdmobMaxHelper.admobMaxShowInterstitialAd(
this@CleanJunkActivity,
isLoading = false
) {
finishToMain()
}
} else {
......@@ -111,17 +114,26 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
when (binding.tvBtn.text) {
"Got it" -> {
val showJunkBtnAd = AppPreferences.getInstance().getString("isGotItplayAd", "0").toInt()
val showJunkBtnAd =
AppPreferences.getInstance().getString("isGotItplayAd", "0").toInt()
if (showJunkBtnAd == 1) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this, false) {
startActivity(Intent(this@CleanJunkActivity, ResultActivity::class.java).apply {
startActivity(
Intent(
this@CleanJunkActivity,
ResultActivity::class.java
).apply {
putExtra("clean_size", JUNK_CLEANER)
putExtra("from", 0)
})
finish()
}
} else {
startActivity(Intent(this@CleanJunkActivity, ResultActivity::class.java).apply {
startActivity(
Intent(
this@CleanJunkActivity,
ResultActivity::class.java
).apply {
putExtra("clean_size", JUNK_CLEANER)
putExtra("from", 0)
})
......@@ -131,7 +143,8 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
}
else -> {
val showJunkBtnAd = AppPreferences.getInstance().getString("isGotItplayAd", "0").toInt()
val showJunkBtnAd =
AppPreferences.getInstance().getString("isGotItplayAd", "0").toInt()
if (showJunkBtnAd == 1) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this, false) {
startActivity(
......@@ -179,14 +192,20 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
var totalSize = 0L
val list1= async(Dispatchers.IO) {
val list1 = async(Dispatchers.IO) {
val list = arrayListOf<ChildBean>()
val emptyFolder1 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM))
val emptyFolder2 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS))
val emptyFolder3 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS))
val emptyFolder4 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES))
val emptyFolder5 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES))
val emptyFolder6 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC))
val emptyFolder1 =
FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM))
val emptyFolder2 =
FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS))
val emptyFolder3 =
FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS))
val emptyFolder4 =
FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES))
val emptyFolder5 =
FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES))
val emptyFolder6 =
FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC))
val emptyFolder = arrayListOf<File>()
emptyFolder.addAll(emptyFolder1)
emptyFolder.addAll(emptyFolder2)
......@@ -203,9 +222,11 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
junkExpandAdapter.addChildData(0, list1)
val list2= async(Dispatchers.IO) {
val list2 = async(Dispatchers.IO) {
val list = arrayListOf<ChildBean>()
val apk = MediaStoreUtils.queryFiles(this@CleanJunkActivity, MediaStoreUtils.FileType.APK) ?: listOf()
val apk =
MediaStoreUtils.queryFiles(this@CleanJunkActivity, MediaStoreUtils.FileType.APK)
?: listOf()
apk.forEach { l ->
totalSize += l.size
list.add(ChildBean(R.mipmap.apk, l.name, l.path, l.size))
......@@ -223,10 +244,11 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
junkExpandAdapter.addChildData(1, list2)
val list3= async(Dispatchers.IO) {
val list3 = async(Dispatchers.IO) {
val list = arrayListOf<ChildBean>()
val temp = MediaStoreUtils.queryFiles(this@CleanJunkActivity, MediaStoreUtils.FileType.TMP) ?: listOf()
val temp =
MediaStoreUtils.queryFiles(this@CleanJunkActivity, MediaStoreUtils.FileType.TMP)
?: listOf()
temp.forEach { l ->
totalSize += l.size
list.add(ChildBean(R.mipmap.temp_clean, l.name, l.path, l.size))
......@@ -244,9 +266,11 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
junkExpandAdapter.addChildData(2, list3)
val list4= async(Dispatchers.IO) {
val list4 = async(Dispatchers.IO) {
val list = arrayListOf<ChildBean>()
val log = MediaStoreUtils.queryFiles(this@CleanJunkActivity, MediaStoreUtils.FileType.LOG) ?: listOf()
val log =
MediaStoreUtils.queryFiles(this@CleanJunkActivity, MediaStoreUtils.FileType.LOG)
?: listOf()
log.forEach { l ->
totalSize += l.size
list.add(ChildBean(R.mipmap.log_clean, l.name, l.path, l.size))
......
app/src/main/java/com/base/filerecoveryrecyclebin/help/NewComUtils.kt
View file @ b128354b
......@@ -11,8 +11,10 @@ import com.base.filerecoveryrecyclebin.utils.EventUtils
import com.base.filerecoveryrecyclebin.utils.LogEx
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import kotlinx.coroutines.CoroutineExceptionHandler
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.json.JSONObject
......@@ -56,7 +58,7 @@ object NewComUtils {
// }
fun requestCfg(callback: (ConfigBean?) -> Unit) {
CoroutineScope(Dispatchers.IO).launch {
MainScope().launch(CoroutineExceptionHandler { _, _ -> } +Dispatchers.IO) {
val response = doGet()
if (response == null) {
withContext(Dispatchers.Main) {
......
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