UI走查

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateUploadVC.swift

@@ -89,7 +89,7 @@ extension YHCertificateUploadVC: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 217.0
+        return UITableView.automaticDimension
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHSheetPickerView.swift

@@ -67,17 +67,33 @@ class YHSheetPickerView: UIView {
         view.addSubview(titleLabel)
         view.addSubview(cancelBtn)
         view.addSubview(confirmBtn)
+        view.addSubview(topLineView)
         titleLabel.snp.makeConstraints { make in
             make.edges.equalToSuperview()
         }
         cancelBtn.snp.makeConstraints { make in
-            make.left.top.bottom.equalToSuperview()
-            make.width.equalTo(60)
+            make.left.equalToSuperview().offset(21)
+            make.centerY.equalToSuperview()
+            make.size.equalTo(CGSizeMake(30, 20))
         }
         confirmBtn.snp.makeConstraints { make in
-            make.right.top.bottom.equalToSuperview()
-            make.width.equalTo(60)
+            make.right.equalToSuperview().offset(-21)
+            make.centerY.equalToSuperview()
+            make.size.equalTo(CGSizeMake(30, 20))
         }
+        topLineView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(21)
+            make.right.equalToSuperview().offset(-21)
+            make.bottom.equalToSuperview()
+            make.height.equalTo(1)
+        }
+
+        return view
+    }()
+    
+    lazy var topLineView:UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor(hexString: "#F0F0F0")
         return view
     }()
     
@@ -85,7 +101,7 @@ class YHSheetPickerView: UIView {
         let label = UILabel()
         label.textColor = UIColor.mainTextColor
         label.textAlignment = .center
-        label.font = UIFont.PFSC_R(ofSize: 16)
+        label.font = UIFont.PFSC_M(ofSize: 17)
         label.text = "请选择"
         return label
     }()
@@ -93,18 +109,20 @@ class YHSheetPickerView: UIView {
     lazy var cancelBtn: UIButton = {
         let btn = UIButton()
         btn.setTitle("取消".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
         btn.setTitleColor(UIColor.mainTextColor, for: .normal)
         btn.addTarget(self, action: #selector(didClickCancelButton), for: .touchUpInside)
+        btn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
         return btn
     }()
     
     lazy var confirmBtn: UIButton = {
         let btn = UIButton()
         btn.setTitle("确定".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
         btn.setTitleColor(UIColor(hex: 0x4487F9), for: .normal)
         btn.addTarget(self, action: #selector(didClickConfirmButton), for: .touchUpInside)
+        btn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
         return btn
     }()
     
@@ -129,6 +147,7 @@ class YHSheetPickerView: UIView {
             pickerView.selectRow(selectRow, inComponent: 0, animated: true)
 
         } else {
+            selectRow = 0
             pickerView.selectRow(0, inComponent: 0, animated: true)
         }
     }
@@ -312,9 +331,21 @@ class YHSheetPickerView: UIView {
             make.edges.equalToSuperview()
         }
         
+        var whiteContentHeight = 322.0
+        if self.type == .educationDegree
+            || self.type == .marriage
+            || self.type == .profession
+            || self.type == .certificate
+            || self.type == .identity
+            || self.type == .professionCertificate
+            || self.type == .degreeCategory 
+        {
+            whiteContentHeight = 411.0
+        }
+        
         whiteContentView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
-            make.top.equalToSuperview().offset(KScreenHeight*2/3.0)
+            make.height.equalTo(whiteContentHeight)
         }
         
         topView.snp.makeConstraints { make in
@@ -477,6 +508,8 @@ extension YHSheetPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
                 let item :YHSheetPickerViewItem = arr[row]
                 print(item.title)
                 selectRow = row
+                //刷新picker，看上面的代理
+                pickerView.reloadComponent(component)
             }
         }
     }
@@ -486,16 +519,19 @@ extension YHSheetPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
     }
     
     func pickerView(_ pickerView: UIPickerView, rowHeightForComponent component: Int) -> CGFloat {
-        return 44
+        if self.type == .professionCertificate {
+            return 62.0
+        }
+        return 42.0
     }
     
     func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView {
 
         let label = UILabel()
         label.textColor = UIColor.mainTextColor
+        label.font = UIFont.PFSC_R(ofSize: 14)
         label.textAlignment = .center
         label.numberOfLines = 2
-        label.font = UIFont.PFSC_R(ofSize: 14)
         label.text = ""
         if let arr = Self.dataSource[type] {
             if 0 <= row && row < arr.count {
@@ -503,6 +539,13 @@ extension YHSheetPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
                 label.text = item.title
             }
         }
+        if selectRow == row {
+            label.font = UIFont.PFSC_M(ofSize: 14)
+
+        } else {
+            label.font = UIFont.PFSC_R(ofSize: 14)
+        }
+            
         // 选中背景色
         if #available(iOS 14.0, *), pickerView.subviews.count > 1 {
            pickerView.subviews[1].backgroundColor = UIColor(hex: 0x4487F9, alpha: 0.06)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHIdentityCardCell.swift

@@ -117,10 +117,10 @@ class YHIdentityCardCell: UITableViewCell {
         
         contentView.addSubview(centerView)
         centerView.snp.makeConstraints { make in
-            make.left.equalTo(16)
-            make.right.equalTo(-16)
-            make.top.equalTo(7)
-            make.bottom.equalTo(-16)
+            make.left.equalToSuperview().offset(16)
+            make.right.equalToSuperview().offset(-16)
+            make.top.equalToSuperview().offset(14)
+            make.bottom.equalToSuperview()
         }
         
         titleLabel = {
@@ -163,7 +163,7 @@ class YHIdentityCardCell: UITableViewCell {
         centerView.addSubview(lineView)
         lineView.snp.makeConstraints { make in
             make.left.equalTo(18)
-            make.top.equalTo(52)
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
             make.height.equalTo(1)
             make.right.equalTo(-18)
         }
@@ -179,7 +179,7 @@ class YHIdentityCardCell: UITableViewCell {
         frontLabel.snp.makeConstraints { make in
             make.left.equalTo(18)
             make.right.equalTo(centerView.snp.centerX)
-            make.top.equalTo(64)
+            make.top.equalTo(lineView.snp.bottom).offset(12)
             make.height.equalTo(20)
         }
         
@@ -194,7 +194,7 @@ class YHIdentityCardCell: UITableViewCell {
         backSurfaceLabel.snp.makeConstraints { make in
             make.right.equalTo(-18)
             make.left.equalTo(centerView.snp.centerX)
-            make.top.equalTo(64)
+            make.top.equalTo(lineView.snp.bottom).offset(12)
             make.height.equalTo(20)
         }
         
@@ -210,9 +210,10 @@ class YHIdentityCardCell: UITableViewCell {
         centerView.addSubview(frontImageButton)
         frontImageButton.snp.makeConstraints { make in
             make.left.equalTo(18)
-            make.top.equalTo(96)
+            make.top.equalTo(frontLabel.snp.bottom).offset(12)
             make.height.equalTo(91)
             make.width.equalTo(147)
+            make.bottom.equalToSuperview().offset(-16)
         }
         
         frontDeleteButton = {
@@ -242,7 +243,7 @@ class YHIdentityCardCell: UITableViewCell {
         centerView.addSubview(backSurfaceImageButton)
         backSurfaceImageButton.snp.makeConstraints { make in
             make.right.equalTo(-18)
-            make.top.equalTo(96)
+            make.top.equalTo(frontLabel.snp.bottom).offset(12)
             make.height.equalTo(91)
             make.width.equalTo(147)
         }