// UI走查

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift

@@ -38,7 +38,6 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         tableView.register(YHFormItemEnterDetailCell.self, forCellReuseIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier)
         tableView.register(YHFormItemTitleCell.self, forCellReuseIdentifier: YHFormItemTitleCell.cellReuseIdentifier)
         tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
-        tableView.register(YHFormItemQuestionsCell.self, forCellReuseIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier)
         tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
         
         return tableView
@@ -165,14 +164,12 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
             }
             if detailItem.type == .isAccompanyToHK 
                 || detailItem.type == .isHandleHKPassPort
+                || detailItem.type == .ownCustody
+                || detailItem.type == .isLiveTother
+                || detailItem.type == .isLiveOverSeasMore1Year
             {
                 return .twoChoice
             }
-            if detailItem.type == .ownCustody
-               || detailItem.type == .isLiveTother
-               || detailItem.type == .isLiveOverSeasMore1Year{
-                return .question
-            }
         }
         return .defaultType
     }
@@ -251,6 +248,17 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                         
                     } else if detailItem.type == .isHandleHKPassPort { // 是否办理港澳通行证
                         self.child?.setNeedHandleHKPassPort(option)
+                        
+                    } else if detailItem.type == .isLiveTother { // 是否与主申请人同住
+                        self.child?.setLiveTother(option)
+                        if option {
+                            self.child?.address.clearAddress()
+                        }
+                    } else if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
+                        self.child?.setOverSearsOver1Year(option)
+                        
+                    } else if detailItem.type == .ownCustody { // 抚养权
+                        self.child?.setOwnCustody(option)
                     }
                     self.loadInfo()
                     save()
@@ -299,46 +307,8 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                     }
                 }
                 return cell
-            } else if cellType == .question {
-                
-                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier, for: indexPath) as! YHFormItemQuestionsCell
-                cell.isMust = detailItem.isNeed
-                cell.title = detailItem.getTitle()
-                
-                var select = false
-                if let value = detailItem.value {
-                   select = Bool(value)!
-                }
-                
-                let answers = [YHFormChoiceItem(title: "是".local, isSelect: select),YHFormChoiceItem(title: "否".local, isSelect: !select)]
-                cell.answerArr = answers
-                            
-                cell.answerBlock = {
-                    
-                    [weak self]  (arr, selectIndex) in
-                    
-                    let selectItem:YHFormChoiceItem = arr[selectIndex]
-                    let option = (selectItem.title == "是".local ? true : false)
-
-                    guard let self = self else { return }
-                    if detailItem.type == .isLiveTother { // 是否与主申请人同住
-                        self.child?.setLiveTother(option)
-                        if option {
-                            self.child?.address.clearAddress()
-                        }
-                    } else if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
-                        self.child?.setOverSearsOver1Year(option)
-                        
-                    } else if detailItem.type == .ownCustody { // 抚养权
-                        self.child?.setOwnCustody(option)
-                    }
-                    self.loadInfo()
-                    save()
-                }
-                return cell
             }
         }
-        
         return createDefaultCell(indexPath)
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift

@@ -38,7 +38,6 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         tableView.register(YHFormItemDoubleChoiceCell.self, forCellReuseIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier)
         tableView.register(YHFormItemInputTextCell.self, forCellReuseIdentifier: YHFormItemInputTextCell.cellReuseIdentifier)
         tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
-        tableView.register(YHFormItemQuestionsCell.self, forCellReuseIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier)
         tableView.register(YHFormItemTitleCell.self, forCellReuseIdentifier: YHFormItemTitleCell.cellReuseIdentifier)
         tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
         return tableView
@@ -168,7 +167,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
             let detailItem = item as! YHFormDetailItem
             
             // 是否随行到香港 / 是否办理港澳通行证 / // 是否与主申请人同住 均用双项按钮cell
-            if detailItem.type == .isAccompanyToHK || detailItem.type == .isHandleHKPassPort || detailItem.type == .isLiveTother {
+            if detailItem.type == .isAccompanyToHK || detailItem.type == .isHandleHKPassPort || detailItem.type == .isLiveTother || detailItem.type == .isLiveOverSeasMore1Year {
                 
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
                 cell.isMust = detailItem.isNeed
@@ -212,32 +211,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                     } else if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
                         self.spouse?.setOverSearsOver1Year(option)
                         self.loadInfo()
-                    }
-                    save()
-                }
-                return cell
-            }
-            
-            if detailItem.type == .isLiveOverSeasMore1Year {
-                
-                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier, for: indexPath) as! YHFormItemQuestionsCell
-                cell.isMust = detailItem.isNeed
-                cell.title = detailItem.getTitle()
-                cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
-    
-                var select = false
-                if let value = detailItem.value {
-                   select = Bool(value)!
-                }
-                let answers = [YHFormChoiceItem(title: "是".local, isSelect: select),YHFormChoiceItem(title: "否".local, isSelect: !select)]
-                cell.answerArr = answers
-                            
-                cell.answerBlock = {
-                    [weak self]  (arr, selectIndex) in
-                    guard let self = self else { return }
-                    let selectItem:YHFormChoiceItem = arr[selectIndex]
-                    let option = (selectItem.title == "是".local ? true : false)
-                    if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
+                    } else if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
                         self.spouse?.setOverSearsOver1Year(option)
                         self.loadInfo()
                     }
@@ -245,7 +219,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                 }
                 return cell
             }
-            
+                        
             if detailItem.type == .nationOrArea || detailItem.type == .liveCity  {
                 
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell