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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignUploadDoc(续签补件)/C/YHResignUploadDocDetailViewController.swift

@@ -116,7 +116,9 @@ class YHResignUploadDocDetailViewController: YHBaseViewController {
     
     @objc func didClickUploadBtn() {
         if self.materialModel.unavailable_reason.count != 0 {
+            YHHUD.show(.progress(message: ""))
             self.viewModel.postUploadDocFillUnavailableReason(id: id, reason: self.materialModel.unavailable_reason) {[weak self] success, err in
+                YHHUD.hide()
                 guard let self = self else { return }
                 if success {
                     self.navigationController?.popViewController(animated: true)
@@ -127,7 +129,9 @@ class YHResignUploadDocDetailViewController: YHBaseViewController {
                 YHHUD.flash(message: "请上传必填文件")
                 return
             }
+            YHHUD.show(.progress(message: ""))
             self.viewModel.postUploadDocUpload(id: id, file: self.items) { [weak self] success, err in
+                YHHUD.hide()
                 guard let self = self else { return }
                 if success {
                     self.navigationController?.popViewController(animated: true)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/C/YHResignUploadTravelCardListViewController.swift

@@ -131,6 +131,18 @@ private extension YHResignUploadTravelCardListViewController {
             make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
             make.bottom.equalTo(-98)
         }
+        
+        let sublineView = {
+            let view = UIView()
+            view.backgroundColor = UIColor.separatorColor
+            return view
+        }()
+        view.addSubview(sublineView)
+        sublineView.snp.remakeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.bottom.equalTo(bottomView.snp.top)
+            make.height.equalTo(1)
+        }
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/C/YHResignUploadTravelHKViewController.swift

@@ -29,7 +29,7 @@ class YHResignUploadTravelHKViewController: YHBaseViewController {
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame:.zero, style:.grouped)
         tableView.estimatedSectionHeaderHeight = 0.01
-        tableView.estimatedSectionFooterHeight = 14.0
+        tableView.estimatedSectionFooterHeight = 16.0
         tableView.contentInsetAdjustmentBehavior = .never
         tableView.showsVerticalScrollIndicator = false
         tableView.separatorStyle = .none
@@ -321,7 +321,7 @@ extension YHResignUploadTravelHKViewController: UITableViewDelegate, UITableView
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section != 0 {
             if urls[0].count == 0 && urls[1].count == 0 {
-                return 243
+                return 223
             } else {
                 var tatol = 0
                 for item in data {
@@ -332,7 +332,7 @@ extension YHResignUploadTravelHKViewController: UITableViewDelegate, UITableView
                         tatol = tatol + 20
                     }
                 }
-                return CGFloat(521 + tatol)
+                return CGFloat(501 + tatol)
             }
         }
         return UITableView.automaticDimension
@@ -348,7 +348,7 @@ extension YHResignUploadTravelHKViewController: UITableViewDelegate, UITableView
     
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
             
-        return 14.0
+        return 16.0
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/C/YHResignUploadTravelPassportViewController.swift

@@ -30,7 +30,7 @@ class YHResignUploadTravelPassportViewController: YHBaseViewController {
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame:.zero, style:.grouped)
         tableView.estimatedSectionHeaderHeight = 0.01
-        tableView.estimatedSectionFooterHeight = 14.0
+        tableView.estimatedSectionFooterHeight = 16.0
         tableView.contentInsetAdjustmentBehavior = .never
         tableView.showsVerticalScrollIndicator = false
         tableView.separatorStyle = .none
@@ -259,7 +259,7 @@ extension YHResignUploadTravelPassportViewController: UITableViewDelegate, UITab
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section != 0 {
             if urls[0].count == 0 {
-                return 243
+                return 231
             } else {
                 var tatol = 0
                 for item in data {
@@ -270,7 +270,7 @@ extension YHResignUploadTravelPassportViewController: UITableViewDelegate, UITab
                         tatol = tatol + 20
                     }
                 }
-                return CGFloat(345 + tatol)
+                return CGFloat(333 + tatol)
             }
         }
         return UITableView.automaticDimension
@@ -286,7 +286,7 @@ extension YHResignUploadTravelPassportViewController: UITableViewDelegate, UITab
     
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
             
-        return 14.0
+        return 16.0
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelCardFootViewController.swift

@@ -37,14 +37,15 @@ extension YHResignUploadTravelCardFootViewController {
         view.addSubview(imageView)
         var height = 0.0
         if type == 0 {
-            height = 528.fix
+            height = 488.fix
             imageView.image = UIImage(named: "resign_upload_travel_foot_one")
         } else {
-            height = 699.fix
+            height = 659.fix
             imageView.image = UIImage(named: "resign_upload_travel_foot_two")
         }
         imageView.snp.makeConstraints { make in
-            make.top.right.left.equalToSuperview()
+            make.top.left.equalTo(20)
+            make.right.equalTo(-20)
             make.height.equalTo(height)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelCardListTableViewCell.swift

@@ -117,12 +117,14 @@ private extension YHResignUploadTravelCardListTableViewCell {
         contentView.addSubview(whiteContentView)
         
         whiteContentView.snp.makeConstraints { make in
-            make.edges.equalToSuperview()
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.top.bottom.equalToSuperview()
         }
         
         whiteContentView.addSubview(statusImageView)
         statusImageView.snp.makeConstraints { make in
-            make.right.equalTo(-18)
+            make.right.equalTo(-16)
             make.width.height.equalTo(20)
             make.centerY.equalToSuperview()
         }
@@ -138,7 +140,7 @@ private extension YHResignUploadTravelCardListTableViewCell {
         whiteContentView.addSubview(titleLable)
         titleLable.snp.makeConstraints { make in
             make.centerY.equalToSuperview()
-            make.left.equalToSuperview().offset(18)
+            make.left.equalToSuperview().offset(20)
             make.height.equalTo(20)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelCardListfootView.swift

@@ -104,7 +104,7 @@ class YHResignUploadTravelCardListfootView: UIView {
         indicator.indicatorColor = UIColor.brandMainColor
         indicator.indicatorHeight = 2
         indicator.indicatorCornerRadius = 0
-        indicator.verticalOffset = 4
+        indicator.verticalOffset = 1
         segmentedView.indicators = [indicator]
         segmentedView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1)
         
@@ -133,6 +133,16 @@ class YHResignUploadTravelCardListfootView: UIView {
             make.height.equalTo(6)
         }
         
+        let sublineView = {
+            let view = UIView()
+            view.backgroundColor = UIColor.separatorColor
+            return view
+        }()
+        segmentedView.addSubview(sublineView)
+        sublineView.snp.remakeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(1)
+        }
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelGuideView.swift

@@ -220,12 +220,24 @@ private extension YHResignUploadTravelGuideView {
             make.height.equalTo(98)
         }
         
+        let sublineView = {
+            let view = UIView()
+            view.backgroundColor = UIColor.separatorColor
+            return view
+        }()
+        whiteContentView.addSubview(sublineView)
+        sublineView.snp.remakeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.bottom.equalTo(bottomView.snp.top)
+            make.height.equalTo(1)
+        }
+        
         whiteContentView.addSubview(myScrollView)
         myScrollView.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(20)
             make.right.equalToSuperview()
             make.width.equalTo(KScreenWidth)
-            make.height.equalTo(whiteHeight-98 - 20)
+            make.height.equalTo(whiteHeight - 98 - 21)
         }
         
         if let tmpImage = UIImage(named:"resign_upload_guideline") {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelHKTableViewCell.swift

@@ -40,6 +40,33 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
     var failString: String = "" {
         didSet {
             showMessageLabel.text = failString
+            if failString.count != 0 {
+                centerView.snp.remakeConstraints { make in
+                    make.left.equalTo(16)
+                    make.right.equalTo(-16)
+                    make.top.equalTo(0)
+                    make.bottom.equalTo(0)
+                }
+                cardLabel.snp.remakeConstraints { make in
+                    make.left.equalTo(18)
+                    make.right.equalTo(-18)
+                    make.top.equalTo(229)
+                    make.height.equalTo(20)
+                }
+            } else {
+                centerView.snp.remakeConstraints { make in
+                    make.left.equalTo(16)
+                    make.right.equalTo(-16)
+                    make.top.equalTo(0)
+                    make.bottom.equalTo(-12)
+                }
+                cardLabel.snp.makeConstraints { make in
+                    make.left.equalTo(18)
+                    make.right.equalTo(-18)
+                    make.top.equalTo(217)
+                    make.height.equalTo(20)
+                }
+            }
         }
     }
     var firstImageName: String = "" {
@@ -173,11 +200,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
                             make.height.equalTo(52)
                         }
                     }
-//                    if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.latest_validaty_date) {
-//                
-//                    } else {
-//                        failString = "签注有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后"
-//                    }
                 }
             }
         }
@@ -219,12 +241,11 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
             make.left.equalTo(16)
             make.right.equalTo(-16)
             make.top.equalTo(0)
-            make.bottom.equalTo(-16)
+            make.bottom.equalTo(0)
         }
         
         titleLabel = {
             let label = UILabel()
-//            label.font = UIFont.PFSC_M(ofSize: 17)
             let str = "* " + "港澳通行证 (逗留D签注)"
             let attributes: [NSAttributedString.Key: Any] = [
                 .font: UIFont.PFSC_M(ofSize: 17),
@@ -234,7 +255,6 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
             let starRange = NSRange(location: 0, length: 2)
             questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor.failColor, range: starRange)
             label.attributedText = questionAttrStr
-//            label.textColor = UIColor.mainTextColor
             return label
         }()
         centerView.addSubview(titleLabel)
@@ -270,10 +290,9 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
         }()
         centerView.addSubview(lineView)
         lineView.snp.makeConstraints { make in
-            make.left.equalTo(18)
+            make.left.right.equalToSuperview()
             make.top.equalTo(52)
             make.height.equalTo(1)
-            make.right.equalTo(-18)
         }
         
         frontLabel = {
@@ -288,7 +307,7 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
         frontLabel.snp.makeConstraints { make in
             make.left.equalTo(18)
             make.right.equalTo(self.snp.centerX)
-            make.top.equalTo(64)
+            make.top.equalTo(70)
             make.height.equalTo(20)
         }
         
@@ -304,7 +323,7 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
         backSurfaceLabel.snp.makeConstraints { make in
             make.right.equalTo(-18)
             make.left.equalTo(self.snp.centerX)
-            make.top.equalTo(64)
+            make.top.equalTo(70)
             make.height.equalTo(20)
         }
         
@@ -320,8 +339,8 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
         centerView.addSubview(frontImageButton)
         frontImageButton.snp.makeConstraints { make in
             make.left.equalTo(18)
-            make.top.equalTo(96)
-            make.height.equalTo(102)
+            make.top.equalTo(102)
+            make.height.equalTo(90)
             make.width.equalTo(CGFloat(147).fix)
         }
         
@@ -352,8 +371,8 @@ class YHResignUploadTravelHKTableViewCell: UITableViewCell {
         centerView.addSubview(backSurfaceImageButton)
         backSurfaceImageButton.snp.makeConstraints { make in
             make.right.equalTo(-18)
-            make.top.equalTo(96)
-            make.height.equalTo(102)
+            make.top.equalTo(102)
+            make.height.equalTo(90)
             make.width.equalTo(CGFloat(147).fix)
         }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/UploadTravelCrad(上传旅行证件)/V/YHResignUploadTravelPassportTableViewCell.swift

@@ -33,6 +33,33 @@ class YHResignUploadTravelPassportTableViewCell: UITableViewCell {
     var failString: String = "" {
         didSet {
             showMessageLabel.text = failString
+            if failString.count != 0 {
+                centerView.snp.remakeConstraints { make in
+                    make.left.equalTo(16)
+                    make.right.equalTo(-16)
+                    make.top.equalTo(0)
+                    make.bottom.equalTo(0)
+                }
+                cardBeginView.snp.remakeConstraints { make in
+                    make.left.equalTo(18)
+                    make.top.equalTo(229)
+                    make.height.equalTo(52)
+                    make.right.equalTo(-18)
+                }
+            } else {
+                centerView.snp.remakeConstraints { make in
+                    make.left.equalTo(16)
+                    make.right.equalTo(-16)
+                    make.top.equalTo(0)
+                    make.bottom.equalTo(-20)
+                }
+                cardBeginView.snp.remakeConstraints { make in
+                    make.left.equalTo(18)
+                    make.top.equalTo(209)
+                    make.height.equalTo(52)
+                    make.right.equalTo(-18)
+                }
+            }
         }
     }
     var firstImageName: String = "" {
@@ -97,11 +124,6 @@ class YHResignUploadTravelPassportTableViewCell: UITableViewCell {
                             make.height.equalTo(52)
                         }
                     }
-//                    if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.latest_validaty_date) {
-//                        failString = ""
-//                    } else {
-//                        failString = "有效期不足，需要为\(self.dataModel.latest_validaty_date)或以后"
-//                    }
                 }
             }
         }
@@ -143,7 +165,7 @@ class YHResignUploadTravelPassportTableViewCell: UITableViewCell {
             make.left.equalTo(16)
             make.right.equalTo(-16)
             make.top.equalTo(0)
-            make.bottom.equalTo(-16)
+            make.bottom.equalTo(0)
         }
         
         titleLabel = {
@@ -192,10 +214,9 @@ class YHResignUploadTravelPassportTableViewCell: UITableViewCell {
         }()
         centerView.addSubview(lineView)
         lineView.snp.makeConstraints { make in
-            make.left.equalTo(18)
+            make.left.right.equalToSuperview()
             make.top.equalTo(52)
             make.height.equalTo(1)
-            make.right.equalTo(-18)
         }
         
         frontLabel = {
@@ -210,7 +231,7 @@ class YHResignUploadTravelPassportTableViewCell: UITableViewCell {
         frontLabel.snp.makeConstraints { make in
             make.left.equalTo(18)
             make.right.equalTo(self.snp.centerX)
-            make.top.equalTo(64)
+            make.top.equalTo(70)
             make.height.equalTo(20)
         }
         
@@ -226,8 +247,8 @@ class YHResignUploadTravelPassportTableViewCell: UITableViewCell {
         centerView.addSubview(frontImageButton)
         frontImageButton.snp.makeConstraints { make in
             make.left.equalTo(18)
-            make.top.equalTo(96)
-            make.height.equalTo(102)
+            make.top.equalTo(102)
+            make.height.equalTo(90)
             make.width.equalTo(CGFloat(147).fix)
         }
         
@@ -293,7 +314,7 @@ class YHResignUploadTravelPassportTableViewCell: UITableViewCell {
         centerView.addSubview(cardBeginView)
         cardBeginView.snp.makeConstraints { make in
             make.left.equalTo(18)
-            make.top.equalTo(229)
+            make.top.equalTo(209)
             make.height.equalTo(52)
             make.right.equalTo(-18)
         }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/续签/续签上传旅行证件/resign_upload_guideline.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "resign_upload_guideline@2x.png",
+      "filename" : "Group 2033196192@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "resign_upload_guideline@3x.png",
+      "filename" : "Group 2033196192@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/续签/续签上传旅行证件/resign_upload_travel_foot_one.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "resign_upload_travel_foot_one@2x.png",
+      "filename" : "大陆办理@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "resign_upload_travel_foot_one@3x.png",
+      "filename" : "大陆办理@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/续签/续签上传旅行证件/resign_upload_travel_foot_two.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "resign_upload_travel_foot_two@2x.png",
+      "filename" : "香港办理@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "resign_upload_travel_foot_two@3x.png",
+      "filename" : "香港办理@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }