update codes

Author: yjfnypeu

docs/EasyDimension.md

@@ -0,0 +1,24 @@
+# EasyDimension
+
+EasyDimension用于快速的在系统提供的各种尺寸间(PX, DIP, SP, IN, PT, MM)进行转换。
+
+## 用法
+
+1. 传入待转换尺寸
+
+```kotlin
+// value为原始数值。unit为数值单位。
+// unit单位使用系统提供的尺寸单位，如TypedValue.COMPLEX_UNIT_PX, TypedValue.COMPLEX_UNIT_DIP
+dimension = EasyDimension.create(value, unit)
+```
+
+2. 输出转换后的不同尺寸的数值
+
+```kotlin
+dimension.toPX()
+dimension.toDIP()
+dimension.toSP()
+dimension.toPT()
+dimension.toIN()
+dimension.toMM()
+```

docs/EasyFormater.md

@@ -0,0 +1,3 @@
+# EasyFormater
+
+EasyFormater用于对任意类型数据进行格式化操作。

utils/src/main/java/com/haoge/usefulcodes/utils/easy/EasyDimension.kt

@@ -23,7 +23,6 @@ class EasyDimension private constructor(private val pixel:Float, private val met
     fun toMM() = pixel / metrics.xdpi / (1.0f / 25.4f)
 
     companion object {
-        @JvmStatic
         fun create(value:Float, unit:Int): EasyDimension {
             val metrics = SingleCache.getApplicationContext().resources.displayMetrics
             return EasyDimension(TypedValue.applyDimension(unit, value, metrics), metrics!!)

utils/src/main/java/com/haoge/usefulcodes/utils/easy/EasyFormater.kt

@@ -67,7 +67,7 @@ class EasyFormater private constructor(private val builder: Builder) {
             }
 
         } catch (e:Exception) {
-            return StringBuilder(data)
+            return StringBuilder("\"$data\"")
         }
         result.append(if (isFlat) "]" else "\n]")
         return result
@@ -77,11 +77,29 @@ class EasyFormater private constructor(private val builder: Builder) {
         val result = StringBuilder("{")
         var isFlat = true
         try {
-            val obj = JSONObject(data)
-            isFlat = obj.length() > builder.maxMapSize
-            appendIterator(result, obj.keys(), isFlat)
+            val json = JSONObject(data)
+            val length = json.length()
+            val keys = json.keys()
+            isFlat = length > builder.maxArraySize
+            var hasNext = keys.hasNext()
+            while (hasNext) {
+                if (!isFlat) {
+                    result.append("\n")
+                }
+
+                val sub = StringBuilder()
+                val next = keys.next()
+                sub.append(formatString(next)).append(":").append(json.optString(next))
+
+                hasNext = keys.hasNext()
+                if (hasNext) {
+                    sub.append(", ")
+                }
+                appendSubString(result, sub)
+            }
+
         } catch (e:Exception) {
-            return StringBuilder(data)
+            return StringBuilder("\"$data\"")
         }
         result.append(if (isFlat) "}" else "\n}")
         return result