优化加载和缓存性能,修改默认HttpLoader为OkHttpLoader来提高图片请求性能

ltttttttttttt · Apr 23, 2024 · b0df20b · b0df20b
1 parent f589cd4
commit b0df20b
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 26 deletions.
diff --git a/load-the-image/build.gradle.kts b/load-the-image/build.gradle.kts
@@ -33,6 +33,7 @@ dependencies {
     implementation(compose.ui)
     implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion")
     implementation("com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru:1.4.2")
+    implementation("com.squareup.okhttp3:okhttp:4.9.1")
 }
 
 publishing {

diff --git a/load-the-image/src/main/java/com/lt/load_the_image/LoadTheImageManager.kt b/load-the-image/src/main/java/com/lt/load_the_image/LoadTheImageManager.kt
@@ -28,6 +28,10 @@ import com.lt.load_the_image.cache.ImageCache
 import com.lt.load_the_image.cache.ImageFileCache
 import com.lt.load_the_image.cache.ImageLruMemoryCache
 import com.lt.load_the_image.loader.*
+import com.lt.load_the_image.loader.http.HttpLoader
+import com.lt.load_the_image.loader.http.HttpURLConnectionLoader
+import com.lt.load_the_image.loader.http.OkHttpLoader
+import com.lt.load_the_image.loader.image.*
 import com.lt.load_the_image.painter.DefaultPainterCreator
 import com.lt.load_the_image.painter.EmptyImagePainter
 import com.lt.load_the_image.painter.PainterCreator
@@ -49,7 +53,7 @@ object LoadTheImageManager {
     /**
      * Load network resource to byteArray
      */
-    var httpLoader: HttpLoader = HttpURLConnectionLoader()
+    var httpLoader: HttpLoader = OkHttpLoader()
 
     /**
      * Create Painter from ByteArray

diff --git a/load-the-image/src/main/java/com/lt/load_the_image/cache/ImageLruMemoryCache.kt b/load-the-image/src/main/java/com/lt/load_the_image/cache/ImageLruMemoryCache.kt
@@ -42,7 +42,10 @@ open class ImageLruMemoryCache(
         cacheMap[url] = t
         cacheSize.getAndAdd(t.size.toLong())
         while (cacheSize.get() > maxMemorySize && cacheMap.isNotEmpty()) {
-            val byteArray = cacheMap.remove(cacheMap.keys.first())
+            val byteArray = cacheMap.remove(cacheMap.keys.firstOrNull() ?: run {
+                cacheSize.set(0)
+                return
+            })
             cacheSize.getAndAdd(-(byteArray?.size ?: 0).toLong())
         }
     }

diff --git a/...om/lt/load_the_image/loader/HttpLoader.kt → .../load_the_image/loader/http/HttpLoader.kt b/...om/lt/load_the_image/loader/HttpLoader.kt → .../load_the_image/loader/http/HttpLoader.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.lt.load_the_image.loader
+package com.lt.load_the_image.loader.http
 
 /**
  * creator: lt  2022/4/8  [email protected]

diff --git a/...e_image/loader/HttpURLConnectionLoader.kt → ...ge/loader/http/HttpURLConnectionLoader.kt b/...e_image/loader/HttpURLConnectionLoader.kt → ...ge/loader/http/HttpURLConnectionLoader.kt
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.lt.load_the_image.loader
+package com.lt.load_the_image.loader.http
 
 import com.lt.load_the_image.util.println
 import java.net.URL

diff --git a/load-the-image/src/main/java/com/lt/load_the_image/loader/http/OkHttpLoader.kt b/load-the-image/src/main/java/com/lt/load_the_image/loader/http/OkHttpLoader.kt
@@ -0,0 +1,27 @@
+package com.lt.load_the_image.loader.http
+
+import com.lt.load_the_image.util.println
+import okhttp3.OkHttpClient
+import okhttp3.Request
+
+/**
+ * creator: lt  2022/4/8  [email protected]
+ * effect : Use OkHttp load url
+ * warning:
+ */
+open class OkHttpLoader(
+    private val okHttpClient: OkHttpClient = OkHttpClient()
+) : HttpLoader {
+
+    override fun load(url: String): ByteArray? {
+        return try {
+            val build = Request.Builder()
+                .url(url)
+                .build()
+            okHttpClient.newCall(build).execute().body?.bytes()
+        } catch (e: Exception) {
+            e.println()
+            null
+        }
+    }
+}
diff --git a/...ad_the_image/loader/BitmapLoadTheImage.kt → ..._image/loader/image/BitmapLoadTheImage.kt b/...ad_the_image/loader/BitmapLoadTheImage.kt → ..._image/loader/image/BitmapLoadTheImage.kt
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package com.lt.load_the_image.loader
+package com.lt.load_the_image.loader.image
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.asComposeImageBitmap
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
+import com.lt.load_the_image.loader.DataToBeLoaded
+import com.lt.load_the_image.loader.LoadTheImage
 import org.jetbrains.skia.Bitmap
 
 /**

diff --git a/...the_image/loader/ByteArrayLoadTheImage.kt → ...age/loader/image/ByteArrayLoadTheImage.kt b/...the_image/loader/ByteArrayLoadTheImage.kt → ...age/loader/image/ByteArrayLoadTheImage.kt
@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package com.lt.load_the_image.loader
+package com.lt.load_the_image.loader.image
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.painter.Painter
 import com.lt.load_the_image.LoadTheImageManager
+import com.lt.load_the_image.loader.DataToBeLoaded
+import com.lt.load_the_image.loader.LoadTheImage
 
 /**
  * creator: lt  2022/6/1  [email protected]

diff --git a/...load_the_image/loader/FileLoadTheImage.kt → ...he_image/loader/image/FileLoadTheImage.kt b/...load_the_image/loader/FileLoadTheImage.kt → ...he_image/loader/image/FileLoadTheImage.kt
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package com.lt.load_the_image.loader
+package com.lt.load_the_image.loader.image
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.painter.Painter
 import com.lt.load_the_image.LoadTheImageManager
+import com.lt.load_the_image.loader.DataToBeLoaded
+import com.lt.load_the_image.loader.LoadTheImage
 import com.lt.load_the_image.painter.AsyncImagePainter
 import com.lt.load_the_image.util.println
 import kotlinx.coroutines.Dispatchers
@@ -44,21 +46,24 @@ open class FileLoadTheImage : LoadTheImage {
         val painter = remember(file.absolutePath) { AsyncImagePainter() }
         LaunchedEffect(file.absolutePath) {
             withContext(Dispatchers.IO) {
-                val byteArray = LoadTheImageManager.memoryCache.getCache(file.absolutePath) ?: try {
-                    val byteArray = file.readBytes()
-                    if (byteArray.isEmpty()) {
+                var byteArray: ByteArray? = LoadTheImageManager.memoryCache.getCache(file.absolutePath)
+                if (byteArray == null) {
+                    try {
+                        val array = file.readBytes()
+                        if (array.isEmpty()) {
+                            painter.imageBitmap.value =
+                                LoadTheImageManager.loadResourceImageBitmap(data.errorImagePath)
+                            return@withContext
+                        }
+                        LoadTheImageManager.memoryCache.saveCache(file.absolutePath, array)
+                        byteArray = array
+                    } catch (e: Exception) {
+                        e.println()
                         painter.imageBitmap.value =
                             LoadTheImageManager.loadResourceImageBitmap(data.errorImagePath)
                         return@withContext
                     }
-                    byteArray
-                } catch (e: Exception) {
-                    e.println()
-                    painter.imageBitmap.value =
-                        LoadTheImageManager.loadResourceImageBitmap(data.errorImagePath)
-                    return@withContext
                 }
-                LoadTheImageManager.memoryCache.saveCache(file.absolutePath, byteArray)
                 painter.imageBitmap.value =
                     try {
                         LoadTheImageManager.painterCreator.createImageBitmap(byteArray)

diff --git a/...load_the_image/loader/HttpLoadTheImage.kt → ...he_image/loader/image/HttpLoadTheImage.kt b/...load_the_image/loader/HttpLoadTheImage.kt → ...he_image/loader/image/HttpLoadTheImage.kt
@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-package com.lt.load_the_image.loader
+package com.lt.load_the_image.loader.image
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.toComposeImageBitmap
 import com.lt.load_the_image.LoadTheImageManager
+import com.lt.load_the_image.loader.DataToBeLoaded
+import com.lt.load_the_image.loader.LoadTheImage
 import com.lt.load_the_image.painter.AsyncImagePainter
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
@@ -41,9 +43,14 @@ open class HttpLoadTheImage : LoadTheImage {
         LaunchedEffect(url) {
             withContext(Dispatchers.IO) {
                 //Use cache
-                var byteArray =
-                    LoadTheImageManager.memoryCache.getCache(url)
-                        ?: LoadTheImageManager.fileCache.getCache(url)
+                var byteArray: ByteArray? = LoadTheImageManager.memoryCache.getCache(url)
+                if (byteArray == null) {
+                    byteArray = LoadTheImageManager.fileCache.getCache(url)
+                    if (byteArray != null) {
+                        LoadTheImageManager.memoryCache.saveCache(url, byteArray)
+                    }
+                }
+                //Http load
                 if (byteArray == null) {
                     val placeholderResource = data.placeholderResource
                     if (placeholderResource.isNotEmpty())
@@ -55,9 +62,9 @@ open class HttpLoadTheImage : LoadTheImage {
                         painter.imageBitmap.value = LoadTheImageManager.createErrorImageBitmap(data)
                         return@withContext
                     }
+                    LoadTheImageManager.memoryCache.saveCache(url, byteArray)
+                    LoadTheImageManager.fileCache.saveCache(url, byteArray)
                 }
-                LoadTheImageManager.memoryCache.saveCache(url, byteArray)
-                LoadTheImageManager.fileCache.saveCache(url, byteArray)
                 val imageBitmap = Image.makeFromEncoded(byteArray).toComposeImageBitmap()
                 painter.imageBitmap.value = imageBitmap
             }

diff --git a/...oad_the_image/loader/ImageLoadTheImage.kt → ...e_image/loader/image/ImageLoadTheImage.kt b/...oad_the_image/loader/ImageLoadTheImage.kt → ...e_image/loader/image/ImageLoadTheImage.kt
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package com.lt.load_the_image.loader
+package com.lt.load_the_image.loader.image
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.graphics.toComposeImageBitmap
+import com.lt.load_the_image.loader.DataToBeLoaded
+import com.lt.load_the_image.loader.LoadTheImage
 import org.jetbrains.skia.Image
 
 /**

diff --git a/...e_image/loader/InputStreamLoadTheImage.kt → ...e/loader/image/InputStreamLoadTheImage.kt b/...e_image/loader/InputStreamLoadTheImage.kt → ...e/loader/image/InputStreamLoadTheImage.kt
@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-package com.lt.load_the_image.loader
+package com.lt.load_the_image.loader.image
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.loadImageBitmap
 import com.lt.load_the_image.LoadTheImageManager
+import com.lt.load_the_image.loader.DataToBeLoaded
+import com.lt.load_the_image.loader.LoadTheImage
 import com.lt.load_the_image.painter.AsyncImagePainter
 import com.lt.load_the_image.util.println
 import kotlinx.coroutines.Dispatchers

diff --git a/...the_image/loader/ResourcesLoadTheImage.kt → ...age/loader/image/ResourcesLoadTheImage.kt b/...the_image/loader/ResourcesLoadTheImage.kt → ...age/loader/image/ResourcesLoadTheImage.kt
@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package com.lt.load_the_image.loader
+package com.lt.load_the_image.loader.image
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.ClassLoaderResourceLoader
 import androidx.compose.ui.res.painterResource
+import com.lt.load_the_image.loader.DataToBeLoaded
+import com.lt.load_the_image.loader.LoadTheImage
 import com.lt.load_the_image.util.println
 
 /**