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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoNameAndSubNameItemView.swift

@@ -22,6 +22,8 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
         let lable0 = UILabel(text: "--")
         lable0.textColor = UIColor.labelTextColor2
         lable0.font = UIFont.PFSC_R(ofSize: 14)
+        lable0.numberOfLines = 0
+        lable0.lineBreakMode = .byWordWrapping
         return lable0
     }()
     
@@ -40,10 +42,12 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
     private func setupUI() {
         addSubview(nameLable)
         nameLable.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(18)
+//            make.top.equalToSuperview().offset(18)
+            make.top.equalToSuperview()
             make.left.equalToSuperview()
-//            make.width.lessThanOrEqualTo(154)
-            make.height.equalTo(20)
+            make.width.lessThanOrEqualTo(160.fix)
+//            make.height.equalTo(20)
+            make.bottom.lessThanOrEqualToSuperview()
         }
         
         
@@ -54,11 +58,16 @@ class YHPreviewInfoNameAndSubNameItemView: UIView {
             make.left.equalTo(nameLable.snp.right).offset(10)
             make.height.greaterThanOrEqualTo(20)
             
-            make.bottom.equalToSuperview()
+//            make.bottom.equalToSuperview()
+            
+            make.bottom.lessThanOrEqualToSuperview()
         }
         nameLable.setContentCompressionResistancePriority(.required, for: .horizontal)
         subtitleLable.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
         
+//        nameLable.backgroundColor = .red //for test hjl
+//        subtitleLable.backgroundColor = .yellow //for test hjl
+        
     }
 }
 
@@ -67,6 +76,31 @@ extension YHPreviewInfoNameAndSubNameItemView {
         nameLable.text = title
         subtitleLable.text = subtitle
         
+        nameLable.snp.removeConstraints()
+        subtitleLable.snp.removeConstraints()
+        
+        
+        nameLable.snp.remakeConstraints() { make in
+            make.top.equalToSuperview().offset(kMargin)
+            make.left.equalToSuperview()
+            make.width.lessThanOrEqualTo(160.fix)
+//            make.height.equalTo(20)
+            make.bottom.lessThanOrEqualToSuperview()
+        }
+        
+        
+        addSubview(subtitleLable)
+        subtitleLable.snp.remakeConstraints { make in
+            make.top.equalTo(nameLable.snp.top)
+            make.right.equalToSuperview()
+            make.left.equalTo(nameLable.snp.right).offset(10)
+            make.height.greaterThanOrEqualTo(20)
+            
+//            make.bottom.equalToSuperview()
+            
+            make.bottom.lessThanOrEqualToSuperview()
+        }
+        
         //处理特长的字符
 //        if title.contains("相关工作是否属国际工作经验：") || title.contains("公司营业额/港元(近一年)：") || title.contains("是否在海外居住满1年及以上：")   {
 //            nameLable.snp.remakeConstraints { make in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoNameAndSubNameItemsView.swift

@@ -28,8 +28,8 @@ extension YHPreviewInfoNameAndSubNameItemsView {
             addSubview(sessionView)
             sessionView.snp.makeConstraints { make in
                 make.top.equalToSuperview()
-                make.right.equalToSuperview().offset(-18)
-                make.left.equalToSuperview().offset(18)
+                make.right.equalToSuperview().offset(-kMargin)
+                make.left.equalToSuperview().offset(kMargin)
                 make.height.equalTo(YHPreviewInfoSingleLineTitleView.viewH)
             }
             lastTagView = sessionView
@@ -45,16 +45,16 @@ extension YHPreviewInfoNameAndSubNameItemsView {
             if lastTagView == nil {
                 cellView.snp.makeConstraints { make in
                     make.top.equalToSuperview()
-                    make.right.equalToSuperview().offset(-18)
-                    make.left.equalToSuperview().offset(18)
+                    make.right.equalToSuperview().offset(-kMargin)
+                    make.left.equalToSuperview().offset(kMargin)
                     make.bottom.equalToSuperview().offset(-21)
                 }
                 
             } else {
                 cellView.snp.makeConstraints { make in
-                    make.top.equalTo(lastTagView!.snp.bottom)
-                    make.right.equalToSuperview().offset(-18)
-                    make.left.equalToSuperview().offset(18)
+                    make.top.equalTo(lastTagView!.snp.bottom).offset(kMargin)
+                    make.right.equalToSuperview().offset(-kMargin)
+                    make.left.equalToSuperview().offset(kMargin)
                     make.bottom.equalToSuperview().offset(-21)
                 }
             }
@@ -70,13 +70,15 @@ extension YHPreviewInfoNameAndSubNameItemsView {
                     cellView.snp.makeConstraints { make in
                         if tmp == nil {
                             make.top.equalToSuperview()
-                            make.right.equalToSuperview().offset(-18)
-                            make.left.equalToSuperview().offset(18)
+                            make.right.equalToSuperview().offset(-kMargin)
+                            make.left.equalToSuperview().offset(kMargin)
                             make.bottom.equalToSuperview().offset(-21)
+                            
+//                            cellView.backgroundColor = UIColor.purple//for test hjl
                         } else {
                             make.top.equalTo(tmp!.snp.bottom)
-                            make.right.equalToSuperview().offset(-18)
-                            make.left.equalToSuperview().offset(18)
+                            make.right.equalToSuperview().offset(-kMargin)
+                            make.left.equalToSuperview().offset(kMargin)
                             make.bottom.equalToSuperview().offset(-21)
                         }
                     }
@@ -85,13 +87,15 @@ extension YHPreviewInfoNameAndSubNameItemsView {
                     cellView.snp.makeConstraints { make in
                         if tmp == nil {
                             make.top.equalToSuperview()
-                            make.right.equalToSuperview().offset(-18)
-                            make.left.equalToSuperview().offset(18)
+                            make.right.equalToSuperview().offset(-kMargin)
+                            make.left.equalToSuperview().offset(kMargin)
+                            
+//                            cellView.backgroundColor = UIColor.purple//for test hjl
                             
                         } else {
                             make.top.equalTo(tmp!.snp.bottom)
-                            make.right.equalToSuperview().offset(-18)
-                            make.left.equalToSuperview().offset(18)
+                            make.right.equalToSuperview().offset(-kMargin)
+                            make.left.equalToSuperview().offset(kMargin)
                         }
                     }
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/V/YHPreviewInfoSingleLineTitleView.swift

@@ -9,7 +9,8 @@
 import UIKit
 
 class YHPreviewInfoSingleLineTitleView: UIView {
-    static let viewH : CGFloat = 52
+//    static let viewH : CGFloat = 52
+    static let viewH : CGFloat = 52 - 16
     override init(frame: CGRect) {
         super.init(frame: frame)
         setupUI()