Skip to content

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

Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev 

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  文书各种状态修改
  //  我的服务红点显示逻辑
  优化服务中心逻辑
  登录资源替换
  OCR日期修改
  ocr 替换
  //  我的评分和我的方案红点UI
  驳回逻辑
  服务中心顶部title
  后台制作中状态添加
  //  退出登录二次提醒弹窗
parents b6b3723a 09e7aa49
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 123 additions and 52 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 50094b6a
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */; }; 0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */; };
0435FA812BA186D600024EAE /* YHMyFileMethodTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */; }; 0435FA812BA186D600024EAE /* YHMyFileMethodTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */; };
0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA822BA2DEB100024EAE /* YHCardButton.swift */; }; 0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA822BA2DEB100024EAE /* YHCardButton.swift */; };
044378A42BFC848C001F95AE /* loginBkg.mov in Resources */ = {isa = PBXBuildFile; fileRef = 044378A32BFC848C001F95AE /* loginBkg.mov */; };
044413FD2BC386DA00784A14 /* YHServiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413FC2BC386DA00784A14 /* YHServiceViewController.swift */; }; 044413FD2BC386DA00784A14 /* YHServiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413FC2BC386DA00784A14 /* YHServiceViewController.swift */; };
044413FF2BC391F000784A14 /* YHServiceListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413FE2BC391F000784A14 /* YHServiceListViewController.swift */; }; 044413FF2BC391F000784A14 /* YHServiceListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044413FE2BC391F000784A14 /* YHServiceListViewController.swift */; };
044414012BC3979800784A14 /* YHServerHKLifeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044414002BC3979800784A14 /* YHServerHKLifeViewController.swift */; }; 044414012BC3979800784A14 /* YHServerHKLifeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044414002BC3979800784A14 /* YHServerHKLifeViewController.swift */; };
...@@ -420,7 +421,6 @@ ...@@ -420,7 +421,6 @@
A5DE0D3C2BB9016200976FE1 /* YHEmailInputAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */; }; A5DE0D3C2BB9016200976FE1 /* YHEmailInputAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */; };
A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */; }; A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */; };
A5DF3D482BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D472BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift */; }; A5DF3D482BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D472BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift */; };
A5DF3D4C2BF9A348003D5F03 /* loginBkg.mov in Resources */ = {isa = PBXBuildFile; fileRef = A5DF3D4B2BF9A348003D5F03 /* loginBkg.mov */; };
A5DF3D4E2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D4D2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift */; }; A5DF3D4E2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D4D2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift */; };
A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; }; A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
A5EF21312BA6DF94005027E6 /* YHMineSchemeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */; }; A5EF21312BA6DF94005027E6 /* YHMineSchemeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */; };
...@@ -492,6 +492,7 @@ ...@@ -492,6 +492,7 @@
0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCommonAlertView.swift; sourceTree = "<group>"; }; 0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCommonAlertView.swift; sourceTree = "<group>"; };
0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileMethodTableViewCell.swift; sourceTree = "<group>"; }; 0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileMethodTableViewCell.swift; sourceTree = "<group>"; };
0435FA822BA2DEB100024EAE /* YHCardButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCardButton.swift; sourceTree = "<group>"; }; 0435FA822BA2DEB100024EAE /* YHCardButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCardButton.swift; sourceTree = "<group>"; };
044378A32BFC848C001F95AE /* loginBkg.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; path = loginBkg.mov; sourceTree = "<group>"; };
044413FC2BC386DA00784A14 /* YHServiceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceViewController.swift; sourceTree = "<group>"; }; 044413FC2BC386DA00784A14 /* YHServiceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceViewController.swift; sourceTree = "<group>"; };
044413FE2BC391F000784A14 /* YHServiceListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceListViewController.swift; sourceTree = "<group>"; }; 044413FE2BC391F000784A14 /* YHServiceListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceListViewController.swift; sourceTree = "<group>"; };
044414002BC3979800784A14 /* YHServerHKLifeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServerHKLifeViewController.swift; sourceTree = "<group>"; }; 044414002BC3979800784A14 /* YHServerHKLifeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServerHKLifeViewController.swift; sourceTree = "<group>"; };
...@@ -893,7 +894,6 @@ ...@@ -893,7 +894,6 @@
A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEmailInputAlertView.swift; sourceTree = "<group>"; }; A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEmailInputAlertView.swift; sourceTree = "<group>"; };
A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTestViewController.swift; sourceTree = "<group>"; }; A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTestViewController.swift; sourceTree = "<group>"; };
A5DF3D472BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneLiginWithVideoBkgViewController.swift; sourceTree = "<group>"; }; A5DF3D472BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneLiginWithVideoBkgViewController.swift; sourceTree = "<group>"; };
A5DF3D4B2BF9A348003D5F03 /* loginBkg.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; path = loginBkg.mov; sourceTree = "<group>"; };
A5DF3D4D2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssWithVideoBkgViewController.swift; sourceTree = "<group>"; }; A5DF3D4D2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssWithVideoBkgViewController.swift; sourceTree = "<group>"; };
A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; }; A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMineSchemeViewController.swift; sourceTree = "<group>"; }; A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMineSchemeViewController.swift; sourceTree = "<group>"; };
...@@ -2384,7 +2384,7 @@ ...@@ -2384,7 +2384,7 @@
A5DF3D492BF9A2E4003D5F03 /* videos */ = { A5DF3D492BF9A2E4003D5F03 /* videos */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
A5DF3D4B2BF9A348003D5F03 /* loginBkg.mov */, 044378A32BFC848C001F95AE /* loginBkg.mov */,
); );
path = videos; path = videos;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2528,7 +2528,7 @@ ...@@ -2528,7 +2528,7 @@
04EA2E712BF74FA200AE80B0 /* shouye.json in Resources */, 04EA2E712BF74FA200AE80B0 /* shouye.json in Resources */,
A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */, A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */,
04EA2E702BF74FA200AE80B0 /* shipin.json in Resources */, 04EA2E702BF74FA200AE80B0 /* shipin.json in Resources */,
A5DF3D4C2BF9A348003D5F03 /* loginBkg.mov in Resources */, 044378A42BFC848C001F95AE /* loginBkg.mov in Resources */,
047619ED2BA9B9C900F45358 /* area.plist in Resources */, 047619ED2BA9B9C900F45358 /* area.plist in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift
View file @ 50094b6a
...@@ -21,6 +21,7 @@ class YHServiceCenterMainViewController: YHBaseViewController { ...@@ -21,6 +21,7 @@ class YHServiceCenterMainViewController: YHBaseViewController {
var orderId: Int = 0 var orderId: Int = 0
var mobile: String = "" var mobile: String = ""
var model: YHContactItemModel = YHContactItemModel() var model: YHContactItemModel = YHContactItemModel()
var doneCount: Int = 0
private lazy var topBkg : UIView = { private lazy var topBkg : UIView = {
let imagV = UIImageView() let imagV = UIImageView()
imagV.image = UIImage(named: "service_center_head_bkg4") imagV.image = UIImage(named: "service_center_head_bkg4")
...@@ -146,9 +147,24 @@ extension YHServiceCenterMainViewController { ...@@ -146,9 +147,24 @@ extension YHServiceCenterMainViewController {
override func viewDidLayoutSubviews() { override func viewDidLayoutSubviews() {
super.viewDidLayoutSubviews() super.viewDidLayoutSubviews()
nameBgImageView.snp.remakeConstraints { make in
segmentedView.frame = CGRect(x: 4, y: k_Height_safeAreaInsetsTop() + 98, width: view.bounds.size.width - 8, height: 48) make.top.equalTo(92)
listContainerView.frame = CGRect(x: 0, y: k_Height_safeAreaInsetsTop() + 48 + 98, width: view.bounds.size.width, height: view.bounds.size.height - 48 - k_Height_safeAreaInsetsTop() - 98 - k_Height_TabBar) make.left.equalTo(20)
make.right.equalTo(-20)
make.bottom.equalTo(nameLabel.snp.bottom).offset(11)
}
segmentedView.snp.remakeConstraints { make in
make.right.equalTo(-4)
make.left.equalTo(4)
make.top.equalTo(nameBgImageView.snp.bottom).offset(14)
make.height.equalTo(48)
}
listContainerView.snp.remakeConstraints { make in
make.right.left.equalToSuperview()
make.top.equalTo(segmentedView.snp.bottom)
make.bottom.equalTo(-k_Height_TabBar)
}
} }
@objc func pushOrderView() { @objc func pushOrderView() {
...@@ -244,26 +260,37 @@ extension YHServiceCenterMainViewController { ...@@ -244,26 +260,37 @@ extension YHServiceCenterMainViewController {
} }
segmentedView.dataSource = segmentedDataSource segmentedView.dataSource = segmentedDataSource
segmentedView.reloadData() segmentedView.reloadData()
serviceCenterMainReqVM.getPersonInfoFillStep(params: ["orderId":orderId]) {[weak self] success, error in getStep()
guard let self = self else { return } }
var name = "" }
if let applicant = self.serviceCenterMainReqVM.informationFillStepModel {
if applicant.applicantName.isEmpty { func getStep() {
name = "尊敬的客户" serviceCenterMainReqVM.getPersonInfoFillStep(params: ["orderId":orderId]) {[weak self] success, error in
guard let self = self else { return }
var name = ""
if let applicant = self.serviceCenterMainReqVM.informationFillStepModel {
if applicant.applicantName.isEmpty {
name = "尊敬的客户"
} else {
name = applicant.applicantName
if applicant.sex == 1 {
name = "尊敬的" + name + "先生"
} else if applicant.sex == 2 {
name = "尊敬的" + name + "女士"
} else { } else {
name = applicant.applicantName
if applicant.sex == 1 {
name = name + "先生"
} else if applicant.sex == 2 {
name = name + "女士"
} else {
}
} }
} }
}
if doneCount == 6 {
let a: ASAttributedString = .init("您好，\(name)，您的资料已全部准备完成，已进入", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor(hex: 0x121a26)))
let aa: ASAttributedString = .init(NSAttributedString(string: "全套资料审核"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("阶段，审核没问题会安排递交入境处哦~", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor(hex: 0x121a26)))
self.nameLabel.attributed.text = a + aa + aaa
} else {
let a: ASAttributedString = .init("您好，\(name)，您当前处于", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor(hex: 0x121a26))) let a: ASAttributedString = .init("您好，\(name)，您当前处于", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor(hex: 0x121a26)))
let aa: ASAttributedString = .init(NSAttributedString(string: "身份申请"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor)) let aa: ASAttributedString = .init(NSAttributedString(string: "信息提交"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("阶段", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor(hex: 0x121a26))) let aaa: ASAttributedString = .init("阶段，让我们一起共同完成您的身份申请之旅吧~", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor(hex: 0x121a26)))
self.nameLabel.attributed.text = a + aa + aaa self.nameLabel.attributed.text = a + aa + aaa
} }
} }
...@@ -272,7 +299,7 @@ extension YHServiceCenterMainViewController { ...@@ -272,7 +299,7 @@ extension YHServiceCenterMainViewController {
func addListView() { func addListView() {
nameBgImageView = { nameBgImageView = {
let view = UIImageView() let view = UIImageView()
view.image = UIImage(named: "service_name_bg") view.image = UIImage(named: "service_name_bg")?.resizableImage(withCapInsets: UIEdgeInsets(top: 21, left: 68, bottom: 11, right: 14), resizingMode: .stretch)
return view return view
}() }()
view.addSubview(nameBgImageView) view.addSubview(nameBgImageView)
...@@ -280,7 +307,7 @@ extension YHServiceCenterMainViewController { ...@@ -280,7 +307,7 @@ extension YHServiceCenterMainViewController {
make.top.equalTo(92) make.top.equalTo(92)
make.left.equalTo(20) make.left.equalTo(20)
make.right.equalTo(-20) make.right.equalTo(-20)
make.height.equalTo(50) make.height.equalTo(68)
} }
nameLabel = { nameLabel = {
...@@ -288,6 +315,7 @@ extension YHServiceCenterMainViewController { ...@@ -288,6 +315,7 @@ extension YHServiceCenterMainViewController {
label.text = "您好，张先生，您当前处于身份申请阶段" label.text = "您好，张先生，您当前处于身份申请阶段"
label.font = UIFont.PFSC_M(ofSize: 12) label.font = UIFont.PFSC_M(ofSize: 12)
label.textColor = UIColor.brandMainColor label.textColor = UIColor.brandMainColor
label.numberOfLines = 0
return label return label
}() }()
nameBgImageView.addSubview(nameLabel) nameBgImageView.addSubview(nameLabel)
...@@ -295,7 +323,6 @@ extension YHServiceCenterMainViewController { ...@@ -295,7 +323,6 @@ extension YHServiceCenterMainViewController {
make.top.equalTo(21) make.top.equalTo(21)
make.left.equalTo(14) make.left.equalTo(14)
make.right.equalTo(-14) make.right.equalTo(-14)
make.height.equalTo(17)
} }
view.addSubview(noDataView) view.addSubview(noDataView)
...@@ -333,6 +360,8 @@ extension YHServiceCenterMainViewController { ...@@ -333,6 +360,8 @@ extension YHServiceCenterMainViewController {
guard let self = self else { return } guard let self = self else { return }
arrItemTitles[3] = "已完成(\(count))" arrItemTitles[3] = "已完成(\(count))"
self.updata() self.updata()
doneCount = count
self.getStep()
} }
arrItemVCs.append(controllerOne) arrItemVCs.append(controllerOne)
arrItemVCs.append(controllerTwo) arrItemVCs.append(controllerTwo)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift
View file @ 50094b6a
...@@ -129,7 +129,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource { ...@@ -129,7 +129,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let model = self.viewModel.arrDataForSeviceCenterProgress[indexPath.section] let model = self.viewModel.arrDataForSeviceCenterProgress[indexPath.section]
if model.status == 1 { if model.status == 1 || model.status == 4 {
return return
} else { } else {
//1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书 //1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
...@@ -137,22 +137,30 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource { ...@@ -137,22 +137,30 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
let vc = YHMineCertificateEntryViewController() let vc = YHMineCertificateEntryViewController()
vc.orderId = orderID vc.orderId = orderID
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} else if model.type == 2 { } else if model.type == 2 {
let vc = YHInformationPerfectListVC() let vc = YHInformationPerfectListVC()
vc.orderId = orderID vc.orderId = orderID
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} else if model.type == 3 {
} else if model.type == 3 { // 评分
handleRedPointFor(key: kMyScoreRedPointInfoKey, model: model)
let vc = YHScoreDetailViewController() let vc = YHScoreDetailViewController()
vc.orderId = orderID vc.orderId = orderID
// vc.model = serviceCenterMainReqVM.allInfoScoreModel // vc.model = serviceCenterMainReqVM.allInfoScoreModel
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} else if model.type == 4 {
} else if model.type == 4 { // 方案
handleRedPointFor(key: kMyPlanRedPointInfoKey, model: model)
let vc = YHMineSchemeViewController() let vc = YHMineSchemeViewController()
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} else if model.type == 5 { } else if model.type == 5 {
let vc = YHMySignatureListViewController() let vc = YHMySignatureListViewController()
vc.orderId = orderID vc.orderId = orderID
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} else if model.type == 6 { } else if model.type == 6 {
let vc = YHMyDocumentsListViewController() let vc = YHMyDocumentsListViewController()
vc.orderId = orderID vc.orderId = orderID
...@@ -161,6 +169,24 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource { ...@@ -161,6 +169,24 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
} }
} }
} }
func handleRedPointFor(key: String, model: YHServiceCenterProgressModel) {
if key != kMyPlanRedPointInfoKey && key != kMyScoreRedPointInfoKey {
return
}
if model.type != 3 && model.type != 4 { // 只有我的评分和我的方案进行红点处理
return
}
if model.status != 3 { // 只有已完成状态才进行红点处理
return
}
let dict:[String: Any] = [kProVersionKey: model.pro_version,
kClickKey: true]
UserDefaults.standard.set(dict, forKey: key)
UserDefaults.standard.synchronize()
}
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHServiceCenterProgressModel.swift
View file @ 50094b6a
...@@ -11,7 +11,9 @@ import UIKit ...@@ -11,7 +11,9 @@ import UIKit
class YHServiceCenterProgressModel : YHBaseModel { class YHServiceCenterProgressModel : YHBaseModel {
var name : String = "" var name : String = ""
var percentage : Int = 0 var percentage : Int = 0
var status : Int = 0 // 0未知 1待开始 2进行中 3 已完成 var status : Int = 0 // 0未知 1待开始 2进行中 3 已完成 4 后台进行中
var num : Int = 0 var num : Int = 0
var type : Int = 0 // 1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书 var type : Int = 0 // 1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
var pro_version : Int = 0
var reject_status : Int = 0
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyMemberViewModel.swift
View file @ 50094b6a
...@@ -73,7 +73,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{ ...@@ -73,7 +73,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
if model.birth.count != 0 { if model.birth.count != 0 {
if mainModel.relationType != .child { if mainModel.relationType != .child {
// 孩子生日设置大于18岁后必须设置为不能随行 导致证件上传和证件信息页面隐藏 会产生异常 // 孩子生日设置大于18岁后必须设置为不能随行 导致证件上传和证件信息页面隐藏 会产生异常
mainModel.birthday = model.birth.toTimeString() mainModel.birthday = model.birth
} }
} }
if model.gender.count != 0 { if model.gender.count != 0 {
...@@ -84,10 +84,10 @@ class YHFamilyMemberViewModel : YHBaseViewModel{ ...@@ -84,10 +84,10 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
} }
} }
if model.term_begins.count != 0 { if model.term_begins.count != 0 {
mainModel.certificates.cnIdentityCard.issueDateStartAt = model.term_begins.toTimeString() mainModel.certificates.cnIdentityCard.issueDateStartAt = model.term_begins
} }
if model.end_of_term.count != 0 { if model.end_of_term.count != 0 {
mainModel.certificates.cnIdentityCard.issueDateEndAt = model.end_of_term.toTimeString() mainModel.certificates.cnIdentityCard.issueDateEndAt = model.end_of_term
} }
if model.issuing_authority.count != 0 { if model.issuing_authority.count != 0 {
mainModel.certificates.cnIdentityCard.issueAt = model.issuing_authority mainModel.certificates.cnIdentityCard.issueAt = model.issuing_authority
...@@ -108,7 +108,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{ ...@@ -108,7 +108,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
if model.birth.count != 0 { if model.birth.count != 0 {
if mainModel.relationType != .child { if mainModel.relationType != .child {
// 孩子生日设置大于18岁后必须设置为不能随行 导致证件上传和证件信息页面隐藏 会产生异常 // 孩子生日设置大于18岁后必须设置为不能随行 导致证件上传和证件信息页面隐藏 会产生异常
mainModel.birthday = model.birth.toTimeString() mainModel.birthday = model.birth
} }
} }
if model.gender.count != 0 { if model.gender.count != 0 {
...@@ -119,10 +119,10 @@ class YHFamilyMemberViewModel : YHBaseViewModel{ ...@@ -119,10 +119,10 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
} }
} }
if model.term_begins.count != 0 { if model.term_begins.count != 0 {
mainModel.certificates.hkMacaoPass.issueDateStartAt = model.term_begins.toTimeString() mainModel.certificates.hkMacaoPass.issueDateStartAt = model.term_begins
} }
if model.end_of_term.count != 0 { if model.end_of_term.count != 0 {
mainModel.certificates.hkMacaoPass.issueDateEndAt = model.end_of_term.toTimeString() mainModel.certificates.hkMacaoPass.issueDateEndAt = model.end_of_term
} }
if model.issuing_authority.count != 0 { if model.issuing_authority.count != 0 {
mainModel.certificates.hkMacaoPass.issueAt = model.issuing_authority mainModel.certificates.hkMacaoPass.issueAt = model.issuing_authority
...@@ -156,7 +156,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{ ...@@ -156,7 +156,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
} }
func requestCnIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) { func requestCnIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.cnIdCard let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.cn
let params: [String : Any] = ["url": url, let params: [String : Any] = ["url": url,
"is_back": isBack] "is_back": isBack]
let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
...@@ -180,7 +180,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{ ...@@ -180,7 +180,7 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
} }
func requestHkIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) { func requestHkIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.hkIdCard let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.hk
let params: [String : Any] = ["url": url, let params: [String : Any] = ["url": url,
"is_back": isBack] "is_back": isBack]
let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift
View file @ 50094b6a
...@@ -347,7 +347,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel { ...@@ -347,7 +347,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
mainModel.username = model.name mainModel.username = model.name
} }
if model.birth.count != 0 { if model.birth.count != 0 {
mainModel.birthday = model.birth.toTimeString() mainModel.birthday = model.birth
} }
if model.gender.count != 0 { if model.gender.count != 0 {
if model.gender == "女" { if model.gender == "女" {
...@@ -357,10 +357,10 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel { ...@@ -357,10 +357,10 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
} }
} }
if model.term_begins.count != 0 { if model.term_begins.count != 0 {
mainModel.certificates.hk_macao_pass.issue_date_start_at = model.term_begins.toTimeString() mainModel.certificates.hk_macao_pass.issue_date_start_at = model.term_begins
} }
if model.end_of_term.count != 0 { if model.end_of_term.count != 0 {
mainModel.certificates.hk_macao_pass.issue_date_end_at = model.end_of_term.toTimeString() mainModel.certificates.hk_macao_pass.issue_date_end_at = model.end_of_term
} }
if model.issuing_authority.count != 0 { if model.issuing_authority.count != 0 {
mainModel.certificates.hk_macao_pass.issue_at = model.issuing_authority mainModel.certificates.hk_macao_pass.issue_at = model.issuing_authority
...@@ -375,7 +375,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel { ...@@ -375,7 +375,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
mainModel.username = model.name mainModel.username = model.name
} }
if model.birth.count != 0 { if model.birth.count != 0 {
mainModel.birthday = model.birth.toTimeString() mainModel.birthday = model.birth
} }
if model.gender.count != 0 { if model.gender.count != 0 {
if model.gender == "女" { if model.gender == "女" {
...@@ -385,10 +385,10 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel { ...@@ -385,10 +385,10 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
} }
} }
if model.term_begins.count != 0 { if model.term_begins.count != 0 {
mainModel.certificates.cn_identity_card.issue_date_start_at = model.term_begins.toTimeString() mainModel.certificates.cn_identity_card.issue_date_start_at = model.term_begins
} }
if model.end_of_term.count != 0 { if model.end_of_term.count != 0 {
mainModel.certificates.cn_identity_card.issue_date_end_at = model.end_of_term.toTimeString() mainModel.certificates.cn_identity_card.issue_date_end_at = model.end_of_term
} }
if model.issuing_authority.count != 0 { if model.issuing_authority.count != 0 {
mainModel.certificates.cn_identity_card.issue_at = model.issuing_authority mainModel.certificates.cn_identity_card.issue_at = model.issuing_authority
...@@ -501,7 +501,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel { ...@@ -501,7 +501,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
} }
func requestCnIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) { func requestCnIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.cnIdCard let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.cn
let params: [String : Any] = ["url": url, let params: [String : Any] = ["url": url,
"is_back": isBack] "is_back": isBack]
let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
...@@ -525,7 +525,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel { ...@@ -525,7 +525,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
} }
func requestHkIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) { func requestHkIDCardMessage(_ url: String, isBack: Int, callBackBlock:@escaping (_ success: Bool, _ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.OrderInformation.hkIdCard let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.hk
let params: [String : Any] = ["url": url, let params: [String : Any] = ["url": url,
"is_back": isBack] "is_back": isBack]
let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkExperienceViewModel.swift
View file @ 50094b6a
...@@ -387,8 +387,8 @@ class YHWorkExperienceViewModel: YHBaseViewModel { ...@@ -387,8 +387,8 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
func requestFileMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ model: YHFileContent?,_ error:YHErrorModel?)->()) { func requestFileMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ model: YHFileContent?,_ error:YHErrorModel?)->()) {
// let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)" // let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)"
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.normal
let params: [String : Any] = ["file_url": url] let params: [String : Any] = ["url": url]
let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
//1. json字符串 转 对象 //1. json字符串 转 对象
guard let self = self else { return } guard let self = self else { return }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/ViewModel/YHWorkIntroductionViewModel.swift
View file @ 50094b6a
...@@ -67,8 +67,8 @@ class YHWorkIntroductionViewModel: YHBaseViewModel { ...@@ -67,8 +67,8 @@ class YHWorkIntroductionViewModel: YHBaseViewModel {
func requestFileMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ model: YHFileContent?,_ error:YHErrorModel?)->()) { func requestFileMessage(_ url: String, callBackBlock:@escaping (_ success: Bool, _ model: YHFileContent?,_ error:YHErrorModel?)->()) {
// let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)" // let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent + "?file_url=\(url)"
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.WorkExperience.ocrFileContent let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OCR.normal
let param: [String: Any] = ["file_url": url] let param: [String: Any] = ["url": url]
let _ = YHNetRequest.getRequest(url: strUrl,params:param) { [weak self] json, code in let _ = YHNetRequest.getRequest(url: strUrl,params:param) { [weak self] json, code in
//1. json字符串 转 对象 //1. json字符串 转 对象
guard let self = self else { return } guard let self = self else { return }
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHDeviceInfoViewController.swift
View file @ 50094b6a
...@@ -40,6 +40,7 @@ class YHDeviceInfoViewController: YHBaseViewController { ...@@ -40,6 +40,7 @@ class YHDeviceInfoViewController: YHBaseViewController {
var info = "deviceToken: \n" + (YHLoginManager.shared.deviceTokenModel.deviceToken) var info = "deviceToken: \n" + (YHLoginManager.shared.deviceTokenModel.deviceToken)
info += "\n" info += "\n"
info += "\nregisterId: \n" + (YHLoginManager.shared.deviceTokenModel.registerId) info += "\nregisterId: \n" + (YHLoginManager.shared.deviceTokenModel.registerId)
printLog("\(info)")
DispatchQueue.main.async { DispatchQueue.main.async {
self.deviceInfoLabel.text = info self.deviceInfoLabel.text = info
} }
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift
View file @ 50094b6a
...@@ -30,7 +30,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget ...@@ -30,7 +30,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
btn.setTitleColor(UIColor(hexString:"#313131"), for: .normal) btn.setTitleColor(UIColor(hexString:"#313131"), for: .normal)
btn.backgroundColor = .contentBkgColor btn.backgroundColor = .contentBkgColor
btn.layer.cornerRadius = kCornerRadius3 btn.layer.cornerRadius = kCornerRadius3
btn.addTarget(self, action: #selector(logout), for: .touchUpInside) btn.addTarget(self, action: #selector(didLogoutBtnClicked), for: .touchUpInside)
return btn return btn
}() }()
...@@ -142,6 +142,14 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget ...@@ -142,6 +142,14 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
#endif #endif
} }
@objc func didLogoutBtnClicked() {
YHCommonAlertView.show("", "退出登录", "取消", "确定",fullGuestureEnable: false) {
} callBack: {
self.logout()
}
}
@objc func logout() { @objc func logout() {
YHHUD.show(.progress(message: "退出登录中...")) YHHUD.show(.progress(message: "退出登录中..."))
...@@ -166,7 +174,6 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget ...@@ -166,7 +174,6 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
msg = error.errorMsg msg = error.errorMsg
} }
YHHUD.flash(message: msg) YHHUD.flash(message: msg)
} }
} }
......
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ 50094b6a
...@@ -195,6 +195,12 @@ class YHAllApiName { ...@@ -195,6 +195,12 @@ class YHAllApiName {
static let getID = "ossv2/sts/auth" static let getID = "ossv2/sts/auth"
} }
struct OCR {
static let cn = "ocr/id_card/recognize"
static let hk = "ocr/permit/recognize"
static let normal = "ocr/advanced/recognize"
}
//我的签字 //我的签字
struct Signature { struct Signature {
// 签字列表 // 签字列表
......
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