修改bug

增加Glide配置接口

Author: forJrking

README.md

@@ -44,8 +44,20 @@
            }
        }
    }
+   
+   //代替AppGlideModule实现来修改glide配置接口
+   AppGlideModuleIml.options = object : IAppGlideOptions {
+       override fun applyOptions(context: Context, builder: GlideBuilder) {
+           //修改缓存大小等
+           Log.d("TAG", "applyOptions")
+       }
+       override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
+           //修改注册组件 例如 okhttp 注意如果修改可能会导致进度丢失
+           Log.d("TAG", "registerComponents")
+       }
+   }
    ```
-
+   
 4. 其他扩展函数和效果
 
    ```kotlin
@@ -269,7 +281,7 @@ iv_8.load(url2, height = 800)
 
 [forJrking/ImageExt: 基于Glide封装ImageView加载图片资源的扩展函数集 (github.com)](https://github.com/forJrking/ImageExt)
 
-- 由于使用到基于okhttp的下载进度管理所以使用了 glide 的@GlideModule配置方法，这样可能会和你项目自定义配置有冲突，目前只能拉代码自己修改，然后依赖Module方式了。如有更好方式联系我改进。
+- ~~由于使用到基于okhttp的下载进度管理所以使用了 glide 的@GlideModule配置方法，这样可能会和你项目自定义配置有冲突，目前只能拉代码自己修改，然后依赖Module方式了。如有更好方式联系我改进。~~
 
 - Android图片加载库常见的只有几种，其他库可以自行参考实现。Kotlin真香！！！
 

app/src/main/java/me/demo/sample/MainActivity.kt

@@ -1,15 +1,21 @@
 package me.demo.sample
 
 import android.Manifest
+import android.content.Context
 import android.graphics.Color
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
 import android.view.View
 import android.widget.Toast
+import com.bumptech.glide.Glide
+import com.bumptech.glide.GlideBuilder
+import com.bumptech.glide.Registry
 import com.github.forjrking.image.*
 import com.github.forjrking.image.core.ImageOptions
+import com.github.forjrking.image.glide.AppGlideModuleIml
 import com.github.forjrking.image.glide.GlideImageLoader
+import com.github.forjrking.image.glide.IAppGlideOptions
 import com.github.forjrking.image.glide.transformation.CircleWithBorderTransformation
 import com.github.forjrking.image.glide.transformation.GrayscaleTransformation
 import kotlinx.android.synthetic.main.activity_main.*
@@ -28,18 +34,34 @@ import pub.devrel.easypermissions.EasyPermissions
  */
 class MainActivity : AppCompatActivity() {
     var url1 = "https://t7.baidu.com/it/u=3713375227,571533122&fm=193&f=GIF"
-    var url3 = "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.huabanimg.com%2F3fee54d0b2e0b7a132319a8e104f5fdc2edd3d35d03ee-93Jmdq_fw658&refer=http%3A%2F%2Fhbimg.huabanimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1619934437&t=2c758765592bf56ec7eb4ad1912a2830"
+    var url3 =
+        "https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fhbimg.huabanimg.com%2F3fee54d0b2e0b7a132319a8e104f5fdc2edd3d35d03ee-93Jmdq_fw658&refer=http%3A%2F%2Fhbimg.huabanimg.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1619934437&t=2c758765592bf56ec7eb4ad1912a2830"
     var url4 = "http://img.mp.itc.cn/upload/20170311/33f2b7f7ffb04ecb81e42405e20b3fdc_th.gif"
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+
+        AppGlideModuleIml.options = object : IAppGlideOptions {
+            override fun applyOptions(context: Context, builder: GlideBuilder) {
+                //修改缓存大小等
+                Log.d("TAG", "applyOptions")
+            }
+
+            override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
+                //修改注册组件 例如 okhttp 注意如果修改可能会导致进度丢失
+                Log.d("TAG", "registerComponents")
+            }
+
+        }
+
+        Log.d("TAG", "clearDiskCache")
         GlobalScope.launch(Dispatchers.IO) {
             GlideImageLoader.clearDiskCache(applicationContext)
         }
         GlideImageLoader.clearMemory(applicationContext)
 
         ImageOptions.DrawableOptions.setDefault {
-            placeHolderResId =  R.drawable.ic_launcher_background
+            placeHolderResId = R.drawable.ic_launcher_background
             errorResId = R.color.gray
         }
 
@@ -49,20 +71,20 @@ class MainActivity : AppCompatActivity() {
     private fun initView() {
         circleProgressView.visibility = View.VISIBLE
         iv_0.postDelayed(
-                {
-                    iv_0.load(url3) {
-                        progressListener { isComplete, percentage, bytesRead, totalBytes ->
-                            // 跟踪进度
-                            Log.d("TAG", "onProgress: $percentage")
-                            if (isComplete) {
-                                circleProgressView.visibility = View.GONE
-                            } else {
-                                circleProgressView.progress = percentage
-                            }
+            {
+                iv_0.load(url3) {
+                    progressListener { isComplete, percentage, bytesRead, totalBytes ->
+                        // 跟踪进度
+                        Log.d("TAG", "onProgress: $percentage")
+                        if (isComplete) {
+                            circleProgressView.visibility = View.GONE
+                        } else {
+                            circleProgressView.progress = percentage
                         }
                     }
+                }
 
-                }, 500
+            }, 500
         )
 
         iv_1.setOnClickListener { downloadImage() }
@@ -102,7 +124,8 @@ class MainActivity : AppCompatActivity() {
 //        iv_10.loadImage(url2, placeHolder = R.color.green)
         iv_8.load(url1) {
             placeHolderResId = R.color.black
-            transformation = arrayOf(GrayscaleTransformation(), CircleWithBorderTransformation(borderWidth = 0, borderColor = 0))
+            transformation = arrayOf(GrayscaleTransformation(),
+                CircleWithBorderTransformation(borderWidth = 0, borderColor = 0))
             progressListener { isComplete, percentage, bytesRead, totalBytes ->
                 //加载进度
             }
@@ -127,18 +150,19 @@ class MainActivity : AppCompatActivity() {
         if (hasStoragePermission()) {
             GlobalScope.launch {
                 try {
-                    val downloadImage = GlideImageLoader.downloadImage(context = this@MainActivity, imgUrl = url1)
+                    val downloadImage =
+                        GlideImageLoader.downloadImage(context = this@MainActivity, imgUrl = url1)
                     Log.d("TAG", "downloadImage: ${downloadImage?.absolutePath}")
                 } catch (e: Exception) {
                     e.printStackTrace()
                 }
             }
         } else {
             EasyPermissions.requestPermissions(
-                    this,
-                    getString(R.string.need_write_external),
-                    WRITE_EXTERNAL_PERM,
-                    Manifest.permission.WRITE_EXTERNAL_STORAGE)
+                this,
+                getString(R.string.need_write_external),
+                WRITE_EXTERNAL_PERM,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE)
         }
     }
 

build.gradle

@@ -9,7 +9,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath 'com.android.tools.build:gradle:4.1.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

libImage/src/main/java/com/github/forjrking/image/core/ImageOptions.kt

@@ -66,7 +66,7 @@ class ImageOptions {
     var errorDrawable: Drawable?
         get() = TODO()
         set(value) {
-            setDrawableOptions { placeHolderDrawable = value }
+            setDrawableOptions { errorDrawable = value }
         }
 
     /** DES: fallback */

libImage/src/main/java/com/github/forjrking/image/glide/GlideModule.kt renamed to libImage/src/main/java/com/github/forjrking/image/glide/AppGlideModuleIml.kt

@@ -9,11 +9,14 @@ import com.bumptech.glide.load.model.GlideUrl
 import com.bumptech.glide.module.AppGlideModule
 import com.github.forjrking.image.glide.http.OkHttpUrlLoader
 import com.github.forjrking.image.glide.progress.ProgressManager
+import com.github.forjrking.image.glide.progress.ProgressManager.glideProgressInterceptor
+import okhttp3.OkHttpClient
 import java.io.InputStream
 
 @GlideModule(glideName = "IGlideModule")
-class GlideModule : AppGlideModule() {
+class AppGlideModuleIml : AppGlideModule() {
     override fun applyOptions(context: Context, builder: GlideBuilder) {
+        options?.applyOptions(context, builder)
 //        builder.setDiskCache(InternalCacheDiskCacheFactory(context, "Glide", IMAGE_DISK_CACHE_MAX_SIZE.toLong()))
 //        val calculator = MemorySizeCalculator.Builder(context).build()
 //        val defaultMemoryCacheSize = calculator.memoryCacheSize
@@ -22,20 +25,31 @@ class GlideModule : AppGlideModule() {
 //        val customBitmapPoolSize = (1.2 * defaultBitmapPoolSize).toInt()
 //        builder.setMemoryCache(LruResourceCache(customMemoryCacheSize.toLong()))
 //        builder.setBitmapPool(LruBitmapPool(customBitmapPoolSize.toLong()))
+
     }
 
     override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
-        registry.replace(GlideUrl::class.java, InputStream::class.java, OkHttpUrlLoader.Factory(ProgressManager.okHttpClient))
+        //下载进度的实现
+        registry.replace(GlideUrl::class.java,
+            InputStream::class.java,
+            OkHttpUrlLoader.Factory(OkHttpClient.Builder().glideProgressInterceptor().build()))
+        options?.registerComponents(context, glide, registry)
     }
 
     override fun isManifestParsingEnabled(): Boolean {
-        return false
+        return options?.isManifestParsingEnabled() ?: false
     }
 
     companion object {
-        /**
-         * 图片缓存文件最大值为100Mb
-         */
-        const val IMAGE_DISK_CACHE_MAX_SIZE = 100 * 1024 * 1024
+        /**把Glide配置方法进行暴露接口*/
+        var options: IAppGlideOptions? = null
     }
+}
+
+/**把Glide配置方法进行保留*/
+interface IAppGlideOptions {
+    fun isManifestParsingEnabled(): Boolean = false
+    fun applyOptions(context: Context, builder: GlideBuilder)
+    /**glide 下载进度的主要逻辑 需要在OkHttpClient.Builder().glideProgressInterceptor()**/
+    fun registerComponents(context: Context, glide: Glide, registry: Registry)
 }

libImage/src/main/java/com/github/forjrking/image/glide/progress/ProgressManager.kt

@@ -16,19 +16,20 @@ import java.util.concurrent.ConcurrentHashMap
 object ProgressManager {
     private val listenersMap = ConcurrentHashMap<String, OnProgressListener>()
 
-    var okHttpClient: Call.Factory = OkHttpClient
-            .Builder()
-            .addNetworkInterceptor { chain: Interceptor.Chain ->
-                val request = chain.request()
-                val response = chain.proceed(request)
-                response.newBuilder().run {
-                    val body = response.body()
-                    if (body != null) {
-                        this.body(ProgressResponseBody(request.url().toString(), LISTENER, body))
-                    }
-                    this.build()
+    /**glide 下载进度的主要逻辑 需要在GlideModule注入*/
+    fun OkHttpClient.Builder.glideProgressInterceptor(): OkHttpClient.Builder =
+        this.addNetworkInterceptor { chain: Interceptor.Chain ->
+            val request = chain.request()
+            val response = chain.proceed(request)
+            response.newBuilder().run {
+                val body = response.body()
+                if (body != null) {
+                    this.body(ProgressResponseBody(request.url().toString(), LISTENER, body))
                 }
-            }.build()
+                this.build()
+            }
+        }
+
 
     private val LISTENER = object : InternalProgressListener {
         override fun onProgress(url: String, bytesRead: Long, totalBytes: Long) {