一处代码 完善

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/V/YHBasicInfoFillView.swift

@@ -321,7 +321,6 @@ private extension YHBasicInfoFillView {
             tmpHoldView.dataModel = subModel.subset
             tmpHoldView.callBackBlock = { tag in
                 self.model?.info = tag
-//                self.layoutForYES()
             }
             
             mutilChoiceHoldView.addSubview(tmpHoldView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/V/YHChoiceButtonHoldView.swift

@@ -29,23 +29,23 @@ class YHChoiceButtonHoldView: UIView {
     }
     
     private func updateView() {
-        var x = 0
+        var x : CGFloat = 0
         var y = 0
         
         arrCheckBtns.removeAll()
         
         for (index,item) in dataModel.enumerated() {
             
-            let string = item.subset_name.count > 0 ? item.subset_name : "--"
+            let string = item.subset_name.isEmpty == false ? item.subset_name : "--"
             let font = UIFont.PFSC_M(ofSize: 14)// 设置字体样式及大小
-            let maxWidth = KScreenWidth - 28 * 2 // label最大宽度限制
+            let maxWidth : CGFloat = KScreenWidth - 28 * 2 // label最大宽度限制
             let butGap : CGFloat = 25
             
             var boundingBox = CGRect()
-            boundingBox = NSString(string: string).boundingRect(with: CGSize(width: maxWidth, height: .greatestFiniteMagnitude), options: [.usesLineFragmentOrigin], attributes: [.font : font], context: nil)
+            boundingBox = NSString(string: string).boundingRect(with: CGSize(width: KScreenWidth, height: .greatestFiniteMagnitude), options: [.usesLineFragmentOrigin], attributes: [.font : font], context: nil)
             let width = boundingBox.size.width
             
-            if CGFloat(x) + width  + 18 + butGap  > maxWidth {
+            if CGFloat(x) + width  + 18.0 + butGap  > maxWidth {
                 x = 0
                 y = y + 1
             }
@@ -91,7 +91,7 @@ class YHChoiceButtonHoldView: UIView {
                 btn.isSelected = false
             }
             
-            x = Int(CGFloat(x + Int(width)) + 18.0 + butGap)
+            x = x + width + 18.0 + butGap
             arrCheckBtns.append(btn)
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/V/YHOtherResidenceFillView.swift

@@ -49,6 +49,12 @@ class YHOtherResidenceFillView: UIView {
             guard let self = self else { return }
             self.endView.updateKeyName(name: "结束时间", keyValue: "")
             self.dataModel?.end_time = text
+            
+            if flag {
+                self.dataModel?.end_time_checked = true
+            } else {
+                self.dataModel?.end_time_checked = false
+            }
             self.layoutIfNeeded()
         }
         endView.snp.makeConstraints { make in