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

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 我的证件UI更新

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateUploadContentListVC.swift

@@ -412,15 +412,11 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
         statusLabel.backgroundColor = bgColor
         
         let tipsLabel = UILabel()
-        tipsLabel.textColor = .failColor
+        tipsLabel.textColor = .labelTextColor2
         tipsLabel.font = UIFont.PFSC_R(ofSize:12)
         tipsLabel.textAlignment = .left
         tipsLabel.numberOfLines = 0
-        if !supplementInfo.auditContent.isEmpty {
-            tipsLabel.text = "被驳回原因: " + supplementInfo.auditContent
-        } else {
-            tipsLabel.text = ""
-        }
+        tipsLabel.text = "支持的文件格式为jpg/jpeg、png、doc/docx、pptx、pdf，最多可上传99张图片或文件"
         view.addSubview(tipsLabel)
         
         titlelabel.snp.makeConstraints { make in
@@ -436,10 +432,66 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
             make.width.equalTo(38)
         }
         
-        tipsLabel.snp.makeConstraints { make in
+        tipsLabel.snp.remakeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+            make.top.equalTo(titlelabel.snp.bottom).offset(7)
+            make.bottom.equalToSuperview().offset(-15)
+        }
+        
+        if supplementInfo.auditContent.isEmpty { // 无驳回理由
+            return view
+        }
+        
+        // 有驳回理由
+        let rejectView = UIView()
+        view.addSubview(rejectView)
+        
+        let warningImgV = UIImageView(image: UIImage(named: "my_cer_upload_warning"))
+        rejectView.addSubview(warningImgV)
+        
+        let rejectTitleLabel = UILabel()
+        rejectTitleLabel.textColor = .failColor
+        rejectTitleLabel.font = UIFont.PFSC_R(ofSize:12)
+        rejectTitleLabel.textAlignment = .left
+        rejectTitleLabel.text = "被驳回原因："
+        rejectView.addSubview(rejectTitleLabel)
+        
+        let rejectContentLabel = UILabel()
+        rejectContentLabel.textColor = .failColor
+        rejectContentLabel.font = UIFont.PFSC_R(ofSize:12)
+        rejectContentLabel.numberOfLines = 0
+        rejectContentLabel.textAlignment = .left
+        rejectContentLabel.text = "被驳回原因："
+        rejectContentLabel.text = supplementInfo.auditContent
+        rejectView.addSubview(rejectContentLabel)
+        
+        tipsLabel.snp.remakeConstraints { make in
             make.left.equalToSuperview().offset(20)
             make.right.equalToSuperview().offset(-20)
-            make.top.equalTo(titlelabel.snp.bottom).offset(3)
+            make.top.equalTo(titlelabel.snp.bottom).offset(7)
+            make.bottom.equalTo(rejectView.snp.top).offset(-20)
+        }
+
+        rejectView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+            make.bottom.equalToSuperview().offset(-12)
+        }
+        
+        warningImgV.snp.makeConstraints { make in
+            make.width.height.equalTo(14)
+            make.left.top.equalTo(0)
+        }
+        
+        rejectTitleLabel.snp.makeConstraints { make in
+            make.centerY.equalTo(warningImgV)
+            make.left.equalTo(warningImgV.snp.right).offset(4)
+        }
+        
+        rejectContentLabel.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.top.equalTo(warningImgV.snp.bottom).offset(7)
             make.bottom.equalToSuperview()
         }
         return view
@@ -465,7 +517,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
         label.font = UIFont.PFSC_R(ofSize:12)
         
         let tipsFont = UIFont.PFSC_R(ofSize: 12)
-        let a: ASAttributedString = .init("*已上传", .font(tipsFont),.foreground(UIColor.labelTextColor2))
+        let a: ASAttributedString = .init("已上传", .font(tipsFont),.foreground(UIColor.labelTextColor2))
         let b: ASAttributedString = .init(" \(items.count)/99 ", .font(UIFont.PFSC_M(ofSize: 12)), .foreground(UIColor.init(hexString:"#2F2F2F")!))
         let c: ASAttributedString = .init("张图片或文件", .font(tipsFont), .foreground(UIColor.labelTextColor2))
         
@@ -474,8 +526,7 @@ extension YHCertificateUploadContentListVC: UITableViewDelegate, UITableViewData
         view.addSubview(label)
         
         label.snp.makeConstraints { make in
-            make.left.right.equalToSuperview()
-            make.top.equalToSuperview().offset(20)
+            make.left.right.top.equalToSuperview()
             make.bottom.equalToSuperview().offset(-20)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateNameCell.swift

@@ -106,8 +106,8 @@ class YHCertificateNameCell: UITableViewCell {
         whiteView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(20)
             make.right.equalToSuperview()
-            make.top.equalToSuperview().offset(15)
-            make.bottom.equalToSuperview()
+            make.top.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-14)
         }
 
         iconImgV.snp.makeConstraints { make in

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的证书/my_cer_upload_warning.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Group 33332558@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Group 33332558@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}