Skip to content

G
galaxy-iOS
Commit 01c42b25 authored by David黄金龙's avatar David黄金龙
Browse files
Options

去 HandyJson

parent 5ae31bc5
Hide whitespace changes
Inline Side-by-side
Showing with 415 additions and 436 deletions
galaxy/Podfile
View file @ 01c42b25
......@@ -63,8 +63,6 @@ target 'galaxy' do
pod 'ByebyeUnicode','1.1.0'
#轮播图
pod 'FSPagerView','0.8.3'
#字典、模型互转
pod 'SmartCodable','2.2.2'
#设备框架
pod 'DeviceKit', '5.2.1'
# #骨架图
......@@ -87,8 +85,11 @@ target 'galaxy' do
#富文本库
pod 'AttributedString','3.3.5'
#json转模型
pod 'HandyJSON', '5.0.2'
# #json转模型
# pod 'HandyJSON', '5.0.2'
#字典、模型互转
# pod 'SmartCodable','2.2.2'
pod 'SmartCodable','2.3.1'
#微信SDK
pod 'WechatOpenSDK', '2.0.2'
#视频播放器
......
galaxy/galaxy/AppDelegate.swift
View file @ 01c42b25
......@@ -125,7 +125,8 @@ extension AppDelegate {
private func thirdSetting() -> Void {
//1.数据解析
#if DEBUG
SmartConfig.debugMode = .none
SmartConfig.debugMode = .verbose
SmartConfig.openErrorAssert = false
#elseif TESTENV
SmartConfig.debugMode = .none
#else
......
galaxy/galaxy/Classes/Base/C/YHBaseViewModel.swift
View file @ 01c42b25
......@@ -52,8 +52,7 @@ class YHBaseViewModel {
return
}
if json.code == 200 {
let dic = json.data
guard let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
callBackBlock(false, nil)
return
}
......@@ -79,8 +78,7 @@ class YHBaseViewModel {
return
}
if json.code == 200 {
let dic = json.data
guard let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
callBackBlock(false, nil)
return
}
......@@ -107,8 +105,7 @@ class YHBaseViewModel {
return
}
if json.code == 200 {
let dic = json.data
guard let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHCardOcrModel.deserialize(dict:dic as? [AnyHashable: Any]) else {
callBackBlock(false, nil)
return
}
......@@ -140,8 +137,7 @@ class YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHSmallWhiteBarInfo.deserialize(dict:dic as? [AnyHashable: Any]) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHSmallWhiteBarInfo.deserialize(dict:dic as? [AnyHashable: Any]) else {
self.smallWhiteBarInfo = nil
callBackBlock(false, nil)
return
......
galaxy/galaxy/Classes/Base/M/YHBaseModel.swift
View file @ 01c42b25
//
// YHBaseModel.swift
// SmartCodable.swift
// galaxy
//
// Created by EDY on 2024/2/28.
......@@ -7,10 +7,9 @@
//
import UIKit
import HandyJSON
import SmartCodable
class YHBaseModel: HandyJSON {
required init() {
}
}
//class SmartCodable: SmartCodable {
// required init() {
// }
//}
galaxy/galaxy/Classes/Modules/AppleLogin(苹果登录)/V/YHAppleLoginViewModel.swift
View file @ 01c42b25
......@@ -17,8 +17,7 @@ class YHAppleLoginViewModel: NSObject {
//1. json字符串 转 对象
guard let self = self else { return }
printLog(json)
let dic = json.data
guard let resultModel = YHUserModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any],let resultModel = YHUserModel.deserialize(dict: dic) else {
let error : YHErrorModel = YHErrorModel(errorCode:-1,errorMsg: "数据解析不成功")
callBackBlock(false, error)
return
......
galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/M/YHOneKeyLoginViewModel.swift
View file @ 01c42b25
......@@ -42,8 +42,7 @@ class YHOneKeyLoginViewModel {
json, code in
printLog(json)
let dic = json.data
guard let resultModel = YHUserModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHUserModel.deserialize(dict: dic) else {
let error : YHErrorModel = YHErrorModel(errorCode:-1,errorMsg: "数据解析不成功")
callBackBlock(false, error)
return
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/M/YHActivityListModel.swift
View file @ 01c42b25
......@@ -7,8 +7,9 @@
//
import UIKit
import SmartCodable
class YHActivityListModel : YHBaseModel {
class YHActivityListModel : SmartCodable {
var total : String = ""
var data : [YHActivityModel] = []
required init() {
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/M/YHActivityModel.swift
View file @ 01c42b25
......@@ -7,8 +7,9 @@
//
import UIKit
import SmartCodable
class YHActivityModel: YHBaseModel {
class YHActivityModel: SmartCodable {
var id : Int = 0 //活动ID
var tag : Int = 0 //活动标签枚举 1：V专享
var name : String = "" //活动标题
......@@ -19,6 +20,9 @@ class YHActivityModel: YHBaseModel {
var status : String = "" //活动的状态 1：立即报名 2：已报名 3：活动结束 4：已取消报名 5:已下架
var checkId : String = "" //活动行程ID 仅当活动状态为2（已报名）时才大于0
required init() {
}
private var beginTimeForUI : String = ""
func getDateString(format : String = "MM/dd") -> String {
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/M/YHActivityTravelModel.swift
View file @ 01c42b25
......@@ -7,11 +7,15 @@
//
import UIKit
import SmartCodable
class YHActivityApplyInfoModel : YHBaseModel {
class YHActivityApplyInfoModel : SmartCodable {
var name : String = "" //用户姓名
var mobile : String = "" //手机号码
var number : Int32 = 0 //报名人数
required init() {
}
}
class YHActivityTravelModel: YHActivityModel {
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/M/YHTravelModel.swift
View file @ 01c42b25
......@@ -7,7 +7,11 @@
//
import UIKit
import SmartCodable
class YHTravelModel : YHBaseModel {
class YHTravelModel : SmartCodable {
var id : String = ""
required init() {
}
}
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/VM/YHActivityViewModel.swift
View file @ 01c42b25
......@@ -7,13 +7,17 @@
//
import UIKit
import SmartCodable
class YHActivityHelpModel: YHBaseModel {
class YHActivityHelpModel: SmartCodable {
var type : Int = 0 //0-详情头 1-详情内容 2-详情tips
//活动详情内容
var activityDetailModel : YHActivityDetailModel?
required init() {
}
}
class YHActivityViewModel: YHBaseViewModel {
......@@ -35,6 +39,8 @@ class YHActivityViewModel: YHBaseViewModel {
//4.活动行程单
var activityTravelModel : YHActivityTravelModel?
}
extension YHActivityViewModel {
......@@ -46,17 +52,16 @@ extension YHActivityViewModel {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Activity.cancelApi
let param = ["id":travelId]
let _ = YHNetRequest.putRequest(url: strUrl,params: param) { [weak self] json, code in
guard self != nil else { return }
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
// let dic = json.data
// guard let result = YHActivityTravelModel.deserialize(from: dic as? Dictionary) else {
// self.activityTravelModel = nil
// callBackBlock(false,nil)
// return
// }
// self.activityTravelModel = result
guard let dic = json.data?.peel as? [String : Any], let result = YHActivityTravelModel.deserialize(dict: dic) else {
self.activityTravelModel = nil
callBackBlock(false,nil)
return
}
self.activityTravelModel = result
callBackBlock(true, nil)
} else {
// self.activityTravelModel = nil
......@@ -81,8 +86,7 @@ extension YHActivityViewModel {
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = YHActivityTravelModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any],let result = YHActivityTravelModel.deserialize(dict: dic) else {
self.activityTravelModel = nil
callBackBlock(false,nil)
return
......@@ -112,8 +116,7 @@ extension YHActivityViewModel {
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = YHTravelModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any],let result = YHTravelModel.deserialize(dict: dic) else {
self.travelModel = nil
callBackBlock(false,nil)
return
......@@ -144,8 +147,7 @@ extension YHActivityViewModel {
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = YHActivityDetailModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHActivityDetailModel.deserialize(dict: dic) else {
self.arrActivityDetail = []
callBackBlock(false,nil)
return
......@@ -232,8 +234,7 @@ extension YHActivityViewModel {
self.isRequestActivityListDataFlag = false
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = YHActivityListModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHActivityListModel.deserialize(dict: dic as? [AnyHashable:Any]) else {
self.arrActivityListData = []
callBackBlock(false,nil)
return
......
galaxy/galaxy/Classes/Modules/Community(社区)/M/YHUserInformationModel.swift
View file @ 01c42b25
......@@ -7,6 +7,7 @@
//
import UIKit
import SmartCodable
enum YHUserInformationID: Int {
case id1 = 0 // 真实姓名
......@@ -43,7 +44,7 @@ struct YHUserInformationModel {
}
}
class YHMainUserInformationModel: YHBaseModel {
class YHMainUserInformationModel: SmartCodable {
var headUrl: String = ""
var username: String = ""
var area: [String] = []
......@@ -55,18 +56,22 @@ class YHMainUserInformationModel: YHBaseModel {
var major: String = ""
var degree: String = ""
var company: String = ""
required init() {
}
}
class YHMainUserInformationSetModel: YHBaseModel {
class YHMainUserInformationSetModel: SmartCodable {
var uid: String = ""
var information_to_card: Int = 2
var authorization_basic_information: Int = 2
var public_education_experience: Int = 2
var public_work_experience: Int = 2
var isclick_card: Int = 2
required init() {
}
}
class YHUserInformationDetailModel: YHBaseModel {
class YHUserInformationDetailModel: SmartCodable {
var username: String = ""
var avatar: String = ""
var address: YHUserInformationDetailAddressModel = YHUserInformationDetailAddressModel()
......@@ -74,11 +79,15 @@ class YHUserInformationDetailModel: YHBaseModel {
var industry: String = ""
var position: String = ""
var is_fillin: Int = 0
required init() {
}
}
class YHUserInformationDetailAddressModel: YHBaseModel {
class YHUserInformationDetailAddressModel: SmartCodable {
var country: String = ""
var province: String = ""
var city: String = ""
required init() {
}
}
galaxy/galaxy/Classes/Modules/Community(社区)/VM/YHInformationAuthorizeViewModel.swift
View file @ 01c42b25
......@@ -100,8 +100,7 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHUserInformationDetailModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHUserInformationDetailModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -122,8 +121,7 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMainUserInformationSetModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMainUserInformationSetModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -174,8 +172,7 @@ class YHInformationAuthorizeViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHChangeHeadModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHChangeHeadModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/Community(社区)/VM/YHMatchUserViewModel.swift
View file @ 01c42b25
......@@ -25,8 +25,7 @@ class YHMatchUserViewModel: NSObject {
printLog(json)
if json.code == 200 {
let dic = json.data
guard let resultModel = [YHMatchUserInfo].deserialize(array: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any],let resultModel = [YHMatchUserInfo].deserialize(array: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
self.matchUserArr = []
callBack(false, err)
......@@ -74,11 +73,9 @@ class YHMatchUserViewModel: NSObject {
let _ = YHNetRequest.getRequest(url: strUrl) {
[weak self] json, code in
guard let self = self else { return }
let dic = json.data
printLog("model 是 ==> \(json)")
if json.code == 200 {
guard let result = YHFriendListModel.deserialize(dict: dic as? Dictionary ) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHFriendListModel.deserialize(dict: dic) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
self.friendListModel = YHFriendListModel()
callBack(false, error)
......@@ -105,11 +102,9 @@ class YHMatchUserViewModel: NSObject {
let _ = YHNetRequest.getRequest(url: strUrl, params: params) {
[weak self] json, code in
guard let self = self else { return }
let dic = json.data
printLog("model 是 ==> \(json)")
if json.code == 200 {
guard let result = YHUserNameCardInfo.deserialize(dict: dic as? Dictionary ) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHUserNameCardInfo.deserialize(dict: dic) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
self.nameCardInfo = YHUserNameCardInfo()
callBack(false, error)
......@@ -138,7 +133,7 @@ class YHMatchUserViewModel: NSObject {
let _ = YHNetRequest.postRequest(url: strUrl, params: params) {
[weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
guard self != nil else { return }
printLog(json)
if json.code == 200 {
......@@ -158,8 +153,7 @@ class YHMatchUserViewModel: NSObject {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMainUserInformationSetModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMainUserInformationSetModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift
View file @ 01c42b25
......@@ -108,7 +108,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(from: dic) else {
guard let result = [YHBannerModel].deserialize(array: dic) else {
return [YHBannerModel.localDefaultItem()]
}
......@@ -132,7 +132,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(from: dic) else {
guard let result = [YHHomeListModel].deserialize(array: dic) else {
return
}
......
galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/M/YHShareCashOutModel.swift
View file @ 01c42b25
......@@ -7,34 +7,45 @@
//
import UIKit
import SmartCodable
class YHShareCashOutModel: YHBaseModel {
class YHShareCashOutModel: SmartCodable {
var mobile: String = ""
var amount: String = ""
var time: String = ""
required init() {
}
}
class YHShareOverviewModel: YHBaseModel {
class YHShareOverviewModel: SmartCodable {
var register_count: Int = 0
var evaluated_count: Int = 0
var signed_up_count: Int = 0
var cycle: YHShareOverviewCycleModel = YHShareOverviewCycleModel()
required init() {
}
}
class YHShareOverviewCycleModel: YHBaseModel {
class YHShareOverviewCycleModel: SmartCodable {
var begin_date: String = ""
var end_date: String = ""
required init() {
}
}
class YHShareRecordModel: YHBaseModel {
class YHShareRecordModel: SmartCodable {
var page_count: Int = 0
var list: [YHShareRecordListModel] = []
required init() {
}
}
class YHShareRecordListModel: YHBaseModel {
class YHShareRecordListModel: SmartCodable {
var mobile: String = ""
var register_time: String = ""
var is_registered: Bool = false
var is_evaluated: Bool = false
var is_signed_up: Bool = false
required init() {
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/VM/YHInvitationWithGiftsViewModel.swift
View file @ 01c42b25
......@@ -22,8 +22,7 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = [YHShareCashOutModel].deserialize(from: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let result = [YHShareCashOutModel].deserialize(array: dic) else {
callBackBlock(false,nil)
return
}
......@@ -55,8 +54,8 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = YHShareOverviewModel.deserialize(from: dic as? [String:Any]) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHShareOverviewModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -93,8 +92,8 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = YHShareRecordModel.deserialize(from: dic as? [String:Any]) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHShareRecordModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/Home(首页)/M/YHBannerModel.swift
View file @ 01c42b25
......@@ -7,8 +7,9 @@
//
import Foundation
import SmartCodable
class YHBannerModel: YHBaseModel {
class YHBannerModel: SmartCodable {
var name: String = ""
var skip_url: String = ""
var img_url: String = ""
......@@ -19,6 +20,8 @@ class YHBannerModel: YHBaseModel {
var img_url_compress: String = ""
//是否为本地
var isLocalItemFlag : Bool = false
required init() {
}
//
static func localDefaultItem() -> YHBannerModel {
......
galaxy/galaxy/Classes/Modules/Home(首页)/M/YHHKEventModel.swift
View file @ 01c42b25
......@@ -7,9 +7,12 @@
//
import UIKit
import SmartCodable
class YHHKEventModel: YHBaseModel {
class YHHKEventModel: SmartCodable {
var id: Int = 0
var tag: String = ""
var list: [String] = []
required init() {
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/M/YHHomeClassifyModel.swift
View file @ 01c42b25
......@@ -7,19 +7,24 @@
//
import UIKit
import SmartCodable
class YHHomeClassifyModel: YHBaseModel {
class YHHomeClassifyModel: SmartCodable {
var id: Int = 0
var name: String = ""
var pid: Int = 0
var type: Int = 0
var children: [YHClassifyModel] = []
required init() {
}
}
class YHClassifyModel: YHBaseModel {
class YHClassifyModel: SmartCodable {
var children: [String] = []
var id: Int = 0
var name: String = ""
var pid: Int = 0
var type: Int = 0
required init() {
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/M/YHHomeListModel.swift
View file @ 01c42b25
......@@ -7,13 +7,16 @@
//
import UIKit
import SmartCodable
class YHHomeListTotalModel: YHBaseModel {
class YHHomeListTotalModel: SmartCodable {
var data: [YHHomeListModel] = []
var total: Int = 0
required init() {
}
}
class YHHomeListModel: YHBaseModel {
class YHHomeListModel: SmartCodable {
var collect_count: Int = 0
var id: Int = 0
var title: String = ""
......@@ -43,6 +46,8 @@ class YHHomeListModel: YHBaseModel {
//描述的高度
var textH : CGFloat = 16.0
required init() {
}
......
galaxy/galaxy/Classes/Modules/Home(首页)/M/YHWebModel.swift
View file @ 01c42b25
......@@ -7,8 +7,9 @@
//
import UIKit
import SmartCodable
class YHWebModel: YHBaseModel {
class YHWebModel: SmartCodable {
var like_count: Int = 0
var id: Int = 0
var is_like: Bool = false
......@@ -20,4 +21,6 @@ class YHWebModel: YHBaseModel {
var img_url: String = ""
var clue_classify_img_url = ""
var clue_classify_img_url_download = ""
required init() {
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift
View file @ 01c42b25
......@@ -49,8 +49,7 @@ extension YHHomePageViewModel {
let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
let dic = json.data
guard let resultModel = YHSignerInfoModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHSignerInfoModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -71,8 +70,7 @@ extension YHHomePageViewModel {
let _ = YHNetRequest.getRequest(url: strUrl,params: param) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
let dic = json.data
guard let result = YHHomeLastMessageListModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHHomeLastMessageListModel.deserialize(dict: dic) else {
self.arrLastTwoMessages = []
callBackBlock(false,nil)
return
......@@ -91,16 +89,13 @@ extension YHHomePageViewModel {
let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
let dic = json.data
guard let resultModel = YHConfigModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHConfigModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
configModel = resultModel
callBackBlock(true,nil)
} failBlock: { err in
callBackBlock(false,err)
}
}
......@@ -141,8 +136,13 @@ extension YHHomePageViewModel {
self.isRequestHomeNewsDataFlag = false
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = YHHomeListTotalModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any] else {
self.arrHomeNewsData = []
callBackBlock(false,nil)
return
}
guard let result = YHHomeListTotalModel.deserialize(dict: dic) else {
self.arrHomeNewsData = []
callBackBlock(false,nil)
return
......@@ -197,8 +197,7 @@ extension YHHomePageViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = [YHBannerModel].deserialize(from: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let result = [YHBannerModel].deserialize(array: dic) else {
let model = YHBannerModel.localDefaultItem()
self.banners?.removeAll()
......@@ -250,8 +249,7 @@ extension YHHomePageViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = [YHHomeClassifyModel].deserialize(from: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let result = [YHHomeClassifyModel].deserialize(array: dic) else {
callBackBlock(false,nil)
return
}
......@@ -283,8 +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 {
let dic = json.data
guard let result = YHHomeListTotalModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHHomeListTotalModel.deserialize(dict: dic) else {
// self.arrHomeNewsData = []
callBackBlock(false,nil)
return
......@@ -344,8 +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 {
let dic = json.data
guard let result = YHHomeListTotalModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHHomeListTotalModel.deserialize(dict: dic) else {
self.arrHomeNewsData = []
callBackBlock(false,nil)
return
......@@ -389,8 +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 {
let dic = json.data
guard let result = [YHHomeInfoClassifyModel].deserialize(array: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let result = [YHHomeInfoClassifyModel].deserialize(array: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
self.classifyArr = []
callBackBlock(false,err)
......@@ -416,8 +411,7 @@ extension YHHomePageViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = [YHHKEventModel].deserialize(from: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let result = [YHHKEventModel].deserialize(array: dic) else {
callBackBlock(false,nil)
return
}
......@@ -452,8 +446,7 @@ extension YHHomePageViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = YHHomeListTotalModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHHomeListTotalModel.deserialize(dict: dic) else {
self.arrHomeNewsData = []
callBackBlock(false,nil)
return
......@@ -498,8 +491,7 @@ extension YHHomePageViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = [YHHomeLifeCategoryModel].deserialize(array: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let result = [YHHomeLifeCategoryModel].deserialize(array: dic) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
self.categoryArr = []
callBackBlock(false, error)
......@@ -526,8 +518,7 @@ extension YHHomePageViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = YHHomeLifeCategoryDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHHomeLifeCategoryDetailModel.deserialize(dict: dic) else {
self.detailModel = YHHomeLifeCategoryDetailModel()
callBackBlock(false, nil)
return
......
galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomeWebViewModel.swift
View file @ 01c42b25
......@@ -21,8 +21,7 @@ extension YHHomeWebViewModel {
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
let dic = json.data
guard let resultModel = YHWebModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHWebModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -42,7 +41,6 @@ extension YHHomeWebViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
......@@ -63,7 +61,6 @@ extension YHHomeWebViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/VM/YHAddpterViewModel.swift
View file @ 01c42b25
......@@ -22,8 +22,7 @@ class YHAddpterViewModel: YHBaseViewModel {
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let resultModel = YHAdopterMainModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAdopterMainModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,err)
......@@ -53,8 +52,7 @@ class YHAddpterViewModel: YHBaseViewModel {
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let resultModel = YHAdopterShowButtonModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAdopterShowButtonModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,err)
......@@ -82,8 +80,7 @@ class YHAddpterViewModel: YHBaseViewModel {
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let resultModel = YHAdopterAddModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAdopterAddModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,err)
......@@ -110,7 +107,6 @@ class YHAddpterViewModel: YHBaseViewModel {
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
callBackBlock(true,nil)
} else {
let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/VM/YHAdopterNewPeopleViewModel.swift
View file @ 01c42b25
......@@ -76,8 +76,7 @@ class YHAdopterNewPeopleViewModel: YHBaseViewModel {
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let resultModel = YHAdopterDependentDataModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any],let resultModel = YHAdopterDependentDataModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,err)
......@@ -111,8 +110,7 @@ class YHAdopterNewPeopleViewModel: YHBaseViewModel {
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let resultModel = YHAdopterDependentDataModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAdopterDependentDataModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,err)
......@@ -143,7 +141,6 @@ class YHAdopterNewPeopleViewModel: YHBaseViewModel {
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
callBackBlock(true,nil)
} else {
let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
......@@ -164,7 +161,6 @@ class YHAdopterNewPeopleViewModel: YHBaseViewModel {
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
callBackBlock(true,nil)
} else {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AddAdopters(2新增受养人)/VM/YHYHAdopterTravelViewModel.swift
View file @ 01c42b25
......@@ -158,8 +158,7 @@ class YHYHAdopterTravelViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHHKIDCardModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any],let result = YHHKIDCardModel.deserialize(dict: dic) else {
callBackBlock(false, nil)
return
}
......@@ -182,8 +181,7 @@ class YHYHAdopterTravelViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHCNIDCardModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHCNIDCardModel.deserialize(dict: dic) else {
callBackBlock(false, nil)
return
}
......@@ -278,7 +276,6 @@ class YHYHAdopterTravelViewModel: YHBaseViewModel {
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
callBackBlock(true,nil)
} else {
let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/VM/YHCerAppointViewModel.swift
View file @ 01c42b25
......@@ -71,8 +71,7 @@ class YHCerAppointViewModel: YHBaseViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHHKLegaldaysModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any],let resultModel = YHHKLegaldaysModel.deserialize(dict: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callback?(false, err)
return
......@@ -106,8 +105,7 @@ class YHCerAppointViewModel: YHBaseViewModel {
printLog(json)
if json.code == 200 {
let dic = json.data
guard let list = [YHServiceItem].deserialize(array: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let list = [YHServiceItem].deserialize(array: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
self.serviceArr = []
callBack(false, err)
......@@ -144,8 +142,7 @@ class YHCerAppointViewModel: YHBaseViewModel {
if json.code == 200 {
let dic = json.data
guard let arr = [YHHKMemberModel].deserialize(array: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let arr = [YHHKMemberModel].deserialize(array: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
self.hkUsers = []
callback?(false, err)
......@@ -183,8 +180,7 @@ class YHCerAppointViewModel: YHBaseViewModel {
if json.code == 200 {
let dic = json.data
guard let resultModel = YHAppointHKResultModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAppointHKResultModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callback?(false, err)
return
......@@ -328,8 +324,7 @@ class YHCerAppointViewModel: YHBaseViewModel {
if json.code == 200 {
let dic = json.data
guard let arr = [YHMakeCertificatePlaceModel].deserialize(array: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let arr = [YHMakeCertificatePlaceModel].deserialize(array: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
self.placeList = []
callback?(false, err)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift
View file @ 01c42b25
......@@ -23,9 +23,7 @@ class YHFamilyInfoConfirmViewModel: NSObject {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHFamilyGroupModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any],let resultModel = YHFamilyGroupModel.deserialize(dict: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callback?(false, err)
return
......@@ -60,8 +58,7 @@ class YHFamilyInfoConfirmViewModel: NSObject {
if json.code == 200 {
let dic = json.data
guard let resultModel = YHFamilyNamePinYin.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHFamilyNamePinYin.deserialize(dict: dic as? [AnyHashable : Any]) 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
View file @ 01c42b25
......@@ -30,8 +30,7 @@ extension YHTravelDocsPreparationViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let list = [YHTravelDocsPreparationListModel].deserialize(array: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any],let list = [YHTravelDocsPreparationListModel].deserialize(array: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
self.arrTravelDocs = []
callBackBlock(false, err)
......@@ -58,8 +57,7 @@ extension YHTravelDocsPreparationViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHTravelDocsPreparationDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHTravelDocsPreparationDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) 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
View file @ 01c42b25
......@@ -27,8 +27,7 @@ extension YHUploadCertificateViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHUploadCertificateListModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHUploadCertificateListModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
......@@ -94,8 +93,7 @@ extension YHUploadCertificateViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHUploadCertificateDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHUploadCertificateDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/Certificate(办证段)/VisaPayment(4电子签字缴费)/VM/YHVisaPaymentViewModel.swift
View file @ 01c42b25
......@@ -41,8 +41,7 @@ extension YHVisaPaymentViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHVisaPaymentListModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHVisaPaymentListModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
......@@ -85,8 +84,7 @@ extension YHVisaPaymentViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHVisaPaymentUpdateStatusModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHVisaPaymentUpdateStatusModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/VM/YHPrincleViewModel.swift
View file @ 01c42b25
......@@ -40,8 +40,7 @@ extension YHPrincleViewModel {
if json.code == 200 {
let dic = json.data
guard let resultModel = YHOfficalLetterListModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHOfficalLetterListModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callback?(false, err)
return
......@@ -175,8 +174,7 @@ extension YHPrincleViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHPrincipleAlertStatusModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPrincipleAlertStatusModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callback?(false, err)
return
......@@ -206,8 +204,7 @@ extension YHPrincleViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHPrincipleWaitResultModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPrincipleWaitResultModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callback?(false, err)
return
......@@ -237,8 +234,7 @@ extension YHPrincleViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHPrincipleEnvelopeModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPrincipleEnvelopeModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callback?(false, err)
return
......@@ -267,8 +263,7 @@ extension YHPrincleViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHPrincipleUploadDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPrincipleUploadDetailModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callback?(false, err)
return
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHServiceCenterProgressModel.swift
View file @ 01c42b25
......@@ -7,8 +7,9 @@
//
import UIKit
import SmartCodable
class YHServiceCenterProgressModel : YHBaseModel {
class YHServiceCenterProgressModel : SmartCodable {
var name : String = ""
var percentage : Int = 0
var status : Int = 0 // 0未知 1待开始 2进行中 3 已完成 4 后台进行中
......@@ -16,16 +17,22 @@ class YHServiceCenterProgressModel : YHBaseModel {
var type : Int = 0 // 1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
var pro_version : Int = 0
var reject_status : Int = 0
required init() {
}
}
class YHServiceSearchModel: YHBaseModel {
class YHServiceSearchModel: SmartCodable {
var id: Int = 0
var dictionary_code: String = ""
var enable_flag: Int = 0
required init() {
}
}
class YHServiceProgressModel : YHBaseModel {
class YHServiceProgressModel : SmartCodable {
var title : String = ""
var type : Int = 0
var list : [YHServiceCenterProgressModel] = []
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/VM/YHCertificateViewModel.swift
View file @ 01c42b25
......@@ -52,8 +52,7 @@ class YHCertificateViewModel: YHBaseViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = [YHFileListModel].deserialize(array: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let resultModel = [YHFileListModel].deserialize(array: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,err)
......@@ -92,9 +91,7 @@ class YHCertificateViewModel: YHBaseViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = [YHQuestionAndAnswerModel].deserialize(array: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let resultModel = [YHQuestionAndAnswerModel].deserialize(array: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,err)
......@@ -127,8 +124,7 @@ class YHCertificateViewModel: YHBaseViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHCertificateEntryModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHCertificateEntryModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,err)
......@@ -154,17 +150,14 @@ class YHCertificateViewModel: YHBaseViewModel {
let _ = YHNetRequest.getRequest(url: strUrl, params:params) { json, code in
printLog("model 是 ==> \(json)")
let dic = json.data
if json.code == 200 {
guard let result = YHUploadCertificateInfo.deserialize(dict: dic as? Dictionary ) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHUploadCertificateInfo.deserialize(dict: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBack(nil, err)
return
}
callBack(result, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBack(nil, error)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/Model/YHMyDocumentDetailModel.swift
View file @ 01c42b25
......@@ -7,13 +7,16 @@
//
import UIKit
import SmartCodable
class YHMyDocumentDetailModel: YHBaseModel {
class YHMyDocumentDetailModel: SmartCodable {
var prospectus: YHMyDocumentProspectusModel = YHMyDocumentProspectusModel()
var writing_document: YHMyDocumentWritingDocumentModel = YHMyDocumentWritingDocumentModel()
required init() {
}
}
class YHMyDocumentProspectusModel: YHBaseModel {
class YHMyDocumentProspectusModel: SmartCodable {
var id: Int = 0
var prospectus_id: Int = 0
var order_id: Int = 0
......@@ -34,9 +37,12 @@ class YHMyDocumentProspectusModel: YHBaseModel {
//赴港计划书状态
var status : Int = 0
required init() {
}
}
class YHMyDocumentWritingDocumentModel: YHBaseModel {
class YHMyDocumentWritingDocumentModel: SmartCodable {
var customer_id: Int = 0
var order_id: Int = 0
var name: String = ""
......@@ -47,9 +53,12 @@ class YHMyDocumentWritingDocumentModel: YHBaseModel {
var is_show_button: Bool = false
var doc_sign: YHMyDocumentWritingDocumentDocSignModel = YHMyDocumentWritingDocumentDocSignModel()
var supplement_list: YHMyDocumentWritingDocumentSupplementListModel = YHMyDocumentWritingDocumentSupplementListModel()
required init() {
}
}
class YHMyDocumentWritingDocumentDocSignModel: YHBaseModel {
class YHMyDocumentWritingDocumentDocSignModel: SmartCodable {
var id: Int = 0
var is_upload: Int = 0
var supplement_id: Int = 0
......@@ -62,9 +71,15 @@ class YHMyDocumentWritingDocumentDocSignModel: YHBaseModel {
var doc_return_manual: [String] = []
var doc_type_name: String = ""
var audit_opinion: String = ""
required init() {
}
}
class YHMyDocumentWritingDocumentSupplementListModel: YHBaseModel {
class YHMyDocumentWritingDocumentSupplementListModel: SmartCodable {
var id: Int = 0
var name: String = ""
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/Model/YHMyDocumentsModel.swift
View file @ 01c42b25
......@@ -7,8 +7,9 @@
//
import UIKit
import SmartCodable
class YHMyDocumentsListModel: YHBaseModel {
class YHMyDocumentsListModel: SmartCodable {
var id: Int = 0
var order_id: Int = 0
var doc_type_name: String = ""
......@@ -31,15 +32,20 @@ class YHMyDocumentsListModel: YHBaseModel {
var isEditFlag : Bool = false //是否为编辑状态
var isSelectedFlag : Bool = true //是否被选择 默认全部全部选择
required init() {
}
}
class YHMyDocumentsNameExtraModel: YHBaseModel {
class YHMyDocumentsNameExtraModel: SmartCodable {
var applicant: String = ""
var user_name: String = ""
var organization: String = ""
required init() {
}
}
class YHMyDocumentsDocumentModel: YHBaseModel {
class YHMyDocumentsDocumentModel: SmartCodable {
var id: Int = 0
var copywriter_id: Int = 0
var customer_id: Int = 0
......@@ -60,10 +66,12 @@ class YHMyDocumentsDocumentModel: YHBaseModel {
var tencent_key: String = ""
var tencent_file_url: String = ""
var first_submit_at: String = ""
required init() {
}
}
class YHMyDocumentsSignDocModel: YHBaseModel {
class YHMyDocumentsSignDocModel: SmartCodable {
var is_upload: Int = 0
var supplement_id: Int = 0
var doc_send: String = ""
......@@ -75,18 +83,24 @@ class YHMyDocumentsSignDocModel: YHBaseModel {
var doc_return_manual: [String] = []
var doc_type_name: String = ""
var id: Int = 0
required init() {
}
}
class YHMyDocumentsUserModel: YHBaseModel {
class YHMyDocumentsUserModel: SmartCodable {
var username: String = ""
var sex: Int = 0
var is_auth: Bool = false
var surname: String = ""
required init() {
}
}
class YHMyDocumentsModel: YHBaseModel {
class YHMyDocumentsModel: SmartCodable {
var docs: [YHMyDocumentsListModel] = []
var user_info: YHMyDocumentsUserModel = YHMyDocumentsUserModel()
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/Model/YHMyDocumentsUrlModel.swift
View file @ 01c42b25
......@@ -7,8 +7,11 @@
//
import UIKit
import SmartCodable
class YHMyDocumentsUrlModel: YHBaseModel {
class YHMyDocumentsUrlModel: SmartCodable {
var is_tencent: Bool = false
var url: String = ""
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsDetailViewModel.swift
View file @ 01c42b25
......@@ -30,8 +30,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMyDocumentDetailModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMyDocumentDetailModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -56,8 +55,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMyDocumentsUrlModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMyDocumentsUrlModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -129,18 +127,12 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
}
func requestSignaturePageURL(_ id: String, callBackBlock:@escaping (_ success: Bool?, _ error: YHErrorModel?)->()) {
// let params: [String : Any] = ["order_id": orderId]
let params: [String : Any] = ["id": id]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.pageUrl
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
// let dic = json.data
// guard let result = YHMySignatureURLModel.deserialize(from: dic as? Dictionary) else {
// callBackBlock(false,nil)
// return
// }
self.pageUrl = json.data as? String
callBackBlock(true, nil)
} else {
......@@ -153,14 +145,12 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
}
func requestSignaturePersonalURL(callBackBlock:@escaping (_ success: Bool?, _ error: YHErrorModel?)->()) {
// let params: [String : Any] = ["order_id": orderId]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.personalUrl
let _ = YHNetRequest.postRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMySignatureURLModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -183,8 +173,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMySignatureURLModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -225,8 +214,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMySignatureURLModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -252,7 +240,7 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
guard self != nil else { return }
if json.code == 200 {
_ = json.data
// guard let result = YHMySignatureURLModel.deserialize(from: dic as? Dictionary) else {
// guard let result = YHMySignatureURLModel.deserialize(dict: dic) else {
// callBackBlock(false,nil)
// return
// }
......@@ -349,7 +337,6 @@ class YHMyDocumentsDetailViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsListViewModel.swift
View file @ 01c42b25
......@@ -20,8 +20,7 @@ class YHMyDocumentsListViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMyDocumentsModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMyDocumentsModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/VM/YHMySchemeViewModel.swift
View file @ 01c42b25
......@@ -22,8 +22,7 @@ class YHMySchemeViewModel: YHBaseViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHMySchemeModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHMySchemeModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,err)
return
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/Model/YHMySignatureDetailModel.swift
View file @ 01c42b25
......@@ -7,8 +7,9 @@
//
import UIKit
import SmartCodable
class YHMySignatureDetailModel: YHBaseModel {
class YHMySignatureDetailModel: SmartCodable {
var id: Int = 0
var order_id: Int = 0
var doc_type: Int = 0
......@@ -20,8 +21,12 @@ class YHMySignatureDetailModel: YHBaseModel {
var is_show_button: Bool = false
var status: Int = 0
var audit_opinion: String = ""
required init() {
}
}
class YHMySignatureURLModel: YHBaseModel {
class YHMySignatureURLModel: SmartCodable {
var url: String = ""
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/Model/YHMySignatureListModel.swift
View file @ 01c42b25
......@@ -7,13 +7,16 @@
//
import UIKit
import SmartCodable
class YHMySignatureListModel: YHBaseModel {
class YHMySignatureListModel: SmartCodable {
var list: [YHMySignatureModel] = []
var user_info: YHMyDocumentsUserModel = YHMyDocumentsUserModel()
required init() {
}
}
class YHMySignatureModel: YHBaseModel {
class YHMySignatureModel: SmartCodable {
var id: Int = 0
var doc_name: String = ""
var doc_type: Int = 0
......@@ -29,12 +32,18 @@ class YHMySignatureModel: YHBaseModel {
var isEditFlag : Bool = false //是否为编辑状态
var isSelectedFlag : Bool = true //是否被选择 默认全部全部选择
required init() {
}
}
class YHMySignatureUserInfoModel: YHBaseModel {
class YHMySignatureUserInfoModel: SmartCodable {
var surname: String = ""
var username: String = ""
var sex: Int = 0
var is_auth: Bool = false
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/VM/YHMySignatureDetailViewModel.swift
View file @ 01c42b25
......@@ -25,8 +25,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMySignatureDetailModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureDetailModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -49,11 +48,6 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
// let dic = json.data
// guard let result = YHMySignatureURLModel.deserialize(from: dic as? Dictionary) else {
// callBackBlock(false,nil)
// return
// }
self.pageUrl = json.data as? String
callBackBlock(true, nil)
} else {
......@@ -66,14 +60,12 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
}
func requestSignaturePersonalURL(callBackBlock:@escaping (_ success: Bool?, _ error: YHErrorModel?)->()) {
// let params: [String : Any] = ["order_id": orderId]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.personalUrl
let _ = YHNetRequest.postRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMySignatureURLModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -96,8 +88,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMySignatureURLModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -137,8 +128,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
self.pageUrl = json.data as? String
self.pageUrl = json.data?.peel as? String
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
......@@ -156,8 +146,7 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMySignatureURLModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -200,12 +189,11 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
// guard let result = YHMySignatureURLModel.deserialize(from: dic as? Dictionary) else {
// callBackBlock(false,nil)
// return
// }
// self.pageUrl = result.url
guard let dic = json.data?.peel as? [String : Any], let result = YHMySignatureURLModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
self.pageUrl = result.url
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
......@@ -243,7 +231,6 @@ class YHMySignatureDetailViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/VM/YHMySignatureListViewModel.swift
View file @ 01c42b25
......@@ -23,8 +23,7 @@ class YHMySignatureListViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMySignatureListModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any],let result = YHMySignatureListModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/VM/YHBasicInfoFillViewModel.swift
View file @ 01c42b25
......@@ -162,8 +162,7 @@ extension YHBasicInfoFillViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/M/YHEducationRequestViewModel.swift
View file @ 01c42b25
......@@ -32,8 +32,7 @@ class YHEducationRequestViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data as? [AnyHashable : Any]
guard let resultModel = YHEducationListInfo.deserialize(dict: dic) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHEducationListInfo.deserialize(dict: dic) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
return
......@@ -65,8 +64,7 @@ class YHEducationRequestViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data as? [AnyHashable : Any]
guard let resultModel = YHEducationDetailInfo.deserialize(dict: dic) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHEducationDetailInfo.deserialize(dict: dic) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
......@@ -210,22 +208,15 @@ class YHEducationRequestViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
if let dic = json.data as? [AnyHashable : Any] {
guard let quaDict = dic["qua_data"] as? [AnyHashable : Any] , let resultModel = YHQualificationDetailInfo.deserialize(dict:quaDict as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let quaDict = dic["qua_data"] as? [AnyHashable : Any],let resultModel = YHQualificationDetailInfo.deserialize(dict:quaDict) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
return
}
qualificationDetailInfo = resultModel
callBackBlock(true,nil)
return
} else {
callBackBlock(false,nil)
return
}
qualificationDetailInfo = resultModel
callBackBlock(true,nil)
} else {
let error = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg)
callBackBlock(false,error)
......@@ -280,10 +271,9 @@ class YHEducationRequestViewModel {
YHHUD.hide()
guard let self = self else { return }
printLog("model 是 ==> \(json)")
let dic = json.data as? [AnyHashable : Any]
if json.code == 200 {
guard let dic = dic, 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(array: list) as? [YHCollegeInfo] else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyMemberViewModel.swift
View file @ 01c42b25
......@@ -164,8 +164,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHCNIDCardModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHCNIDCardModel.deserialize(dict: dic) else {
callBackBlock(false, nil)
return
}
......@@ -189,8 +188,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHHKIDCardModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHHKIDCardModel.deserialize(dict: dic) else {
callBackBlock(false, nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyRequestViewModel.swift
View file @ 01c42b25
......@@ -20,10 +20,8 @@ class YHFamilyRequestViewModel {
YHHUD.hide()
printLog("model 是 ==> \(json)")
let dic = json.data
if json.code == 200 {
guard let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic as? Dictionary ) else {
guard let dic = json.data?.peel as? [String : Any],let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic as? Dictionary ) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(nil, error)
return
......@@ -125,10 +123,8 @@ class YHFamilyRequestViewModel {
YHHUD.hide()
printLog("model 是 ==> \(json)")
YHHUD.hide()
let dic = json.data
if json.code == 200 {
guard let resultModel = YHFamilyMember.deserialize(dict: dic as? Dictionary ) else {
guard let dic = json.data?.peel as? [String : Any],let resultModel = YHFamilyMember.deserialize(dict: dic as? Dictionary ) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(nil, error)
return
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/M/YHCNIDCardModel.swift
View file @ 01c42b25
......@@ -7,8 +7,9 @@
//
import UIKit
import SmartCodable
class YHCNIDCardModel: YHBaseModel {
class YHCNIDCardModel: SmartCodable {
var gender: String = ""
var address: String = ""
var card_num: String = ""
......@@ -19,4 +20,6 @@ class YHCNIDCardModel: YHBaseModel {
var nationality: String = ""
var name: String = ""
var is_back: String = ""
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/M/YHCountryMessage.swift
View file @ 01c42b25
......@@ -7,9 +7,12 @@
//
import Foundation
import SmartCodable
class YHCountryMessage: YHBaseModel {
class YHCountryMessage: SmartCodable {
var name_cn: String?
var name_en: String?
var code: String?
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/M/YHHKIDCardModel.swift
View file @ 01c42b25
......@@ -7,8 +7,9 @@
//
import UIKit
import SmartCodable
class YHHKIDCardModel: YHBaseModel {
class YHHKIDCardModel: SmartCodable {
var name: String = ""
var pingyin: String = ""
var birth: String = ""
......@@ -19,4 +20,6 @@ class YHHKIDCardModel: YHBaseModel {
var IssueAddress: String = ""
var card_num: String = ""
var is_back: String = ""
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/M/YHMainInformationModel.swift
View file @ 01c42b25
......@@ -7,8 +7,9 @@
//
import Foundation
import SmartCodable
class YHMainInformationModel: YHBaseModel {
class YHMainInformationModel: SmartCodable {
var id: Int = 0
var order_id: String = ""
var nationality: String = ""
......@@ -35,27 +36,35 @@ class YHMainInformationModel: YHBaseModel {
var live_address: String = ""
var live_address_detail: String = ""
required init() {
}
}
class YHUserNameModel: YHBaseModel {
class YHUserNameModel: SmartCodable {
var family_name: String = ""
var given_name: String = ""
required init() {
}
}
class YHAddressModel: YHBaseModel {
class YHAddressModel: SmartCodable {
var area: [String] = []
var country: String = ""
var details: String = ""
var foreign: String = ""
required init() {
}
}
class YHCertificatesModels: YHBaseModel {
class YHCertificatesModels: SmartCodable {
var hk_macao_pass: YHCertificatesModel = YHCertificatesModel()
var passport: YHCertificatesModel = YHCertificatesModel()
var cn_identity_card: YHCertificatesModel = YHCertificatesModel()
required init() {
}
}
class YHCertificatesModel: YHBaseModel {
class YHCertificatesModel: SmartCodable {
var number: String = ""
var issue_at: String = ""
var issue_date_start_at: String = ""
......@@ -63,4 +72,6 @@ class YHCertificatesModel: YHBaseModel {
var img_front: String = ""
var img_back: String = ""
var passport_type: Int = 0
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift
View file @ 01c42b25
......@@ -405,8 +405,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMainInformationModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMainInformationModel.deserialize(dict: dic) else {
callBackBlock(nil,nil)
return
}
......@@ -514,8 +513,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHCNIDCardModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHCNIDCardModel.deserialize(dict: dic) else {
callBackBlock(false, nil)
return
}
......@@ -538,8 +536,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHHKIDCardModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHHKIDCardModel.deserialize(dict: dic) else {
callBackBlock(false, nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHSelectCountryViewModel.swift
View file @ 01c42b25
......@@ -17,9 +17,8 @@ class YHSelectCountryViewModel: NSObject {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.countryInformation
let param: [String: Any] = ["keyword": key]
let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
guard let self = self else { return }
let dic = json.data as? [Any]
guard let resultArray = [YHCountryMessage].deserialize(from: dic) else {
guard self != nil else { return }
guard let dic = json.data?.peel as? [Any], let resultArray = [YHCountryMessage].deserialize(array: dic) else {
callBackBlock([],nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/VM/YHOtherInfoFillViewModel.swift
View file @ 01c42b25
......@@ -23,8 +23,7 @@ extension YHOtherInfoFillViewModel {
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let resultModel = YHOtherInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHOtherInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift
View file @ 01c42b25
......@@ -49,8 +49,7 @@ extension YHPreviewViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data as? [AnyHashable : Any]
guard let resultModel = YHWorkExpInfoPreviewModel.deserialize(dict: dic) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHWorkExpInfoPreviewModel.deserialize(dict: dic) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
return
......@@ -76,8 +75,7 @@ extension YHPreviewViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data as? [AnyHashable : Any]
guard let resultModel = YHAcademicPreviewModel.deserialize(dict: dic) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHAcademicPreviewModel.deserialize(dict: dic) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
return
......@@ -106,8 +104,7 @@ extension YHPreviewViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data as? [AnyHashable : Any]
guard let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,error)
return
......@@ -134,8 +131,7 @@ extension YHPreviewViewModel {
arrDataForMainApplicationInfo.removeAll()
if json.code == 200 {
let dic = json.data as? [AnyHashable : Any]
guard let result = YHMainInfoPreviewModel.deserialize(dict: dic) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMainInfoPreviewModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -162,8 +158,7 @@ extension YHPreviewViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
......@@ -192,8 +187,7 @@ extension YHPreviewViewModel {
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let resultModel = YHPreviewForOtherInfoModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHPreviewForOtherInfoModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/Model/YHCompanyModel.swift
View file @ 01c42b25
......@@ -7,8 +7,9 @@
//
import UIKit
import SmartCodable
class YHCompanyModel: YHBaseModel {
class YHCompanyModel: SmartCodable {
var current_page: Int?
var first_page_url: String?
var from: Int?
......@@ -20,12 +21,16 @@ class YHCompanyModel: YHBaseModel {
var to: Int?
var total: Int?
var list: [YHCompanyModelListModel]?
required init() {
}
}
class YHCompanyModelListModel: YHBaseModel {
class YHCompanyModelListModel: SmartCodable {
var company_id: Int? = 0
var company_name: String? = ""
var company_num: Int? = 0
var company_link: String? = ""
var company_introduce: String? = ""
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/Model/YHWorkExampleModel.swift
View file @ 01c42b25
......@@ -7,15 +7,20 @@
//
import UIKit
import SmartCodable
class YHWorkExampleModel: YHBaseModel {
class YHWorkExampleModel: SmartCodable {
var type: Int?
var industry: String?
var wduty_list: [String]?
var highlights_list: [String]?
var template: [String]?
required init() {
}
}
class YHFileContent:YHBaseModel {
class YHFileContent:SmartCodable {
var content: String?
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/Model/YHWorkExperienceDetailModel.swift
View file @ 01c42b25
......@@ -7,8 +7,9 @@
//
import Foundation
import SmartCodable
class YHWorkExperienceDetailModel: YHBaseModel {
class YHWorkExperienceDetailModel: SmartCodable {
var id: Int = 0
var order_id: Int = 0
var company_name: String = ""
......@@ -58,11 +59,16 @@ class YHWorkExperienceDetailModel: YHBaseModel {
var is_project_introduction: Int = 0
var customer_center_id: Int = 0
var projects: [String] = []
required init() {
}
}
class YHWorkExperienceFileModel: YHBaseModel {
class YHWorkExperienceFileModel: SmartCodable {
var fileName: String = ""
var fileUrl: String = ""
var uploadedAt: String = ""
var isSelect: Bool = false
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/Model/YHWorkExperienceProjectModel.swift
View file @ 01c42b25
......@@ -9,7 +9,7 @@
import UIKit
import SmartCodable
class YHWorkExperienceProjectModel: YHBaseModel {
class YHWorkExperienceProjectModel: SmartCodable {
var id: Int?
var order_id: Int?
var work_id: Int?
......@@ -23,4 +23,6 @@ class YHWorkExperienceProjectModel: YHBaseModel {
var created_at: String?
var updated_at: String?
var deleted_at: String?
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/Model/YHWorkItemListModel.swift
View file @ 01c42b25
......@@ -7,14 +7,17 @@
//
import UIKit
import SmartCodable
class YHWorkModel: YHBaseModel {
class YHWorkModel: SmartCodable {
var count: Int?
var list: [YHWorkItemListModel]?
required init() {
}
}
class YHWorkItemListModel: YHBaseModel {
class YHWorkItemListModel: SmartCodable {
var id: Int?
var order_id: Int?
var company_name: String?
......@@ -22,4 +25,6 @@ class YHWorkItemListModel: YHBaseModel {
var entry_time: String?
var departure_time: String?
var vacant_num: Int?
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHCompanyViewModel.swift
View file @ 01c42b25
......@@ -21,8 +21,7 @@ class YHCompanyViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard self != nil else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHCompanyModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHCompanyModel.deserialize(dict: dic) else {
callBackBlock([],nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkExperienceViewModel.swift
View file @ 01c42b25
......@@ -213,8 +213,8 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = [YHWorkExampleModel].deserialize(from: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any],let result = [YHWorkExampleModel].deserialize(array: dic) else {
callBackBlock(false,nil)
return
}
......@@ -238,8 +238,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHWorkExperienceDetailModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHWorkExperienceDetailModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -329,8 +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 {
let dic = json.data
guard let result = YHWorkExperienceDetailModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHWorkExperienceDetailModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......@@ -354,8 +352,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let resultArray = [YHWorkExperienceProjectModel].deserialize(from: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let resultArray = [YHWorkExperienceProjectModel].deserialize(array: dic) else {
callBackBlock([],nil)
return
}
......@@ -395,8 +392,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHFileContent.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHFileContent.deserialize(dict: dic) else {
callBackBlock(false, nil, nil)
return
}
......@@ -417,8 +413,8 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = [YHWorkExperienceFileModel].deserialize(from: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let result = [YHWorkExperienceFileModel].deserialize(array: dic) else {
callBackBlock(false, nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkIntroductionViewModel.swift
View file @ 01c42b25
......@@ -22,8 +22,7 @@ class YHWorkIntroductionViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = [YHWorkExampleModel].deserialize(from: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let result = [YHWorkExampleModel].deserialize(array: dic) else {
callBackBlock(false,nil)
return
}
......@@ -73,8 +72,7 @@ class YHWorkIntroductionViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHFileContent.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHFileContent.deserialize(dict: dic) else {
callBackBlock(false, nil, nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkItemListViewModel.swift
View file @ 01c42b25
......@@ -25,8 +25,7 @@ class YHWorkItemListViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHWorkModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHWorkModel.deserialize(dict: dic) else {
callBackBlock([],nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift
View file @ 01c42b25
......@@ -52,8 +52,7 @@ extension YHServiceCenterMainViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let result = [YHServiceCenterProgressModel].deserialize(from: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let result = [YHServiceCenterProgressModel].deserialize(array: dic) else {
callBackBlock(false,nil)
return
}
......@@ -90,8 +89,7 @@ extension YHServiceCenterMainViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let result = [YHServiceProgressModel].deserialize(from: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let result = [YHServiceProgressModel].deserialize(array: dic) else {
callBackBlock(false,nil)
return
}
......@@ -134,8 +132,7 @@ extension YHServiceCenterMainViewModel {
printLog("model 是 ==> \(json)")
if json.code == 200 {
let dic = json.data
guard let resultModel = YHScoreResultModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHScoreResultModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false,err)
......@@ -181,9 +178,8 @@ extension YHServiceCenterMainViewModel {
arrContactList.removeAll()
if json.code == 200 {
let dic = json.data
DispatchQueue.global().async {
guard let resultModel = YHContactItemHoldModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any],let resultModel = YHContactItemHoldModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
DispatchQueue.main.async {
self.arrContactList = []
......@@ -221,8 +217,7 @@ extension YHServiceCenterMainViewModel {
arrContactStausItmes = []
if json.code == 200 {
let dic = json.data
guard let resultModel = YHContactMainItemStatusModel2.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHContactMainItemStatusModel2.deserialize(dict: dic as? [AnyHashable : Any]) else {
self.arrContactStausItmes = []
callBackBlock(false,nil)
return
......@@ -308,8 +303,7 @@ extension YHServiceCenterMainViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
printLog("model 是 ==> \(json)")
let dic = json.data
guard let resultModel = YHPersonInfoFillStepModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any],let resultModel = YHPersonInfoFillStepModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
self.arrInfoFillStep = []
informationFillStepModel = nil
callBackBlock(false,nil)
......@@ -372,8 +366,7 @@ extension YHServiceCenterMainViewModel {
return
}
if json.code == 200 {
let dic = json.data
guard let resultModel = YHContactInfoScoreModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHContactInfoScoreModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
......@@ -401,8 +394,7 @@ extension YHServiceCenterMainViewModel {
return
}
if json.code == 200 {
let dic = json.data
guard let resultModel = YHContactInfoScoreModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHContactInfoScoreModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
......@@ -422,8 +414,7 @@ extension YHServiceCenterMainViewModel {
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
let dic = json.data
guard let resultModel = YHPersonInfoModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any],let resultModel = YHPersonInfoModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceOrderSearchViewModel.swift
View file @ 01c42b25
......@@ -18,9 +18,7 @@ class YHServiceOrderSearchViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard self != nil else { return }
if json.code == 200 {
let dic = json.data as! Dictionary<String, Any>
let data = dic["Data"]
guard let result = [YHServiceSearchModel].deserialize(from: data as? [Any]) else {
guard let dic = json.data?.peel as? [String : Any],let data = dic["Data"],let result = [YHServiceSearchModel].deserialize(array: data as? [Any]) else {
callBackBlock(false,nil)
return
}
......@@ -46,8 +44,7 @@ class YHServiceOrderSearchViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let resultModel = [YHContactItemModel].deserialize(array: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any],let resultModel = [YHContactItemModel].deserialize(array: dic) else {
self.arrContactList = []
callBackBlock(false,nil)
return
......@@ -66,15 +63,14 @@ class YHServiceOrderSearchViewModel: YHBaseViewModel {
}
}
//TODO: for test hjl
func getAssistList(callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.assist
let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data as! [String: Any]
let data = dic["orders"] as? [Any]
guard 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(array: data) else {
self.arrContactList = []
callBackBlock(false,nil)
return
......
galaxy/galaxy/Classes/Modules/Login(登录)/M/YHChangeHeadModel.swift
View file @ 01c42b25
......@@ -7,8 +7,11 @@
//
import UIKit
import SmartCodable
class YHChangeHeadModel: YHBaseModel {
class YHChangeHeadModel: SmartCodable {
var avatar: String = ""
required init() {
}
}
galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift
View file @ 01c42b25
......@@ -58,8 +58,7 @@ extension YHLoginViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
printLog(json)
let dic = json.data
guard let resultModel = YHUserModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any],let resultModel = YHUserModel.deserialize(dict: dic) else {
let error : YHErrorModel = YHErrorModel(errorCode:-1,errorMsg: "数据解析不成功")
callBackBlock(false,error)
return
......@@ -158,8 +157,7 @@ extension YHLoginViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
printLog(json)
let dic = json.data
guard let resultModel = YHUserModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHUserModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
let error : YHErrorModel = YHErrorModel(errorCode:-1,errorMsg: "数据解析不成功")
callBackBlock(false,error)
return
......@@ -198,7 +196,7 @@ extension YHLoginViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
printLog(json)
if let dic = json.data as? [AnyHashable : Any] {
if let dic = json.data?.peel as? [AnyHashable : Any] {
if let uid = dic["uid"] as? String {
YHLoginManager.shared.userModel?.id = uid
callBack?(uid)
......
galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHUserInfoSettingViewModel.swift
View file @ 01c42b25
......@@ -17,8 +17,7 @@ class YHUserInfoSettingViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHChangeHeadModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHChangeHeadModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/Message(消息)/VM/YHMsgViewModel.swift
View file @ 01c42b25
......@@ -21,10 +21,9 @@ class YHMsgViewModel: NSObject {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Message.unreadMsgListApi
let _ = YHNetRequest.getRequest(url: strUrl) { json, code in
let dic = json.data
printLog("model 是 ==> \(json)")
if json.code == 200 {
guard let result = YHMsgListModel.deserialize(dict: dic as? Dictionary ) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHMsgListModel.deserialize(dict: dic as? Dictionary ) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
DispatchQueue.main.async {
callBackBlock(false, error)
......@@ -59,8 +58,7 @@ class YHMsgViewModel: NSObject {
"pageSize": kMsgPageSize]
let _ = YHNetRequest.postRequest(url: strUrl, params: params) { json, code in
let dic = json.data
guard let dic = dic as? [String: Any], let totalPage = dic["page_count"] as? Int, let arrDict = dic["list"] as? [Any] else {
guard let dic = json.data?.peel as? [String : Any],let totalPage = dic["page_count"] as? Int, let arrDict = dic["list"] as? [Any] else {
callBackBlock(false, false)
return
......@@ -123,8 +121,6 @@ class YHMsgViewModel: NSObject {
printLog("params 是 ==> \(params)")
let _ = YHNetRequest.postRequest(url: strUrl, params: params) { json, code in
let dic = json.data
printLog("model 是 ==> \(json)")
if json.code == 200 {
callBackBlock(true, nil)
......@@ -144,17 +140,18 @@ class YHMsgViewModel: NSObject {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Message.unreadTotalCountApi
let _ = YHNetRequest.getRequest(url: strUrl) {
json, code in
let dic = json.data as? [String : Any]
printLog("model 是 ==> \(json)")
if json.code == 200 {
if let dic = dic, let total = dic["total"] as? Int {
self.unreadTotalCount = total
callBackBlock(true, nil)
} else {
guard let dic = json.data?.peel as? [String : Any],let total = dic["total"] as? Int else {
self.unreadTotalCount = 0
callBackBlock(false, nil)
return
}
self.unreadTotalCount = total
callBackBlock(true, nil)
} else {
self.unreadTotalCount = 0
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
......@@ -173,7 +170,6 @@ class YHMsgViewModel: NSObject {
let params = ["device_id" : deviceId]
let _ = YHNetRequest.postRequest(url: strUrl, params: params) {
json, code in
let dic = json.data as? [String : Any]
printLog("model 是 ==> \(json)")
if json.code == 200 {
callBackBlock(true, nil)
......
galaxy/galaxy/Classes/Modules/Mine（我的）/AboutYH/VM/YHListViewModel.swift
View file @ 01c42b25
......@@ -19,8 +19,7 @@ class YHListViewModel: YHBaseViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = [YHHKEventModel].deserialize(from: dic as? [Any]) else {
guard let dic = json.data?.peel as? [Any], let result = [YHHKEventModel].deserialize(array: dic) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/VM/YHEditViewModel.swift
View file @ 01c42b25
......@@ -21,8 +21,7 @@ class YHEditViewModel: YHBaseViewModel {
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHChangeHeadModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHChangeHeadModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/ViewModel/YHMyLikeViewModel.swift
View file @ 01c42b25
......@@ -38,8 +38,7 @@ extension YHMyLikeViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = YHHomeListTotalModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any],let result = YHHomeListTotalModel.deserialize(dict: dic) else {
self.arrHomeNewsData = []
callBackBlock(false,nil)
return
......@@ -93,8 +92,7 @@ extension YHMyLikeViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = YHHomeListTotalModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHHomeListTotalModel.deserialize(dict: dic) else {
self.arrHomeNewsData = []
callBackBlock(false,nil)
return
......@@ -138,8 +136,7 @@ extension YHMyLikeViewModel {
guard let self = self else { return }
//1. json字符串 转 对象
if json.code == 200 {
let dic = json.data
guard let result = YHCollectionModel.deserialize(dict: dic as? Dictionary ) else {
guard let dic = json.data?.peel as? [String : Any], let result = YHCollectionModel.deserialize(dict: dic as? Dictionary ) else {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBack?(false, error)
return
......
galaxy/galaxy/Classes/Modules/UatModule(灰度功能)/YHUatHelperViewModel.swift
View file @ 01c42b25
......@@ -75,15 +75,11 @@ extension YHUatHelperViewModel {
let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
let dic = json.data
guard let resultModel = YHUatListModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHUatListModel.deserialize(dict: dic) else {
callBackBlock(false,nil)
return
}
self.dataList = resultModel
callBackBlock(true,nil)
} failBlock: { err in
callBackBlock(false,err)
......
galaxy/galaxy/Classes/Tools/NetWork/NetBaseModel.swift
View file @ 01c42b25
......@@ -8,34 +8,14 @@
import Foundation
import SmartCodable
import HandyJSON
enum NetWorkCode: Int {
case success = 200
case parseFail = 9527
}
struct NetBaseModel: SmartCodable {
struct NetWorkBaseModel: SmartCodable {
var data : SmartAny?
var code : Int = -1
var msg : String = ""
// var other : SmartAny?
}
struct TestModel: SmartCodable {
var test1 : String = ""
var test2 : String = ""
var test3 : String = ""
enum CodingKeys: String, CodingKey {
case test1
case test2
case test3 = "test333" //字段 映射
}
}
struct NetWorkBaseModel: HandyJSON {
var data : Any?
var code : Int32 = -1
var msg : String = ""
}
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ 01c42b25
......@@ -324,14 +324,14 @@ class YHNetRequest: NSObject {
}
if statusCode == 200 {
DispatchQueue.global().async {
guard let obj = NetWorkBaseModel.deserialize(from: serverDict) else {
DispatchQueue.main.async {
// printLog(serverDict)
guard let obj = NetWorkBaseModel.deserialize(dict: serverDict) else {
print("解析出错了。 兄弟")
guard let errorBlock = self.failure else { return }
DispatchQueue.main.async {
let errorModel = YHErrorModel(errorCode: Int32(statusCode), errorMsg: errorResponseMsg)
errorBlock(errorModel)
}
let errorModel = YHErrorModel(errorCode: Int32(statusCode), errorMsg: errorResponseMsg)
errorBlock(errorModel)
return
}
......
galaxy/galaxy/Classes/Tools/Upload/YHOSSManager.swift
View file @ 01c42b25
......@@ -8,8 +8,9 @@
import UIKit
import AliyunOSSiOS
import SmartCodable
class YHOSSModel: YHBaseModel {
struct YHOSSModel: SmartCodable {
var bucket: String = ""
var Expiration: String = ""
var bucketPath: String = ""
......@@ -57,10 +58,10 @@ class YHOSSManager: NSObject, URLSessionDelegate {
let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
let dic = json.data
guard let resultModel = YHOSSModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHOSSModel.deserialize(dict: dic) else {
return
}
print(resultModel.toJSONString() as Any)
self.model = resultModel
self.mProvider = OSSStsTokenCredentialProvider(accessKeyId: self.model.accessKeyId, secretKeyId: self.model.accessKeySecret, securityToken: self.model.securityToken)
self.mClient = OSSClient(endpoint: self.model.endpoint, credentialProvider: self.mProvider)
......@@ -68,13 +69,17 @@ class YHOSSManager: NSObject, URLSessionDelegate {
block()
}
} failBlock: { err in
}
let _ = YHNetRequest.getRequest(url: strUrl, params: param, "5000000") { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
let dic = json.data
guard let resultModel = YHOSSModel.deserialize(from: dic as? Dictionary) else {
guard let dic = json.data?.peel as? [String : String] else {
return
}
guard let resultModel = YHOSSModel.deserialize(dict: dic) else {
return
}
self.publicModel = resultModel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment