fix: MMKV can't decode bug

pslilysm · pslilysm · commit a714605323a3 · 2022-08-16T11:10:32.000+08:00
feat: add SdkTest.kt for test (sdk-ktx)'s ability
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ dependencyResolutionManagement {
 ```groovy
 dependencies {
     // add sdk-ktx to your dependencies
-    implementation 'com.github.pslilysm:sdk-ktx:2.0.1'
+    implementation 'com.github.pslilysm:sdk-ktx:2.0.2'
 }
 ```
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -32,10 +32,13 @@ android {
 dependencies {
 
     implementation 'androidx.core:core-ktx:1.8.0'
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
     implementation 'com.google.android.material:material:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
+    implementation 'com.tencent:mmkv:1.2.13'
+
+    implementation project(':sdk-library')
+
+    implementation 'com.google.code.gson:gson:2.9.1'
 }
diff --git a/app/src/main/java/perx/pslilysm/sdk_ktx/MainActivity.kt b/app/src/main/java/perx/pslilysm/sdk_ktx/MainActivity.kt
@@ -1,11 +1,12 @@
 package perx.pslilysm.sdk_ktx
 
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
+        SdkTest.test()
     }
 }
diff --git a/app/src/main/java/perx/pslilysm/sdk_ktx/SdkTest.kt b/app/src/main/java/perx/pslilysm/sdk_ktx/SdkTest.kt
@@ -0,0 +1,70 @@
+package perx.pslilysm.sdk_ktx
+
+import android.util.Log
+import com.tencent.mmkv.MMKV
+import pers.pslilysm.sdk_library.AppHolder
+import pers.pslilysm.sdk_library.util.*
+import pers.pslilysm.sdk_library.util.MMKVExtensions.decode
+import java.util.*
+
+/**
+ *
+ *
+ * @author cxd
+ * Created on 2022/8/16 10:25
+ */
+object SdkTest {
+
+    private const val TAG = "CXD-SdkTest"
+
+    init {
+        MMKV.initialize(AppHolder.get())
+    }
+
+    fun test() {
+        var value: Any = AesUtil.encrypt("pslilysm")
+        Log.i(TAG, "test: $value")
+        value = AesUtil.decrypt(value as String)
+        Log.i(TAG, "test: $value")
+        val json = "{\n" +
+                "  \"psl\": 24,\n" +
+                "  \"cxd\": 23,\n" +
+                "  \"fyh\": 23\n" +
+                "}"
+        value = GsonUtil.jsonToMap(json, Int::class.java)
+        (value as Map<String, Int>).forEach { _key: String, _value: Int ->
+            Log.i(TAG, "test: key -> $_key, value -> $_value")
+        }
+        value = GsonUtil.objToJson(value, true)
+        Log.i(TAG, "test: $value")
+        MMKV.defaultMMKV().encode("key", 12)
+        value = MMKV.defaultMMKV().decode("key", 123)
+        Log.i(TAG, "test: $value")
+        MMKV.defaultMMKV().encode("key", "abc")
+        value = MMKV.defaultMMKV().decode("key", "aa")
+        Log.i(TAG, "test: $value")
+        MMKV.defaultMMKV().encode("key", 3F)
+        value = MMKV.defaultMMKV().decode("key", 4F)
+        Log.i(TAG, "test: $value")
+        MMKV.defaultMMKV().encode("key", 4L)
+        value = MMKV.defaultMMKV().decode("key", 5L)
+        Log.i(TAG, "test: $value")
+        MMKV.defaultMMKV().encode("key", true)
+        value = MMKV.defaultMMKV().decode("key", false)
+        Log.i(TAG, "test: $value")
+        val set = mutableSetOf<String>()
+        set.add("1")
+        set.add("2")
+        MMKV.defaultMMKV().encode("key", set)
+        value = MMKV.defaultMMKV().decode("key", HashSet<String>())
+        Log.i(TAG, "test: $value")
+        Log.i(TAG, "test: " + FormatterUtil.getyyyyMMddHHmmssFormatter().format(Date()))
+        Log.i(TAG, "test: " + FormatterUtil.get_0dot00Formatter().format(36.24444))
+        GlobalExecutors.io().execute {
+            Log.i(TAG, "test: run")
+        }
+        ThreadUtil.checkIsMainThread()
+        ToastUtil.showShort("sdk test")
+    }
+
+}
diff --git a/sdk-library/src/main/java/pers/pslilysm/sdk_library/util/AesUtil.kt b/sdk-library/src/main/java/pers/pslilysm/sdk_library/util/AesUtil.kt
@@ -97,7 +97,7 @@ object AesUtil {
      * @return 加密好的字符串，最后会BASE64编码一下
      */
     @kotlin.jvm.JvmStatic
-    fun encrypt(str: String, aesMode: String?, aesKey: String, ivKey: String): String {
+    fun encrypt(str: String, aesMode: String, aesKey: String, ivKey: String): String {
         return try {
             val cipher = Cipher.getInstance(aesMode)
             cipher.init(
@@ -122,7 +122,7 @@ object AesUtil {
      * @return 解密好的字符串
      */
     @kotlin.jvm.JvmStatic
-    fun decrypt(str: String?, aesMode: String?, aesKey: String, ivKey: String): String {
+    fun decrypt(str: String, aesMode: String, aesKey: String, ivKey: String): String {
         return try {
             val cipher = Cipher.getInstance(aesMode)
             cipher.init(
diff --git a/sdk-library/src/main/java/pers/pslilysm/sdk_library/util/GsonUtil.kt b/sdk-library/src/main/java/pers/pslilysm/sdk_library/util/GsonUtil.kt
@@ -102,7 +102,7 @@ object GsonUtil {
                 jsonObject,
                 "members"
             )
-            members.forEach { (s: String, jsonElement: JsonElement?) ->
+            members!!.forEach { (s: String, jsonElement: JsonElement?) ->
                 result[s] = sGson.fromJson(jsonElement, vClass)
             }
         } catch (e: ReflectiveOperationException) {
diff --git a/sdk-library/src/main/java/pers/pslilysm/sdk_library/util/MMKVExtensions.kt b/sdk-library/src/main/java/pers/pslilysm/sdk_library/util/MMKVExtensions.kt
@@ -64,11 +64,11 @@ object MMKVExtensions {
      *
      * @param key          mapped value
      * @param defaultValue will be return if not find the key
-     * @return saved value by key
+     * @return defaultValue if not found the key
      */
     @kotlin.jvm.JvmStatic
-    fun <T> MMKV.decode(key: String, defaultValue: T): T? {
-        return decode<T>(key, defaultValue, null)
+    fun <T> MMKV.decode(key: String, defaultValue: T): T {
+        return decode<T>(key, defaultValue, null)!!
     }
 
     /**
@@ -89,35 +89,35 @@ object MMKVExtensions {
         } else {
             valueClass!!
         }
-        return if (clazz == Int::class.java) {
+        return if (clazz == Int::class.javaPrimitiveType || clazz == Int::class.javaObjectType) {
             Integer.valueOf(
                 this.decodeInt(
                     key,
                     (if (defaultValue == null) 0 else defaultValue as Int?)!!
                 )
             ) as T
-        } else (if (clazz == Float::class.java) {
+        } else (if (clazz == Float::class.javaPrimitiveType || clazz == Float::class.javaObjectType) {
             java.lang.Float.valueOf(
                 this.decodeFloat(
                     key,
                     (if (defaultValue == null) 0 else defaultValue as Float?) as Float
                 )
             ) as T
-        } else if (clazz == Double::class.java) {
+        } else if (clazz == Double::class.javaPrimitiveType || clazz == Double::class.javaObjectType) {
             java.lang.Double.valueOf(
                 this.decodeDouble(
                     key,
                     (if (defaultValue == null) 0 else defaultValue as Double?) as Double
                 )
             ) as T
-        } else if (clazz == Long::class.java) {
+        } else if (clazz == Long::class.javaPrimitiveType || clazz == Long::class.javaObjectType) {
             java.lang.Long.valueOf(
                 this.decodeLong(
                     key,
                     (if (defaultValue == null) 0 else defaultValue as Long?)!!
                 )
             ) as T
-        } else if (clazz == Boolean::class.java) {
+        } else if (clazz == Boolean::class.javaPrimitiveType || clazz == Boolean::class.javaObjectType) {
             java.lang.Boolean.valueOf(
                 this.decodeBool(
                     key,
@@ -146,7 +146,6 @@ object MMKVExtensions {
      * @param tClass value's class
      * @param <T>    the type of the value and must extends [Parcelable]
      * @return a parcelable value by the key
-     * @see .decodeParcelable
      */
     @kotlin.jvm.JvmStatic
     fun <T : Parcelable?> MMKV.decodeParcelable(key: String?, tClass: Class<T?>?): T? {
@@ -167,8 +166,8 @@ object MMKVExtensions {
         key: String?,
         tClass: Class<T>?,
         defaultValue: T
-    ): T? {
-        return this.decodeParcelable(key, tClass, defaultValue)
+    ): T {
+        return this.decodeParcelable(key, tClass, defaultValue)!!
     }
 
 }
diff --git a/sdk-library/src/main/java/pers/pslilysm/sdk_library/util/reflection/ReflectionUtil.kt b/sdk-library/src/main/java/pers/pslilysm/sdk_library/util/reflection/ReflectionUtil.kt
@@ -238,7 +238,7 @@ object ReflectionUtil {
 
     @kotlin.jvm.JvmStatic
     @Throws(ReflectiveOperationException::class)
-    fun <T> getFieldValue(`object`: Any?, fieldName: String): T {
+    fun <T> getFieldValue(`object`: Any?, fieldName: String): T? {
         return findOrCreateField(`object`!!.javaClass, fieldName)[`object`] as T
     }
 
@@ -250,13 +250,17 @@ object ReflectionUtil {
 
     @kotlin.jvm.JvmStatic
     @Throws(ReflectiveOperationException::class)
-    fun <T> invokeMethod(`object`: Any, methodName: String): T {
+    fun <T> invokeMethod(`object`: Any, methodName: String): T? {
         return invokeMethod(`object`, methodName, *sEmptyParameterTypesAndArgs)
     }
 
     @kotlin.jvm.JvmStatic
     @Throws(ReflectiveOperationException::class)
-    fun <T> invokeMethod(`object`: Any, methodName: String, vararg parameterTypesAndArgs: Any?): T {
+    fun <T> invokeMethod(
+        `object`: Any,
+        methodName: String,
+        vararg parameterTypesAndArgs: Any?
+    ): T? {
         val clazz: Class<*> = `object`.javaClass
         val classLoader =
             if (clazz.classLoader == null) ClassLoader.getSystemClassLoader() else clazz.classLoader
@@ -275,7 +279,7 @@ object ReflectionUtil {
 
     @kotlin.jvm.JvmStatic
     @Throws(ReflectiveOperationException::class)
-    fun <T> getStaticFieldValue(className: String, fieldName: String): T {
+    fun <T> getStaticFieldValue(className: String, fieldName: String): T? {
         return getStaticFieldValue(Class.forName(className), fieldName)
     }
 
@@ -285,13 +289,13 @@ object ReflectionUtil {
         className: String,
         classLoader: ClassLoader,
         fieldName: String
-    ): T {
+    ): T? {
         return getStaticFieldValue(classLoader.loadClass(className), fieldName)
     }
 
     @kotlin.jvm.JvmStatic
     @Throws(ReflectiveOperationException::class)
-    fun <T> getStaticFieldValue(clazz: Class<*>, fieldName: String): T {
+    fun <T> getStaticFieldValue(clazz: Class<*>, fieldName: String): T? {
         return findOrCreateField(clazz, fieldName)[null] as T
     }
 
@@ -320,7 +324,7 @@ object ReflectionUtil {
 
     @kotlin.jvm.JvmStatic
     @Throws(ReflectiveOperationException::class)
-    fun <T : Any> invokeStaticMethod(className: String, methodName: String): T {
+    fun <T : Any> invokeStaticMethod(className: String, methodName: String): T? {
         return invokeStaticMethod(
             ClassLoader.getSystemClassLoader().loadClass(className),
             methodName,
@@ -334,7 +338,7 @@ object ReflectionUtil {
         className: String,
         classLoader: ClassLoader,
         methodName: String
-    ): T {
+    ): T? {
         return invokeStaticMethod(
             classLoader.loadClass(className),
             methodName,
@@ -344,7 +348,7 @@ object ReflectionUtil {
 
     @kotlin.jvm.JvmStatic
     @Throws(ReflectiveOperationException::class)
-    fun <T> invokeStaticMethod(clazz: Class<*>, methodName: String): T {
+    fun <T> invokeStaticMethod(clazz: Class<*>, methodName: String): T? {
         return invokeStaticMethod(clazz, methodName, *sEmptyParameterTypesAndArgs)
     }
 
@@ -355,7 +359,7 @@ object ReflectionUtil {
         classLoader: ClassLoader,
         methodName: String,
         vararg parameterTypesAndArgs: Any?
-    ): T {
+    ): T? {
         return invokeStaticMethod(
             classLoader.loadClass(className),
             methodName,
@@ -369,7 +373,7 @@ object ReflectionUtil {
         clazz: Class<*>,
         methodName: String,
         vararg parameterTypesAndArgs: Any?
-    ): T {
+    ): T? {
         val classLoader =
             if (clazz.classLoader == null) ClassLoader.getSystemClassLoader() else clazz.classLoader
         val splitParameterTypesAndArgs =

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ dependencyResolutionManagement {`
`27`	`27`	```groovy
`28`	`28`	`dependencies {`
`29`	`29`	`// add sdk-ktx to your dependencies`
`30`		`- implementation 'com.github.pslilysm:sdk-ktx:2.0.1'`
	`30`	`+ implementation 'com.github.pslilysm:sdk-ktx:2.0.2'`
`31`	`31`	`}`
`32`	`32`	```
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`package perx.pslilysm.sdk_ktx`
`2`	`2`
`3`		`-import androidx.appcompat.app.AppCompatActivity`
`4`	`3`	`import android.os.Bundle`
	`4`	`+import androidx.appcompat.app.AppCompatActivity`
`5`	`5`
`6`	`6`	`class MainActivity : AppCompatActivity() {`
`7`	`7`	`override fun onCreate(savedInstanceState: Bundle?) {`
`8`	`8`	`super.onCreate(savedInstanceState)`
`9`	`9`	`setContentView(R.layout.activity_main)`
	`10`	`+ SdkTest.test()`
`10`	`11`	`}`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ object GsonUtil {`
`102`	`102`	`jsonObject,`
`103`	`103`	`"members"`
`104`	`104`	`)`
`105`		`- members.forEach { (s: String, jsonElement: JsonElement?) ->`
	`105`	`+ members!!.forEach { (s: String, jsonElement: JsonElement?) ->`
`106`	`106`	`result[s] = sGson.fromJson(jsonElement, vClass)`
`107`	`107`	`}`
`108`	`108`	`} catch (e: ReflectiveOperationException) {`