Merge branch 'develop_v1.2' of git.kdan.cc:Mac_PDF/PDF_Office into develop_v1.2

PDF Office/PDF Master/Class/KMLightMember/Cache/KMLightMemberCache.swift

@@ -98,6 +98,8 @@ extension KMLightMemberCache {
             } else if !(value is NSNull) {
                 // 子集不为 null，则将键值对添加到结果字典中
                 result[key] = value
+            } else if (value is NSNull) {
+                result[key] = ""
             }
         }
 

PDF Office/PDF Master/Class/KMLightMember/Model/KMLightMemberUserInfo.swift

@@ -14,7 +14,7 @@ class KMLightMemberUserInfo: NSObject, Codable {
     var isInFreeUseTime: Bool = false //是否免费使用
     var email: String = ""
     var platformType: Int = 0
-    var accountType: Int = 0
+    var accountType: String = ""
     var createdAt: String = ""
     var validFlag: String = "" // 0是已注销 5是注销中
     var subscriptionInfoList: [KMLightMemberUserSubscriptionInfo] = []
@@ -63,7 +63,9 @@ extension KMLightMemberUserInfo {
         
         var result: KMLightMemberUserInfo = KMLightMemberUserInfo()
         
-        let jsonString: String = DictionaryToJson.dictionary(toJson: data)!
+        let resultData = KMLightMemberCache.cache.removeNullValuesFromDictionary(data as! [String : Any])
+        
+        let jsonString: String = DictionaryToJson.dictionary(toJson: resultData as? AnyObject)!
         let jsonData: Data = jsonString.data(using: .utf8)!
         
         let decoder = JSONDecoder()