修复认证-上滑页、下滑页左右两侧边缘点击没有反应的问题 , 上滑页下滑页左右角遮盖的视图宽高设为0

“张旭”
1 parent 9b149f21
Showing 5 changed files with 120 additions and 59 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/ShopUpDetail/CNLiveDownShopDetailController.swift
metaCode/Classes/Main/HomePage/View/Shop/ShopDetail/CNLliveShopDetailCloseCell.swift
metaCode/Classes/Vendors/NewPagedFlowView.m
@@ -134,6 +134,7 @@
 		19CC4D542ADD163D00308E2A /* CNUpSlideCardPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D532ADD163D00308E2A /* CNUpSlideCardPresentationController.swift */; };
 		19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D552ADD19C200308E2A /* String+Extension.swift */; };
 		19D2CE632AE8B65D00691757 /* CNLiveDownSlideTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19D2CE622AE8B65D00691757 /* CNLiveDownSlideTool.swift */; };
+		19E302672BC8FEBC00F6B8BD /* CNLliveShopDetailCloseCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19E302662BC8FEBC00F6B8BD /* CNLliveShopDetailCloseCell.swift */; };
 		19E9D1602B3A98C200D0FB30 /* CNLiveShopAssociatedGoodsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19E9D15F2B3A98C200D0FB30 /* CNLiveShopAssociatedGoodsTableViewCell.swift */; };
 		19E9D1622B3BBB2E00D0FB30 /* CNLiveFileManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19E9D1612B3BBB2E00D0FB30 /* CNLiveFileManager.swift */; };
 		19F1C2332AB5728B0083D06C /* CNIDCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19F1C2322AB5728B0083D06C /* CNIDCardView.swift */; };
@@ -408,6 +409,7 @@
 		19CC4D532ADD163D00308E2A /* CNUpSlideCardPresentationController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideCardPresentationController.swift; sourceTree = "<group>"; };
 		19CC4D552ADD19C200308E2A /* String+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "String+Extension.swift"; sourceTree = "<group>"; };
 		19D2CE622AE8B65D00691757 /* CNLiveDownSlideTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDownSlideTool.swift; sourceTree = "<group>"; };
+		19E302662BC8FEBC00F6B8BD /* CNLliveShopDetailCloseCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLliveShopDetailCloseCell.swift; sourceTree = "<group>"; };
 		19E9D15F2B3A98C200D0FB30 /* CNLiveShopAssociatedGoodsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopAssociatedGoodsTableViewCell.swift; sourceTree = "<group>"; };
 		19E9D1612B3BBB2E00D0FB30 /* CNLiveFileManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveFileManager.swift; sourceTree = "<group>"; };
 		19F1C2322AB5728B0083D06C /* CNIDCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNIDCardView.swift; sourceTree = "<group>"; };
@@ -877,6 +879,7 @@
 		1938BD4D2B512F4600390A34 /* ShopDetail */ = {
 			isa = PBXGroup;
 			children = (
+				19E302662BC8FEBC00F6B8BD /* CNLliveShopDetailCloseCell.swift */,
 				19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */,
 				19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */,
 				19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */,
@@ -1786,6 +1789,7 @@
 				19BB202B2AF382150094D962 /* CNLiveAdaptTool.swift in Sources */,
 				79E672032AFDFA9C00F2F768 /* CNLiveMineSignOutViewController.swift in Sources */,
 				19565ECD2AF8D256007D6727 /* CNLiveShopGoodsListClassifyView.swift in Sources */,
+				19E302672BC8FEBC00F6B8BD /* CNLliveShopDetailCloseCell.swift in Sources */,
 				1938BD322B4B8F0400390A34 /* CNLiveHomePageModel.swift in Sources */,
 				191732EF2B075C3A007BCC04 /* CNLiveCreateShopClassifyViewController.swift in Sources */,
 				1938BD302B4B8A3500390A34 /* CNLiveHomePageViewModel.swift in Sources */,
@@ -245,6 +245,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         super.viewWillAppear(animated)
         self.view.height = KSreenHeight
         self.topNavView.isHidden = true
+        self.hiddenLeftRightView()
 //        print("22222222currentPageIndex:\(self.pageFlowView.currentPageIndex)")
         switch vNumPage {
         case .VNumPageMain://中间主页
@@ -602,6 +603,9 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             vNumPage = .VNumPageUp
         }
  
+        //左右上角遮盖的视图 宽高设为0
+        self.hiddenLeftRightView()
+        
         if scrollView.contentOffset.y == KSreenHeight {
             self.view.height = self.tabBarY
  
@@ -617,6 +621,42 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
 //            }
         }
     }
+    // MARK: - 左右上角遮盖的视图 宽高设为0
+    func hiddenLeftRightView(){
+        let toIndex:Int = self.pageFlowView.currentPageIndex
+        if dataArray.count > toIndex{
+            if let identityModel = dataArray[toIndex] as? StandListModel{
+                if let toBannerView =  self.pageFlowView.cells[toIndex] as? CNCustomIndexView{
+                    self.pageFlowView.scrollView.bringSubviewToFront(toBannerView)
+                    UIView.animate(withDuration: 0.2) {
+                        toBannerView.downSlideView.frame = CGRectMake(-LeftGap, 0, KSreenWidth, KSreenHeight)
+                        toBannerView.downSlideView.upSlideVC.view.height = KSreenHeight-DownSlideBottomViewHeight
+                        if identityModel.id == 9{
+                            toBannerView.downSlideView.shopConsoleVC.view.height = KSreenHeight-DownSlideBottomViewHeight
+                        }
+                        toBannerView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,KSreenWidth, KSreenHeight)
+                    }
+                    
+                }
+            }
+        }
+        if toIndex-1 >= 0{
+            if let toBannerViewLeftView =  self.pageFlowView.cells[toIndex-1] as? CNCustomIndexView{
+                UIView.animate(withDuration: 0.2) {
+                    toBannerViewLeftView.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
+                    toBannerViewLeftView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
+                }
+            }
+        }
+        if toIndex+1 < self.pageFlowView.cells.count{
+            if let toBannerViewRightView =  self.pageFlowView.cells[toIndex+1] as? CNCustomIndexView{
+                UIView.animate(withDuration: 0.2) {
+                    toBannerViewRightView.downSlideView.frame = CGRectMake(-LeftGap, 0, 0, 0)
+                    toBannerViewRightView.upSlideView.frame = CGRectMake(-LeftGap, KSreenHeight*2,0, 0)
+                }
+            }
+        }
+    }
  
     //MARK: - 网络请求获取身份列表
     func getUserIdentityApi()
@@ -13,6 +13,7 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
     let kCNLiveShopDetailDefaultCellID = "kCNLiveShopDetailDefaultCellID"
     let kCNLiveShopDetailHeaderViewID = "kCNLiveShopDetailHeaderViewID"
  
+    let kCNLiveShopDetailCloseCellID = "kCNLiveShopDetailCloseCellID"
     let kCNLiveShopDetailBannerCellID = "kCNLiveShopDetailBannerCellID"
     let kCNLiveShopDetailBtnsCellID = "kCNLiveShopDetailBtnsCellID"
     let kCNLiveShopDetailOrderAssetCellID = "kCNLiveShopDetailOrderAssetCellID"
@@ -22,56 +23,21 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
         let shopDetailModel = CNLiveShopDetailModel()
         return shopDetailModel
     }()
-    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
-        let upSlideView = self.view.superview as! CNUpSlideView
-        let scrollView = upSlideView.superview as! UIScrollView
-        scrollView.setContentOffset(CGPoint(x: 0, y: scrollView.height), animated: true)
-        
-        let result:Dictionary = ["AuthVNumPage":2]
-        NotificationCenter.default.post(name:  Notification.Name.AuthVNumPageManage.kAuthVNumPageChangedNotification, object: nil, userInfo: result)
-        
-        currentViewController()?.tabBarController?.tabBar.isHidden = false
-        
-        let metaVC = currentViewController() as! CNMetaCodeHomePageController
-        let index = metaVC.pageFlowView.currentPageIndex
-        let customIndexView = metaVC.pageFlowView.viewWithTag(100+index) as! CNCustomIndexView
-        customIndexView.superScrollView?.isScrollEnabled = true
-    }
-//    lazy var closeBtn: UIButton = {
-//        let closeBtn = UIButton(type: .custom)
-//        closeBtn.frame = CGRect(x: KSreenWidth-50, y: KStatusBarHeight, width: 50, height: KNavigationHeight-KStatusBarHeight)
-//        closeBtn.setImage(UIImage(named: "mine_header_icon_close"), for: .normal)
-//        closeBtn.addTarget(self, action: #selector(closeBtnAction), for: .touchUpInside)
-//        closeBtn.isUserInteractionEnabled = false
-//        return closeBtn
-//    }()
-    
-//    lazy var navView: UIView = {
-//        let closeBtn = UIView(frame: CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth-50, height: KNavigationHeight-KStatusBarHeight))
-//        closeBtn.backgroundColor = .yellow
-//        return closeBtn
-//    }()
-    lazy var closeBtn: UIImageView = {
-        let closeBtn = UIImageView(frame: CGRect(x: KSreenWidth-35, y: KStatusBarHeight+(KNavigationHeight-KStatusBarHeight-20)*0.5, width: 20, height: 20))
-        closeBtn.image = UIImage(named: "mine_header_icon_close")
-//        closeBtn.isUserInteractionEnabled = true
-//        let tap = UITapGestureRecognizer.init(target: self, action: #selector(closeBtnAction))
-//        closeBtn.addGestureRecognizer(tap)
-        return closeBtn
-        }()
-    
     lazy var collectionView: UICollectionView = {
         let layout = UICollectionViewFlowLayout.init()
         let collectionView = UICollectionView(frame: .zero, collectionViewLayout: layout)
         collectionView.delegate = self
         collectionView.dataSource = self
         collectionView.backgroundColor = .white
-//        collectionView.register(CNLiveShopConsoleHeaderView.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: kCNLiveShopConsoleCollectionReusableHeaderViewID)
+        
+        collectionView.register(CNLliveShopDetailCloseCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailCloseCellID)
+
         collectionView.register(CNLliveShopDetailBannerCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailBannerCellID)
         collectionView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailDefaultCellID)
         collectionView.register(CNLiveShopDetailBtnsCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailBtnsCellID)
         collectionView.register(CNLiveShopDetailOrderAssetCell.self, forCellWithReuseIdentifier: kCNLiveShopDetailOrderAssetCellID)
  
+        
         return collectionView
     }()
  
@@ -80,12 +46,8 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
         self.getShopDetailApi()
         self.view.addSubview(collectionView)
         collectionView.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(KNavigationHeight)
-            make.left.bottom.right.equalToSuperview()
+            make.top.left.bottom.right.equalToSuperview()
         }
-        self.view.addSubview(self.closeBtn)
-//        self.view.addSubview(navView)
-        
     }
  
     // MARK: BtnAction
@@ -102,15 +64,13 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
         let index = metaVC.pageFlowView.currentPageIndex
         let customIndexView = metaVC.pageFlowView.viewWithTag(100+index) as! CNCustomIndexView
         customIndexView.superScrollView?.isScrollEnabled = true
-//        customIndexView.baseScrollView.setContentOffset(CGPoint(x: 0, y: customIndexView.baseScrollView.height), animated: true)
-//        currentViewController()?.tabBarController?.tabBar.isHidden = false
     }
-    
+        
     // MARK: - UICollectionViewDelegate
     func numberOfSections(in collectionView: UICollectionView) -> Int {
         if self.shopDetailModel.is_seller != nil{
             if self.shopDetailModel.is_seller == true{
-                return 5
+                return 6
             }else{//非商家,不处理
                 return 3
             }
@@ -121,7 +81,7 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         if self.shopDetailModel.is_seller != nil {
             if (self.shopDetailModel.is_seller == true) {
-                if (section == 4) {
+                if (section == 5) {
                     let count = self.shopDetailModel.dynamic.count
                     return count == 0 ? 1 : count
                 }else {
@@ -144,12 +104,15 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
 //    }
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         switch indexPath.section {
-        case 0://banner轮播图
+        case 0://close关闭
+            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailCloseCellID, for: indexPath) as! CNLliveShopDetailCloseCell
+            return cell
+        case 1://banner轮播图
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailBannerCellID, for: indexPath) as! CNLliveShopDetailBannerCell
  
             cell.shopDetailModel = self.shopDetailModel
             return cell
-        case 1://btn
+        case 2://btn
             if (self.shopDetailModel.is_seller != nil && self.shopDetailModel.is_seller == true) {
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailBtnsCellID, for: indexPath) as! CNLiveShopDetailBtnsCell
                 cell.shopDetailModel = self.shopDetailModel
@@ -158,7 +121,7 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
                 return cell
             }
-        case 2://我的订单
+        case 3://我的订单
             if (self.shopDetailModel.is_seller != nil && self.shopDetailModel.is_seller == true) {
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailOrderAssetCellID, for: indexPath) as! CNLiveShopDetailOrderAssetCell
                 cell.displayType = .CNLiveShopDetailDisplayTypeOrder
@@ -168,7 +131,7 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
                 return cell
             }
-        case 3://我的资产
+        case 4://我的资产
             if (self.shopDetailModel.is_seller != nil && self.shopDetailModel.is_seller == true) {
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailOrderAssetCellID, for: indexPath) as! CNLiveShopDetailOrderAssetCell
                 cell.displayType = .CNLiveShopDetailDisplayTypeAsset
@@ -178,7 +141,6 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
                 let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
                 return cell
             }
-//        case 4:
         default:
             let cell = collectionView.dequeueReusableCell(withReuseIdentifier: kCNLiveShopDetailDefaultCellID, for: indexPath)
             return cell
@@ -186,19 +148,27 @@ class CNLiveDownShopDetailController:CNLiveBaseViewController, UICollectionViewD
  
     }
  
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        if indexPath.section == 0{
+            self.closeBtnAction()
+        }
+    }
+    
     // MARK: - UICollectionViewDelegateFlowLayout
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         if (self.shopDetailModel.is_seller != nil && self.shopDetailModel.is_seller == true) {
             switch (indexPath.section) {
-                case 0://banner
+                case 0://close
+                    return CGSize(width: KSreenWidth, height: KNavigationHeight)
+                case 1://banner
                     return CGSize(width: KSreenWidth, height: CNLiveAdaptTool.adaptLength(length: 210))
-                case 1://btn
+                case 2://btn
                     return CGSize(width: KSreenWidth, height: 10+45+5+17+15)
-                case 2://我的订单
+                case 3://我的订单
                     return CGSize(width: KSreenWidth, height: 10+25+15+CNLiveAdaptTool.adaptLength(length: tempOrderZiChanHeight)+15)
-                case 3://我的资产
+                case 4://我的资产
                     return CGSize(width: KSreenWidth, height: 10+25+15+CNLiveAdaptTool.adaptLength(length: tempOrderZiChanHeight)+15)
-                case 4://
+                case 5://
                     return CGSize(width: KSreenWidth, height: 50)
                 default:
                     return CGSizeZero
+//
+//  CNLliveShopDetailCloseCell.swift
+//  metaCode
+//
+//  Created by zx on 2024/4/12.
+//  电商上滑页-close cell
+
+import Foundation
+
+class CNLliveShopDetailCloseCell: UICollectionViewCell {
+    lazy var closeBtn: UIImageView = {
+        let closeBtn = UIImageView(frame: CGRect(x: KSreenWidth-35, y: KStatusBarHeight+(KNavigationHeight-KStatusBarHeight-20)*0.5, width: 20, height: 20))
+        closeBtn.image = UIImage(named: "mine_header_icon_close")
+        return closeBtn
+        }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.setUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setUI(){
+        self.backgroundColor = .white
+        self.contentView.addSubview(self.closeBtn)
+    }
+
+}
@@ -557,6 +557,22 @@ static NSString *subviewClassName;
         newPoint.y = point.y - _scrollView.frame.origin.y + _scrollView.contentOffset.y;
         if ([_scrollView pointInside:newPoint withEvent:event]) {
             return [_scrollView hitTest:newPoint withEvent:event];
+        }else{
+            //24年4-12,多层的子视图超过了父视图,如果有子视图内点击,传递给子视图点击事件
+            PGIndexBannerSubiew *cell = [_cells objectAtIndex:self.currentPageIndex];
+            for (UIView *view in cell.subviews) {
+                if ([view isKindOfClass:[UIScrollView class]]){
+                    UIScrollView *scrollView = (UIScrollView *)view;
+                    for (UIView *subView in [scrollView subviews]) {
+                        // 将父类point点转换成子类坐标系下的点
+                        CGPoint convertedPoint = [subView convertPoint:point fromView:self];
+                        UIView *targetView = [subView hitTest:convertedPoint withEvent:event];
+                        if (targetView != nil) {
+                            return targetView;
+                        }
+                    }
+                }
+            }
         }
  
         return _scrollView;