From b6738d63575d53a718ae7c59f204100447bb8934 Mon Sep 17 00:00:00 2001
From: yimiao <iori320222@126.com>
Date: Mon, 26 Jul 2021 11:51:43 +0800
Subject: [PATCH] =?UTF-8?q?author:wangyimiao=20desc:=E6=B8=85=E7=90=86?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=8D=8F=E7=A8=8B=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/commonlibtest/MainActivity.java    |  2 ++
 app/src/main/res/layout/activity_main.xml     | 19 ++++++++++++++++---
 .../commonlib/image/loader/ImageLoader.kt     | 10 ++++++----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/common/commonlibtest/MainActivity.java b/app/src/main/java/com/common/commonlibtest/MainActivity.java
index f39b57e..c681af4 100644
--- a/app/src/main/java/com/common/commonlibtest/MainActivity.java
+++ b/app/src/main/java/com/common/commonlibtest/MainActivity.java
@@ -69,6 +69,8 @@ public class MainActivity extends AppCompatActivity {
             });
         });
 
+        binding.clearBtn.setOnClickListener(l -> ImageLoader.INSTANCE.clearAllCache(MainActivity.this));
+
         binding.btn.setOnClickListener(l -> {
             List<RequestHeadInterceptor> interceptors = new ArrayList<>();
             RequestHeadInterceptor.Builder builder = new RequestHeadInterceptor.Builder();
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5271a83..383b4a4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,7 +15,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.2" />
 
-    <TextView
+    <Button
         android:id="@+id/tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -23,7 +23,8 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.53" />
 
     <Button
         android:id="@+id/btn"
@@ -31,10 +32,11 @@
         android:layout_height="wrap_content"
         android:text="get collections"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.599" />
+        app:layout_constraintVertical_bias="0.6" />
 
     <Button
         android:id="@+id/login_btn"
@@ -47,4 +49,15 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.690" />
 
+    <Button
+        android:id="@+id/clear_btn"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="clear"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.770" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/commonLib/src/main/java/com/common/commonlib/image/loader/ImageLoader.kt b/commonLib/src/main/java/com/common/commonlib/image/loader/ImageLoader.kt
index 64bb3da..d386a89 100644
--- a/commonLib/src/main/java/com/common/commonlib/image/loader/ImageLoader.kt
+++ b/commonLib/src/main/java/com/common/commonlib/image/loader/ImageLoader.kt
@@ -2,6 +2,7 @@ package com.common.commonlib.image.loader
 
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.util.Log
 import android.widget.ImageView
 import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestBuilder
@@ -11,6 +12,7 @@ import com.common.commonlib.image.config.GlideBaseConfig
 import com.common.commonlib.image.config.GlideHolderConfig
 import com.common.commonlib.image.config.GlideTransitionConfig
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 
@@ -77,22 +79,22 @@ object ImageLoader : ILoader {
     }
 
     override fun clearMemoryCache(context: Context) = runBlocking<Unit> {
-        launch(Dispatchers.Main) {
+        GlobalScope.launch(Dispatchers.Main) {
             Glide.get(context).clearMemory()
         }
     }
 
     override fun clearDiskCache(context: Context) = runBlocking<Unit> {
-        launch(Dispatchers.IO) {
+        launch(Dispatchers.Default) {
             Glide.get(context).clearDiskCache()
         }
     }
 
     override fun clearAllCache(context: Context) = runBlocking<Unit> {
-        launch(Dispatchers.Main) {
+        GlobalScope.launch(Dispatchers.Main) {
             Glide.get(context).clearMemory()
         }
-        launch(Dispatchers.IO) {
+        launch(Dispatchers.Default) {
             Glide.get(context).clearDiskCache()
         }
     }