替换 SmartCodable 版本

galaxy/Podfile

@@ -89,7 +89,9 @@ target 'galaxy' do
 #  pod 'HandyJSON', '5.0.2'
   #字典、模型互转
 #  pod 'SmartCodable','2.2.2'
-  pod 'SmartCodable','2.3.1'
+#  pod 'SmartCodable','2.3.1'
+   pod 'SmartCodable','3.3.0'
+
   #微信SDK
   pod 'WechatOpenSDK', '2.0.2'
   #视频播放器

galaxy/galaxy/Classes/Base/C/YHBaseViewModel.swift

@@ -52,7 +52,7 @@ class YHBaseViewModel {
                 return
             }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHCardOcrModel.deserialize(from:dic) else {
                     callBackBlock(false, nil)
                     return
                 }
@@ -78,7 +78,7 @@ class YHBaseViewModel {
                 return
             }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHCardOcrModel.deserialize(from:dic) else {
                     callBackBlock(false, nil)
                     return
                 }
@@ -105,7 +105,7 @@ class YHBaseViewModel {
                 return
             }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHCardOcrModel.deserialize(from:dic) else {
                     callBackBlock(false, nil)
                     return
                 }
@@ -137,7 +137,7 @@ class YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHSmallWhiteBarInfo.deserialize(dict:dic as? [AnyHashable: Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHSmallWhiteBarInfo.deserialize(from:dic) else {
                     self.smallWhiteBarInfo = nil
                     callBackBlock(false, nil)
                     return

galaxy/galaxy/Classes/Modules/AppleLogin(苹果登录)/V/YHAppleLoginViewModel.swift

@@ -17,7 +17,7 @@ class YHAppleLoginViewModel: NSObject {
             //1. json字符串 转 对象
             guard let self = self else { return }
             printLog(json)
-            guard let dic = json.data?.peel as?  [String : Any],let resultModel = YHUserModel.deserialize(dict: dic) else {
+            guard let dic = json.data?.peel as?  [String : Any],let resultModel = YHUserModel.deserialize(from: dic) else {
                 let error : YHErrorModel = YHErrorModel(errorCode:-1,errorMsg: "数据解析不成功")
                 callBackBlock(false, error)
                 return

galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/M/YHOneKeyLoginViewModel.swift

@@ -42,7 +42,7 @@ class YHOneKeyLoginViewModel {
             
             json, code in
             printLog(json)
-            guard let dic = json.data?.peel as?  [String : Any], let resultModel = YHUserModel.deserialize(dict: dic) else {
+            guard let dic = json.data?.peel as?  [String : Any], let resultModel = YHUserModel.deserialize(from: dic) else {
                 let error : YHErrorModel = YHErrorModel(errorCode:-1,errorMsg: "数据解析不成功")
                 callBackBlock(false, error)
                 return

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/VM/YHActivityViewModel.swift

@@ -56,7 +56,7 @@ extension YHActivityViewModel {
             
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHActivityTravelModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHActivityTravelModel.deserialize(from: dic) else {
                     self.activityTravelModel = nil
                     callBackBlock(false,nil)
                     return
@@ -86,7 +86,7 @@ extension YHActivityViewModel {
             
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any],let result = YHActivityTravelModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any],let result = YHActivityTravelModel.deserialize(from: dic) else {
                     self.activityTravelModel = nil
                     callBackBlock(false,nil)
                     return
@@ -116,7 +116,7 @@ extension YHActivityViewModel {
             
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any],let result = YHTravelModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any],let result = YHTravelModel.deserialize(from: dic) else {
                     self.travelModel = nil
                     callBackBlock(false,nil)
                     return
@@ -147,7 +147,7 @@ extension YHActivityViewModel {
             
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any], let result = YHActivityDetailModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any], let result = YHActivityDetailModel.deserialize(from: dic) else {
                     self.arrActivityDetail = []
                     callBackBlock(false,nil)
                     return
@@ -234,7 +234,7 @@ extension YHActivityViewModel {
             self.isRequestActivityListDataFlag = false
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any], let result = YHActivityListModel.deserialize(dict: dic as? [AnyHashable:Any]) else {
+                guard let dic = json.data?.peel as?  [String : Any], let result = YHActivityListModel.deserialize(from: dic) else {
                     self.arrActivityListData = []
                     callBackBlock(false,nil)
                     return

galaxy/galaxy/Classes/Modules/Community(社区)/VM/YHInformationAuthorizeViewModel.swift

@@ -100,7 +100,7 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any], let result = YHUserInformationDetailModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any], let result = YHUserInformationDetailModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -121,7 +121,7 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any], let result = YHMainUserInformationSetModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any], let result = YHMainUserInformationSetModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -172,7 +172,7 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any], let result = YHChangeHeadModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any], let result = YHChangeHeadModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/Community(社区)/VM/YHMatchUserViewModel.swift

@@ -25,7 +25,7 @@ class YHMatchUserViewModel: NSObject {
             printLog(json)
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [Any],let resultModel = [YHMatchUserInfo].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as?  [Any],let resultModel = [YHMatchUserInfo].deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     self.matchUserArr = []
                     callBack(false, err)
@@ -75,7 +75,7 @@ class YHMatchUserViewModel: NSObject {
             guard let self = self else { return }
             printLog("model 是 ==> \(json)")
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHFriendListModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHFriendListModel.deserialize(from: dic) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     self.friendListModel = YHFriendListModel()
                     callBack(false, error)
@@ -104,7 +104,7 @@ class YHMatchUserViewModel: NSObject {
             guard let self = self else { return }
             printLog("model 是 ==> \(json)")
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHUserNameCardInfo.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHUserNameCardInfo.deserialize(from: dic) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     self.nameCardInfo = YHUserNameCardInfo()
                     callBack(false, error)
@@ -153,7 +153,7 @@ class YHMatchUserViewModel: NSObject {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any], let result = YHMainUserInformationSetModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any], let result = YHMainUserInformationSetModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -167,7 +167,7 @@ private extension YHHomePageViewController {
     func getCacheDataForBanner() -> [YHBannerModel] {
         let arrString2 = UserDefaults.standard.value(forKey: "homeBannerData")
         if let tmp = arrString2 as? String,let dic = tmp.toArray() {
-            guard let result = [YHBannerModel].deserialize(array: dic) else {
+            guard let result = [YHBannerModel].deserialize(from: dic) else {
                 return [YHBannerModel.localDefaultItem()]
             }
             
@@ -191,7 +191,7 @@ private extension YHHomePageViewController {
     func getCacheDataForHomeNewsData() {
         let arrString2 = UserDefaults.standard.value(forKey: "homeFirstPageNewsData")
         if let tmp = arrString2 as? String,let dic = tmp.toArray() {
-            guard let result = [YHHomeListModel].deserialize(array: dic) else {
+            guard let result = [YHHomeListModel].deserialize(from: dic) else {
                 return
             }
             

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/VM/YHInvitationWithGiftsViewModel.swift

@@ -22,7 +22,7 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let result = [YHShareCashOutModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let result = [YHShareCashOutModel].deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -55,7 +55,7 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             if json.code == 200 {
                 
-                guard let dic = json.data?.peel as?  [String : Any], let result = YHShareOverviewModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any], let result = YHShareOverviewModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -93,7 +93,7 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             if json.code == 200 {
                 
-                guard let dic = json.data?.peel as?  [String : Any], let result = YHShareRecordModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any], let result = YHShareRecordModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -49,7 +49,7 @@ extension YHHomePageViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let dic = json.data?.peel as?  [String : Any], let resultModel = YHSignerInfoModel.deserialize(dict: dic) else {
+            guard let dic = json.data?.peel as?  [String : Any], let resultModel = YHSignerInfoModel.deserialize(from: dic) else {
                 callBackBlock(false,nil)
                 return
             }
@@ -70,7 +70,7 @@ extension YHHomePageViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl,params: param) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let dic = json.data?.peel as?  [String : Any], let result = YHHomeLastMessageListModel.deserialize(dict: dic) else {
+            guard let dic = json.data?.peel as?  [String : Any], let result = YHHomeLastMessageListModel.deserialize(from: dic) else {
                 self.arrLastTwoMessages = []
                 callBackBlock(false,nil)
                 return
@@ -89,7 +89,7 @@ extension YHHomePageViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let dic = json.data?.peel as? [String : Any], let resultModel = YHConfigModel.deserialize(dict: dic) else {
+            guard let dic = json.data?.peel as? [String : Any], let resultModel = YHConfigModel.deserialize(from: dic) else {
                 callBackBlock(false,nil)
                 return
             }
@@ -142,7 +142,7 @@ extension YHHomePageViewModel {
                     return
                 }
                 
-                guard let result = YHHomeListTotalModel.deserialize(dict: dic) else {
+                guard let result = YHHomeListTotalModel.deserialize(from: dic) else {
                     self.arrHomeNewsData = []
                     callBackBlock(false,nil)
                     return
@@ -197,7 +197,7 @@ extension YHHomePageViewModel {
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let result = [YHBannerModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let result = [YHBannerModel].deserialize(from: dic) else {
                     
                     let model = YHBannerModel.localDefaultItem()
                     self.banners?.removeAll()
@@ -249,7 +249,7 @@ extension YHHomePageViewModel {
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let result = [YHHomeClassifyModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let result = [YHHomeClassifyModel].deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -281,7 +281,7 @@ extension YHHomePageViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any], let result = YHHomeListTotalModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any], let result = YHHomeListTotalModel.deserialize(from: dic) else {
 //                    self.arrHomeNewsData = []
                     callBackBlock(false,nil)
                     return
@@ -341,7 +341,7 @@ extension YHHomePageViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any], let result = YHHomeListTotalModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any], let result = YHHomeListTotalModel.deserialize(from: dic) else {
                     self.arrHomeNewsData = []
                     callBackBlock(false,nil)
                     return
@@ -385,7 +385,7 @@ extension YHHomePageViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let result = [YHHomeInfoClassifyModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let result = [YHHomeInfoClassifyModel].deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     self.classifyArr = []
                     callBackBlock(false,err)
@@ -411,7 +411,7 @@ extension YHHomePageViewModel {
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let result = [YHHKEventModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let result = [YHHKEventModel].deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -446,7 +446,7 @@ extension YHHomePageViewModel {
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any], let result = YHHomeListTotalModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any], let result = YHHomeListTotalModel.deserialize(from: dic) else {
                     self.arrHomeNewsData = []
                     callBackBlock(false,nil)
                     return
@@ -491,7 +491,7 @@ extension YHHomePageViewModel {
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let result = [YHHomeLifeCategoryModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let result = [YHHomeLifeCategoryModel].deserialize(from: dic) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     self.categoryArr = []
                     callBackBlock(false, error)
@@ -518,7 +518,7 @@ extension YHHomePageViewModel {
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any], let result = YHHomeLifeCategoryDetailModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any], let result = YHHomeLifeCategoryDetailModel.deserialize(from: dic) else {
                     self.detailModel = YHHomeLifeCategoryDetailModel()
                     callBackBlock(false, nil)
                     return

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomeWebViewModel.swift

@@ -21,7 +21,7 @@ extension YHHomeWebViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let dic = json.data?.peel as?  [String : Any], let resultModel = YHWebModel.deserialize(dict: dic) else {
+            guard let dic = json.data?.peel as?  [String : Any], let resultModel = YHWebModel.deserialize(from: dic) else {
                 callBackBlock(false,nil)
                 return
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterIncomeDetailViewController.swift

@@ -32,14 +32,14 @@ class YHAdopterIncomeDetailViewController: YHBaseViewController {
     }
     
     func getData() {
-        guard let resultModels = [YHAdopterFileModel].deserialize(json: data.urls) else {
+        guard let resultModels = [YHAdopterFileModel].deserialize(from: data.urls) else {
             return
         }
         for item in resultModels {
             var tempFile = YHWorkExperienceFileModel()
-            tempFile.fileName = item?.name ?? ""
-            tempFile.fileUrl = item?.url ?? ""
-            tempFile.uploadedAt = item?.upload_date ?? ""
+            tempFile.fileName = item.name ?? ""
+            tempFile.fileUrl = item.url ?? ""
+            tempFile.uploadedAt = item.upload_date ?? ""
             file.append(tempFile)
         }
         tableView.reloadData()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/VM/YHAddpterViewModel.swift

@@ -22,7 +22,7 @@ class YHAddpterViewModel: YHBaseViewModel {
             guard let self = self else { return }
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAdopterMainModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAdopterMainModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     
                     callBackBlock(false,err)
@@ -52,7 +52,7 @@ class YHAddpterViewModel: YHBaseViewModel {
             guard let self = self else { return }
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAdopterShowButtonModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAdopterShowButtonModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     
                     callBackBlock(false,err)
@@ -80,7 +80,7 @@ class YHAddpterViewModel: YHBaseViewModel {
             guard let self = self else { return }
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAdopterAddModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAdopterAddModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     
                     callBackBlock(false,err)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/VM/YHAdopterNewPeopleViewModel.swift

@@ -76,7 +76,7 @@ class YHAdopterNewPeopleViewModel: YHBaseViewModel {
             guard let self = self else { return }
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any],let resultModel = YHAdopterDependentDataModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as?  [String : Any],let resultModel = YHAdopterDependentDataModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     
                     callBackBlock(false,err)
@@ -110,7 +110,7 @@ class YHAdopterNewPeopleViewModel: YHBaseViewModel {
             guard let self = self else { return }
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAdopterDependentDataModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAdopterDependentDataModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     
                     callBackBlock(false,err)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/VM/YHYHAdopterTravelViewModel.swift

@@ -158,7 +158,7 @@ class YHYHAdopterTravelViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any],let result = YHHKIDCardModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any],let result = YHHKIDCardModel.deserialize(from: dic) else {
                     callBackBlock(false, nil)
                     return
                 }
@@ -181,7 +181,7 @@ class YHYHAdopterTravelViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHCNIDCardModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHCNIDCardModel.deserialize(from: dic) else {
                     callBackBlock(false, nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/VM/YHCerAppointViewModel.swift

@@ -71,7 +71,7 @@ class YHCerAppointViewModel: YHBaseViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any],let resultModel = YHHKLegaldaysModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any],let resultModel = YHHKLegaldaysModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callback?(false, err)
                     return
@@ -105,7 +105,7 @@ class YHCerAppointViewModel: YHBaseViewModel {
             printLog(json)
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let list = [YHServiceItem].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let list = [YHServiceItem].deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     self.serviceArr = []
                     callBack(false, err)
@@ -113,9 +113,9 @@ class YHCerAppointViewModel: YHBaseViewModel {
                 }
                 self.serviceArr.removeAll()
                 for item in list {
-                    if let item = item {
+//                    if let item = item {
                         self.serviceArr.append(item)
-                    }
+//                    }
                 }
                 callBack(true, nil)
                 
@@ -142,7 +142,7 @@ class YHCerAppointViewModel: YHBaseViewModel {
             
             if json.code == 200 {
                 
-                guard let dic = json.data?.peel as? [Any], let arr = [YHHKMemberModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let arr = [YHHKMemberModel].deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     self.hkUsers = []
                     callback?(false, err)
@@ -150,9 +150,9 @@ class YHCerAppointViewModel: YHBaseViewModel {
                 }
                 self.hkUsers.removeAll()
                 for user in arr {
-                    if let user = user {
+//                    if let user = user {
                         self.hkUsers.append(user)
-                    }
+//                    }
                 }
                 callback?(true, nil)
                 
@@ -180,7 +180,7 @@ class YHCerAppointViewModel: YHBaseViewModel {
             
             if json.code == 200 {
                 
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAppointHKResultModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAppointHKResultModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callback?(false, err)
                     return
@@ -324,7 +324,7 @@ class YHCerAppointViewModel: YHBaseViewModel {
             
             if json.code == 200 {
                 
-                guard let dic = json.data?.peel as? [Any], let arr = [YHMakeCertificatePlaceModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let arr = [YHMakeCertificatePlaceModel].deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     self.placeList = []
                     callback?(false, err)
@@ -332,9 +332,9 @@ class YHCerAppointViewModel: YHBaseViewModel {
                 }
                 self.placeList.removeAll()
                 for user in arr {
-                    if let user = user {
+//                    if let user = user {
                         self.placeList.append(user)
-                    }
+//                    }
                 }
                 callback?(true, nil)
                 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift

@@ -23,7 +23,7 @@ class YHFamilyInfoConfirmViewModel: NSObject {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any],let resultModel = YHFamilyGroupModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as?  [String : Any],let resultModel = YHFamilyGroupModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callback?(false, err)
                     return
@@ -58,7 +58,7 @@ class YHFamilyInfoConfirmViewModel: NSObject {
             
             if json.code == 200 {
                 
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHFamilyNamePinYin.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHFamilyNamePinYin.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callback?("", "")
                     return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/VM/YHTravelDocsPreparationViewModel.swift

@@ -30,7 +30,7 @@ extension YHTravelDocsPreparationViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any],let list = [YHTravelDocsPreparationListModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any],let list = [YHTravelDocsPreparationListModel].deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     self.arrTravelDocs = []
                     callBackBlock(false, err)
@@ -57,7 +57,7 @@ extension YHTravelDocsPreparationViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHTravelDocsPreparationDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHTravelDocsPreparationDetailModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     self.travelDetailModel = nil
                     callBackBlock(false, err)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/UploadCertificate(7上传过关证件)/VM/YHUploadCertificateViewModel.swift

@@ -27,7 +27,7 @@ extension YHUploadCertificateViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHUploadCertificateListModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHUploadCertificateListModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -93,7 +93,7 @@ extension YHUploadCertificateViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHUploadCertificateDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHUploadCertificateDetailModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/VisaPayment(4电子签字缴费)/VM/YHVisaPaymentViewModel.swift

@@ -41,7 +41,7 @@ extension YHVisaPaymentViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHVisaPaymentListModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHVisaPaymentListModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -84,7 +84,7 @@ extension YHVisaPaymentViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHVisaPaymentUpdateStatusModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHVisaPaymentUpdateStatusModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/VM/YHPrincleViewModel.swift

@@ -40,7 +40,7 @@ extension YHPrincleViewModel {
             
             if json.code == 200 {
                 
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHOfficalLetterListModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHOfficalLetterListModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callback?(false, err)
                     return
@@ -174,7 +174,7 @@ extension YHPrincleViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPrincipleAlertStatusModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPrincipleAlertStatusModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callback?(false, err)
                     return
@@ -204,7 +204,7 @@ extension YHPrincleViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPrincipleWaitResultModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPrincipleWaitResultModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callback?(false, err)
                     return
@@ -234,7 +234,7 @@ extension YHPrincleViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPrincipleEnvelopeModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPrincipleEnvelopeModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callback?(false, err)
                     return
@@ -263,7 +263,7 @@ extension YHPrincleViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPrincipleUploadDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPrincipleUploadDetailModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callback?(false, err)
                     return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/VM/YHCertificateViewModel.swift

@@ -52,7 +52,7 @@ class YHCertificateViewModel: YHBaseViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let resultModel = [YHFileListModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let resultModel = [YHFileListModel].deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     
                     callBackBlock(false,err)
@@ -60,10 +60,10 @@ class YHCertificateViewModel: YHBaseViewModel {
                 }
                 
                 for (_,item) in resultModel.enumerated() {
-                    let arr = item?.supplement_list.filter { (item) -> Bool in
+                    let arr = item.supplement_list.filter { (item) -> Bool in
                         return item.checkStatus == 2 || item.checkStatus == 3
                      }
-                    item?.supplement_list = arr ?? []
+                    item.supplement_list = arr ?? []
                 }
                 var arr = resultModel
                 self.arrFileListData = arr
@@ -91,7 +91,7 @@ class YHCertificateViewModel: YHBaseViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let resultModel = [YHQuestionAndAnswerModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let resultModel = [YHQuestionAndAnswerModel].deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     
                     callBackBlock(false,err)
@@ -124,7 +124,7 @@ class YHCertificateViewModel: YHBaseViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHCertificateEntryModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHCertificateEntryModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     
                     callBackBlock(false,err)
@@ -152,7 +152,7 @@ class YHCertificateViewModel: YHBaseViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHUploadCertificateInfo.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHUploadCertificateInfo.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callBack(nil, err)
                     return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsDetailViewModel.swift

@@ -30,7 +30,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMyDocumentDetailModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMyDocumentDetailModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -55,7 +55,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMyDocumentsUrlModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMyDocumentsUrlModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -150,7 +150,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -173,7 +173,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -214,7 +214,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -240,7 +240,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
             guard self != nil else { return }
             if json.code == 200 {
                 _ = json.data
-//                guard let result = YHMySignatureURLModel.deserialize(dict: dic) else {
+//                guard let result = YHMySignatureURLModel.deserialize(from: dic) else {
 //                    callBackBlock(false,nil)
 //                    return
 //                }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsListViewModel.swift

@@ -20,7 +20,7 @@ class YHMyDocumentsListViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMyDocumentsModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMyDocumentsModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/VM/YHMySchemeViewModel.swift

@@ -22,7 +22,7 @@ class YHMySchemeViewModel: YHBaseViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHMySchemeModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHMySchemeModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callBackBlock(false,err)
                     return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/VM/YHMySignatureDetailViewModel.swift

@@ -25,7 +25,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureDetailModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureDetailModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -65,7 +65,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -88,7 +88,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -146,7 +146,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -189,7 +189,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/VM/YHMySignatureListViewModel.swift

@@ -23,7 +23,7 @@ class YHMySignatureListViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any],let result = YHMySignatureListModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any],let result = YHMySignatureListModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/VM/YHBasicInfoFillViewModel.swift

@@ -162,7 +162,7 @@ extension YHBasicInfoFillViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHBasicInfoFillModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/M/YHEducationRequestViewModel.swift

@@ -32,7 +32,7 @@ class YHEducationRequestViewModel {
            printLog("model 是 ==> \(json)")
            
            if json.code == 200 {
-               guard let dic = json.data?.peel as? [String : Any], let resultModel = YHEducationListInfo.deserialize(dict: dic) else {
+               guard let dic = json.data?.peel as? [String : Any], let resultModel = YHEducationListInfo.deserialize(from: dic) else {
                    let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                    callBackBlock(false,error)
                    return
@@ -64,7 +64,7 @@ class YHEducationRequestViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHEducationDetailInfo.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHEducationDetailInfo.deserialize(from: dic) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
 
                     callBackBlock(false,error)
@@ -208,7 +208,7 @@ class YHEducationRequestViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let quaDict = dic["qua_data"] as? [AnyHashable : Any],let resultModel = YHQualificationDetailInfo.deserialize(dict:quaDict) else {
+                guard let dic = json.data?.peel as? [String : Any], let quaDict = dic["qua_data"] as? [String : Any],let resultModel = YHQualificationDetailInfo.deserialize(from:quaDict) else {
 
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callBackBlock(false,error)
@@ -273,7 +273,7 @@ class YHEducationRequestViewModel {
            printLog("model 是 ==> \(json)")
            
            if json.code == 200 {
-               guard let dic = json.data?.peel as? [String : Any],let list = dic["list"] as? [[String:Any]], let results = [YHCollegeInfo].deserialize(array: list) as? [YHCollegeInfo] else {
+               guard let dic = json.data?.peel as? [String : Any],let list = dic["list"] as? [[String:Any]], let results = [YHCollegeInfo].deserialize(from: list) as? [YHCollegeInfo] else {
 
                    let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                    callBackBlock(false,error)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/M/YHQuestionInfo.swift

@@ -42,7 +42,7 @@ extension YHQuestionInfo {
         let questions:[Dictionary] = NSArray(contentsOfFile:path!) as! [Dictionary<String, Any>]
         var res:[YHQuestionInfo] = []
         for dict in questions {
-            guard let questionInfo = YHQuestionInfo.deserialize(dict: dict as? [AnyHashable : Any]) else {
+            guard let questionInfo = YHQuestionInfo.deserialize(from: dict) else {
                 continue
             }
             if questionInfo.key == "graduate" {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyMemberViewModel.swift

@@ -164,7 +164,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHCNIDCardModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHCNIDCardModel.deserialize(from: dic) else {
                     callBackBlock(false, nil)
                     return
                 }
@@ -188,7 +188,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHHKIDCardModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHHKIDCardModel.deserialize(from: dic) else {
                     callBackBlock(false, nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyRequestViewModel.swift

@@ -21,7 +21,7 @@ class YHFamilyRequestViewModel {
                          
             printLog("model 是 ==> \(json)")
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any],let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic as? Dictionary ) else {
+                guard let dic = json.data?.peel as? [String : Any],let resultModel = YHFamilyMemberGroupInfo.deserialize(from: dic) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callBackBlock(nil, error)
                     return
@@ -124,7 +124,7 @@ class YHFamilyRequestViewModel {
             printLog("model 是 ==> \(json)")
             YHHUD.hide()
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any],let resultModel = YHFamilyMember.deserialize(dict: dic as? Dictionary ) else {
+                guard let dic = json.data?.peel as? [String : Any],let resultModel = YHFamilyMember.deserialize(from: dic) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callBackBlock(nil, error)
                     return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -405,7 +405,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMainInformationModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMainInformationModel.deserialize(from: dic) else {
                     callBackBlock(nil,nil)
                     return
                 }
@@ -513,7 +513,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHCNIDCardModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHCNIDCardModel.deserialize(from: dic) else {
                     callBackBlock(false, nil)
                     return
                 }
@@ -536,7 +536,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHHKIDCardModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHHKIDCardModel.deserialize(from: dic) else {
                     callBackBlock(false, nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHSelectCountryViewModel.swift

@@ -18,7 +18,7 @@ class YHSelectCountryViewModel: NSObject {
         let param: [String: Any] = ["keyword": key]
         let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             guard self != nil else { return }
-            guard let dic = json.data?.peel as?  [Any], let resultArray = [YHCountryMessage].deserialize(array: dic) else {
+            guard let dic = json.data?.peel as?  [Any], let resultArray = [YHCountryMessage].deserialize(from: dic) else {
                 callBackBlock([],nil)
                 return
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/VM/YHOtherInfoFillViewModel.swift

@@ -23,7 +23,7 @@ extension YHOtherInfoFillViewModel {
             guard let self = self else { return }
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHOtherInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHOtherInfoFillModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift

@@ -49,7 +49,7 @@ extension YHPreviewViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHWorkExpInfoPreviewModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHWorkExpInfoPreviewModel.deserialize(from: dic) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callBackBlock(false,error)
                     return
@@ -75,7 +75,7 @@ extension YHPreviewViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAcademicPreviewModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAcademicPreviewModel.deserialize(from: dic) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callBackBlock(false,error)
                     return
@@ -104,7 +104,7 @@ extension YHPreviewViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHFamilyMemberGroupInfo.deserialize(from: dic) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callBackBlock(false,error)
                     return
@@ -131,7 +131,7 @@ extension YHPreviewViewModel {
             
             arrDataForMainApplicationInfo.removeAll()
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMainInfoPreviewModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMainInfoPreviewModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -158,7 +158,7 @@ extension YHPreviewViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHBasicInfoFillModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -187,7 +187,7 @@ extension YHPreviewViewModel {
             guard let self = self else { return }
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPreviewForOtherInfoModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPreviewForOtherInfoModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHCompanyViewModel.swift

@@ -21,7 +21,7 @@ class YHCompanyViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard self != nil else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHCompanyModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHCompanyModel.deserialize(from: dic) else {
                     callBackBlock([],nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkExperienceViewModel.swift

@@ -214,7 +214,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
             guard let self = self else { return }
             if json.code == 200 {
                 
-                guard let dic = json.data?.peel as? [Any],let result = [YHWorkExampleModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any],let result = [YHWorkExampleModel].deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -238,7 +238,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHWorkExperienceDetailModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHWorkExperienceDetailModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -328,7 +328,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHWorkExperienceDetailModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHWorkExperienceDetailModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -352,7 +352,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let resultArray = [YHWorkExperienceProjectModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let resultArray = [YHWorkExperienceProjectModel].deserialize(from: dic) else {
                     callBackBlock([],nil)
                     return
                 }
@@ -392,7 +392,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHFileContent.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHFileContent.deserialize(from: dic) else {
                     callBackBlock(false, nil, nil)
                     return
                 }
@@ -414,7 +414,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
             guard let self = self else { return }
             if json.code == 200 {
                 
-                guard let dic = json.data?.peel as? [Any], let result = [YHWorkExperienceFileModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let result = [YHWorkExperienceFileModel].deserialize(from: dic) else {
                     callBackBlock(false, nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkIntroductionViewModel.swift

@@ -22,7 +22,7 @@ class YHWorkIntroductionViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let result = [YHWorkExampleModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let result = [YHWorkExampleModel].deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -72,7 +72,7 @@ class YHWorkIntroductionViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHFileContent.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHFileContent.deserialize(from: dic) else {
                     callBackBlock(false, nil, nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkItemListViewModel.swift

@@ -25,7 +25,7 @@ class YHWorkItemListViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHWorkModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHWorkModel.deserialize(from: dic) else {
                     callBackBlock([],nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift

@@ -52,7 +52,7 @@ extension YHServiceCenterMainViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let result = [YHServiceCenterProgressModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let result = [YHServiceCenterProgressModel].deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -89,7 +89,7 @@ extension YHServiceCenterMainViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let result = [YHServiceProgressModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let result = [YHServiceProgressModel].deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -99,11 +99,11 @@ extension YHServiceCenterMainViewModel {
                 }
                 var resultItem = YHServiceProgressModel()
                 for item in result {
-                    if item?.type == orderType {
-                        resultItem = item ?? YHServiceProgressModel()
+                    if item.type == orderType {
+                        resultItem = item
                     } else {
-                        if orderType == 2 && (item?.type == 2 || item?.type == 3) {
-                            resultItem = item ?? YHServiceProgressModel()
+                        if orderType == 2 && (item.type == 2 || item.type == 3) {
+                            resultItem = item
                         }
                     }
                 }
@@ -132,7 +132,7 @@ extension YHServiceCenterMainViewModel {
             printLog("model 是 ==> \(json)")
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHScoreResultModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHScoreResultModel.deserialize(from: dic) else {
                     let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     
                     callBackBlock(false,err)
@@ -179,7 +179,7 @@ extension YHServiceCenterMainViewModel {
             
             if json.code == 200 {
                 DispatchQueue.global().async {
-                    guard let dic = json.data?.peel as? [String : Any],let resultModel = YHContactItemHoldModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                    guard let dic = json.data?.peel as? [String : Any],let resultModel = YHContactItemHoldModel.deserialize(from: dic) else {
                         
                         DispatchQueue.main.async {
                             self.arrContactList = []
@@ -217,7 +217,7 @@ extension YHServiceCenterMainViewModel {
             arrContactStausItmes = []
             
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHContactMainItemStatusModel2.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHContactMainItemStatusModel2.deserialize(from: dic) else {
                     self.arrContactStausItmes = []
                     callBackBlock(false,nil)
                     return
@@ -303,7 +303,7 @@ extension YHServiceCenterMainViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             printLog("model 是 ==> \(json)")
-            guard let dic = json.data?.peel as? [String : Any],let resultModel = YHPersonInfoFillStepModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+            guard let dic = json.data?.peel as? [String : Any],let resultModel = YHPersonInfoFillStepModel.deserialize(from: dic) else {
                 self.arrInfoFillStep = []
                 informationFillStepModel = nil
                 callBackBlock(false,nil)
@@ -366,7 +366,7 @@ extension YHServiceCenterMainViewModel {
                 return
             }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHContactInfoScoreModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHContactInfoScoreModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -394,7 +394,7 @@ extension YHServiceCenterMainViewModel {
                 return
             }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHContactInfoScoreModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                guard let dic = json.data?.peel as? [String : Any], let resultModel = YHContactInfoScoreModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }
@@ -414,7 +414,7 @@ extension YHServiceCenterMainViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let dic = json.data?.peel as? [String : Any],let resultModel = YHPersonInfoModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+            guard let dic = json.data?.peel as? [String : Any],let resultModel = YHPersonInfoModel.deserialize(from: dic) else {
                 callBackBlock(false,nil)
                 return
             }
@@ -441,7 +441,7 @@ extension YHServiceCenterMainViewModel {
             if let plistData = FileManager.default.contents(atPath: path) {
                 do {
                     let listDictionary = try PropertyListSerialization.propertyList(from: plistData, options: [], format: nil) as! [String: Any]
-                    guard let model = YHScoreDataModel.deserialize(dict: listDictionary) else {
+                    guard let model = YHScoreDataModel.deserialize(from: listDictionary) else {
                         localScoreData = nil
                         return
                     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceOrderSearchViewModel.swift

@@ -18,11 +18,11 @@ class YHServiceOrderSearchViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard self != nil else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String : Any],let data = dic["Data"],let result = [YHServiceSearchModel].deserialize(array: data as? [Any]) else {
+                guard let dic = json.data?.peel as?  [String : Any],let data = dic["Data"],let result = [YHServiceSearchModel].deserialize(from: data as? [Any]) else {
                     callBackBlock(false,nil)
                     return
                 }
-                if result.count != 0, let model = result.first, model?.dictionary_code.count != 0 {
+                if result.count != 0, let model = result.first, model.dictionary_code.count != 0 {
                     callBackBlock(true, nil)
                 } else {
                     callBackBlock(false,nil)
@@ -44,7 +44,7 @@ class YHServiceOrderSearchViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any],let resultModel = [YHContactItemModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any],let resultModel = [YHContactItemModel].deserialize(from: dic) else {
                     self.arrContactList = []
                     callBackBlock(false,nil)
                     return
@@ -70,7 +70,7 @@ class YHServiceOrderSearchViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String: Any],let data = dic["orders"] as? [Any],let resultModel = [YHContactItemModel].deserialize(array: data) else {
+                guard let dic = json.data?.peel as? [String: Any],let data = dic["orders"] as? [Any],let resultModel = [YHContactItemModel].deserialize(from: data) else {
                     self.arrContactList = []
                     callBackBlock(false,nil)
                     return

galaxy/galaxy/Classes/Modules/Login(登录)/Server/YHLoginManager.swift

@@ -51,8 +51,8 @@ extension YHLoginManager {
     }
     
     func loadLocalUserInfoData() {
-        let dic = UserDefaults.standard.value(forKey: YhConstant.KLoginedInfoKey)
-        guard let resultModel = YHUserModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+        
+        guard let dic = UserDefaults.standard.value(forKey: YhConstant.KLoginedInfoKey) as? [String : Any],let resultModel = YHUserModel.deserialize(from: dic) else {
             return
         }
         self.userModel = resultModel

galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SmartCodable
 
 class YHLoginViewModel: YHBaseViewModel {
     var userModel: YHUserModel?
@@ -58,7 +59,7 @@ extension YHLoginViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             printLog(json)
-            guard let dic = json.data?.peel as?  [String : Any],let resultModel = YHUserModel.deserialize(dict: dic) else {
+            guard let dic = json.data?.peel as?  [String : Any],let resultModel = YHUserModel.deserialize(from: dic) else {
                 let error : YHErrorModel = YHErrorModel(errorCode:-1,errorMsg: "数据解析不成功")
                 callBackBlock(false,error)
                 return
@@ -157,7 +158,7 @@ extension YHLoginViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             printLog(json)
-            guard let dic = json.data?.peel as? [String : Any], let resultModel = YHUserModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+            guard let dic = json.data?.peel as? [String : Any], let resultModel = YHUserModel.deserialize(from: dic) else {
                 let error : YHErrorModel = YHErrorModel(errorCode:-1,errorMsg: "数据解析不成功")
                 callBackBlock(false,error)
                 return

galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHUserInfoSettingViewModel.swift

@@ -17,7 +17,7 @@ class YHUserInfoSettingViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHChangeHeadModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHChangeHeadModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/Message(消息)/VM/YHMsgViewModel.swift

@@ -23,7 +23,7 @@ class YHMsgViewModel: NSObject {
         let _ = YHNetRequest.getRequest(url: strUrl) { json, code in
             printLog("model 是 ==> \(json)")
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHMsgListModel.deserialize(dict: dic as? Dictionary ) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHMsgListModel.deserialize(from: dic) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     DispatchQueue.main.async {
                         callBackBlock(false, error)
@@ -66,7 +66,7 @@ class YHMsgViewModel: NSObject {
 //            printLog("model 是 ==> \(json)")
             if json.code == 200 {
                 DispatchQueue.global().async {
-                    guard let arr = [YHDetailMessageModel].deserialize(array: arrDict) else {
+                    guard let arr = [YHDetailMessageModel].deserialize(from: arrDict) else {
                         
                         DispatchQueue.main.async {
                             let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
@@ -82,9 +82,9 @@ class YHMsgViewModel: NSObject {
                             self.msgDetailList.removeAll()
                         }
                         for item in arr {
-                            if let item = item {
+//                            if let item = item {
                                 self.msgDetailList.append(item)
-                            }
+//                            }
                         }
                         let currentPage = (self.msgDetailList.count+kMsgPageSize-1)/kMsgPageSize
                         callBackBlock(true, currentPage == totalPage)

galaxy/galaxy/Classes/Modules/Mine（我的）/AboutYH/VM/YHListViewModel.swift

@@ -19,7 +19,7 @@ class YHListViewModel: YHBaseViewModel {
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let result = [YHHKEventModel].deserialize(array: dic) else {
+                guard let dic = json.data?.peel as? [Any], let result = [YHHKEventModel].deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/VM/YHEditViewModel.swift

@@ -21,7 +21,7 @@ class YHEditViewModel: YHBaseViewModel {
             //1. json字符串 转 对象
             guard let self = self else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHChangeHeadModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHChangeHeadModel.deserialize(from: dic) else {
                     callBackBlock(false,nil)
                     return
                 }

galaxy/galaxy/Classes/Modules/Mine（我的）/ViewModel/YHMyLikeViewModel.swift

@@ -38,7 +38,7 @@ extension YHMyLikeViewModel {
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any],let result = YHHomeListTotalModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any],let result = YHHomeListTotalModel.deserialize(from: dic) else {
                     self.arrHomeNewsData = []
                     callBackBlock(false,nil)
                     return
@@ -92,7 +92,7 @@ extension YHMyLikeViewModel {
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHHomeListTotalModel.deserialize(dict: dic) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHHomeListTotalModel.deserialize(from: dic) else {
                     self.arrHomeNewsData = []
                     callBackBlock(false,nil)
                     return
@@ -136,7 +136,7 @@ extension YHMyLikeViewModel {
             guard let self = self else { return }
             //1. json字符串 转 对象
             if json.code == 200 {
-                guard let dic = json.data?.peel as? [String : Any], let result = YHCollectionModel.deserialize(dict: dic as? Dictionary ) else {
+                guard let dic = json.data?.peel as? [String : Any], let result = YHCollectionModel.deserialize(from: dic) else {
                     let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
                     callBack?(false, error)
                     return

galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelperViewModel.swift

@@ -75,7 +75,7 @@ extension YHUatHelperViewModel {
         let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let dic = json.data?.peel as?  [String : Any], let resultModel = YHUatListModel.deserialize(dict: dic) else {
+            guard let dic = json.data?.peel as?  [String : Any], let resultModel = YHUatListModel.deserialize(from: dic) else {
                 callBackBlock(false,nil)
                 return
             }

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -327,7 +327,7 @@ class YHNetRequest: NSObject {
             DispatchQueue.main.async {
                 
 //                printLog(serverDict)
-                guard let obj = NetWorkBaseModel.deserialize(dict: serverDict) else {
+                guard let obj = NetWorkBaseModel.deserialize(from: serverDict) else {
                     print("解析出错了。 兄弟")
                     guard let errorBlock = self.failure else { return }
                     let errorModel = YHErrorModel(errorCode: Int32(statusCode), errorMsg: errorResponseMsg)

galaxy/galaxy/Classes/Tools/Upload/YHOSSManager.swift

@@ -58,7 +58,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
         let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
-            guard let dic = json.data?.peel as? [String : Any], let resultModel = YHOSSModel.deserialize(dict: dic) else {
+            guard let dic = json.data?.peel as? [String : Any], let resultModel = YHOSSModel.deserialize(from: dic) else {
                 return
             }
             print(resultModel.toJSONString() as Any)
@@ -79,7 +79,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
                 return
             }
             
-            guard let resultModel = YHOSSModel.deserialize(dict: dic) else {
+            guard let resultModel = YHOSSModel.deserialize(from: dic) else {
                 return
             }
             self.publicModel = resultModel