Skip to content

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

网络线程 数据异步处理

parent ea4c897f
Show whitespace changes
Inline Side-by-side
Showing with 97 additions and 53 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsDetailViewModel.swift
View file @ 67aaf214
......@@ -335,6 +335,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "1、主要事业成就"
tModel.content = model.career_achievement.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 100 {
tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
}
tModel.type = .planDocQuestion1
tModel.isFirstData = true
arrHKPlanData.append(tModel)
......@@ -345,6 +348,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "2、专业技能成就"
tModel.content = model.professional_skills.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 100 {
tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
}
tModel.type = .planDocQuestion2
arrHKPlanData.append(tModel)
......@@ -355,6 +361,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "3、学业成就"
tModel.content = model.academic_achievement.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 100 {
tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
}
tModel.type = .planDocQuestion3
arrHKPlanData.append(tModel)
......@@ -365,6 +374,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "4、未来发展计划"
tModel.content = model.plan_detail.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 100 {
tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
}
tModel.type = .planDocQuestion4
arrHKPlanData.append(tModel)
......@@ -375,6 +387,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "5、专业资格及奖项"
tModel.content = model.qualifications_and_awards.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 100 {
tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
}
tModel.type = .planDocQuestion5
arrHKPlanData.append(tModel)
......@@ -385,6 +400,9 @@ private extension YHMyDocumentsDetailViewModel {
let tModel = YHHKPlanDocModel()
tModel.title = "6、其他材料"
tModel.content = model.other.defaultStringIfEmpty(detaultValue: "")
if tModel.content.count > 100 {
tModel.content = tModel.content.slicing(from: 0, length: 100) ?? ""
}
tModel.type = .planDocQuestion6
arrHKPlanData.append(tModel)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScore(我的评分)/V/YHScorePersonInfoCell.swift
View file @ 67aaf214
......@@ -26,7 +26,7 @@ class YHScorePersonInfoCell: UITableViewCell {
//头像
private lazy var headImagV : UIImageView = {
let imageV = UIImageView(image: UIImage(named: "score_header_default"))
let imageV = UIImageView(image: UIImage(named: "mine_head_default"))
imageV.contentMode = .scaleAspectFill
imageV.layer.cornerRadius = 20.5
imageV.clipsToBounds = true
......@@ -264,15 +264,15 @@ extension YHScorePersonInfoCell {
private func handleCardImage() {
guard let dataModel = dataModel?.userinfo, dataModel.head_url.isEmpty == false else { return }
let url = dataModel.head_url
if url.isEmpty == false {
self.requestVM.getPublicImageUrl(url) {[weak self] success, error in
guard let self = self else { return }
guard success != nil else { return }
self.headImagV.kf.setImage(with: URL(string: success), placeholder: UIImage(named: "global_default_image"))
}
}
// guard let dataModel = dataModel?.userinfo, dataModel.head_url.isEmpty == false else { return }
//
// let url = dataModel.head_url
// if url.isEmpty == false {
// self.requestVM.getPublicImageUrl(url) {[weak self] success, error in
// guard let self = self else { return }
// guard success != nil else { return }
// self.headImagV.kf.setImage(with: URL(string: success), placeholder: UIImage(named: "global_default_image"))
// }
// }
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHPreviewMainViewController.swift
View file @ 67aaf214
......@@ -56,7 +56,7 @@ class YHPreviewMainViewController: YHBaseViewController {
//头像
private lazy var headImagV : UIImageView = {
let imageV = UIImageView(image: UIImage(named: "score_header_default"))
let imageV = UIImageView(image: UIImage(named: "mine_head_default"))
imageV.contentMode = .scaleAspectFill
imageV.layer.cornerRadius = 26.5
imageV.clipsToBounds = true
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift
View file @ 67aaf214
......@@ -129,13 +129,21 @@ extension YHServiceCenterMainViewModel {
if json.code == 200 {
let dic = json.data
DispatchQueue.global().async {
guard let resultModel = YHContactItemHoldModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
arrContactList = []
DispatchQueue.main.async {
self.arrContactList = []
callBackBlock(false,nil)
}
return
}
arrContactList = resultModel.orders
DispatchQueue.main.async {
self.arrContactList = resultModel.orders
callBackBlock(true,nil)
}
}
} else {
arrContactList = []
......
galaxy/galaxy/Classes/Modules/Message(消息)/VM/YHMsgViewModel.swift
View file @ 67aaf214
......@@ -24,7 +24,9 @@ class YHMsgViewModel: NSObject {
if json.code == 200 {
guard 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)
}
return
}
self.msgList = result
......@@ -33,8 +35,8 @@ class YHMsgViewModel: NSObject {
self.msgList.draft.type = YHMessageType.draft.rawValue
self.msgList.signature.type = YHMessageType.fileSign.rawValue
self.msgList.dataSubmission.type = YHMessageType.infoSubmit.rawValue
callBackBlock(true, nil)
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error)
......@@ -51,15 +53,23 @@ class YHMsgViewModel: NSObject {
let _ = YHNetRequest.postRequest(url: strUrl, params: params) { json, code in
let dic = json.data
printLog("model 是 ==> \(json)")
// printLog("model 是 ==> \(json)")
if json.code == 200 {
DispatchQueue.global().async {
guard let arr = [YHDetailMessageModel].deserialize(array: dic as? [Any]) else {
DispatchQueue.main.async {
let error = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
self.msgDetailList = []
callBackBlock(false, error)
}
return
}
DispatchQueue.main.async {
self.msgDetailList.removeAll()
for item in arr {
if let item = item {
......@@ -67,7 +77,9 @@ class YHMsgViewModel: NSObject {
}
}
callBackBlock(true, nil)
}
}
} else {
self.msgDetailList = []
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
......
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ 67aaf214
......@@ -311,10 +311,14 @@ class YHNetRequest: NSObject {
}
if statusCode == 200 {
DispatchQueue.global().async {
guard let obj = NetWorkBaseModel.deserialize(from: serverDict) else {
guard let errorBlock = self.failure else { return }
DispatchQueue.main.async {
let errorModel = YHErrorModel(errorCode: Int32(statusCode), errorMsg: errorResponseMsg)
errorBlock(errorModel)
}
return
}
#if DEBUG
......@@ -349,9 +353,11 @@ class YHNetRequest: NSObject {
return
}
DispatchQueue.main.async {
guard let suclock = self.success else { return }
suclock(obj, statusCode)
}
}
} else {
guard let errorBlock = self.failure else { return }
if statusCode == 502 {
......
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