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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -442,6 +442,7 @@
 		A592FE952BA6D23C0062FACA /* YHCertificateEntryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE942BA6D23C0062FACA /* YHCertificateEntryCell.swift */; };
 		A592FE972BA6DB340062FACA /* YHCertificateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE962BA6DB340062FACA /* YHCertificateViewModel.swift */; };
 		A59CCBCE2C241FCB001910FE /* YHApplyActivityAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59CCBCD2C241FCB001910FE /* YHApplyActivityAlert.swift */; };
+		A59CCBD02C244B13001910FE /* YHApplyActivityResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59CCBCF2C244B13001910FE /* YHApplyActivityResultViewController.swift */; };
 		A5ACE9282B4564F7002C94D2 /* YHSmsCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8DE2B4564F7002C94D2 /* YHSmsCodeView.swift */; };
 		A5ACE9292B4564F7002C94D2 /* YHSmsCodeInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8E02B4564F7002C94D2 /* YHSmsCodeInputView.swift */; };
 		A5ACE92C2B4564F7002C94D2 /* YHLoginStyleButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8E42B4564F7002C94D2 /* YHLoginStyleButton.swift */; };
@@ -994,6 +995,7 @@
 		A592FE942BA6D23C0062FACA /* YHCertificateEntryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateEntryCell.swift; sourceTree = "<group>"; };
 		A592FE962BA6DB340062FACA /* YHCertificateViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCertificateViewModel.swift; sourceTree = "<group>"; };
 		A59CCBCD2C241FCB001910FE /* YHApplyActivityAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHApplyActivityAlert.swift; sourceTree = "<group>"; };
+		A59CCBCF2C244B13001910FE /* YHApplyActivityResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHApplyActivityResultViewController.swift; sourceTree = "<group>"; };
 		A5ACE8DE2B4564F7002C94D2 /* YHSmsCodeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSmsCodeView.swift; sourceTree = "<group>"; };
 		A5ACE8E02B4564F7002C94D2 /* YHSmsCodeInputView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSmsCodeInputView.swift; sourceTree = "<group>"; };
 		A5ACE8E42B4564F7002C94D2 /* YHLoginStyleButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHLoginStyleButton.swift; sourceTree = "<group>"; };
@@ -2345,6 +2347,7 @@
 			children = (
 				044D0BEF2C2025FF00C5CF5E /* YHActivityListViewController.swift */,
 				A5787E352C23CFDA00B021D7 /* YHActivityDetailViewController.swift */,
+				A59CCBCF2C244B13001910FE /* YHApplyActivityResultViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -3179,6 +3182,7 @@
 				045EEE7A2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift in Sources */,
 				0414BDA92BC7E81500225367 /* YHMyPermissionSettingVC.swift in Sources */,
 				A567E5AA2BD7643D00D5D5A0 /* YHGestureTableView.swift in Sources */,
+				A59CCBD02C244B13001910FE /* YHApplyActivityResultViewController.swift in Sources */,
 				04F5F8642C19460D004A463C /* YHHKLifeViewController.swift in Sources */,
 				A5ACE94A2B4564F7002C94D2 /* YHHUDProgressView.swift in Sources */,
 				04A271232BABFF3200652B1B /* YHCertificateUploadTypeCell.swift in Sources */,

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityDetailViewController.swift

@@ -72,14 +72,20 @@ class YHActivityDetailViewController: YHBaseViewController {
             make.height.equalTo(YHActivityDetailBottomView.viewH)
         }
         
+        bottomView.block = { tag in
+            
+            YHApplyActivityAlert.showApplyActivityAlertView { tag in
+                let vc = YHApplyActivityResultViewController()
+                self.navigationController?.pushViewController(vc)
+            }
+        }
+        
         //2.
 //        addTopView()
 //        topView.backgroundColor = .red
         
         
-        YHApplyActivityAlert.showApplyActivityAlertView { tag in
-            
-        }
+        
     }
 }
 

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift

@@ -10,10 +10,12 @@ import UIKit
 import JXSegmentedView
 
 /*
- 活动列表
+ 活动列表 或 我的报名活动
  */
-
 class YHActivityListViewController: YHBaseViewController {
+    
+    var type : Int = 0 //0-活动列表  1-我的报名活动
+    
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame:.zero, style:.grouped)
         tableView.showsVerticalScrollIndicator = false
@@ -38,8 +40,19 @@ class YHActivityListViewController: YHBaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         view.backgroundColor = .white
+        
         gk_navigationBar.isHidden = true
         gk_navigationBar.backgroundColor = .white
+        
+        
+        
+        if type == 1 {
+            gk_navTitle = "我的活动"
+            gk_navigationBar.isHidden = false
+            gk_navigationBar.backgroundColor = .clear
+        }
+        
+        
         view.addSubview(self.tableView)
         tableView.snp.makeConstraints { make in
             make.left.equalTo(20)
@@ -56,9 +69,11 @@ class YHActivityListViewController: YHBaseViewController {
         tableView.es.addInfiniteScrolling {
             self.loadMoreData()
         }
+        
+        emptyDataTipsView.isHidden = friendsArr.count > 0 ? true : false
     }
     
-    var friendsArr:[String] = ["","","","","","","","",""]
+    var friendsArr:[String] = ["","","",""]
 }
 
 extension YHActivityListViewController {

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHApplyActivityResultViewController.swift

+//
+//  YHApplyActivityResultViewController.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/6/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+/*
+ 报名结果页
+ */
+class YHApplyActivityResultViewController:  YHBaseViewController {
+    
+    lazy var statusImageV:UIImageView = {
+        let view = UIImageView()
+        view.image = UIImage(named: "activity_apply_result_success")
+        view.contentMode = .scaleAspectFill
+        return view
+    }()
+    
+    
+    lazy var titleLabel:UILabel = {
+        let lable = UILabel()
+        lable.textColor = UIColor.mainTextColor
+        lable.textAlignment = .center
+        lable.font = UIFont.PFSC_M(ofSize:18)
+        lable.text = "报名成功"
+        lable.numberOfLines = 0
+        return lable
+    }()
+    
+    
+    lazy var nameLabel:UILabel = {
+        let lable = UILabel()
+        lable.textColor = UIColor.mainTextColor
+        lable.textAlignment = .center
+        lable.font = UIFont.PFSC_R(ofSize:14)
+        lable.text = "已报名成功活动【哈佛爸爸线下教育沙龙】，记得准时参加哦"
+        lable.numberOfLines = 0
+        return lable
+    }()
+    
+    
+    lazy var submitButton:UIButton = {
+        let button = UIButton(type: .custom)
+        button.titleLabel?.font = UIFont.PFSC_R(ofSize: 16)
+        button.contentHorizontalAlignment = .center
+        button.setTitle("查看行程单", for: .normal)
+        button.setTitle("查看行程单", for: .highlighted)
+        button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
+        button.setTitleColor( UIColor(hex:0xffffff), for: .highlighted)
+        button.layer.cornerRadius = kCornerRadius3
+        button.addTarget(self, action: #selector(clickSubmitBtn), for: .touchUpInside)
+        button.layer.cornerRadius = kCornerRadius3
+        button.clipsToBounds = true
+        button.backgroundColor = .brandMainColor
+        return button
+    }()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+    }
+}
+
+extension YHApplyActivityResultViewController {
+    func setupUI() {
+        gk_navigationBar.isHidden = false
+        gk_navigationBar.backgroundColor = .clear
+        
+//        view.backgroundColor = UIColor.pageBkgColor
+        view.backgroundColor = UIColor.white
+        
+        view.addSubview(statusImageV)
+        statusImageV.snp.makeConstraints { make in
+            make.top.equalTo(180)
+            make.centerX.equalToSuperview()
+            make.height.width.equalTo(128)
+        }
+        
+        view.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(statusImageV.snp.bottom)
+            make.centerX.equalToSuperview()
+            make.height.equalTo(25)
+        }
+        
+        
+        view.addSubview(nameLabel)
+        nameLabel.snp.makeConstraints { make in
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
+            make.centerX.equalToSuperview()
+            make.left.equalTo(46)
+            make.right.equalTo(-46)
+        }
+        
+        view.addSubview(submitButton)
+        submitButton.snp.makeConstraints { make in
+            make.top.equalTo(nameLabel.snp.bottom).offset(42)
+            make.centerX.equalToSuperview()
+            make.width.equalTo(142)
+            make.height.equalTo(42)
+        }
+    }
+    
+    @objc func clickSubmitBtn() {
+        
+    }
+}

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHApplyActivityAlert.swift

@@ -360,6 +360,8 @@ class YHApplyActivityAlert: UIView {
     }
     
     @objc func clickSubmitBtn() {
+        
+        block?(true)
         clickCloseBtn()
     }
     

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

@@ -325,6 +325,10 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             self.navigationController?.pushViewController(vc)
         case .myActivity:
             printLog("我的活动")
+            let vc = YHActivityListViewController()
+            vc.type = 1
+            self.navigationController?.pushViewController(vc)
+            
         default:
             printLog("不需要响应")
         }

galaxy/galaxy/Res/Assets.xcassets/Activity/activity_apply_result_fail.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/Activity/activity_apply_result_success.imageset/Contents.json

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