From acfe4de00833384cf5bc47111c3fc22dc9a19784 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Mon, 27 Apr 2020 11:33:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/model/analyzeRule/AnalyzeUrl.kt       |  1 +
 .../io/legado/app/utils/GsonExtensions.kt     | 76 ++++++++++++++++++-
 2 files changed, 74 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt
index 20f03797e..f0b9cb3b6 100644
--- a/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt
+++ b/app/src/main/java/io/legado/app/model/analyzeRule/AnalyzeUrl.kt
@@ -162,6 +162,7 @@ class AnalyzeUrl(
                 options.method?.let { if (it.equals("POST", true)) method = RequestMethod.POST }
                 options.headers?.let { headers ->
                     if (headers is Map<*, *>) {
+                        @Suppress("unchecked_cast")
                         headerMap.putAll(headers as Map<out String, String>)
                     }
                     if (headers is String) {
diff --git a/app/src/main/java/io/legado/app/utils/GsonExtensions.kt b/app/src/main/java/io/legado/app/utils/GsonExtensions.kt
index 3f736abc5..b2ae3d297 100644
--- a/app/src/main/java/io/legado/app/utils/GsonExtensions.kt
+++ b/app/src/main/java/io/legado/app/utils/GsonExtensions.kt
@@ -1,15 +1,20 @@
 package io.legado.app.utils
 
-import com.google.gson.Gson
-import com.google.gson.GsonBuilder
-import com.google.gson.JsonSyntaxException
+import com.google.gson.*
+import com.google.gson.internal.LinkedTreeMap
 import com.google.gson.reflect.TypeToken
 import org.jetbrains.anko.attempt
 import java.lang.reflect.ParameterizedType
 import java.lang.reflect.Type
+import kotlin.math.ceil
+
 
 val GSON: Gson by lazy {
     GsonBuilder()
+        .registerTypeAdapter(
+            object : TypeToken<Map<String?, Any?>?>() {}.type,
+            MapDeserializerDoubleAsIntFix()
+        )
         .disableHtmlEscaping()
         .setPrettyPrinting()
         .create()
@@ -40,3 +45,68 @@ class ParameterizedTypeImpl(private val clazz: Class<*>) : ParameterizedType {
 
     override fun getActualTypeArguments(): Array<Type> = arrayOf(clazz)
 }
+
+/**
+ * 修复Int变为Double的问题
+ */
+class MapDeserializerDoubleAsIntFix :
+    JsonDeserializer<Map<String, Any>?> {
+
+    @Throws(JsonParseException::class)
+    override fun deserialize(
+        jsonElement: JsonElement,
+        type: Type,
+        jsonDeserializationContext: JsonDeserializationContext
+    ): Map<String, Any>? {
+        @Suppress("unchecked_cast")
+        return read(jsonElement) as? Map<String, Any>
+    }
+
+    fun read(`in`: JsonElement): Any? {
+        when {
+            `in`.isJsonArray -> {
+                val list: MutableList<Any?> = ArrayList()
+                val arr = `in`.asJsonArray
+                for (anArr in arr) {
+                    list.add(read(anArr))
+                }
+                return list
+            }
+            `in`.isJsonObject -> {
+                val map: MutableMap<String, Any?> =
+                    LinkedTreeMap()
+                val obj = `in`.asJsonObject
+                val entitySet =
+                    obj.entrySet()
+                for ((key, value) in entitySet) {
+                    map[key] = read(value)
+                }
+                return map
+            }
+            `in`.isJsonPrimitive -> {
+                val prim = `in`.asJsonPrimitive
+                when {
+                    prim.isBoolean -> {
+                        return prim.asBoolean
+                    }
+                    prim.isString -> {
+                        return prim.asString
+                    }
+                    prim.isNumber -> {
+                        val num: Number = prim.asNumber
+                        // here you can handle double int/long values
+                        // and return any type you want
+                        // this solution will transform 3.0 float to long values
+                        return if (ceil(num.toDouble()) == num.toLong().toDouble()) {
+                            num.toLong()
+                        } else {
+                            num.toDouble()
+                        }
+                    }
+                }
+            }
+        }
+        return null
+    }
+
+}
\ No newline at end of file