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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 上传内容

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -199,6 +199,8 @@
 		049A48A82B49417300D0C641 /* YHAboutUsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049A48A72B49417300D0C641 /* YHAboutUsViewController.swift */; };
 		049A48AA2B49536000D0C641 /* YHAboutUsAdvantageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049A48A92B49536000D0C641 /* YHAboutUsAdvantageCell.swift */; };
 		04A671592B9F18C800C1FB91 /* YHCertificateUploadSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A671582B9F18C800C1FB91 /* YHCertificateUploadSheetView.swift */; };
+		04A6715C2B9FE9EA00C1FB91 /* YHUploadContentVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A6715B2B9FE9EA00C1FB91 /* YHUploadContentVC.swift */; };
+		04A6715E2B9FFCA700C1FB91 /* YHCertificateInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A6715D2B9FFCA700C1FB91 /* YHCertificateInfoCell.swift */; };
 		04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A7BC902B6B7B89000E8D47 /* YHTwoOptionAlertView.swift */; };
 		04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF58C32B4FC51C0066011A /* YHLocalizable.swift */; };
 		04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; };
@@ -530,6 +532,8 @@
 		049A48A72B49417300D0C641 /* YHAboutUsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutUsViewController.swift; sourceTree = "<group>"; };
 		049A48A92B49536000D0C641 /* YHAboutUsAdvantageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutUsAdvantageCell.swift; sourceTree = "<group>"; };
 		04A671582B9F18C800C1FB91 /* YHCertificateUploadSheetView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCertificateUploadSheetView.swift; sourceTree = "<group>"; };
+		04A6715B2B9FE9EA00C1FB91 /* YHUploadContentVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUploadContentVC.swift; sourceTree = "<group>"; };
+		04A6715D2B9FFCA700C1FB91 /* YHCertificateInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateInfoCell.swift; sourceTree = "<group>"; };
 		04A7BC902B6B7B89000E8D47 /* YHTwoOptionAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTwoOptionAlertView.swift; sourceTree = "<group>"; };
 		04AF58C32B4FC51C0066011A /* YHLocalizable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLocalizable.swift; sourceTree = "<group>"; };
 		04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
@@ -1306,6 +1310,7 @@
 		04A671562B9F18C800C1FB91 /* MyCertificates(我的证书) */ = {
 			isa = PBXGroup;
 			children = (
+				04A6715A2B9FE9A300C1FB91 /* C */,
 				04A671572B9F18C800C1FB91 /* V */,
 			);
 			path = "MyCertificates(我的证书)";
@@ -1315,10 +1320,19 @@
 			isa = PBXGroup;
 			children = (
 				04A671582B9F18C800C1FB91 /* YHCertificateUploadSheetView.swift */,
+				04A6715D2B9FFCA700C1FB91 /* YHCertificateInfoCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
 		};
+		04A6715A2B9FE9A300C1FB91 /* C */ = {
+			isa = PBXGroup;
+			children = (
+				04A6715B2B9FE9EA00C1FB91 /* YHUploadContentVC.swift */,
+			);
+			path = C;
+			sourceTree = "<group>";
+		};
 		04AF58BA2B4FB71C0066011A /* Localized */ = {
 			isa = PBXGroup;
 			children = (
@@ -1946,6 +1960,7 @@
 				045EEEBD2B9F171A0022A143 /* YHWorkExampleTypeView.swift in Sources */,
 				045EEEB12B9F171A0022A143 /* YHClipperView.swift in Sources */,
 				A514E5DC2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift in Sources */,
+				04A6715C2B9FE9EA00C1FB91 /* YHUploadContentVC.swift in Sources */,
 				045EEEF02B9F171A0022A143 /* YHChildPrimaryInfoVC.swift in Sources */,
 				0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */,
 				045EEEF62B9F171A0022A143 /* YHSpousePrimaryInfoVC.swift in Sources */,
@@ -2126,6 +2141,7 @@
 				045EEF0F2B9F171A0022A143 /* YHSelectCountryViewModel.swift in Sources */,
 				045EEEB52B9F171A0022A143 /* YHWorkIntroductionItemView.swift in Sources */,
 				045EEF202B9F171A0022A143 /* YHCardExampleView.swift in Sources */,
+				04A6715E2B9FFCA700C1FB91 /* YHCertificateInfoCell.swift in Sources */,
 				045EEE8E2B9F171A0022A143 /* YHPreviewInfoWorkSummaryView.swift in Sources */,
 				045EEECE2B9F171A0022A143 /* YHScoreDetailViewController.swift in Sources */,
 				A5C5B3252B57C74900A7C5D1 /* YHDavidCell3.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyCertificates(我的证书)/C/YHUploadContentVC.swift

+//
+//  YHUploadContentVC.swift
+//  galaxy
+//
+//  Created by edy on 2024/3/12.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHUploadContentVC: YHBaseViewController {
+    
+    var items:[String] = ["1", "2", "2", "2", "2", "2", "2", "2"]
+    lazy var tableView: UITableView = {
+        
+        let tableView = UITableView(frame:.zero, style:.grouped)
+
+        if #available(iOS 11.0, *) {
+            tableView.contentInsetAdjustmentBehavior = .never
+        }
+        tableView.showsVerticalScrollIndicator = false
+        tableView.backgroundColor = .white
+        tableView.separatorStyle = .none
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
+        tableView.register(YHCertificateInfoCell.self, forCellReuseIdentifier: YHCertificateInfoCell.cellReuseIdentifier)
+        
+        let size = headView.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
+        let rect = CGRect(x: 0, y: 0, width: 0, height: size.height)
+        headView.frame = rect
+        tableView.tableHeaderView = headView
+
+        return tableView
+    }()
+    
+    lazy var headView:UIView = {
+        let view = UIView()
+        view.addSubview(templateTitleLabel)
+        view.addSubview(tipsLabel)
+        view.addSubview(templateView)
+        
+        templateTitleLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+            make.top.equalToSuperview().offset(16)
+            make.height.equalTo(24.0)
+        }
+        tipsLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+            make.top.equalTo(templateTitleLabel.snp.bottom).offset(5)
+            make.height.equalTo(44)
+        }
+        templateView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+            make.top.equalTo(tipsLabel.snp.bottom).offset(15)
+            make.height.equalTo(62.0)
+            make.bottom.equalToSuperview().offset(-34)
+        }
+        return view
+    }()
+    
+    lazy var tipsLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.labelTextColor2
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_R(ofSize:12)
+        label.numberOfLines = 0
+        label.text = "注意事项：这里是上传应该注意的事项这里是上传应该注意的事项这里是上传应该注意的事项。"
+        return label
+    }()
+    
+    lazy var templateTitleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.mainTextColor
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_M(ofSize:17)
+        label.text = "身份证示例模版"
+        return label
+    }()
+    
+    lazy var templateView: YHCertificateSampleTemplateView = {
+        let view = YHCertificateSampleTemplateView(frame:CGRectZero)
+//        let tap = UITapGestureRecognizer(target:self, action:#selector(action(_:)))
+//        view.addGestureRecognizer(tap)
+        return view
+    }()
+    
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        self.view.backgroundColor = .white
+        self.gk_navTitle = "上传内容"
+        createUI()
+    }
+    
+    func createUI() {
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+            make.left.right.equalTo(view)
+            make.bottom.equalToSuperview().offset(-k_Height_safeAreaInsetsBottom())
+        }
+    }
+}
+
+extension YHUploadContentVC: UITableViewDelegate, UITableViewDataSource {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return items.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        let item = items[indexPath.row]
+        let cell = tableView.dequeueReusableCell(withIdentifier: YHCertificateInfoCell.cellReuseIdentifier, for: indexPath)
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 55.0
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return 24.0
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        
+        let view = UIView()
+        
+        let label = UILabel()
+        label.textColor = UIColor.mainTextColor
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_M(ofSize:17)
+        label.text = "身份证件"
+        view.addSubview(label)
+        
+        let statusLabel = UILabel()
+        statusLabel.textColor = .warnColor
+        statusLabel.backgroundColor = .warnColor8
+        statusLabel.textAlignment = .center
+        statusLabel.font = UIFont.PFSC_M(ofSize:10)
+        statusLabel.text = "审核中"
+        view.addSubview(statusLabel)
+        
+        label.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.height.equalTo(24.0)
+            make.centerY.equalToSuperview()
+        }
+        
+        statusLabel.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(label.snp.right).offset(4)
+            make.height.equalTo(16)
+            make.width.equalTo(38)
+        }
+
+        return view
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        return 60.0
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        
+        let view = UIView()
+        
+        let label = UILabel(frame: CGRect(x: 0, y: 20, width:KScreenWidth, height:20))
+        label.textColor = UIColor.labelTextColor2
+        label.textAlignment = .center
+        label.font = UIFont.PFSC_R(ofSize:12)
+        label.text = "*最多上传5/99张图片或文件"
+        view.addSubview(label)
+        
+        return view
+    }
+
+}

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

+//
+//  YHCertificateInfoCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/3/12.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHCertificateInfoCell: UITableViewCell {
+    
+    static let cellReuseIdentifier = "YHCertificateInfoCell"
+    
+    var whiteView: UIView!
+    var iconImgV: UIImageView!
+    var nameLabel: UILabel!
+    var timeLabel: UILabel!
+    var editBtn: UIButton!
+    
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        contentView.backgroundColor = .white
+        
+        whiteView = UIView()
+        contentView.addSubview(whiteView)
+        
+        iconImgV = UIImageView(image:UIImage(named:"my_cer_type_pdf"))
+        whiteView.addSubview(iconImgV)
+        
+        nameLabel = UILabel()
+        nameLabel.textColor = UIColor.mainTextColor
+        nameLabel.textAlignment = .left
+        nameLabel.font = UIFont.PFSC_M(ofSize:14)
+        nameLabel.text = "文档名称.doc"
+        whiteView.addSubview(nameLabel)
+        
+        timeLabel = UILabel()
+        timeLabel.textColor = UIColor.labelTextColor2
+        timeLabel.textAlignment = .left
+        timeLabel.font = UIFont.PFSC_R(ofSize:11)
+        timeLabel.text = "上传于2024.01.01"
+        whiteView.addSubview(timeLabel)
+        
+        editBtn = UIButton()
+        editBtn.setImage(UIImage(named:"my_cer_btn_edit"), for:.normal)
+        whiteView.addSubview(editBtn)
+
+        whiteView.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(20)
+            make.right.equalToSuperview().offset(-20)
+            make.height.equalTo(55)
+            make.top.equalToSuperview().offset(15)
+        }
+
+        iconImgV.snp.makeConstraints { make in
+            make.width.height.equalTo(31)
+            make.centerY.equalToSuperview()
+            make.left.equalToSuperview().offset(6)
+        }
+        
+        nameLabel.snp.makeConstraints { make in
+            make.left.equalTo(iconImgV.snp.right).offset(18)
+            make.height.equalTo(20)
+            make.bottom.equalTo(whiteView.snp.centerY).offset(-1)
+            make.right.equalTo(editBtn.snp.left)
+        }
+        
+        timeLabel.snp.makeConstraints { make in
+            make.left.right.equalTo(nameLabel)
+            make.top.equalTo(whiteView.snp.centerY).offset(1)
+            make.height.equalTo(20)
+        }
+        
+        editBtn.snp.makeConstraints { make in
+            make.width.height.equalTo(16)
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-6)
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyCertificates(我的证书)/V/YHCertificateUploadSheetView.swift

@@ -145,6 +145,11 @@ class YHCertificateSampleTemplateView: UIView {
     }
     
     func createUI() {
+        
+        self.backgroundColor = .contentBkgColor
+        self.layer.cornerRadius = 6.0
+        self.clipsToBounds = true
+        
         self.addSubview(iconImgV)
         self.addSubview(titleLabel)
         self.addSubview(arrowImgV)
@@ -249,9 +254,6 @@ class YHCertificateUploadSheetView: UIView {
     lazy var templateView: YHCertificateSampleTemplateView = {
         let view = YHCertificateSampleTemplateView(frame:CGRectZero)
         view.tag = YHCertificateActionType.sample.rawValue
-        view.backgroundColor = .contentBkgColor
-        view.layer.cornerRadius = 6.0
-        view.clipsToBounds = true
         let tap = UITapGestureRecognizer(target:self, action:#selector(action(_:)))
         view.addGestureRecognizer(tap)
         return view

galaxy/galaxy/Classes/Tools/Extention/UIColor+Extension.swift

@@ -48,6 +48,9 @@ extension UIColor {
     //警告 color
     static let warnColor : UIColor = UIColor(hexString: "#FF9900")!
     
+    //警告 背景色 color
+    static let warnColor8 : UIColor = UIColor(hexString: "#FF9900",transparency: 0.08)!
+
     //提示 color
     static let tipsColor : UIColor = UIColor(hexString: "#2F7EF6")!
     

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

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

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

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

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

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

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

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

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

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

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

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