refactor(lite): 重构多个组件并提升代码质量

AndroidCoderPeng · AndroidCoderPeng · commit a9aa2e8a1247 · 2025-01-20T10:19:58.000+08:00
-优化 Bitmap 扩展函数，增加图片压缩质量参数
- 改进旋转图片函数，优化内存使用
- 更新适配器代码，提高可读性和性能
-修复 HtmlRenderEngine 中的图片处理逻辑
- 优化屏幕适配和 Glide 使用
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.pengxh.kt.lib"
-        minSdkVersion 23
+        minSdkVersion 26
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/adapter/GridViewImageAdapterFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/adapter/GridViewImageAdapterFragment.kt
@@ -10,13 +10,15 @@ import com.pengxh.kt.lite.base.KotlinBaseFragment
 class GridViewImageAdapterFragment : KotlinBaseFragment<FragmentAdapterGridviewImageBinding>() {
 
     private val images = mutableListOf(
-        "https://img.zcool.cn/community/010d5c5b9d17c9a8012099c8781b7e.jpg@1280w_1l_2o_100sh.jpg",
-        "https://tse4-mm.cn.bing.net/th/id/OIP-C.6szqS1IlGtWsaiHQUtUOVwHaQC?rs=1&pid=ImgDetMain",
-        "https://img.zcool.cn/community/01a15855439bdf0000019ae9299cce.jpg@1280w_1l_2o_100sh.jpg",
         "https://pic1.zhimg.com/v2-0cc45f5fda6e8ff79350ec1303835629_r.jpg",
-        "https://img.zcool.cn/community/010d5c5b9d17c9a8012099c8781b7e.jpg@1280w_1l_2o_100sh.jpg",
-        "https://tse4-mm.cn.bing.net/th/id/OIP-C.6szqS1IlGtWsaiHQUtUOVwHaQC?rs=1&pid=ImgDetMain",
-        "https://img.zcool.cn/community/01a15855439bdf0000019ae9299cce.jpg@1280w_1l_2o_100sh.jpg",
+        "https://pic1.zhimg.com/v2-0cc45f5fda6e8ff79350ec1303835629_r.jpg",
+        "https://pic1.zhimg.com/v2-0cc45f5fda6e8ff79350ec1303835629_r.jpg",
+        "https://pic1.zhimg.com/v2-0cc45f5fda6e8ff79350ec1303835629_r.jpg",
+        "https://pic1.zhimg.com/v2-0cc45f5fda6e8ff79350ec1303835629_r.jpg",
+        "https://pic1.zhimg.com/v2-0cc45f5fda6e8ff79350ec1303835629_r.jpg",
+        "https://pic1.zhimg.com/v2-0cc45f5fda6e8ff79350ec1303835629_r.jpg",
+        "https://pic1.zhimg.com/v2-0cc45f5fda6e8ff79350ec1303835629_r.jpg",
+        "https://pic1.zhimg.com/v2-0cc45f5fda6e8ff79350ec1303835629_r.jpg",
         "https://pic1.zhimg.com/v2-0cc45f5fda6e8ff79350ec1303835629_r.jpg"
     )
 
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/extensions/BitmapExtensionFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/extensions/BitmapExtensionFragment.kt
@@ -64,7 +64,7 @@ class BitmapExtensionFragment : KotlinBaseFragment<FragmentExtensionBitmapBindin
             if (binding.angleView.text.isNullOrBlank()) {
                 return@setOnClickListener
             }
-            val rotateImage = originalBitmap.rotateImage(binding.angleView.text.toString().toInt())
+            val rotateImage = originalBitmap.rotateImage(binding.angleView.text.toString().toFloat())
             binding.revolvedImageView.setImageBitmap(rotateImage)
         }
 
diff --git a/app/src/main/java/com/pengxh/kt/lib/fragments/extensions/ImageExtensionFragment.kt b/app/src/main/java/com/pengxh/kt/lib/fragments/extensions/ImageExtensionFragment.kt
@@ -87,7 +87,7 @@ class ImageExtensionFragment : KotlinBaseFragment<FragmentExtensionImageBinding>
     }
 
     private fun bindPreview(cameraProvider: ProcessCameraProvider) {
-        val screenAspectRatio = if (Build.VERSION.SDK_INT >= 30) {
+        val screenAspectRatio = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
             val metrics = requireActivity().windowManager.currentWindowMetrics.bounds
             aspectRatio(metrics.width(), metrics.height())
         } else {
diff --git a/lite/build.gradle b/lite/build.gradle
@@ -5,7 +5,7 @@ android {
     compileSdkVersion 33
 
     defaultConfig {
-        minSdkVersion 23
+        minSdkVersion 26
         targetSdkVersion 33
         versionCode 1
         versionName "1.0"
diff --git a/lite/src/main/java/com/pengxh/kt/lite/adapter/EditableImageAdapter.kt b/lite/src/main/java/com/pengxh/kt/lite/adapter/EditableImageAdapter.kt
@@ -29,24 +29,22 @@ class EditableImageAdapter(
 ) : RecyclerView.Adapter<ViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(
-            LayoutInflater.from(context).inflate(R.layout.item_editable_rv_g, parent, false)
-        )
+        val view = LayoutInflater.from(context).inflate(R.layout.item_editable_rv_g, parent, false)
+        val imageSize = viewWidth / spanCount
+        val params = LinearLayout.LayoutParams(imageSize, imageSize)
+        view.findViewById<ImageView>(R.id.imageView).layoutParams = params
+        return ViewHolder(view)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val imageView = holder.getView<ImageView>(R.id.imageView)
-        val imageSize = viewWidth / spanCount
-        val params = LinearLayout.LayoutParams(imageSize, imageSize)
-        imageView.layoutParams = params
-
         if (position == itemCount - 1 && images.size < imageCountLimit) {
             imageView.setImageResource(R.drawable.ic_add_pic)
             imageView.setOnClickListener { //添加图片
                 itemClickListener?.onAddImageClick()
             }
         } else {
-            Glide.with(context).load(images[position]).into(imageView)
+            Glide.with(holder.itemView.context).load(images[position]).into(imageView)
             imageView.setOnClickListener { // 点击操作，查看大图
                 itemClickListener?.onItemClick(holder.bindingAdapterPosition)
             }
@@ -58,11 +56,7 @@ class EditableImageAdapter(
         }
     }
 
-    override fun getItemCount(): Int = if (images.size >= imageCountLimit) {
-        imageCountLimit
-    } else {
-        images.size + 1
-    }
+    override fun getItemCount(): Int = minOf(imageCountLimit, images.size + 1)
 
     private var itemClickListener: OnItemClickListener? = null
 
diff --git a/lite/src/main/java/com/pengxh/kt/lite/adapter/GridViewImageAdapter.kt b/lite/src/main/java/com/pengxh/kt/lite/adapter/GridViewImageAdapter.kt
@@ -19,13 +19,16 @@ import com.pengxh.kt.lite.extensions.getScreenWidth
 class GridViewImageAdapter(private val context: Context, private val images: List<String>) :
     BaseAdapter() {
 
-    private val screenWidth = context.getScreenWidth()
-
     override fun getItemId(position: Int): Long = position.toLong()
 
     override fun getCount(): Int = images.size
 
-    override fun getItem(position: Int): Any = images[position]
+    override fun getItem(position: Int): Any {
+        if (position < 0 || position >= images.size) {
+            throw IndexOutOfBoundsException("Position $position is out of bounds")
+        }
+        return images[position]
+    }
 
     override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View {
         val view: View
@@ -39,20 +42,27 @@ class GridViewImageAdapter(private val context: Context, private val images: Lis
             view = convertView
             holder = view.tag as ItemViewHolder
         }
-        Glide.with(context)
+        Glide.with(context.applicationContext)
             .load(images[position])
             .apply(RequestOptions().error(R.mipmap.load_image_error))
             .into(holder.imageView)
 
         //动态设置图片高度，和图片宽度保持一致
+        val screenWidth = context.getScreenWidth()
         val padding = (view.paddingLeft + view.paddingRight) * 3
         val imageSize = (screenWidth - padding) / 3
-        val params = LinearLayout.LayoutParams(imageSize, imageSize)
-        holder.imageView.layoutParams = params
+        if (holder.cachedLayoutParams == null) {
+            holder.cachedLayoutParams = LinearLayout.LayoutParams(imageSize, imageSize)
+        } else {
+            holder.cachedLayoutParams?.width = imageSize
+            holder.cachedLayoutParams?.height = imageSize
+        }
+        holder.imageView.layoutParams = holder.cachedLayoutParams
         return view
     }
 
     private class ItemViewHolder {
         lateinit var imageView: ImageView
+        var cachedLayoutParams: LinearLayout.LayoutParams? = null
     }
 }
diff --git a/lite/src/main/java/com/pengxh/kt/lite/adapter/MultipleChoiceAdapter.kt b/lite/src/main/java/com/pengxh/kt/lite/adapter/MultipleChoiceAdapter.kt
@@ -1,6 +1,5 @@
 package com.pengxh.kt.lite.adapter
 
-import android.os.Build
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
@@ -40,16 +39,7 @@ abstract class MultipleChoiceAdapter<T>(
         holder.itemView.setOnClickListener {
             if (multipleSelected.containsKey(position)) {
                 multipleSelected.remove(position)
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    selectedItems.removeIf { it == dataRows[position] }
-                } else {
-                    val iterator = selectedItems.iterator()
-                    while (iterator.hasNext()) {
-                        if (iterator.next() == dataRows[position]) {
-                            iterator.remove()
-                        }
-                    }
-                }
+                selectedItems.removeIf { it == dataRows[position] }
                 holder.itemView.isSelected = false
             } else {
                 multipleSelected[position] = true
diff --git a/lite/src/main/java/com/pengxh/kt/lite/extensions/Bitmap.kt b/lite/src/main/java/com/pengxh/kt/lite/extensions/Bitmap.kt
@@ -19,13 +19,12 @@ import kotlin.math.min
 /**
  * 保存图片，不压缩
  */
-fun Bitmap.saveImage(imagePath: String) {
+fun Bitmap.saveImage(imagePath: String, quality: Int = 100) {
+    val imageFile = File(imagePath)
     try {
-        val imageFile = File(imagePath)
-        val fileOutputStream = FileOutputStream(imageFile)
-        this.compress(Bitmap.CompressFormat.JPEG, 100, fileOutputStream)
-        fileOutputStream.flush()
-        fileOutputStream.close()
+        FileOutputStream(imageFile).use { fos ->
+            this.compress(Bitmap.CompressFormat.JPEG, quality, fos)
+        }
     } catch (e: IOException) {
         e.printStackTrace()
     }
@@ -34,11 +33,24 @@ fun Bitmap.saveImage(imagePath: String) {
 /**
  * 旋转图片
  */
-fun Bitmap.rotateImage(angle: Int): Bitmap {
+fun Bitmap.rotateImage(angle: Float): Bitmap {
+    // 确保在0到360度之间
+    val rotatedAngle = (angle % 360 + 360) % 360
+    if (rotatedAngle == 0f) {
+        return this
+    }
+
     val matrix = Matrix()
-    matrix.postRotate(angle.toFloat())
+    matrix.postRotate(rotatedAngle)
     // 创建新的图片
-    return Bitmap.createBitmap(this, 0, 0, this.width, this.height, matrix, true)
+    val rotatedBitmap = Bitmap.createBitmap(this, 0, 0, this.width, this.height, matrix, true)
+
+    // 尝试复用原Bitmap对象以节省内存
+    if (rotatedBitmap != this) {
+        this.recycle()
+    }
+
+    return rotatedBitmap
 }
 
 /**
diff --git a/lite/src/main/java/com/pengxh/kt/lite/extensions/Context.kt b/lite/src/main/java/com/pengxh/kt/lite/extensions/Context.kt
@@ -10,10 +10,8 @@ import android.util.DisplayMetrics
 import android.view.WindowInsets
 import android.view.WindowManager
 import com.pengxh.kt.lite.utils.LiteKitConstant
-import java.io.BufferedReader
 import java.io.File
 import java.io.IOException
-import java.io.InputStreamReader
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -68,20 +66,16 @@ inline fun <reified T> Context.navigatePageTo(index: Int, imageList: ArrayList<S
  */
 fun Context.readAssetsFile(fileName: String?): String {
     if (fileName.isNullOrBlank()) return ""
-    try {
-        val inputStreamReader = InputStreamReader(this.assets.open(fileName))
-        val bufferedReader = BufferedReader(inputStreamReader)
-        val data = StringBuilder()
-        var line: String
-        while (true) {
-            line = bufferedReader.readLine() ?: break
-            data.append(line)
+    return try {
+        this.assets.open(fileName).use { inputStream ->
+            inputStream.bufferedReader().use { bufferedReader ->
+                bufferedReader.useLines { lines -> lines.joinToString(separator = "") }
+            }
         }
-        return data.toString()
     } catch (e: IOException) {
         e.printStackTrace()
+        ""
     }
-    return ""
 }
 
 /**
diff --git a/lite/src/main/java/com/pengxh/kt/lite/utils/HtmlRenderEngine.kt b/lite/src/main/java/com/pengxh/kt/lite/utils/HtmlRenderEngine.kt
@@ -1,7 +1,6 @@
 package com.pengxh.kt.lite.utils
 
 import android.content.Context
-import android.os.Build
 import android.text.Editable
 import android.text.Html
 import android.text.Spanned
@@ -81,11 +80,7 @@ class HtmlRenderEngine(builder: Builder) {
         scope.launch(Dispatchers.Main) {
             textView.movementMethod = LinkMovementMethod.getInstance()
             //默认不处理图片先这样简单设置
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                textView.text = Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY)
-            } else {
-                textView.text = Html.fromHtml(html)
-            }
+            textView.text = Html.fromHtml(html, Html.FROM_HTML_MODE_LEGACY)
             withContext(Dispatchers.IO) {
                 val imageGetter = Html.ImageGetter { source ->
                     val drawable = try {
@@ -107,35 +102,16 @@ class HtmlRenderEngine(builder: Builder) {
                     drawable
                 }
 
-                val htmlText = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    Html.fromHtml(
-                        html, Html.FROM_HTML_MODE_LEGACY, imageGetter, object : Html.TagHandler {
-                            override fun handleTag(
-                                opening: Boolean, tag: String,
-                                output: Editable, xmlReader: XMLReader
-                            ) {
-                                if (tag.lowercase(Locale.getDefault()) == "img") {
-                                    val len = output.length
-                                    val images = output.getSpans(
-                                        len - 1, len, ImageSpan::class.java
-                                    )
-                                    val imgSource = images[0].source ?: return
-                                    output.setSpan(object : ClickableSpan() {
-                                        override fun onClick(widget: View) {
-                                            listener.imageSource(imgSource)
-                                        }
-                                    }, len - 1, len, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
-                                }
-                            }
-                        })
-                } else {
-                    Html.fromHtml(html, imageGetter, object : Html.TagHandler {
+                val htmlText = Html.fromHtml(
+                    html, Html.FROM_HTML_MODE_LEGACY, imageGetter, object : Html.TagHandler {
                         override fun handleTag(
                             opening: Boolean, tag: String, output: Editable, xmlReader: XMLReader
                         ) {
                             if (tag.lowercase(Locale.getDefault()) == "img") {
                                 val len = output.length
-                                val images = output.getSpans(len - 1, len, ImageSpan::class.java)
+                                val images = output.getSpans(
+                                    len - 1, len, ImageSpan::class.java
+                                )
                                 val imgSource = images[0].source ?: return
                                 output.setSpan(object : ClickableSpan() {
                                     override fun onClick(widget: View) {
@@ -145,7 +121,6 @@ class HtmlRenderEngine(builder: Builder) {
                             }
                         }
                     })
-                }
                 withContext(Dispatchers.Main) {
                     textView.text = htmlText
                 }

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ class BitmapExtensionFragment : KotlinBaseFragment<FragmentExtensionBitmapBindin`
`64`	`64`	`if (binding.angleView.text.isNullOrBlank()) {`
`65`	`65`	`return@setOnClickListener`
`66`	`66`	`}`
`67`		`- val rotateImage = originalBitmap.rotateImage(binding.angleView.text.toString().toInt())`
	`67`	`+ val rotateImage = originalBitmap.rotateImage(binding.angleView.text.toString().toFloat())`
`68`	`68`	`binding.revolvedImageView.setImageBitmap(rotateImage)`
`69`	`69`	`}`
`70`	`70`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ class ImageExtensionFragment : KotlinBaseFragment<FragmentExtensionImageBinding>`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`private fun bindPreview(cameraProvider: ProcessCameraProvider) {`
`90`		`- val screenAspectRatio = if (Build.VERSION.SDK_INT >= 30) {`
	`90`	`+ val screenAspectRatio = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {`
`91`	`91`	`val metrics = requireActivity().windowManager.currentWindowMetrics.bounds`
`92`	`92`	`aspectRatio(metrics.width(), metrics.height())`
`93`	`93`	`} else {`