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

galaxy/fastlane/Fastfile

@@ -30,7 +30,7 @@ platform :ios do
   uat = "uat"
   
   #打包正使用的分支
-  myPack_branch = uat
+  myPack_branch = develop_branch
 
   # 打adhoc包 执行命令 fastlane galaxyTest
   lane :galaxyTest do 

galaxy/galaxy/Applegate(JPush).swift

@@ -115,7 +115,6 @@ extension AppDelegate: JPUSHRegisterDelegate {
         // 转换到消息tab
         YHLoginManager.shared.needJumpToMsgTabFlag = true
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.25, execute: {
-//            NotificationCenter.default.post(name: YhConstant.YhNotification.didRevMsgNotifiction, object: nil)
             goToMessagePage()
         })
     }

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/V/YHInvitationWithGiftsSecondTableViewCell.swift

@@ -451,10 +451,11 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
                 viewModel.state = two
                 self.page = 1
                 //请求刷新数据
+                self.tableView.es.resetNoMoreData()
                 self.viewModel.postRecord(page: 1) {[weak self] success, error in
                     guard let self = self else { return }
-                    self.tableView.es.stopLoadingMore()
-                    if self.viewModel.recordModel.page_count == self.page {
+//                    self.tableView.es.stopLoadingMore()
+                    if self.viewModel.recordModel.page_count == 1 {
                         self.tableView.es.noticeNoMoreData()
                         self.tableView.footer?.alpha = 1
                     }

galaxy/galaxy/Classes/Modules/Home(首页)/InvitationWithGifts(邀请有礼)/VM/YHInvitationWithGiftsViewModel.swift

@@ -46,10 +46,10 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
             param.updateValue(self.startTime, forKey: "registered_date.begin_date")
         }
         if self.endTime.count != 0 {
-            param.updateValue(self.endTime, forKey: "egistered_date.end_date")
+            param.updateValue(self.endTime, forKey: "registered_date.end_date")
         }
         if self.state < 3 {
-            param.updateValue(self.state + 1, forKey: "status")
+            param.updateValue((2 - self.state) + 1, forKey: "status")
         }
         let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             guard let self = self else { return }
@@ -83,7 +83,7 @@ class YHInvitationWithGiftsViewModel: YHBaseViewModel {
         var param: [String: Any] = ["page": page,
                                     "pagesize": 20]
         if self.state < 3 {
-            param.updateValue(self.state + 1, forKey: "status")
+            param.updateValue((2 - self.state) + 1, forKey: "status")
         }
         if !registered_date.isEmpty {
             param.updateValue(registered_date, forKey: "registered_date")

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService(客服段)/ OfficialApprovalBatch(正式批)/C/YHOfficialApprovalResultVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/ OfficialApprovalBatch/C/YHOfficialApprovalResultVC2.swift

@@ -12,8 +12,10 @@ import UIKit
  正式批 结果页
  */
 
-class YHOfficialApprovalResultVC: YHBaseViewController {
+class YHOfficialApprovalResultVC2: YHBaseViewController {
 
+    var contentView: YHOffivialApprovalSuccessView!
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
@@ -48,7 +50,7 @@ class YHOfficialApprovalResultVC: YHBaseViewController {
     
 }
 
-private extension YHOfficialApprovalResultVC {
+private extension YHOfficialApprovalResultVC2 {
     func setupUI() {
         
         gk_navBarAlpha = 0.0
@@ -78,11 +80,25 @@ private extension YHOfficialApprovalResultVC {
             make.width.equalTo(294)
             make.height.equalTo(530)
         }
-        docImageV.layer.zPosition = 1
-        
-        
-        
         
+        contentView = {
+            let view = YHOffivialApprovalSuccessView()
+            view.updataView(data: ["祝贺您和您的家人申请的","【优秀人才入境计划】","2023年10月1日正式获批","这意味着，您领取香港居民身份证","仅有一步之遥！！"])
+            return view
+        }()
+        view.addSubview(contentView)
+        contentView.snp.makeConstraints { make in
+            make.left.equalTo(144)
+            make.top.equalTo(213)
+            make.width.equalTo(334)
+            make.height.equalTo(239)
+        }
+        contentView.transform = rotatedTransform()
+    }
+    
+    private func rotatedTransform() -> CGAffineTransform {
+        // 创建一个 CGAffineTransform 对象并设置旋转角度
+        return CGAffineTransform(rotationAngle: -CGFloat.pi / 64) // 旋转 45 度
     }
     
     func addRightItem() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/ OfficialApprovalBatch/V/YHOffivialApprovalSuccessView.swift

+//
+//  YHOffivialApprovalSuccessView.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/9.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHOffivialApprovalSuccessView: UIView {
+
+    var titleLabel: UILabel!
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupUI()
+    }
+
+    func setupUI() {
+        titleLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 30)
+            label.textColor = UIColor(hex: 0x881000)
+            label.text = "恭喜 侯先生！"
+            return label
+        }()
+        addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(5)
+            make.top.equalTo(0)
+            make.right.equalTo(-5)
+            make.height.equalTo(42)
+        }
+    }
+    
+    func updataView(data: [String]) {
+        var h = 80
+        var index = 0
+        for item in data {
+            let label = UILabel()
+            label.text = item
+            label.font = UIFont.PFSC_M(ofSize: 15)
+            label.textColor = UIColor(hex: 0x881000)
+            if index == 2 {
+                label.textColor = UIColor(hex: 0xd12501)
+            }
+            addSubview(label)
+            label.snp.makeConstraints { make in
+                make.left.equalTo(5)
+                make.top.equalTo(h)
+                make.right.equalTo(-5)
+                make.height.equalTo(26)
+            }
+            let line = UIView()
+            line.backgroundColor = UIColor(hex: 0x881000).withAlphaComponent(0.15)
+            addSubview(line)
+            line.snp.makeConstraints { make in
+                make.left.equalTo(5)
+                make.top.equalTo(h + 26 + 5)
+                make.width.equalTo(234)
+                make.height.equalTo(1)
+            }
+            h = h + 26 + 5
+            index = index + 1
+        }
+    }
+}

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

@@ -102,7 +102,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
             
             
 //            let vc = YHOfficialApprovalResultVC()
-//            self.navigationController?.pushViewController(vc) //for test hjl
+//            self?.navigationController?.pushViewController(vc) //for test hjl
         }
         view.evaluateBlock = {
             [weak self] in