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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/FileList(文件清单)/V/YHMyFileListCell.swift

@@ -50,7 +50,7 @@ class YHMyFileListCell: UITableViewCell {
     var isLastCell:Bool = false {
         didSet {
             self.grayView.layer.cornerRadius = isLastCell ?  6.0 : 0.0
-            self.grayView.layer.borderWidth = isLastCell ?  1.0 : 0.0
+            self.grayView.layer.borderWidth = isLastCell ?  0.5 : 0.0
             self.grayView.snp.updateConstraints { make in
                 make.top.equalToSuperview().offset(isLastCell ? -6.0 : 0.0)
             }
@@ -84,7 +84,7 @@ class YHMyFileListCell: UITableViewCell {
         let view = UIView()
         view.backgroundColor = UIColor.init(hex: 0xDEE5F1)
         view.layer.cornerRadius = 0
-        view.layer.borderWidth = 1
+        view.layer.borderWidth = 0.5
         view.layer.borderColor = UIColor.init(hex: 0xDEE5F1).cgColor
         view.clipsToBounds = true
         return view
@@ -182,9 +182,9 @@ class YHMyFileListCell: UITableViewCell {
         
         self.infoView.snp.makeConstraints { make in
             make.top.equalTo(0)
-            make.left.equalTo(1)
-            make.right.equalTo(-1)
-            make.bottom.equalTo(-1)
+            make.left.equalTo(0.5)
+            make.right.equalTo(-0.5)
+            make.bottom.equalTo(-0.5)
         }
         self.indexLabel.snp.makeConstraints { make in
             make.centerY.equalToSuperview()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/FileList(文件清单)/V/YHMyFileListHeaderView.swift

@@ -66,7 +66,7 @@ class YHMyFileListHeaderView: UIView {
         let view = UIView()
         view.backgroundColor = UIColor.init(hex: 0xDEE5F1)
         view.layer.cornerRadius = 6.0
-        view.layer.borderWidth = 1
+        view.layer.borderWidth = 0.5
         view.layer.borderColor = UIColor.init(hex: 0xDEE5F1).cgColor
         view.clipsToBounds = true
         return view
@@ -151,7 +151,7 @@ class YHMyFileListHeaderView: UIView {
         
         lineView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
-            make.height.equalTo(1)
+            make.height.equalTo(0.5)
         }
         
         self.grayView.snp.makeConstraints { make in
@@ -162,9 +162,9 @@ class YHMyFileListHeaderView: UIView {
         }
         
         self.columnView.snp.makeConstraints { make in
-            make.left.top.equalTo(1)
-            make.right.equalTo(-1)
-            make.bottom.equalTo(0)
+            make.left.top.equalTo(0.5)
+            make.right.equalTo(-0.5)
+            make.bottom.equalTo(0.5)
         }
 
         self.whiteContentView.snp.makeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyCertificates(我的证书)/C/YHQuestionAndAnswerViewController.swift

@@ -67,7 +67,7 @@ extension YHQuestionAndAnswerViewController {
     
     func setupUI() {
         gk_navTitle = "问题答疑"
-        gk_navBarAlpha = 0.5
+        gk_navBarAlpha = 1.0
         gk_navLineHidden = false
         gk_navBackgroundColor = .white
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateInfoController.swift

@@ -486,14 +486,14 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                 }
             } else if detailItem.type == .certificateType { // 选择证件类别
                 
-                let type = self.familyMember?.certificates.passport.passPortType ?? 3
-                YHSheetPickerView.show(type: .certificate, selectIndex:type) {
-                    [weak self] selectItem in
-                    guard let self = self else { return }
-                    self.familyMember?.certificates.passport.passPortType = selectItem.index
-                    self.loadInfo()
-                    self.save()
-                }
+//                let type = self.familyMember?.certificates.passport.passPortType ?? 3
+//                YHSheetPickerView.show(type: .certificate, selectIndex:type) {
+//                    [weak self] selectItem in
+//                    guard let self = self else { return }
+//                    self.familyMember?.certificates.passport.passPortType = selectItem.index
+//                    self.loadInfo()
+//                    self.save()
+//                }
             }
             return
         }

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

@@ -273,7 +273,7 @@ class YHFormTitleItem : YHFormItemProtocol {
         case .chinaIdCardInfo:
             return "中国身份证".local
         case .passPortOrTravelInfo:
-            return "护照及其他旅行证件".local
+            return "护照".local
         case .spouseInfo:
             return "配偶信息".local
         case .occupationInfo:
@@ -1145,7 +1145,6 @@ class YHCNIdentityCard: SmartCodable {
     var lastIssueDateEndAt: String = ""
     var imgFront: String = ""
     var imgBack: String = ""
-    var passPortType: Int = 0
 
     enum CodingKeys: String, CodingKey {
         case id = "id"
@@ -1155,7 +1154,6 @@ class YHCNIdentityCard: SmartCodable {
         case issueDateEndAt = "issue_date_end_at"
         case imgFront = "img_front"
         case imgBack = "img_back"
-        case passPortType = "passport_type"
     }
     
     required init() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Certificates(证书上传和证书信息)/YHGCCertificateInfoController.swift

@@ -118,7 +118,7 @@ class YHGCCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol
             is_live_oversea_year = mainApplicant.isOverSeasOver1Year()
         }
         
-        if nationality == "中国-China" { // 中国国籍
+        if nationality.contains("中国") { // 中国国籍
             let isLiveInChina = liveCountry.contains("中国".local)
             if isLiveInChina { // 居住国内
                 if familyMember.isHandled == 0 { // 没办理过港澳通行证
@@ -506,14 +506,14 @@ extension YHGCCertificateInfoController : UITableViewDelegate, UITableViewDataSo
                 }
             } else if detailItem.type == .certificateType { // 选择证件类别
                 
-                let type = self.familyMember?.certificates.passport.passPortType ?? 3
-                YHSheetPickerView.show(type: .certificate, selectIndex:type) {
-                    [weak self] selectItem in
-                    guard let self = self else { return }
-                    self.familyMember?.certificates.passport.passPortType = selectItem.index
-                    self.loadInfo()
-                    self.save()
-                }
+//                let type = self.familyMember?.certificates.passport.passPortType ?? 3
+//                YHSheetPickerView.show(type: .certificate, selectIndex:type) {
+//                    [weak self] selectItem in
+//                    guard let self = self else { return }
+//                    self.familyMember?.certificates.passport.passPortType = selectItem.index
+//                    self.loadInfo()
+//                    self.save()
+//                }
             }
             return
         }