Commit b128354b authored by 周文华's avatar 周文华

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

parent 467cee2b
...@@ -50,7 +50,7 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -50,7 +50,7 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
BarUtils.setStatusBarLightMode(this, true) BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.TRANSPARENT) BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
// binding.root.updatePadding(top = BarUtils.getStatusBarHeight()) // binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
AdmobMaxHelper.admobMaxShowNativeAd(this,binding.idFlNative) AdmobMaxHelper.admobMaxShowNativeAd(this, binding.idFlNative)
junkExpandAdapter = JunkExpandAdapter { size -> junkExpandAdapter = JunkExpandAdapter { size ->
if (size == 0L) { if (size == 0L) {
binding.tvBtn.text = "Got it" binding.tvBtn.text = "Got it"
...@@ -97,7 +97,10 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -97,7 +97,10 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
override fun handleOnBackPressed() { override fun handleOnBackPressed() {
showExitFunctionDialog(this@CleanJunkActivity) { showExitFunctionDialog(this@CleanJunkActivity) {
if (it) { if (it) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this@CleanJunkActivity, isLoading = false) { AdmobMaxHelper.admobMaxShowInterstitialAd(
this@CleanJunkActivity,
isLoading = false
) {
finishToMain() finishToMain()
} }
} else { } else {
...@@ -111,27 +114,37 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -111,27 +114,37 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
when (binding.tvBtn.text) { when (binding.tvBtn.text) {
"Got it" -> { "Got it" -> {
val showJunkBtnAd = AppPreferences.getInstance().getString("isGotItplayAd", "0").toInt() val showJunkBtnAd =
AppPreferences.getInstance().getString("isGotItplayAd", "0").toInt()
if (showJunkBtnAd == 1) { if (showJunkBtnAd == 1) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this, false) { AdmobMaxHelper.admobMaxShowInterstitialAd(this, false) {
startActivity(Intent(this@CleanJunkActivity, ResultActivity::class.java).apply { startActivity(
putExtra("clean_size", JUNK_CLEANER) Intent(
putExtra("from", 0) this@CleanJunkActivity,
}) ResultActivity::class.java
).apply {
putExtra("clean_size", JUNK_CLEANER)
putExtra("from", 0)
})
finish() finish()
} }
} else { } else {
startActivity(Intent(this@CleanJunkActivity, ResultActivity::class.java).apply { startActivity(
putExtra("clean_size", JUNK_CLEANER) Intent(
putExtra("from", 0) this@CleanJunkActivity,
}) ResultActivity::class.java
).apply {
putExtra("clean_size", JUNK_CLEANER)
putExtra("from", 0)
})
finish() finish()
} }
} }
else -> { else -> {
val showJunkBtnAd = AppPreferences.getInstance().getString("isGotItplayAd", "0").toInt() val showJunkBtnAd =
AppPreferences.getInstance().getString("isGotItplayAd", "0").toInt()
if (showJunkBtnAd == 1) { if (showJunkBtnAd == 1) {
AdmobMaxHelper.admobMaxShowInterstitialAd(this, false) { AdmobMaxHelper.admobMaxShowInterstitialAd(this, false) {
startActivity( startActivity(
...@@ -179,14 +192,20 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -179,14 +192,20 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
var totalSize = 0L var totalSize = 0L
val list1= async(Dispatchers.IO) { val list1 = async(Dispatchers.IO) {
val list = arrayListOf<ChildBean>() val list = arrayListOf<ChildBean>()
val emptyFolder1 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM)) val emptyFolder1 =
val emptyFolder2 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS)) FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM))
val emptyFolder3 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS)) val emptyFolder2 =
val emptyFolder4 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES)) FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS))
val emptyFolder5 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MOVIES)) val emptyFolder3 =
val emptyFolder6 = FileHelp.getFileFolder(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC)) 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>() val emptyFolder = arrayListOf<File>()
emptyFolder.addAll(emptyFolder1) emptyFolder.addAll(emptyFolder1)
emptyFolder.addAll(emptyFolder2) emptyFolder.addAll(emptyFolder2)
...@@ -203,9 +222,11 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -203,9 +222,11 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
junkExpandAdapter.addChildData(0, list1) junkExpandAdapter.addChildData(0, list1)
val list2= async(Dispatchers.IO) { val list2 = async(Dispatchers.IO) {
val list = arrayListOf<ChildBean>() 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 -> apk.forEach { l ->
totalSize += l.size totalSize += l.size
list.add(ChildBean(R.mipmap.apk, l.name, l.path, l.size)) list.add(ChildBean(R.mipmap.apk, l.name, l.path, l.size))
...@@ -217,16 +238,17 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -217,16 +238,17 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
// list.add(ChildBean(R.mipmap.apk, "1", "apl$it", size)) // list.add(ChildBean(R.mipmap.apk, "1", "apl$it", size))
// } // }
// } // }
delay(Random.nextLong(1000, 1500)) delay(Random.nextLong(1000, 1500))
list list
}.await() }.await()
junkExpandAdapter.addChildData(1, list2) junkExpandAdapter.addChildData(1, list2)
val list3 = async(Dispatchers.IO) {
val list3= async(Dispatchers.IO) {
val list = arrayListOf<ChildBean>() 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 -> temp.forEach { l ->
totalSize += l.size totalSize += l.size
list.add(ChildBean(R.mipmap.temp_clean, l.name, l.path, l.size)) list.add(ChildBean(R.mipmap.temp_clean, l.name, l.path, l.size))
...@@ -244,9 +266,11 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() { ...@@ -244,9 +266,11 @@ class CleanJunkActivity : BaseActivity<ActivityLayoutCleanJunkBinding>() {
junkExpandAdapter.addChildData(2, list3) junkExpandAdapter.addChildData(2, list3)
val list4= async(Dispatchers.IO) { val list4 = async(Dispatchers.IO) {
val list = arrayListOf<ChildBean>() 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 -> log.forEach { l ->
totalSize += l.size totalSize += l.size
list.add(ChildBean(R.mipmap.log_clean, l.name, l.path, l.size)) list.add(ChildBean(R.mipmap.log_clean, l.name, l.path, l.size))
......
...@@ -11,8 +11,10 @@ import com.base.filerecoveryrecyclebin.utils.EventUtils ...@@ -11,8 +11,10 @@ import com.base.filerecoveryrecyclebin.utils.EventUtils
import com.base.filerecoveryrecyclebin.utils.LogEx import com.base.filerecoveryrecyclebin.utils.LogEx
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
import kotlinx.coroutines.CoroutineExceptionHandler
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import org.json.JSONObject import org.json.JSONObject
...@@ -56,7 +58,7 @@ object NewComUtils { ...@@ -56,7 +58,7 @@ object NewComUtils {
// } // }
fun requestCfg(callback: (ConfigBean?) -> Unit) { fun requestCfg(callback: (ConfigBean?) -> Unit) {
CoroutineScope(Dispatchers.IO).launch { MainScope().launch(CoroutineExceptionHandler { _, _ -> } +Dispatchers.IO) {
val response = doGet() val response = doGet()
if (response == null) { if (response == null) {
withContext(Dispatchers.Main) { 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