Merge commit '1a09439b' into davidhuang

* commit '1a09439b':
  // 旅行
  //
  新增受养人细节添加
  服务中心
  服务中心逻辑
  //  消息
  //  UI

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsItemView.swift

@@ -40,6 +40,12 @@ class YHOrderTipsItemView: UIView {
             }  else if msg.type == YHMessageType.identityApproved.rawValue {
                 return "身份获批"
                 
+            }  else if msg.type == YHMessageType.goToHK.rawValue {
+                return "赴港办证"
+                
+            }  else if msg.type == YHMessageType.renewal.rawValue {
+                return "身份续签"
+                
             } else {
                 return "--"
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAddAdoptersViewController.swift

@@ -174,6 +174,7 @@ extension YHAddAdoptersViewController: UITableViewDelegate, UITableViewDataSourc
                             guard let self = self else { return }
                             let vc = YHAdopterNewPeopleViewController()
                             vc.id = self.viewModel.addModel?.id ?? 0
+                            vc.titleText = "新增配偶"
                             self.navigationController?.pushViewController(vc)
                         }
                     }
@@ -182,6 +183,7 @@ extension YHAddAdoptersViewController: UITableViewDelegate, UITableViewDataSourc
                             guard let self = self else { return }
                             let vc = YHAdopterNewPeopleViewController()
                             vc.id = self.viewModel.addModel?.id ?? 0
+                            vc.titleText = "新增子女"
                             self.navigationController?.pushViewController(vc)
                         }
                     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterNewPeopleViewController.swift

@@ -17,11 +17,12 @@ class YHAdopterNewPeopleViewController: YHBaseViewController {
     var cardDataSource: [YHAdopterDependentDataDocModel] = []
     var isShowPrompt: Bool = false
     var id: Int = 0
+    var titleText: String = "新增子女"
     
     override func viewDidLoad() {
         super.viewDidLoad()
         viewModel = YHAdopterNewPeopleViewModel()
-        gk_navTitle = "新增配偶"
+        gk_navTitle = titleText
         gk_navBackgroundColor = .white
         gk_navBarAlpha = 1
         setView()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterCardExplainTableViewCell.swift

@@ -62,6 +62,7 @@ class YHAdopterCardExplainTableViewCell: UITableViewCell {
             label.font = UIFont.PFSC_R(ofSize: 10)
             label.textColor = UIColor(hex: 0x3cc694)
             label.backgroundColor = UIColor(hex: 0xf0fbf7)
+            label.textAlignment = .center
             //带上传
 //            label.textColor = UIColor.brandMainColor
 //            label.backgroundColor = UIColor(hex: 0xf0f4fb)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterIncomeTitleTableViewCell.swift

@@ -70,6 +70,7 @@ class YHAdopterIncomeTitleTableViewCell: UITableViewCell {
             label.font = UIFont.PFSC_R(ofSize: 10)
             label.textColor = UIColor(hex: 0x3cc694)
             label.backgroundColor = UIColor(hex: 0xf0fbf7)
+            label.textAlignment = .center
             //带上传
 //            label.textColor = UIColor.brandMainColor
 //            label.backgroundColor = UIColor(hex: 0xf0f4fb)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterItemView.swift

@@ -46,7 +46,7 @@ class YHAdopterItemView: UIView {
         addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
             make.left.top.bottom.equalToSuperview()
-            make.width.equalTo(243)
+            make.right.equalTo(-30)
         }
         
         explainLabel = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHGrabFileCell.swift

@@ -14,6 +14,7 @@ class YHGrabFileCell: UICollectionViewCell {
 
     lazy var fileImgView:UIImageView = {
         let view = UIImageView(image: UIImage(named: "global_default_image"))
+        view.contentMode = .scaleAspectFit
         return view
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/C/YHFamilyInfoUpdateViewController.swift

@@ -120,17 +120,24 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
         self.navigationController?.popViewController()
     }
     
-    @objc func didConfirmBtnClicked() {
-        self.detailMember.info.isCheck = true
-        self.updateData()
-        
+    func checkInfo() -> Bool {
         if let arr1 = items.first {
             for item in arr1 {
                 if !item.tips.isEmpty {
-                    return
+                    return false
                 }
             }
         }
+        return true
+    }
+    
+    @objc func didConfirmBtnClicked() {
+        self.detailMember.info.isCheck = true
+        self.updateData()
+        
+        if !checkInfo() {
+            return
+        }
         
         if let detaiParams = self.detailMember.info.toDictionary() {
             
@@ -222,8 +229,18 @@ extension YHFamilyInfoUpdateViewController: UITableViewDelegate, UITableViewData
             cell.editBlock = {
                 [weak self] isEdit in
                 guard let self = self else { return }
+                if !isEdit {
+                    if !checkInfo() {
+                        // 检查信息错误
+                        self.isInfoEditing = true
+                        self.detailMember.info.isCheck = true
+                        self.updateData()
+                        return
+                    }
+                }
                 self.isInfoEditing = isEdit
                 self.updateData()
+                
             }
             // 选择出生国家/地区
             cell.selectBirthNation = {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHFamilyInfoWarmTipsView.swift

@@ -47,7 +47,7 @@ class YHFamilyInfoWarmTipsView: UIView {
         let a: ASAttributedString = .init("电子签证缴费截止日期：", .font(UIFont.PFSC_M(ofSize: 15)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
         let b: ASAttributedString = .init("一般为正式获批信下发后", .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
         let c: ASAttributedString = .init("3个月内", .font(UIFont.PFSC_B(ofSize: 15)),.foreground(UIColor.brandMainColor))
-        let d: ASAttributedString = .init("(请以获批函规定日期为准)", .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor.brandMainColor))
+        let d: ASAttributedString = .init("(请以获批函规定日期为准)", .font(UIFont.PFSC_R(ofSize: 15)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
         label.attributed.text = a+b+c+d
         return label
     }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/C/YHTravelDocsPreparationDetailVC.swift

@@ -139,7 +139,7 @@ class YHTravelDocsPreparationDetailVC: YHBaseViewController {
         }
         
         // 头部提示
-        let tipsArr = viewModel.getTipsWithType(self.type)
+        let tipsArr = viewModel.getTipsWithType(self.type, date: self.viewModel.travelDetailModel?.latest_validaty_date ?? "")
         let item1 = YHTravelCerSectionItem(type: .tips, tipsArr: tipsArr)
         sectionItems.append(item1)
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/V/YHTravelCertificateUploadCell.swift

@@ -18,13 +18,14 @@ enum YHCertificateID: Int {
 
 class YHCertificateDateItem {
     var id: YHCertificateID = .signDate
+    var isMust: Bool = false
     var title: String = ""
     var value: String = ""
     var placeHolder: String = ""
     var errorTips: String = ""
     var isShowErrorTips: Bool = false
     
-    init(id: YHCertificateID, title: String, value: String, placeHolder: String, errorTips: String, isShowErrorTips: Bool = false) {
+    init(id: YHCertificateID, isMust:Bool, title: String, value: String, placeHolder: String, errorTips: String, isShowErrorTips: Bool = false) {
         
         self.id = id
         self.title = title
@@ -308,6 +309,15 @@ class YHTravelCertificateUploadCell: UITableViewCell {
         // 证件正反面图片
         certificateFrontView.state = !model.isCanEdit
         certificateBackView.state = !model.isCanEdit
+        
+        var frontDefaultImg = "credentials_default_front"
+        var  backDefaultImg = "credentials_default_back"
+        if model.type == 2 { // 中国居留许可证
+            frontDefaultImg = "credentials_default_residence_front"
+        }
+        
+        certificateFrontView.defaultImageName = frontDefaultImg
+        certificateBackView.defaultImageName = backDefaultImg
         certificateFrontView.url = model.img_front
         certificateBackView.url = model.img_back
         
@@ -382,8 +392,8 @@ class YHTravelCertificateUploadCell: UITableViewCell {
             
         } else {
             
-            let item1 = YHCertificateDateItem(id: .signDate, title: "签发日期", value: model.issue_start, placeHolder: "请选择", errorTips: "请选择签发日期", isShowErrorTips: self.dataModel.isNeedCheckDate && model.issue_start.isEmpty)
-            let item2 = YHCertificateDateItem(id: .deadDate, title: "届满日期", value: model.issue_end, placeHolder: "请选择", errorTips: "请选择届满日期", isShowErrorTips: self.dataModel.isNeedCheckDate && model.issue_end.isEmpty)
+            let item1 = YHCertificateDateItem(id: .signDate, isMust: true, title: "签发日期", value: model.issue_start, placeHolder: "请选择", errorTips: "请选择签发日期", isShowErrorTips: self.dataModel.isNeedCheckDate && model.issue_start.isEmpty)
+            let item2 = YHCertificateDateItem(id: .deadDate, isMust: true, title: "届满日期", value: model.issue_end, placeHolder: "请选择", errorTips: "请选择届满日期", isShowErrorTips: self.dataModel.isNeedCheckDate && model.issue_end.isEmpty)
             let arr:[YHCertificateDateItem] = [item1, item2]
             updateArr(arr)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/TravelDocumentsPreparation(6 旅行证件准备)/VM/YHTravelDocsPreparationViewModel.swift

@@ -113,10 +113,10 @@ extension YHTravelDocsPreparationViewModel {
 
 extension YHTravelDocsPreparationViewModel {
     
-    func getTextWithType(type: Int) -> ASAttributedString  {
+    func getTextWithType(type: Int, date:String) -> ASAttributedString  {
         
         if type ==  0 {
-           return .init("上传《港澳通行证》(需有效期≥dd-mm-yyyy)", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
+           return .init("上传《港澳通行证》(需有效期≥\(date))", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
         }
         
         if type == 1 {
@@ -131,7 +131,7 @@ extension YHTravelDocsPreparationViewModel {
         }
         
         if type == 3 {
-            return .init("上传《护照》(需有效期≥dd-mm-yyyy)", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
+            return .init("上传《护照》(需有效期≥\(date))", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
         }
         
         if type == 4 {
@@ -140,32 +140,23 @@ extension YHTravelDocsPreparationViewModel {
         return .init("", .font(UIFont.PFSC_R(ofSize:14)),.foreground(UIColor.mainTextColor(alpha: 0.5)))
     }
     
-    func getTipsWithType(_ type: YHTravelDocsType) -> [ASAttributedString] {
+    func getTipsWithType(_ type: YHTravelDocsType, date: String) -> [ASAttributedString] {
         
         if type == .HK {
-            return [self.getTextWithType(type: 0),
-                    self.getTextWithType(type: 1)]
+            return [self.getTextWithType(type: 0, date: date),
+                    self.getTextWithType(type: 1, date: date),]
         }
         
         if type == .chinesePassPort {
-            return [self.getTextWithType(type: 2)]
+            return [self.getTextWithType(type: 2, date: date),]
         }
         
         if type == .forignPassPort {
-            return [self.getTextWithType(type: 3),
-                    self.getTextWithType(type: 4)]
+            return [self.getTextWithType(type: 3, date: date),
+                    self.getTextWithType(type: 4, date: date),]
         }
         
         return []
     }
     
-    func getCertificateDateSelectItemOfType(_ type: YHTravelDocsType) -> [YHCertificateDateItem] {
-        
-        if type == .HK {
-            let item1 = YHCertificateDateItem(id: .signDate, title: "签发日期", value: "2018-07-31", placeHolder: "请选择", errorTips: "请选择签发日期", isShowErrorTips: false)
-            let item2 = YHCertificateDateItem(id: .deadDate, title: "届满日期", value: "", placeHolder: "请选择", errorTips: "请选择届满日期", isShowErrorTips: false)
-            return [item1, item2]
-        }
-        return []
-    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderProgressTableViewCell.swift

@@ -111,6 +111,48 @@ extension YHServiceOrderProgressTableViewCell {
             let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor.withAlphaComponent(0.3)))
             let bb: ASAttributedString = .init("%", .font(UIFont.PFSC_M(ofSize: 10)),.foreground(UIColor.mainTextColor.withAlphaComponent(0.3)))
             progressLabel.attributed.text = b + bb
+            if model.type == 22 {
+                titleLabel.text = "家庭信息确认"
+                messageLabel.text = "请确认现阶段信息是否存在变更～"
+            }
+            
+            if model.type == 21 {
+                titleLabel.text = "新增受养人"
+                messageLabel.text = "如需，建议现阶段新增，激活后新增需香港住址证明"
+                progress.isHidden = true
+                progressImageView.isHidden = true
+                progressLabel.isHidden = true
+                messageLabel.snp.remakeConstraints { make in
+                    make.top.equalTo(49)
+                    make.left.equalTo(21)
+                    make.right.equalTo(-21)
+                }
+            }
+            
+            if model.type == 24 {
+                titleLabel.text = "赴港办证预约"
+                messageLabel.text = "请填写意向办证时间，银河代预约～"
+            }
+            
+            if model.type == 23 {
+                titleLabel.text = "电子签证缴费"
+                messageLabel.text = "请根据指引缴费领取电子签证～"
+            }
+            
+            if model.type == 25 {
+                titleLabel.text = "赴港行程指引"
+                messageLabel.text = "请根据指引清单提前规划赴港行程"
+            }
+            
+            if model.type == 26 {
+                titleLabel.text = "旅行证件准备"
+                messageLabel.text = "请更新所有赴港人员的旅行证件"
+            }
+            
+            if model.type == 27 {
+                titleLabel.text = "上传过关证件"
+                messageLabel.text = "点击保存入境小白条及香港身份证（后续身份续期、永居均涉及）"
+            }
         }
         if model.status == 2 {
             titleLabel.textColor = UIColor.mainTextColor
@@ -337,6 +379,12 @@ extension YHServiceOrderProgressTableViewCell {
                 messageLabel.text = "恭喜您，文书已全部定稿~"
             }
             
+            if model.type == 15 {
+                titleLabel.text = "港府获批结果"
+                messageLabel.text = "恭喜您，正式批已获批~"
+                buttonLabel.text = "去查看"
+            }
+            
             if model.type == 22 {
                 titleLabel.text = "家庭信息确认"
                 messageLabel.text = "请确认现阶段信息是否存在变更～"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift

@@ -79,6 +79,9 @@ extension YHServiceCenterMainViewModel {
         let params: [String : Any] = ["orderId": orderId,
                                       "status": type]
 
+        if type == 3 {
+            
+        }
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.process
         
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
@@ -92,6 +95,10 @@ extension YHServiceCenterMainViewModel {
                     callBackBlock(false,nil)
                     return
                 }
+                
+                if type == 3 {
+                    
+                }
                 var resultItem = YHServiceProgressModel()
                 for item in result {
                     if item?.type == orderType {

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift

@@ -272,6 +272,12 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
             } else if self.type == YHMessageType.identityApproved.rawValue { // 身份获批
                 self.navigationController?.popToRootViewController(animated: false)
                 goTabBarBy(tabType: .service)
+                
+            } else if self.type == YHMessageType.goToHK.rawValue { // 赴港办证
+                
+            
+            } else if self.type == YHMessageType.renewal.rawValue { // 身份续签
+                
             }
         }
     }

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageListVC.swift

@@ -190,6 +190,16 @@ class YHMessageListVC: YHBaseViewController {
                         hasUnreadMsg = true
                     }
                     
+                    // 赴港办证
+                    if !self.viewModel.msgList.goToHK.lastMessage.isEmpty {
+                        hasUnreadMsg = true
+                    }
+                    
+                    // 身份续签
+                    if !self.viewModel.msgList.renewal.lastMessage.isEmpty {
+                        hasUnreadMsg = true
+                    }
+                    
                     if hasUnreadMsg {
                         if !isHidden {
                             msgArr.append(self.viewModel.msgList.information)
@@ -200,6 +210,9 @@ class YHMessageListVC: YHBaseViewController {
                         }
                        
                         msgArr.append(self.viewModel.msgList.approval)
+                        msgArr.append(self.viewModel.msgList.goToHK)
+                        msgArr.append(self.viewModel.msgList.renewal)
+
                     }
                 }
                 emptyDataTipsView.isHidden = msgArr.count > 0

galaxy/galaxy/Classes/Modules/Message(消息)/M/YHMsgListModel.swift

@@ -17,6 +17,8 @@ enum YHMessageType: Int {
     case fileSign = 4   // 文件签字
     case infoSubmit = 5 // 资料递交
     case identityApproved = 6 // 身份获批
+    case goToHK = 7 // 赴港办证
+    case renewal = 8 // 身份续签
 }
 
 class YHMessageInfoModel: SmartCodable {
@@ -54,6 +56,12 @@ class YHMessageInfoModel: SmartCodable {
             
         } else if type == YHMessageType.identityApproved.rawValue {
             return "身份获批"
+            
+        } else if type == YHMessageType.goToHK.rawValue {
+            return "赴港办证"
+            
+        }  else if type == YHMessageType.renewal.rawValue {
+            return "身份续签"
         }
         return ""
     }
@@ -66,6 +74,8 @@ class YHMsgListModel: SmartCodable {
     var signature: YHMessageInfoModel = YHMessageInfoModel()
     var dataSubmission: YHMessageInfoModel = YHMessageInfoModel()
     var approval: YHMessageInfoModel = YHMessageInfoModel()
+    var goToHK: YHMessageInfoModel = YHMessageInfoModel()
+    var renewal: YHMessageInfoModel = YHMessageInfoModel()
     
     required init() {
         self.information.type = YHMessageType.infoFill.rawValue
@@ -74,11 +84,14 @@ class YHMsgListModel: SmartCodable {
         self.signature.type = YHMessageType.fileSign.rawValue
         self.dataSubmission.type = YHMessageType.infoSubmit.rawValue
         self.approval.type = YHMessageType.identityApproved.rawValue
+        self.goToHK.type = YHMessageType.goToHK.rawValue
+        self.renewal.type = YHMessageType.renewal.rawValue
     }
     
     enum CodingKeys: String, CodingKey {
-        case information, certificate, draft, signature, approval
+        case information, certificate, draft, signature, approval, renewal
         case dataSubmission = "data_submission"
+        case goToHK = "go_to_hk"
     }
 }
 

galaxy/galaxy/Classes/Modules/Message(消息)/V/YHDetailMessageCell.swift

@@ -59,6 +59,12 @@ class YHDetailMessageCell: UITableViewCell {
             
         } else if type == YHMessageType.identityApproved.rawValue {
             bottomBtn.setTitle("去查看".local, for: .normal)
+            
+        } else if type == YHMessageType.goToHK.rawValue {
+            bottomBtn.setTitle("去查看".local, for: .normal)
+        
+        } else if type == YHMessageType.renewal.rawValue {
+            bottomBtn.setTitle("去查看".local, for: .normal)
         }
     }
 

galaxy/galaxy/Classes/Modules/Message(消息)/V/YHMessageSessionCell.swift

@@ -51,6 +51,12 @@ class YHMessageSessionCell: UITableViewCell {
         
         } else if model.type == YHMessageType.identityApproved.rawValue {
             self.iconImgView.image = UIImage(named: "msg_icon_identity_approved")
+        
+        } else if model.type == YHMessageType.goToHK.rawValue {
+            self.iconImgView.image = UIImage(named: "msg_icon_goToHK")
+        
+        } else if model.type == YHMessageType.renewal.rawValue {
+            self.iconImgView.image = UIImage(named: "msg_icon_renewal")
         }
         
         self.badgeLabel.isHidden = model.unreadCount <= 0

galaxy/galaxy/Classes/Modules/Message(消息)/VM/YHMsgViewModel.swift

@@ -38,8 +38,9 @@ class YHMsgViewModel: NSObject {
                 self.msgList.signature.type = YHMessageType.fileSign.rawValue
                 self.msgList.dataSubmission.type = YHMessageType.infoSubmit.rawValue
                 self.msgList.approval.type = YHMessageType.identityApproved.rawValue
+                self.msgList.goToHK.type = YHMessageType.goToHK.rawValue
+                self.msgList.renewal.type = YHMessageType.renewal.rawValue
 
-                
                 callBackBlock(true, nil)
             } else {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)

galaxy/galaxy/Res/Assets.xcassets/Message/msg_icon_goToHK.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Message_fugangbanzheng@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Message_fugangbanzheng@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/Message/msg_icon_renewal.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Mask group@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Mask group@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/6旅行证件准备/credentials_default_back.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "港澳通行证背面@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "港澳通行证背面@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/6旅行证件准备/credentials_default_front.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "港澳通行证正面@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "港澳通行证正面@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/6旅行证件准备/credentials_default_residence_front.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "中国居留许可签证@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "中国居留许可签证@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}