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

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

@@ -75,9 +75,13 @@ class YHGCChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
             // 居住信息
             let title2 = YHFormTitleItem(type: .liveInfo)
             let item20 = YHFormDetailItem(type: .isLiveTother, value:String(child.isLiveTother()))
-            let item21 = YHFormDetailItem(type:.permanentResidenceStatus, value: String(child.havePermanentResidency))
-            item21.tips = "请选择"
-            var arr2: [YHFormItemProtocol] = [title2, item20, item21]
+            var arr2: [YHFormItemProtocol] = [title2, item20]
+            
+            let addResidenceBlock = {
+                let item21 = YHFormDetailItem(type:.permanentResidenceStatus, value: String(child.havePermanentResidency))
+                item21.tips = "请选择"
+                arr2.append(item21)
+            }
             
             if !child.isLiveTother() { // 不同住 才需填写国家/地区
                 let item21 = YHFormDetailItem(type: .nationOrArea, value:child.address.country, tips:"请选择国家/地区".local)
@@ -102,12 +106,20 @@ class YHGCChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
                     let item23 = YHFormDetailItem(type:.detailAddress, value:detailAddress, placeHolder:placeHolder, tips:placeHolder)
                     arr2.append(item23)
                     
+                    addResidenceBlock()
+
+                    
                     if !isLiveInChina {// 在国外
                         // 是否在海外居住满1年及以上
                         let item24 = YHFormDetailItem(type: .isLiveOverSeasMore1Year, value:String(child.isOverSeasOver1Year()))
                         arr2.append(item24)
                     }
+                } else {
+                    addResidenceBlock()
                 }
+                
+            } else {
+                addResidenceBlock()
             }
             
             items.append(contentsOf:[arr1, arr2])

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

@@ -80,11 +80,12 @@ class YHGCSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
 
             let item20 = YHFormDetailItem(type:.isLiveTother, value:String(spouse.isLiveTother()))
             arr2.append(item20)
-
-            let item21 = YHFormDetailItem(type:.permanentResidenceStatus, value: String(spouse.havePermanentResidency))
-            item21.tips = "请选择"
-            arr2.append(item21)
             
+            let addResidenceBlock = {
+                let item21 = YHFormDetailItem(type:.permanentResidenceStatus, value: String(spouse.havePermanentResidency))
+                item21.tips = "请选择"
+                arr2.append(item21)
+            }
 
             if !spouse.isLiveTother() { // 不同住 才需填写国家/地区
                 let item21 = YHFormDetailItem(type:.nationOrArea, value:spouse.address.country, placeHolder:"请选择".local, tips:"请选择国家/地区".local)
@@ -111,13 +112,20 @@ class YHGCSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
                     let item23 = YHFormDetailItem(type:.detailAddress, value:detailAddress, placeHolder:placeHolder, tips:tips)
                     arr2.append(item23)
                     
+                    addResidenceBlock()
+                    
                     if !isLiveInChina {// 在国外
                         // 是否在海外居住满1年及以上
                         let item24 = YHFormDetailItem(type: .isLiveOverSeasMore1Year)
                         item24.value = String(spouse.isOverSeasOver1Year())
                         arr2.append(item24)
                     }
+                } else {
+                    addResidenceBlock()
                 }
+                
+            } else {
+                addResidenceBlock()
             }
             
             items.append(contentsOf:[arr1, arr2])