处理活动行程相关的跳转逻辑

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

@@ -78,9 +78,7 @@ extension YHActivityDetailViewController {
                 showApplyUI()
             case .applied:
                 printLog("已报名")
-                let vc = YHActivityTravelViewController()
-                vc.travelId = viewModel.activityDetailModel?.checkId ?? ""
-                navigationController?.pushViewController(vc)
+                gotoActivityTravelVC()
             case .canceled:
 //                printLog("已取消报名")
                 showApplyUI()
@@ -96,6 +94,34 @@ extension YHActivityDetailViewController {
         
     }
     
+    func gotoActivityTravelVC() {
+        if let nav = self.navigationController {
+            let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityTravelViewController.self) }
+            if rrr {
+                
+                var  targetVc : UIViewController?
+                for(_,value) in nav.viewControllers.enumerated() {
+                    if value.isKind(of: YHActivityTravelViewController.self) {
+                        targetVc = value
+                        break
+                    }
+                }
+                
+                if let vc = targetVc {
+                    navigationController?.popToViewController(vc, animated: true)
+                }
+                return
+            }
+        }
+        
+        
+        //行程单详情
+        let vc = YHActivityTravelViewController()
+        vc.travelId = viewModel.activityDetailModel?.checkId ?? ""
+        navigationController?.pushViewController(vc)
+    }
+    
+    
     func showApplyUI() {
         YHApplyActivityAlert.showApplyActivityAlertView(name: self.viewModel.activityDetailModel?.businessCardName ?? "") { (tag,name,number,phone) in
             if tag {

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

@@ -272,9 +272,7 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
             
             if type == 1 {
                 if model.status.int == 2 {
-                    let vc = YHActivityTravelViewController()
-                    vc.travelId = model.checkId
-                    navigationController?.pushViewController(vc)
+                    gotoActivityTravelVC(checkId: model.checkId)
                     return
                 } else if model.status.int == 5 {
                     YHHUD.flash(message: "已下架")
@@ -289,6 +287,34 @@ extension YHActivityListViewController: UITableViewDelegate, UITableViewDataSour
         }
     }
     
+    
+    func gotoActivityTravelVC(checkId : String = "") {
+        if let nav = self.navigationController {
+            let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityTravelViewController.self) }
+            if rrr {
+                
+                var  targetVc : UIViewController?
+                for(_,value) in nav.viewControllers.enumerated() {
+                    if value.isKind(of: YHActivityTravelViewController.self) {
+                        targetVc = value
+                        break
+                    }
+                }
+                
+                if let vc = targetVc {
+                    navigationController?.popToViewController(vc, animated: true)
+                }
+                return
+            }
+        }
+        
+        
+        //行程单详情
+        let vc = YHActivityTravelViewController()
+        vc.travelId = checkId
+        navigationController?.pushViewController(vc)
+    }
+    
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
         var height : CGFloat = 16.0
         if section != 0 {

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

@@ -126,13 +126,38 @@ extension YHApplyActivityResultViewController {
     @objc func clickSubmitBtn() {
         if isSuccessFlag {
             //行程单详情
-            let vc = YHActivityTravelViewController()
-            vc.travelId = activityTravelId
-            self.navigationController?.pushViewController(vc)
-            
+            gotoActivityTravelVC()
         } else {
             //返回活动列表
             navigationController?.popToRootViewController(animated: true)
         }
     }
+    
+    
+    func gotoActivityTravelVC() {
+        if let nav = self.navigationController {
+            let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityTravelViewController.self) }
+            if rrr {
+                
+                var  targetVc : UIViewController?
+                for(_,value) in nav.viewControllers.enumerated() {
+                    if value.isKind(of: YHActivityTravelViewController.self) {
+                        targetVc = value
+                        break
+                    }
+                }
+                
+                if let vc = targetVc {
+                    navigationController?.popToViewController(vc, animated: true)
+                }
+                return
+            }
+        }
+        
+        
+        //行程单详情
+        let vc = YHActivityTravelViewController()
+        vc.travelId = activityTravelId
+        self.navigationController?.pushViewController(vc)
+    }
 }

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

@@ -98,6 +98,40 @@ class YHActivityTravelitemView: UIView {
 
 extension YHActivityTravelitemView {
     
+    @objc func goActiveDetailVC(gestureRecognizer:UITapGestureRecognizer) {
+        
+        guard let model = dataModel else  {
+            return
+        }
+        
+        if let pvc = self.parentViewController,let nav = pvc.navigationController {
+            let rrr = nav.viewControllers.contains { $0.isKind(of: YHActivityDetailViewController.self) }
+            if rrr {
+                
+                var  targetVc : UIViewController?
+                for(_,value) in nav.viewControllers.enumerated() {
+                    if value.isKind(of: YHActivityDetailViewController.self) {
+                        targetVc = value
+                        break
+                    }
+                }
+                
+                if let vc = targetVc {
+                    pvc.navigationController?.popToViewController(vc, animated: true)
+                }
+                return
+            }
+            
+            
+            
+            let vc = YHActivityDetailViewController()
+            vc.activityId = String(model.id)
+            vc.activityName = model.name
+            pvc.navigationController?.pushViewController(vc)
+        }
+    }
+    
+    
     func updateUI() {
         guard let model = dataModel else  {
             return
@@ -167,6 +201,15 @@ extension YHActivityTravelitemView {
             make.bottom.equalToSuperview().offset(-20)
         }
         
+        
+        
+        let tap : UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(goActiveDetailVC(gestureRecognizer:)))
+        activityImgV.addGestureRecognizer(tap)
+        activityImgV.isUserInteractionEnabled = true
+        
+        let tap1 : UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(goActiveDetailVC(gestureRecognizer:)))
+        nameLabel.addGestureRecognizer(tap1)
+        nameLabel.isUserInteractionEnabled = true
     }
     
     func setupUI() {