1、首页 提醒弹窗

2、添加返回上一级app界面的功能

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -682,6 +682,7 @@
 		A5765B262C771F86002CD3C1 /* YHRangeDatePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5765B252C771F86002CD3C1 /* YHRangeDatePickerView.swift */; };
 		A5765B282C772185002CD3C1 /* YHRangeDatePickerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5765B272C772185002CD3C1 /* YHRangeDatePickerCell.swift */; };
 		A5765B2A2C77268C002CD3C1 /* YHRangeDatePickerSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5765B292C77268C002CD3C1 /* YHRangeDatePickerSheetView.swift */; };
+		A57964C42C9E9FB80074D28B /* YHManagerFuncGuildeCheckView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A57964C32C9E9FB80074D28B /* YHManagerFuncGuildeCheckView.swift */; };
 		A580371E2BAD784B0031C312 /* YHMySchemeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */; };
 		A58037212BAD7B2A0031C312 /* YHMySchemeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */; };
 		A582B23D2BB944ED009D098C /* YHHKPlanDoctumentVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A582B23C2BB944ED009D098C /* YHHKPlanDoctumentVC.swift */; };
@@ -1534,6 +1535,7 @@
 		A5765B252C771F86002CD3C1 /* YHRangeDatePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRangeDatePickerView.swift; sourceTree = "<group>"; };
 		A5765B272C772185002CD3C1 /* YHRangeDatePickerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRangeDatePickerCell.swift; sourceTree = "<group>"; };
 		A5765B292C77268C002CD3C1 /* YHRangeDatePickerSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRangeDatePickerSheetView.swift; sourceTree = "<group>"; };
+		A57964C32C9E9FB80074D28B /* YHManagerFuncGuildeCheckView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHManagerFuncGuildeCheckView.swift; sourceTree = "<group>"; };
 		A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeViewModel.swift; sourceTree = "<group>"; };
 		A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeModel.swift; sourceTree = "<group>"; };
 		A582B23C2BB944ED009D098C /* YHHKPlanDoctumentVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKPlanDoctumentVC.swift; sourceTree = "<group>"; };
@@ -3872,6 +3874,7 @@
 				04213B2A2C48F1BE00797900 /* YHHomeInfoSectionCell.swift */,
 				04213B2C2C48FEB000797900 /* YHHomeInfoSectionHeadView.swift */,
 				A59B43CC2C4A36DF00B28379 /* YHStatusAdvantageBottomView.swift */,
+				A57964C32C9E9FB80074D28B /* YHManagerFuncGuildeCheckView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -5127,6 +5130,7 @@
 				A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */,
 				A5ACE93E2B4564F7002C94D2 /* UIImage+Extension.swift in Sources */,
 				A587F7C02BBADBE1002D9781 /* YHHKPlanItemView.swift in Sources */,
+				A57964C42C9E9FB80074D28B /* YHManagerFuncGuildeCheckView.swift in Sources */,
 				A5ACE94C2B4564F7002C94D2 /* YHHUDErrorView.swift in Sources */,
 				A5EB6C712C69FB9A0081FB6C /* YHOffivialApprovalSuccessView.swift in Sources */,
 				A567E5AD2BD7643D00D5D5A0 /* YHSearchInfoHistoryCell.swift in Sources */,

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeHoldViewPageViewController.swift

@@ -81,6 +81,16 @@ class YHHomeHoldViewPageViewController: YHBaseViewController {
             needReloadDataFlag = false
             homePageVC.requestOrder()
         }
+        
+        
+        
+    }
+    
+    
+    private func isViewVisibleOnScreen(view: UIView) -> Bool {
+        let viewFrame = view.convert(view.bounds, to: UIScreen.main.coordinateSpace)
+        let screenFrame = UIScreen.main.bounds
+        return viewFrame.intersects(screenFrame)
     }
 
     override func viewWillDisappear(_ animated: Bool) {
@@ -186,6 +196,25 @@ extension YHHomeHoldViewPageViewController {
                 } else if model.type == 20 {
                     //签约用户新人指引
                     //TODO: 需要完善  for test hjl
+                    
+                    print("HJL1: \(self.homePageVC.homeHeaderView.orderTipsView.mgrItem.frame.origin.y)")
+                    print("HJL2: \(self.isViewVisibleOnScreen(view: self.homePageVC.homeHeaderView.orderTipsView.mgrItem))")
+                    
+                    
+                    //TODO: for test hjl
+                    let view = YHManagerFuncGuildeCheckView.sheetView()
+                    view.show()
+                } else {
+                    //for test hjl
+                    
+                    
+                    print("HJL1: \(self.homePageVC.homeHeaderView.orderTipsView.mgrItem.frame.origin.y)")
+                    print("HJL2: \(self.isViewVisibleOnScreen(view: self.homePageVC.homeHeaderView.orderTipsView.mgrItem))")
+                    
+                    
+                    //TODO: for test hjl
+                    let view = YHManagerFuncGuildeCheckView.sheetView()
+                    view.show()
                 }
             }
         }
@@ -306,7 +335,6 @@ extension YHHomeHoldViewPageViewController {
                 //资讯
                 let vc = YHHomeInformationViewController()
                 arrItemVCs.append(vc)
-
             }
         }
         
@@ -335,7 +363,6 @@ extension YHHomeHoldViewPageViewController {
 
         segmentedView.listContainer = listContainerView
         view.addSubview(listContainerView)
-        
     }
     
     // 跳转到资讯tab

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHManagerFuncGuildeCheckView.swift

+//
+//  YHManagerFuncGuildeCheckView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/9/21.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHManagerFuncGuildeCheckView: UIView {
+    
+    typealias Block = (Int) -> ()
+    var block: Block?
+    
+    lazy var blackMaskView: UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor(hex: 0x0F1214, alpha: 0.6)
+        return view
+    }()
+    
+    
+    lazy var closeBtn: UIButton = {
+        let button = UIButton(type: .custom)
+        button.addTarget(self, action: #selector(clickCloseBtn), for: .touchUpInside)
+        button.setTitle("知道啦", for: .normal)
+        button.layer.borderColor = UIColor.white.cgColor
+        button.layer.cornerRadius = 2
+        button.layer.borderWidth = 0.5
+        button.titleLabel?.font = UIFont.PFSC_R(ofSize: 12)
+        
+        return button
+    }()
+    
+    lazy var imageV1: UIImageView = {
+        let imageV  = UIImageView()
+        imageV.image = UIImage(named: "home_guild_yhmanager_1")
+        imageV.contentMode = .scaleToFill
+        imageV.clipsToBounds = true
+        imageV.isUserInteractionEnabled = true
+        return imageV
+    }()
+    
+    lazy var imageV2: UIImageView = {
+        let imageV  = UIImageView()
+        imageV.image = UIImage(named: "home_guild_yhmanager_2")
+        imageV.contentMode = .scaleToFill
+        imageV.clipsToBounds = true
+        return imageV
+    }()
+    
+   
+    
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupUI()
+    }
+    
+//    var days : Int = 0 {
+//        didSet {
+//            lastText = "从递交资料伊始，经历了" + String(days) + "天，感谢您这一路以来对银河的信赖与包容！"
+//        }
+//    }
+}
+
+extension YHManagerFuncGuildeCheckView  {
+    
+    static func sheetView() -> YHManagerFuncGuildeCheckView {
+        let view = YHManagerFuncGuildeCheckView(frame:UIScreen.main.bounds)
+        return view
+    }
+    
+    func show() {
+        UIApplication.shared.yhKeyWindow()?.addSubview(self)
+    }
+    
+    @objc func dismiss() {
+        self.removeFromSuperview()
+    }
+    
+    @objc func clickCloseBtn() {
+        self.block?(1)
+        dismiss()
+    }
+}
+
+private extension YHManagerFuncGuildeCheckView {
+    func setupUI() {
+        addSubview(blackMaskView)
+        blackMaskView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        blackMaskView.addSubview(imageV2)
+        imageV2.snp.makeConstraints { make in
+            make.bottom.equalToSuperview().offset(-142.0)
+            make.left.equalTo(30)
+            make.right.equalTo(-30)
+            make.height.equalTo(63.fix)
+        }
+        
+        
+        blackMaskView.addSubview(imageV1)
+        imageV1.snp.makeConstraints { make in
+            make.bottom.equalTo(imageV2.snp.top).offset(-24)
+            make.left.equalTo(30)
+            make.right.equalTo(-30)
+            make.height.equalTo(228.fix)
+        }
+        
+        
+        imageV1.addSubview(closeBtn)
+        closeBtn.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-20)
+            make.bottom.equalToSuperview().offset(-22)
+            make.width.equalTo(66)
+            make.height.equalTo(30)
+        }
+        
+        closeBtn.YH_clickEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
+    }
+}

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsView.swift

@@ -130,7 +130,7 @@ class YHOrderTipsView: UIView {
         return itemView
     }()
     
-    private lazy var mgrItem: YHGalaxyManagerTipsItemView = {
+    lazy var mgrItem: YHGalaxyManagerTipsItemView = {
         let itemView: YHGalaxyManagerTipsItemView = YHGalaxyManagerTipsItemView()
         itemView.isHidden = true
         itemView.buttonClickEvent = { [weak self] in

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift

@@ -344,6 +344,10 @@ extension YHH5WebViewVC {
 // MARK: - h5实现的接口
 extension YHH5WebViewVC {
     
+    func backToAppPreView() {
+        self.navigationController?.popViewController()
+    }
+    
     func setAppNavigation(_ show : Bool) {
         if show {
             gk_navBarAlpha = 1.0

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -17,6 +17,14 @@ class YHJsApi: NSObject {
 }
 
 extension YHJsApi {
+    //5、返回App上一个界面
+    @objc func backToAppPreView() {
+        DispatchQueue.main.async {
+            if let delegate = self.delegate as? YHH5WebViewVC {
+                delegate.backToAppPreView()
+            }
+        }
+    }
     
     //4、设置app导航栏隐藏、显示
     @objc func setAppNavigation(_ tag : Any) {

galaxy/galaxy/Res/Assets.xcassets/Home/home_guild_yhmanager_1.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/Home/home_guild_yhmanager_2.imageset/Contents.json

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