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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -355,6 +355,8 @@
 		04AF82D82C291E960028CE2A /* YHMatchUserViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AF82D72C291E960028CE2A /* YHMatchUserViewModel.swift */; };
 		04B360E32C60A346001EB053 /* YHPrinciplePhotoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360E22C60A346001EB053 /* YHPrinciplePhotoCell.swift */; };
 		04B360E52C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360E42C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift */; };
+		04B360E72C60CD37001EB053 /* YHPrincipleUploadFileCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360E62C60CD37001EB053 /* YHPrincipleUploadFileCell.swift */; };
+		04B360EB2C60E88C001EB053 /* YHPrincipleCongratulationAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B360EA2C60E88C001EB053 /* YHPrincipleCongratulationAlertView.swift */; };
 		04B9EE5A2C06CC3100A4018D /* YHCodeSueecssViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE582C06CC3100A4018D /* YHCodeSueecssViewController.swift */; };
 		04B9EE5B2C06CC3100A4018D /* YHOtherLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */; };
 		04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; };
@@ -989,6 +991,8 @@
 		04AF82D72C291E960028CE2A /* YHMatchUserViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMatchUserViewModel.swift; sourceTree = "<group>"; };
 		04B360E22C60A346001EB053 /* YHPrinciplePhotoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrinciplePhotoCell.swift; sourceTree = "<group>"; };
 		04B360E42C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrinciplePhotoCollectCell.swift; sourceTree = "<group>"; };
+		04B360E62C60CD37001EB053 /* YHPrincipleUploadFileCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleUploadFileCell.swift; sourceTree = "<group>"; };
+		04B360EA2C60E88C001EB053 /* YHPrincipleCongratulationAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPrincipleCongratulationAlertView.swift; sourceTree = "<group>"; };
 		04B9EE582C06CC3100A4018D /* YHCodeSueecssViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssViewController.swift; sourceTree = "<group>"; };
 		04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOtherLoginViewController.swift; sourceTree = "<group>"; };
 		04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
@@ -2195,6 +2199,8 @@
 				0409BEEA2C5B41D4003FCFD7 /* YHPrincipleUnapprovedCell.swift */,
 				04B360E22C60A346001EB053 /* YHPrinciplePhotoCell.swift */,
 				04B360E42C60B5D3001EB053 /* YHPrinciplePhotoCollectCell.swift */,
+				04B360E62C60CD37001EB053 /* YHPrincipleUploadFileCell.swift */,
+				04B360EA2C60E88C001EB053 /* YHPrincipleCongratulationAlertView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -3556,6 +3562,7 @@
 				045EEEC22B9F171A0022A143 /* YHOtherInfoFillViewController.swift in Sources */,
 				045EEE7C2B9F171A0022A143 /* YHPreviewInfoSessionModel.swift in Sources */,
 				049A48AA2B49536000D0C641 /* YHAboutUsAdvantageCell.swift in Sources */,
+				04B360EB2C60E88C001EB053 /* YHPrincipleCongratulationAlertView.swift in Sources */,
 				04CE1AD42C2AD91F001CB80A /* YHActivityDetailModel.swift in Sources */,
 				045EEF112B9F171A0022A143 /* YHMainInformationModel.swift in Sources */,
 				A58AC09D2BABD59600A30FA9 /* YHFileListModel.swift in Sources */,
@@ -3690,6 +3697,7 @@
 				A5C382CA2B5E1F4C00C5E65C /* YHLoginTipsView.swift in Sources */,
 				04FB01D02C23FA420040115D /* YHMatchUserInfo.swift in Sources */,
 				045EEEE92B9F171A0022A143 /* YHFamilyRequestViewModel.swift in Sources */,
+				04B360E72C60CD37001EB053 /* YHPrincipleUploadFileCell.swift in Sources */,
 				04F957472C203033003C631C /* YHMyGoodFriendsVC.swift in Sources */,
 				044867B42BA1953B00DFAD4A /* YHCertificateFilterView.swift in Sources */,
 				045EEEDF2B9F171A0022A143 /* YHCollegeSearchBar.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/V/YHPrincipleCongratulationAlertView.swift

+//
+//  YHPrincipleCongratulationAlertView.swift
+//  galaxy
+//
+//  Created by edy on 2024/8/5.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHPrincipleCongratulationAlertView: UIView {
+
+    lazy var blackMaskView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .alertMaskColor
+        return view
+    }()
+    
+    lazy var whiteContentView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        view.layer.cornerRadius = kCornerRadius6
+        return view
+    }()
+    
+    lazy var closeBtn:UIButton = {
+        let btn = UIButton()
+        btn.setImage(UIImage(named: "update_close"), for: .normal)
+        btn.addTarget(self, action: #selector(didCloseBtnClicked), for: .touchUpInside)
+        return btn
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.font = UIFont.PFSC_B(ofSize: 24)
+        label.textColor = UIColor.brandMainColor
+        label.text = "祝贺获批!"
+        return label
+    }()
+    
+    lazy var detailLabel: UILabel = {
+        var label = UILabel()
+        label.numberOfLines = 0
+        label.font = UIFont.PFSC_R(ofSize: 14.0)
+        let a: ASAttributedString = .init("恭喜您申请的【优秀人才入境计划】", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
+        let b: ASAttributedString = .init("已获得港府的甄选名额！", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
+        label.attributed.text = a+b
+        return label
+    }()
+    
+    lazy var bgImgView: UIImageView = {
+        let view = UIImageView(image: UIImage(named: "principle_congratulation_bg"))
+        let bottomView = UIImageView(image: UIImage(named: "principle_congratulation_alpha"))
+        view.addSubview(bottomView)
+        bottomView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(58.0)
+        }
+        return view
+    }()
+    
+    lazy var lookBtn: UIButton = {
+        let button = UIButton()
+        button.backgroundColor =  UIColor.brandMainColor
+        button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
+        button.setTitle("查看详情", for: .normal)
+        button.setTitleColor(UIColor.white, for: .normal)
+        button.layer.cornerRadius = kCornerRadius3
+        button.addTarget(self, action: #selector(didLookBtnClicked), for: .touchUpInside)
+        return button
+    }()
+    
+    static func alertView() -> YHPrincipleCongratulationAlertView {
+        let view = YHPrincipleCongratulationAlertView(frame: UIScreen.main.bounds)
+        return view
+    }
+    
+    @objc func didCloseBtnClicked() {
+        self.dismiss()
+    }
+    
+    @objc func didLookBtnClicked() {
+        
+    }
+    
+    @objc func show() {
+        UIApplication.shared.yhKeyWindow()?.addSubview(self)
+    }
+    
+    @objc func dismiss() {
+        self.removeFromSuperview()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        createUI()
+    }
+    
+    func createUI() {
+        
+        self.addSubview(blackMaskView)
+        self.addSubview(whiteContentView)
+        self.addSubview(closeBtn)
+        whiteContentView.addSubview(titleLabel)
+        whiteContentView.addSubview(detailLabel)
+        whiteContentView.addSubview(bgImgView)
+        whiteContentView.addSubview(lookBtn)
+        
+        
+        blackMaskView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        whiteContentView.snp.makeConstraints { make in
+            make.left.equalTo(38)
+            make.right.equalTo(-38)
+            make.centerY.equalToSuperview()
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(24)
+            make.top.equalTo(32)
+            make.height.equalTo(34)
+        }
+        
+        detailLabel.snp.makeConstraints { make in
+            make.left.equalTo(24)
+            make.right.equalTo(-24)
+            make.top.equalTo(titleLabel.snp.bottom).offset(20)
+        }
+        
+        bgImgView.snp.makeConstraints { make in
+            make.width.equalTo(245)
+            make.height.equalTo(170)
+            make.top.equalTo(detailLabel.snp.bottom).offset(20)
+            make.centerX.equalToSuperview()
+        }
+        
+        lookBtn.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.bottom.equalTo(-16)
+            make.height.equalTo(45)
+            make.top.equalTo(bgImgView.snp.bottom)
+        }
+        
+        closeBtn.snp.makeConstraints { make in
+            make.width.height.equalTo(24)
+            make.top.equalTo(whiteContentView.snp.bottom).offset(24)
+            make.centerX.equalTo(whiteContentView)
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/V/YHPrincipleGroupUploadCell.swift

@@ -14,10 +14,12 @@ class YHPrincipleGroupUploadCell: UITableViewCell {
     static let cellReuseIdentifier = "YHPrincipleGroupUploadCell"
     let btnTitleColor:UIColor = .brandMainColor
     let uploadBtnSize = CGSize(width: (KScreenWidth-(40)*2), height: 44)
+    
+    var isNeedTemplate: Bool = false
 
-    lazy var grayView: UIView = {
+    lazy var whiteView: UIView = {
         let view = UIView()
-        view.backgroundColor = UIColor.init(hex: 0xf8f9fb)
+        view.backgroundColor = UIColor.white
         view.layer.cornerRadius = 6.0
         view.clipsToBounds = true
         return view
@@ -37,6 +39,17 @@ class YHPrincipleGroupUploadCell: UITableViewCell {
         return label
     }()
     
+    lazy var titleView: UITextView = {
+        let view = UITextView()
+        view.text = "《赴港居留同意书》"
+        view.textColor = UIColor.mainTextColor
+        view.font = UIFont.PFSC_M(ofSize: 17)
+        view.isScrollEnabled = false
+        view.isEditable = false
+        view.isSelectable = false
+        return view
+    }()
+    
     lazy var detailLabel: UILabel = {
         var label = UILabel()
         label.numberOfLines = 0
@@ -86,19 +99,23 @@ class YHPrincipleGroupUploadCell: UITableViewCell {
         
     }
     
+    func updateStatus(_ status: Int) {
+        
+    }
+    
     func setupUI() {
         
         self.selectionStyle = .none
-        contentView.backgroundColor = UIColor.white
-        
-        contentView.addSubview(grayView)
-        grayView.addSubview(titleLabel)
-        grayView.addSubview(lineView)
-        grayView.addSubview(detailLabel)
-        grayView.addSubview(uploadBtn)
+        contentView.backgroundColor = UIColor.init(hex: 0xf8f9fb)
+
+        contentView.addSubview(whiteView)
+        whiteView.addSubview(titleLabel)
+        whiteView.addSubview(lineView)
+        whiteView.addSubview(detailLabel)
+        whiteView.addSubview(uploadBtn)
         uploadBtn.layer.addSublayer(dotLineLayer)
 
-        grayView.snp.makeConstraints { make in
+        whiteView.snp.makeConstraints { make in
             make.left.equalTo(24)
             make.right.equalTo(-24)
             make.top.bottom.equalTo(0)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/PrincipleBatch(原则批)/V/YHPrincipleUploadFileCell.swift

+//
+//  YHPrincipleUploadFileCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/8/5.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHPrincipleUploadFileCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHPrincipleUploadFileCell"
+
+    static let height = 55.0
+    var iconImgV: UIImageView!
+    var titleLabel: UILabel!
+    var timeLabel: UILabel!
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    func updateModel(_ str: String) {
+        titleLabel.text = str
+        timeLabel.text = "上传于2023.02.06"
+    }
+    
+    func setupUI() {
+        
+        iconImgV = UIImageView(image: UIImage(named: "my_cer_type_pdf"))
+        self.addSubview(iconImgV)
+        
+        titleLabel = UILabel()
+        titleLabel.font = UIFont.PFSC_M(ofSize: 14)
+        titleLabel.textColor = UIColor.mainTextColor
+        titleLabel.text = "新公司在职证明.pdf"
+        self.addSubview(titleLabel)
+        
+        timeLabel = UILabel()
+        timeLabel.font = UIFont.PFSC_R(ofSize: 11)
+        timeLabel.textColor = UIColor.labelTextColor2
+        timeLabel.text = "上传于2024.12.12"
+        self.addSubview(timeLabel)
+        
+        iconImgV.snp.makeConstraints { make in
+            make.left.equalTo(22)
+            make.centerY.equalToSuperview()
+            make.width.height.equalTo(31.0)
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.bottom.equalTo(self.snp.centerY).offset(-1)
+            make.left.equalTo(iconImgV.snp.right).offset(18)
+            make.right.equalTo(-16)
+            make.height.equalTo(20)
+        }
+        
+        timeLabel.snp.makeConstraints { make in
+            make.top.equalTo(self.snp.centerY).offset(1)
+            make.left.equalTo(iconImgV.snp.right).offset(18)
+            make.height.equalTo(20)
+            make.right.equalTo(-16)
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -331,16 +331,21 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         if (indexPath.row >= items.count) { return }
+        
+        
                 
         if !checkLogin() {
             return
         }
         
-//        if true {
+        if true {
+            
+            YHPrincipleCongratulationAlertView.alertView().show()
+            
 //            let vc = YHPrincipleReviewListVC()
 //            self.navigationController?.pushViewController(vc)
-//            return
-//        }
+            return
+        }
         
         let item: PersonalModuleItem = items[indexPath.row]
         switch item.type {

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/原则批/Contents.json

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/原则批/principle_congratulation_alpha.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/原则批/principle_congratulation_bg.imageset/Contents.json

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