// 家庭成员信息填写表单

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -15,9 +15,10 @@
 		041B52932B5E6CBA007EBCEB /* YHFormTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52922B5E6CBA007EBCEB /* YHFormTitleCell.swift */; };
 		041B52952B5E7037007EBCEB /* YHFormAddInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52942B5E7037007EBCEB /* YHFormAddInfoCell.swift */; };
 		041B52982B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52972B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift */; };
-		041B52D62B5F899E007EBCEB /* YHConsortFormVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52D52B5F899E007EBCEB /* YHConsortFormVC.swift */; };
+		041B52D62B5F899E007EBCEB /* YHSpouseFormVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52D52B5F899E007EBCEB /* YHSpouseFormVC.swift */; };
 		041B52D92B5F8B07007EBCEB /* YHConsortInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52D82B5F8B07007EBCEB /* YHConsortInfo.swift */; };
 		041B52DB2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52DA2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift */; };
+		041B52DD2B60A889007EBCEB /* YHTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52DC2B60A889007EBCEB /* YHTest.swift */; };
 		0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; };
 		0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; };
 		0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; };
@@ -158,9 +159,10 @@
 		041B52922B5E6CBA007EBCEB /* YHFormTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormTitleCell.swift; sourceTree = "<group>"; };
 		041B52942B5E7037007EBCEB /* YHFormAddInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormAddInfoCell.swift; sourceTree = "<group>"; };
 		041B52972B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyMemberFormVC.swift; sourceTree = "<group>"; };
-		041B52D52B5F899E007EBCEB /* YHConsortFormVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHConsortFormVC.swift; sourceTree = "<group>"; };
+		041B52D52B5F899E007EBCEB /* YHSpouseFormVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSpouseFormVC.swift; sourceTree = "<group>"; };
 		041B52D82B5F8B07007EBCEB /* YHConsortInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHConsortInfo.swift; sourceTree = "<group>"; };
 		041B52DA2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyInitialInfo.swift; sourceTree = "<group>"; };
+		041B52DC2B60A889007EBCEB /* YHTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTest.swift; sourceTree = "<group>"; };
 		0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; };
 		0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; };
 		0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; };
@@ -332,7 +334,7 @@
 			isa = PBXGroup;
 			children = (
 				041B52972B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift */,
-				041B52D52B5F899E007EBCEB /* YHConsortFormVC.swift */,
+				041B52D52B5F899E007EBCEB /* YHSpouseFormVC.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -342,6 +344,7 @@
 			children = (
 				041B52D82B5F8B07007EBCEB /* YHConsortInfo.swift */,
 				041B52DA2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift */,
+				041B52DC2B60A889007EBCEB /* YHTest.swift */,
 			);
 			path = M;
 			sourceTree = "<group>";
@@ -1015,6 +1018,7 @@
 				A5C5B2FB2B5535DF00A7C5D1 /* YHHomeBannerView.swift in Sources */,
 				041B528B2B5E15F1007EBCEB /* YHDoubleChoiceQuestionCell.swift in Sources */,
 				A5ACE94B2B4564F7002C94D2 /* BsHUDRotatingImageView.swift in Sources */,
+				041B52DD2B60A889007EBCEB /* YHTest.swift in Sources */,
 				A5ACE94F2B4564F7002C94D2 /* YhOverlayView.swift in Sources */,
 				A53026902B4E6F2700F35102 /* YHHomeCustomCell.swift in Sources */,
 				A5ACE92E2B4564F7002C94D2 /* YHValidateCodeInputView.swift in Sources */,
@@ -1038,7 +1042,7 @@
 				A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */,
 				A5ACE93E2B4564F7002C94D2 /* UIImage+Extension.swift in Sources */,
 				A5ACE94C2B4564F7002C94D2 /* BsHUDErrorView.swift in Sources */,
-				041B52D62B5F899E007EBCEB /* YHConsortFormVC.swift in Sources */,
+				041B52D62B5F899E007EBCEB /* YHSpouseFormVC.swift in Sources */,
 				A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */,
 				A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */,
 				A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */,

galaxy/galaxy/AppDelegate.swift

@@ -67,7 +67,7 @@ extension AppDelegate {
             
             //1.数据解析
 #if DEBUG
-            SmartConfig.debugMode = .verbose
+//            SmartConfig.debugMode = .verbose
             SmartConfig.debugMode = .none //for test hjl
 #else
             SmartConfig.debugMode = .none

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHConsortFormVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseFormVC.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class YHConsortFormVC: YHBaseViewController {
+class YHSpouseFormVC: YHBaseViewController {
     
     lazy var items:[YHTableItemInfo] = [YHTableItemInfo]()
 
@@ -118,7 +118,7 @@ class YHConsortFormVC: YHBaseViewController {
 }
 
 
-extension YHConsortFormVC : UITableViewDelegate, UITableViewDataSource {
+extension YHSpouseFormVC : UITableViewDelegate, UITableViewDataSource {
     
     func numberOfSections(in tableView: UITableView) -> Int {
         return items.count

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHFamilyInitialInfo.swift

@@ -9,6 +9,68 @@
 import UIKit
 import SmartCodable
 
+enum YHFamilyMemberItemType:Int {
+    
+    case sponse = 1
+    case parent = 2
+    case child = 3
+    case brother  = 4
+    case addChild = 5
+    case addBrother = 6
+}
+
+
+protocol YHFamilyMemberProtocol {
+    
+    func getTitle() -> String
+    func getSubTitle() -> String
+}
+
+class YHFamilyMemberFormItem : YHFamilyMemberProtocol {
+    
+    var type: YHFamilyMemberItemType
+
+    init(type: YHFamilyMemberItemType) {
+        self.type = type
+    }
+    
+    func getTitle() -> String {
+        switch self.type {
+            case .sponse:
+                return "配偶".local
+            case .parent:
+                return "父母".local
+            case .brother:
+                return "兄弟姐妹".local
+            case .child:
+                return "子女".local
+            case .addChild:
+                return "新增子女".local
+            case .addBrother:
+                return "新增兄弟姐妹".local
+        }
+    }
+    
+    func getSubTitle() -> String {
+        switch self.type {
+            case .sponse:
+                return String(format: "(%@)", "如未婚、离婚、丧偶可不填".local)
+            case .parent:
+                return String(format: "(%@)", "包含已故".local)
+            case .brother:
+                return String(format: "(%@)", "如无可不填".local)
+            case .child:
+                return String(format: "(%@)", "如无可不填".local)
+            case .addChild:
+                return ""
+            case .addBrother:
+                return ""
+        }
+    }
+}
+
+
+/*  ***** ***** ***** ***** ***** ***** ***** ***** */
 // MARK: - YHWelcome
 class YHWelcome: SmartCodable {
     
@@ -34,13 +96,15 @@ class YHFamilyMemberInfo: SmartCodable {
     var mother: YHParent?
     var spouse: YHSpouse?
     var child: [YHChild]?
+    var brother: [YHBrother]?
 
-    enum CodingKeys: String, CodingKey {
-        case father = "father"
-        case mother = "mother"
-        case spouse = "spouse"
-        case child = "child"
-    }
+        enum CodingKeys: String, CodingKey {
+            case father = "father"
+            case mother = "mother"
+            case spouse = "spouse"
+            case brother = "brother"
+            case child = "child"
+        }
 
     required init() {
         
@@ -48,7 +112,7 @@ class YHFamilyMemberInfo: SmartCodable {
 }
 
 // MARK: - 子女初始信息 YHChild
-class YHChild: SmartCodable {
+class YHChild: SmartCodable, YHFamilyMemberProtocol {
     
     var id: Int = -1
     var deceased: Int = -1
@@ -133,6 +197,111 @@ class YHChild: SmartCodable {
     required init() {
         
     }
+    
+    // YHFamilyMemberProtocol
+    func getTitle() -> String {
+        return "配偶".local
+    }
+    
+    func getSubTitle() -> String {
+        return ""
+    }
+}
+
+// MARK: - YHBrother
+class YHBrother: SmartCodable, YHFamilyMemberProtocol {
+    var id: Int? = -1
+    var deceased: Int? = -1
+    var custody: Int? = -1
+    var nationality: String?
+    var orderId: Int? = -1
+    var relation: String?
+    var hasDegree: String?
+    var hasDegreeJson: [SmartAny]?
+    var follow: Int? = -1
+    var statement: Int? = -1
+    var subsetName: String?
+    var subsetNamePinyin: YHSubsetNamePinyin?
+    var usedName: String?
+    var birthday: String?
+    var birthPlaceAboard: Int? = -1
+    var birthPlace: YHAddress?
+    var occupation: String?
+    var occupationName: String?
+    var operatorAme: SmartAny?
+    var childHasHkId: YHChildStepchildClass?
+    var hkIdentityCard: String?
+    var sex: Int? = -1
+    var married: String?
+    var nows: Int? = -1
+    var address: YHAddress?
+    var childStepchild: YHChildStepchildClass?
+    var childInHk: YHChildStepchildClass?
+    var countryIdentity: [SmartAny]?
+    var hkIdentity: String?
+    var hkIdentityOther: String?
+    var liveCountry: String?
+    var isHandled: Int? = -1
+    var finishFollow: Int? = -1
+    var step: Int? = -1
+    var notFillNum: Int? = -1
+    var isLiveOverseaYear: Int? = -1
+    var surname: String?
+    var certificates: [SmartAny]?
+    
+    enum CodingKeys: String, CodingKey {
+        case id = "id"
+        case deceased = "deceased"
+        case custody = "custody"
+        case nationality = "nationality"
+        case orderId = "order_id"
+        case relation = "relation"
+        case hasDegree = "has_degree"
+        case hasDegreeJson = "has_degree_json"
+        case follow = "follow"
+        case statement = "statement"
+        case subsetName = "subset_name"
+        case subsetNamePinyin = "subset_name_pinyin"
+        case usedName = "used_name"
+        case birthday = "birthday"
+        case birthPlaceAboard = "birth_place_aboard"
+        case birthPlace = "birth_place"
+        case occupation = "occupation"
+        case occupationName = "occupation_name"
+        case operatorAme = "operator_ame"
+        case childHasHkId = "child_has_hk_id"
+        case hkIdentityCard = "hk_identity_card"
+        case sex = "sex"
+        case married = "married"
+        case nows = "nows"
+        case address = "address"
+        case childStepchild = "child_stepchild"
+        case childInHk = "child_in_hk"
+        case countryIdentity = "country_identity"
+        case hkIdentity = "hk_identity"
+        case hkIdentityOther = "hk_identity_other"
+        case liveCountry = "live_country"
+        case isHandled = "is_handled"
+        case finishFollow = "finish_follow"
+        case step = "step"
+        case notFillNum = "not_fill_num"
+        case isLiveOverseaYear = "is_live_oversea_year"
+        case surname = "surname"
+        case certificates = "certificates"
+    }
+    
+    required init() {
+        
+    }
+    
+    // YHFamilyMemberProtocol
+    func getTitle() -> String {
+        return "兄弟姐妹".local
+    }
+    
+    func getSubTitle() -> String {
+        return ""
+    }
 }
 
 // MARK: - 居住地址信息 YHAddress
@@ -185,7 +354,7 @@ class YHSubsetNamePinyin: SmartCodable {
 }
 
 // MARK: - 父母信息 YHParent
-class YHParent: SmartCodable {
+class YHParent: SmartCodable, YHFamilyMemberProtocol {
     var id: Int = -1
     var deceased: Int = -1
     var custody: Int = -1
@@ -267,10 +436,22 @@ class YHParent: SmartCodable {
     required init() {
         
     }
+    
+    // YHFamilyMemberProtocol
+    func getTitle() -> String {
+        if sex == 0 {
+            return "父亲".local
+        }
+        return "母亲".local
+    }
+    
+    func getSubTitle() -> String {
+        return ""
+    }
 }
 
 // MARK: - 配偶 YHSpouse
-class YHSpouse: SmartCodable {
+class YHSpouse: SmartCodable, YHFamilyMemberProtocol {
     var id: Int = -1
     var deceased: Int = -1
     var custody: Int = -1
@@ -354,6 +535,15 @@ class YHSpouse: SmartCodable {
     required init() {
         
     }
+    
+    // YHFamilyMemberProtocol
+    func getTitle() -> String {
+        return "配偶".local
+    }
+    
+    func getSubTitle() -> String {
+        return ""
+    }
 }
 
 // MARK: - YHCertificates

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/M/YHTest.swift

+//
+//  YHTest.swift
+//  galaxy
+//
+//  Created by edy on 2024/1/24.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+
+
+   

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormAddInfoCell.swift

@@ -16,6 +16,8 @@ class YHFormAddInfoCell: UITableViewCell {
     let btnHeight = 44.0
     let cornerRadius = 4.0
     
+    var clickBlock:(()->Void)?
+    
     lazy var addBtn: UIButton = {
         let btn = UIButton.bs_button(title: "新增信息", font: UIFont.PFSCR(ofSize: 14), normalColor: btnTitleColor)
         btn.iconInLeft(spacing: 10)
@@ -72,7 +74,9 @@ class YHFormAddInfoCell: UITableViewCell {
     }
     
     @objc func didClickAddBtn() {
-        
+     
+        if let clickBlock = clickBlock {
+            clickBlock()
+        }
     }
-
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHFormTitleCell.swift

@@ -11,13 +11,18 @@ import UIKit
 class YHFormTitleCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHFormTitleCell"
+    let editTag = 9527
+    let cancelTag = 9528
+    
+    var rightClickBlock:((YHFamilyMemberEditType)->Void)?
+
 
     lazy var titleLabel: UILabel = {
         let label = UILabel()
         label.textColor = UIColor(hexString:"#333333")
         label.textAlignment = .left
         label.numberOfLines = 0
-        label.font = UIFont.PFSCR(ofSize: 20)
+        label.font = UIFont.PFSCR(ofSize: 16)
         return label
     }()
     
@@ -26,10 +31,27 @@ class YHFormTitleCell: UITableViewCell {
         label.textColor = UIColor(hexString:"#888F98")
         label.textAlignment = .left
         label.numberOfLines = 0
-        label.font = UIFont.PFSCR(ofSize: 15)
+        label.font = UIFont.PFSCR(ofSize: 14)
         return label
     }()
     
+    lazy var cancelButton: UIButton = {
+        let btn = UIButton.bs_button(title: "取消操作".local, font: UIFont.PFSCR(ofSize: 14), normalColor: UIColor(hex: 0x4487F9))
+        btn.tag = cancelTag
+        btn.addTarget(self, action: #selector(didClickOperatorBtn(btn:)), for: .touchUpInside)
+        btn.isHidden = true
+        return btn
+    }()
+    
+    lazy var editButton: UIButton = {
+        let btn = UIButton()
+        btn.setImage(UIImage(named: "form_edit"), for: .normal)
+        btn.tag = editTag
+        btn.addTarget(self, action: #selector(didClickOperatorBtn(btn:)), for: .touchUpInside)
+        btn.isHidden = true
+        return btn
+    }()
+    
     lazy var bottomLineView:UIView = {
         let view = UIView()
         view.backgroundColor = UIColor(hex: 0xF0F0F0)
@@ -51,10 +73,9 @@ class YHFormTitleCell: UITableViewCell {
         contentView.addSubview(titleLabel)
         contentView.addSubview(subTitleLabel)
         contentView.addSubview(bottomLineView)
-        
-        titleLabel.text = "配偶"
-        subTitleLabel.text = " (如未婚、离婚、丧偶可不填）"
-        
+        contentView.addSubview(editButton)
+        contentView.addSubview(cancelButton)
+
         titleLabel.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
             make.right.equalTo(subTitleLabel.snp.left).offset(-3)
@@ -66,9 +87,54 @@ class YHFormTitleCell: UITableViewCell {
             make.centerY.equalToSuperview()
         }
         
+        editButton.snp.makeConstraints { make in
+            make.size.equalTo(CGSizeMake(24, 24))
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-18)
+        }
+        
+        editButton.snp.makeConstraints { make in
+            make.size.equalTo(CGSizeMake(24, 24))
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-18)
+        }
+        
+        cancelButton.snp.makeConstraints { make in
+            make.size.equalTo(CGSizeMake(92, 40))
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview()
+        }
+        
         bottomLineView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
             make.height.equalTo(1.0)
         }
     }
+    
+    func showEditType(type: YHFamilyMemberEditType) {
+        switch type {
+            case .none:
+                cancelButton.isHidden = true
+                editButton.isHidden = true
+            case .canEdit:
+                cancelButton.isHidden = true
+                editButton.isHidden = false
+            case .canCancel:
+                cancelButton.isHidden = false
+                editButton.isHidden = true
+        }
+    }
+    
+    @objc func didClickOperatorBtn(btn:UIButton) {
+        
+        if let clickBlock = rightClickBlock {
+            if btn.tag == editTag {
+                clickBlock(.canEdit)
+                
+            } else if btn.tag == cancelTag {
+                clickBlock(.canCancel)
+            }
+        }
+    }
+    
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/View/YHSingleLineSelectCell.swift

@@ -14,6 +14,15 @@ class YHSingleLineSelectCell: UITableViewCell {
     
     // 是否必填 如必填title会展示红色*
     var isMust = false
+    var deleteBlock:(()->Void)?
+    var isShowDeleteBtn:Bool = false {
+        didSet {
+            deleteButton.isHidden = !isShowDeleteBtn
+            detailLabel.isHidden = isShowDeleteBtn
+            arrowImgView.isHidden = isShowDeleteBtn
+        }
+    }
+
     var title:String? {
         didSet {
             
@@ -56,6 +65,12 @@ class YHSingleLineSelectCell: UITableViewCell {
         return imgView
     }()
     
+    lazy var deleteButton: UIButton = {
+        let btn = UIButton.bs_button(title: "删除".local, font: UIFont.PFSCR(ofSize: 14), normalColor: UIColor(hex: 0xF81D22))
+        btn.addTarget(self, action: #selector(didClickDeleteBtn(btn:)), for: .touchUpInside)
+        btn.isHidden = true
+        return btn
+    }()
     
     required init?(coder: NSCoder) {
         super.init(coder: coder)
@@ -72,7 +87,8 @@ class YHSingleLineSelectCell: UITableViewCell {
         contentView.addSubview(titleLabel)
         contentView.addSubview(detailLabel)
         contentView.addSubview(arrowImgView)
-        
+        contentView.addSubview(deleteButton)
+
         title = "婚姻状况"
         detailLabel.text = "沙发上发顺丰"
         titleLabel.snp.makeConstraints { make in
@@ -91,5 +107,18 @@ class YHSingleLineSelectCell: UITableViewCell {
             make.right.equalToSuperview().offset(-16)
             make.centerY.equalToSuperview()
         }
+        
+        deleteButton.snp.makeConstraints { make in
+            make.size.equalTo(CGSizeMake(64, 40))
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview()
+        }
+    }
+    
+    @objc func didClickDeleteBtn(btn:UIButton) {
+        
+        if let deleteBlock = deleteBlock {
+            deleteBlock()
+        }
     }
 }

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -93,7 +93,7 @@ class YHNetRequest: NSObject {
         print("sign = \(sign)")
         
         requestHeader.add(name:"sign",value:sign)
-        requestHeader.add(name: "token", value: "eyJpdiI6ImFheHNOa3dmYzZ0NUFSQzZUeDh2MVE9PSIsInZhbHVlIjoiblpTOVFWUFwvMHh4am5GUUxmaHkzTWUrZ1Roenk2QXp2V3FtbzJ2cHJSMXo2N2RnMGdpOG9JS3d3RlZtS1cweWhCcUpweVN6dGw5d2s2WldTRDdWODBhTGpFRWZmOFBiWDJib2lkSDNxSjJ2RXdRT2NhcXVLNGQ2ZjlFK1VIOTFRVjhld0F3eUk4amtcL0o1SDM5dm95TTB3RnZwcmVWaGZDU1FQckhCaGd6Y1cxMWNVUm5jRzZNOEhudWRrN1R1UzVreXR3YUhDeEdKNnhMbFlDNkIzendjVGJXRnFZbGpZUm1VRjltNHkxV0VXaUpHWTIwUVU3MjJCd3Z0YmgzTHNEOHRPTW5URks0T0lEdTFOYU5cL1lFZnJVdkpxRmpFSU9Dcms3R3NoQmlnbFRjY1ZpUFFtT0pDeE1SanpPemdoNFhSUUN0TkJ1V1VvXC9XWjdNSGVXMVNsVERHcThiM1dxVmZ1MlZrb3dDSUZLeFQ1SDBlcTl5NU1IUDJRQUtMeXZ4SnJOSjczWDhRWXZoZE1DVVIzclUzdEtNQkRRSHVRejNkSWpJNGZyUXVQOFlTbEd2Ujk1bjRKT3ZValltNXkwKzdTMCtJdDlRc015VDErMmdqQU52ejVcL0FLQ3BwdjJPQUZHeFozRjJKRzlINmxDTWdEcnQyaXZNaEVaZm1laXFMXC80TmJsblh0Q2JGWFVWRzhuWWF1SHc5SkFmMUdENExwR3FtRW1GTGpsZUcwNlFhbkdEU0dIZFQ5aU9FQlJWa2EzajRHOEt6NFwvXC9qNzhnWkpQOEFiOEIwbFdZWUVCcFd2YWZ4NHhcL1ZSOGZvaElnc3R2cVpFRG1GUTlwUEZwdFcxYnJEMjQ0Yk50bVd2ZU52cDlFZTBueEtmam55MUhLbDVlRjJGS0V3djlhQ1huZFU1QU1lYWZ6TEdQQ1wvK2V6VnFwSzJJeTVsZ2RCNE5qZkRRXC9GSzdvVkNcL1wvWUR2a2Q2NE5kVXBHYVloZDhtMlo1SHJFZnBITXlqWUQyZEVjQStGNGZiaXRPMVpJXC9ibDFXbG9HS21GSHhGVmNleG94UW9mQWhwY09qeDRJekpEQk9mMzZpdDNUSFwvUWpCa2xiYjlUcmRSdnZMTVpmajNkMU4zMk9mNWN3Mng2RlBWbEtYMGtwUDVZNjRsRlpTSmMyUWVMelo2K1J6R1VyYU9aYlVCMUFjZ2todm1kOWdcL3JUaXBCMjFleWliRTZhNDJ6d3dxb3llaHlSVmE4TjlkNCszMzJBbEdOY2N6ZE9zRW50K3VMUnV2d0xYMWtxM1RObkRiQTZDUGtpUHYzT01iQ2c1M1hxeEQ2RStTa3JRWUVpOGZ4d3lsOXpISTJzaGpLTHc0Z1NNZ0srRkdjbExET3drbFViVVdmRFhPVUZ2aU5VUkFqUTlkTUNDOHd4aUltUHNTSmtpWXlYMm9hY09JUCtGRlJ2amdYV2pIdEtBd2Frd1hEczA3Wk44T3FDY2t3dEk4RzhMMFJIK0x5WFB5cG9wTUR6dk9xdFZXVDk5eThFNmYzZ2IyTksyTGhDeHc4RlphTHBnc2ZJS2JRcWhtM1FYYm5TdFZLdnluYlZcL2N2TEYwYUNNOVNzMlpId0JKOXZSSEZ6d2tiQUdsdDErdkJYYXdvZnFsTTVnWFRNR1hcL2E2dXkrZ0h5bmRORFwvWW4yOVl1SHdZdjdra042bjBpUGIwWkJwZFZpMkY4RWtqTXpWT243Z0xBVGhLYzNiTStQSWhTQTNUV3BNSENTYXdYVGo0U0Y0WWlXTkRLdjBwend2Q3oySzJiUktKa1d2UlRrXC81emNwb0VEM3MzbFwvc3dLS0ZBcmxuaFladmtnXC9qb0JpOHFpYzlxeWNqVE5pYXNHbVcwajdnQUVPRngwK2xRdnZZOFdSXC9vb056UT09IiwibWFjIjoiN2MxYzYwYzFmMWY4ZmQyNjBjMjhjNTQ2ZGY2ZmY5NDE4MmRmN2IwNDg3ZWNmMWE1ZTk3YzhhMzFkNTBjYjhiMyJ9")
+        requestHeader.add(name: "token", value: "eyJpdiI6IkhLdkJSZlFKeSswZkJMSEM3c3BieVE9PSIsInZhbHVlIjoiQ0h3eXZPeUZUVnZ5VUtDcmRSRDNFbU1IRURRMnowVTFRSmFOWTZlTTlVYUM1eWZRYXJpOE1HXC9xMlM1NytmVHV2dVQzdzRqdEwwU29VTTJSYlNYcWl3UDRjXC9GVHNLSEM5WU1Eb3Y4ZERNd0Z6QmF1RzdUT01EakZoXC80bjJHUXgycUN6U08xZFdnQ3pRT3IyQUxobDZFZTJzMDFOTXZvdmFtOEJBaHV2Z1NTN0Vldk9Yd1d5TE52U2ZUTzJaSEhGRkJBOEpaMnd0REdycHJOU3p2M1NncEtnY2ZMeG5WT01OekdPV0FNb0hvdjErWXNldHlYYjFaelRyRSthTUhyQWtCSlNTdVNBV1lwbVpnM3FpSUxKeWg0QTgrOTZxWEVNcWk5bVpjYVVHMTZPS05nNnI3WXhQSUh4Nkp5NHVtZGNcL0RIcnBVaUNxOGpwUGhmeWxINTN6bllqMUw4WVJwd0t4VmpqN2pNWGFqajhBQVV0Slp2VmhodTBSMzlEZEdFZlBEWFpOZHlUejRwdlUyRWpvYUdtTmlqdG05TXpqV0VXRXNuTlpzclwvdnpDMlZzWWZBVE5YMExBU29rNmRtXC9oeUZnNHNoU0RoU1pxa0VvRlNHT1ozdVZCRzZTRXVCNXE4RkkxUnlPakpBaTgrXC9McjZ5OWR2ZE8zaWg4R0lkamdVYUNaZFMrMGFvQkdSMnVzeVJZeTQyZmFvYkR2U3FJVW1XZTVcL3hXMGJZNisyK3FrenRFTmlxZ2pCdENEajBtS1RuOGVobHVyU25uMGZXZ1R4ZUdHeHNNMXlFVjNycmZVZ1BKam03KzlwMGFCR2U2aTN3NmNKeXY4Y1lLNWcyQXBFaytwSm1EZ05EZDFNQVZUdzJNTUE5VXRndnhPS3VXbGh2OXBcL1pUTE96V1lnYld6Q1JcL21qOE8yREtJQ1AyMmg4T1RSQ0FweUN0M0tJeDNHd29SK204RmRTbTlrS2NaK2YwTGR4QldxVmZ1cks4UUN5MVBGdzZtWHBGMnB1bzBKY09uYTFQVks2d3VRYzgrRGpiM0lqSnBRR1kxRFdla1BpMEk1dlBzdENqRTlZaGI5RDFVbWdJakhWUVhidWxEZG16cDJBcVB3T3ZIZTlmM0NGQVRIMXdadXR3XC8zbVlrSjVYWk5SVjlDbkhvS0pqNU1MVmFxcmVuWEtLN0w5WGpidFlhZWFUdXhBSnVoT0I1OFhFUGgzdHk1TVRJXC9vYVlyYlwvXC9jcVVVUVVLNndMNW1iU09Xd2JlQ2lMOWo0NHBBXC9DTjFmXC91cjZJZGpEVzJQN3FiN3pzVjMrY1lGQkJxanNnMWdJU3pJZUV4N2FzemhVVnpxb2tpR0NvMCtSMEJRczJUcE5ROUVIRlwvUmtlNEVXT1g0RkZaQUorWnVuTUR4aWNuaFByMHc4UkowMU5JNzdsYlwvK3pya2pucHMyM0ZNVERxQko3Zm41dFgyMDBicFNUTXd6Q0hGNlM0WlI5c3JuR0IzN0d3eVp4WGNVTEJCU2lNQnR4bmE4MXpVbnE0RmUxMjlyK2NNM0JLYjJRZjJYQWRNb0ZhZTFEeDFndnQ0T2p4TTJaUFZtXC9oM1Q4T2FMNnpENkJNXC9zRUxSZjEwSm5POHpHRXYwcmZ5SUxIWUkxbE1UejFINEluWW13V1dpWXdGTzVqN0FXcjEzR0RrUXBqcTIwUUllTjV5Z052UXlCUHdHNE5mMEpNcW5LY1pDQmdQUm9sTzhVVzg3TE94ZnFlK0c0S3VhWnpVNzVXOUZvVkdHenlKK1V3ODArUDQ5MjQ3OExBNjlDcnlnOHNZOVVKV2xRaSthMFNRaVVycFpoXC9ZY1lLa0VPV2xtQ21sQzdyRExTTkNkdzJoa1ZqS0U1QjhQT2RoSUFNdTBBNFdWRGZydWsxUEE9PSIsIm1hYyI6IjNjOGU0ODg2NzA1YTI2NWEyNmU4NGZiNWY3NjVjMTVkZWQ5ZWM2ZTkzNzAwZjI2MmFhYmIzMGE4MWI4MzAyZDkifQ==")
         
         headers = requestHeader
     }

galaxy/galaxy/Res/Assets.xcassets/Form/form_edit.imageset/Contents.json

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