Optimize ParcelDiffHelper

.github/workflows/ci.yml

@@ -40,10 +40,7 @@ jobs:
 
   build:
     name: Build
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3

app/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id("com.android.application")
     id("kotlin-android")
+    id("kotlin-parcelize")
 }
 
 android {

app/src/main/java/com/kronos/sample/entity/TestEntity.kt

@@ -1,16 +1,17 @@
 package com.kronos.sample.entity
 
-import android.os.Parcel
 import android.os.Parcelable
-
 import com.kronos.diffutil.IDifference
 import com.kronos.diffutil.IEqualsAdapter
-
+import kotlinx.parcelize.Parcelize
 import java.util.Random
 
-data class TestEntity(var id: Int = 0,
-                      var displayTime: Long = 0,
-                      var text: String? = Random().nextInt(10000).toString())  : Parcelable, IDifference, IEqualsAdapter {
+@Parcelize
+data class TestEntity(
+        var id: Int = 0,
+        var displayTime: Long = 0,
+        var text: String? = Random().nextInt(10000).toString()
+) : Parcelable, IDifference, IEqualsAdapter {
 
     override val uniqueId: String
         get() = id.toString()
@@ -19,27 +20,4 @@ data class TestEntity(var id: Int = 0,
         displayTime = System.currentTimeMillis()
         text = "更新数据"
     }
-
-
-    constructor(source: Parcel) : this(
-            source.readInt(),
-            source.readLong(),
-            source.readString()
-    )
-
-    override fun describeContents() = 0
-
-    override fun writeToParcel(dest: Parcel, flags: Int) = with(dest) {
-        writeInt(id)
-        writeLong(displayTime)
-        writeString(text)
-    }
-
-    companion object {
-        @JvmField
-        val CREATOR: Parcelable.Creator<TestEntity> = object : Parcelable.Creator<TestEntity> {
-            override fun createFromParcel(source: Parcel): TestEntity = TestEntity(source)
-            override fun newArray(size: Int): Array<TestEntity?> = arrayOfNulls(size)
-        }
-    }
 }

diflib/src/main/java/com/kronos/diffutil/ParcelDiffHelper.kt

@@ -8,24 +8,25 @@ import java.util.concurrent.CopyOnWriteArrayList
 class ParcelDiffHelper<T : Parcelable> : BaseDiffHelper<T>() {
 
     override fun clone() {
-        try {
-            itemsCursor?.apply {
-                snapshot = CopyOnWriteArrayList()
-                for (entity in this) {
-                    val parcel = Parcel.obtain()
-                    (entity as Parcelable).writeToParcel(parcel, 0)
-                    parcel.setDataPosition(0)
-                    val constructor = entity.javaClass.getDeclaredConstructor(Parcel::class.java)
-                    constructor.isAccessible = true
-                    val dateEntity = constructor.newInstance(parcel) as T
-                    snapshot?.add(dateEntity)
-                    parcel.recycle()
-                }
+        itemsCursor?.run {
+            snapshot = CopyOnWriteArrayList()
+            forEach {
+                snapshot?.add(it.deepCopy() ?: it)
             }
-        } catch (e: Exception) {
-            e.printStackTrace()
         }
     }
 
+    private fun <T : Parcelable> T.deepCopy(): T? {
+        var parcel: Parcel? = null
+        return try {
+            parcel = Parcel.obtain().also {
+                it.writeParcelable(this, 0)
+                it.setDataPosition(0)
+            }
+            parcel.readParcelable(this::class.java.classLoader)
+        } finally {
+            parcel?.recycle()
+        }
+    }
 }