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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  家庭
  //  家庭信息

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -243,6 +243,10 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                 self.navigationController?.pushViewController(vc)
             } else if model.type == 21 {
                 //家庭信息确认
+                let vc = YHFamilyInfoConfirmViewController()
+                vc.orderId = orderID
+                self.navigationController?.pushViewController(vc)
+                
             } else if model.type == 22 {
                 //新增受养人
                 let vc = YHAddAdoptersViewController()

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

@@ -11,8 +11,15 @@ import UIKit
 class YHCertificateAppointViewController: YHBaseViewController {
 
     var orderId: Int = 0
+    var sections: [[YHAppointItem]] = []
+    // 第一个section数据组
+    var items1: [YHAppointItem] = []
+    
+    var items2: [YHAppointItem] = []
+    
+    var waitList: [YHAppointMemberGroupModel] = []
+    var successList: [YHAppointMemberGroupModel] = []
     
-    var items: [YHAppointItem] = []
     // 无需预约办证人员
     var noNeedAppointMembers:[YHHKMemberModel] = []
     // 需要办证人员
@@ -66,19 +73,26 @@ class YHCertificateAppointViewController: YHBaseViewController {
             make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
         }
         
-        self.requetIsGoToHK {
-            self.requetAppointMembers {
+        self.requetIsGoToHK { // 请求是否赴港办证选项和是否已预约过
+            self.requetAppointMembers { // 请求赴港办证人员名单
+                if self.reservationToHK == 1 { // 有历史预约人员
+                    self.requestAppointResultList { // 请求预约结果
+                        self.updateData()
+                    }
+                } else { // 没有预约过
                     self.updateData()
                 }
             }
         }
+    }
     
     func updateData() {
         
-        items.removeAll()
+        sections.removeAll()
+        items1.removeAll()
         // *赴港办证
         let item1 = YHAppointItem(type: .goHKMakeCertificate)
-        items.append(item1)
+        items1.append(item1)
         
         if self.isNeedGoHK != 1 { // 是否赴港办证没有选择是
             self.tableView.reloadData()
@@ -87,19 +101,19 @@ class YHCertificateAppointViewController: YHBaseViewController {
         // 赴港办证选择了是
         // *温馨提示
         let item2 = YHAppointItem(type: .warmTips)
-        items.append(item2)
+        items1.append(item2)
         
         // *无需预约办证成员（未满11岁）
         if self.noNeedAppointMembers.count > 0 {
             let item3 = YHAppointItem(type: .noNeedMakeCertificateMembers)
-            items.append(item3)
+            items1.append(item3)
         }
         
         if self.reservationToHK == 0 { // 没有预约过人员
             
             // 赴港激活签证 申请人是否统一赴港激活签证
             let item4 = YHAppointItem(type: .activeVisa)
-            items.append(item4)
+            items1.append(item4)
             
             if self.isAllMembersGo { // 申请人统一赴港激活签证
                 
@@ -110,29 +124,57 @@ class YHCertificateAppointViewController: YHBaseViewController {
             
         } else { // 有预约过的人员
             
+            // 待预约的赴港成员
             if waitAppointMembers.count > 0 {
                 let item5 = YHAppointItem(type: .needReAppointMembers)
-                items.append(item5)
+                items1.append(item5)
+            }
+            
+            // 赴港办理抢号中批次
+            if self.waitList.count > 0 {
+                let item6 = YHAppointItem(type: .grabingNumberBatch)
+                items1.append(item6)
+            }
+            
+            // 赴港办理已抢号批次
+            if self.successList.count > 0 {
+                let item6 = YHAppointItem(type: .haveGrabedNumberBatch)
+                items1.append(item6)
             }
         }
         
-        self.tableView.reloadData()
+        if items1.count > 0 {
+            sections.append(items1)
+        }
+        if items2.count > 0 {
+            sections.append(items2)
+        }
         
+        self.tableView.reloadData()
     }
 }
 
 extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDataSource {
     
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return sections.count
+    }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return items.count
+        if 0 <= section, section < sections.count {
+            let arr = sections[section]
+            return arr.count
+        }
+        return 0
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         
         let cell = tableView.dequeueReusableCell(withIdentifier: "UITableViewCell", for: indexPath) 
         
-        if 0 <= indexPath.row, indexPath.row < items.count {
-            let item = items[indexPath.row]
+        if 0 <= indexPath.section, indexPath.section < sections.count {
+            let arr = sections[indexPath.section]
+            if 0 <= indexPath.row, indexPath.row < arr.count {
+                let item = arr[indexPath.row]
                 if item.type == .goHKMakeCertificate {
                     // 赴港办证
                     let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateAppointOptionCell.cellReuseIdentifier, for: indexPath) as! YHCertificateAppointOptionCell
@@ -204,8 +246,15 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
                 if item.type == .grabingNumberBatch {
                     // 赴港办理抢号中批次
                     let cell = tableView.dequeueReusableCell(withIdentifier: YHGrabNumberListCell.cellReuseIdentifier, for: indexPath) as! YHGrabNumberListCell
+                    
                     return cell
                 }
+                
+                if item.type == .haveGrabedNumberBatch {
+                   // 赴港办理已抢号批次
+                    
+                }
+            }
         }
     
         return cell
@@ -217,17 +266,17 @@ extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDa
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-        self.viewModel.getServicelist { success, error in
-            let view = YHServiceSelectAlertView.alertView()
-            view.items = self.viewModel.serviceArr
-            view.confirmBlock = {
-               [weak self] ids in
-                printLog("\(ids)")
-            }
-            view.show()
-        }
+//        self.viewModel.getServicelist { success, error in
+//            let view = YHServiceSelectAlertView.alertView()
+//            view.items = self.viewModel.serviceArr
+//            view.confirmBlock = {
+//               [weak self] ids in
+//                printLog("\(ids)")
+//            }
+//            view.show()
+//        }
         
-        if 0 <= indexPath.section && indexPath.section < items.count {
+        if 0 <= indexPath.section && indexPath.section < items1.count {
             
         }
     }
@@ -284,21 +333,21 @@ extension YHCertificateAppointViewController {
             noNeedAppointMembers.removeAll()
             waitAppointMembers.removeAll()
             for user in users {
-                if user.isAtLeast11Years() {
+                if user.isAtLeast11Years() { // 不小于11岁的人才能预约赴港
                     waitAppointMembers.append(user)
                 } else {
                     noNeedAppointMembers.append(user)
                 }
             }
+            completion?()
+        }
+    }
     
-            let item1 = YHHKMemberModel()
-            item1.name = "艾师傅"
-            
-            let item2 = YHHKMemberModel()
-            item2.name = "艾傅"
-        
-            waitAppointMembers.append(contentsOf: [item1, item2])
+    func requestAppointResultList(completion:(()->())?) {
         
+        viewModel.getAppointResult(orderId: orderId) { success, error in
+            self.waitList = self.viewModel.appointResult.waiting
+            self.successList = self.viewModel.appointResult.success
             completion?()
         }
     }

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

@@ -94,11 +94,13 @@ class YHFamilyInfoConfirmViewController: YHBaseViewController {
             guard let self = self else { return }
             if success {
                 YHHUD.flash(message: "确认修改成功")
+                self.navigationController?.popViewController()
+                YHFamilyInfoWarmTipsView.tipsView().show()
                 return
             }
             let msg = error?.errorMsg ?? "确认修改失败"
             YHHUD.flash(message: msg)
-            self.navigationController?.popViewController()
+            
         }
     }
     

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

@@ -14,6 +14,8 @@ class YHFamilyInfoWarmTipsView: UIView {
     lazy var blackMaskView: UIView = {
         let view = UIView()
         view.backgroundColor = .alertMaskColor
+        let tap = UITapGestureRecognizer(target: self, action: #selector(dismiss))
+        view.addGestureRecognizer(tap)
         return view
     }()
     
@@ -168,8 +170,6 @@ class YHFamilyInfoWarmTipsView: UIView {
             make.bottom.equalTo(-16)
             make.height.equalTo(45)
         }
-        
-
     }
 
 }