Merge branches 'develop' and 'develop' of...

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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  我的文字 我的签字接口整理
  // 我的证书

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  我的文字 我的签字接口整理
  // 我的证书

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

@@ -46,7 +46,7 @@ class YHCertificateInfoCell: UITableViewCell {
                 titleColor = .failColor
                 title = "已驳回".local
             case .review:
-                titleColor = .labelTextColor2
+                titleColor = .warnColor
                 title = "审核中".local
             case .finish:
                 titleColor = .labelTextColor2

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

@@ -14,6 +14,7 @@ class YHCertificateNameCell: UITableViewCell {
     
     var editBlock:((YHContentUrl)->())?
     
+    var whiteView: UIView!
     var iconImgV: UIImageView!
     var nameLabel: UILabel!
     var timeLabel: UILabel!
@@ -36,7 +37,7 @@ class YHCertificateNameCell: UITableViewCell {
         nameLabel.text = model.name
         timeLabel.text = "上传于\(model.updatedAt)"
         
-        var suffix = model.getFileSuffixName()
+        let suffix = model.getFileSuffixName()
         var iconImgName = ""
         
         if suffix == "jpeg" {
@@ -73,37 +74,47 @@ class YHCertificateNameCell: UITableViewCell {
         self.selectionStyle = .none
         contentView.backgroundColor = .white
         
+        whiteView = UIView()
+        contentView.addSubview(whiteView)
+        
         iconImgV = UIImageView(image:UIImage(named:"my_cer_type_jpg"))
-        contentView.addSubview(iconImgV)
+        whiteView.addSubview(iconImgV)
         
         nameLabel = UILabel()
         nameLabel.textColor = UIColor.mainTextColor
         nameLabel.textAlignment = .left
         nameLabel.numberOfLines = 0
         nameLabel.font = UIFont.PFSC_M(ofSize:14)
-        contentView.addSubview(nameLabel)
+        whiteView.addSubview(nameLabel)
         
         timeLabel = UILabel()
         timeLabel.textColor = UIColor.labelTextColor2
         timeLabel.textAlignment = .left
         timeLabel.font = UIFont.PFSC_R(ofSize:11)
-        contentView.addSubview(timeLabel)
+        whiteView.addSubview(timeLabel)
         
         editBtn = UIButton()
         editBtn.setImage(UIImage(named:"my_cer_btn_edit"), for:.normal)
         editBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 30, left: 30, bottom: 30, right: 30)
         editBtn.addTarget(self, action: #selector(didEditBtnClicked), for: .touchUpInside)
-        contentView.addSubview(editBtn)
+        whiteView.addSubview(editBtn)
+        
+        whiteView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview()
+            make.top.equalToSuperview().offset(15)
+            make.bottom.equalToSuperview()
+        }
 
         iconImgV.snp.makeConstraints { make in
             make.width.height.equalTo(31)
             make.centerY.equalToSuperview()
-            make.left.equalToSuperview().offset(20+6)
+            make.left.equalToSuperview().offset(6)
         }
         
         nameLabel.snp.makeConstraints { make in
             make.left.equalTo(iconImgV.snp.right).offset(18)
-            make.top.equalToSuperview().offset(15+7)
+            make.top.equalToSuperview().offset(7)
             make.right.equalTo(editBtn.snp.left)
         }
         

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

@@ -34,7 +34,7 @@ class YHCertificateSearchBar: UIView {
     lazy var textField:UITextField = {
         let textField = UITextField()
         textField.backgroundColor = .clear
-        textField.attributedPlaceholder = NSAttributedString(string: "输入关键词搜索资料", attributes: [NSAttributedString.Key.foregroundColor : UIColor.placeHolderColor])
+        textField.attributedPlaceholder = NSAttributedString(string: "请输出资料名称搜索".local, attributes: [NSAttributedString.Key.foregroundColor : UIColor.placeHolderColor])
         textField.font = UIFont.PFSC_M(ofSize: 12)
         textField.tintColor = UIColor(hexString: "#3D88F8")
         textField.textColor = UIColor.mainTextColor

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -169,7 +169,7 @@ class YHAllApiName {
         static let getPublicUrlsApi = "oss/storage/batchConvertToPublicURL"
     }
     
-    //我的签字和文书
+    //我的签字
     struct Signature {
         // 签字列表
         static let list = "infoflow/my-sign/list"
@@ -181,8 +181,20 @@ class YHAllApiName {
         static let personalUrl = "infoflow/sign/personal-auth"
         // 获取签署状态
         static let callBack = "infoflow/sign/check-is-complete"
+        // 签字上传
+        static let upload = "infoflow/sign/upload"
+        // 签字下载
+        static let download = "infoflow/sign/download"
+        // 发送邮箱
+        static let sendMail = "infoflow/sign/send_mail"
+        // 提交签字
+        static let confirm = "infoflow/my-sign/confirm"
+        // 查看合同
+        static let look = "infoflow/sign/view-detail"
+        
     }
     
+    //我的文书
     struct Documents {
         // 文书列表
         static let list = "infoflow/my-doc/doc-list"
@@ -190,6 +202,13 @@ class YHAllApiName {
         static let detail = "infoflow/my-doc/doc-details"
         // 腾讯文档编辑
         static let temporaryUrl = "infoflow/my-doc/get_temporaryUrl"
+        // 赴港计划书操作
+        static let hkPlan = "infoflow/my-doc/hk-plan-edit"
+        // 文书提交
+        static let submit = "infoflow/my-doc/doc-submit"
+        // 文书操作记录
+        static let record = "infoflow/my-doc/document-operation-record"
+
     }
     
     //我的证件