禁止认证mainview左右没有视图时滑动

张旭
1 parent de9f1649
Showing 52 changed files with 165 additions and 109 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNCertificationView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveAddGoodsSelectUploadImageView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveRoundedRectView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveRoundedRectView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveSelUplSingleImageView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveSelUplSingleImageView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopAddGoodsSingleView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopAddGoodsSingleView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopAssociatedGoodsTableViewCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopAssociatedGoodsTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassifyCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassifyCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassifyInputTableViewCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassifyInputTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassifySectionHeaderView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassifySectionHeaderView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassifySwitchTableViewCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassifySwitchTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassilyIconTableViewCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassilyIconTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassilyManageHeaderView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassilyManageHeaderView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopClassilyManageTableViewCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopClassilyManageTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopGoodsListCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopGoodsListCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopGoodsListClassifyView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopGoodsListClassifyView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopGoodsManageListTableViewCell.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopGoodsManageListTableViewCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopTextView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveShopTextView.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveSwitchView.swift → metaCode/Classes/Main/HomePage/View/Shop/GoodsManager/CNLiveSwitchView.swift
@@ -801,6 +801,80 @@
 			path = PlayletHomePage;
 			sourceTree = "<group>";
 		};
+		1938BD482B512C5800390A34 /* DownSlide */ = {
+			isa = PBXGroup;
+			children = (
+				7CD6753B2A2740B0008354C1 /* CNDownSlideView.swift */,
+				7CD6753A2A2740B0008354C1 /* CNDownSlideViewRemindView.swift */,
+				19FA20162AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift */,
+				19FA20182AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift */,
+				19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */,
+				19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */,
+			);
+			path = DownSlide;
+			sourceTree = "<group>";
+		};
+		1938BD492B512CA300390A34 /* UpSlide */ = {
+			isa = PBXGroup;
+			children = (
+				7CD675392A2740B0008354C1 /* CNUpSlideView.swift */,
+				7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */,
+			);
+			path = UpSlide;
+			sourceTree = "<group>";
+		};
+		1938BD4A2B512CCE00390A34 /* MainView */ = {
+			isa = PBXGroup;
+			children = (
+				7CD675382A2740B0008354C1 /* CNMainView.swift */,
+				7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
+				19F1C2322AB5728B0083D06C /* CNIDCardView.swift */,
+				7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */,
+				7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */,
+			);
+			path = MainView;
+			sourceTree = "<group>";
+		};
+		1938BD4B2B512D3000390A34 /* Shop */ = {
+			isa = PBXGroup;
+			children = (
+				1938BD4C2B512EBF00390A34 /* ShopConsole */,
+				191733402B284D4A007BCC04 /* ShopCoupon */,
+				19565ED02AF8D904007D6727 /* GoodsManager */,
+				1938BD4D2B512F4600390A34 /* ShopDetail */,
+			);
+			path = Shop;
+			sourceTree = "<group>";
+		};
+		1938BD4C2B512EBF00390A34 /* ShopConsole */ = {
+			isa = PBXGroup;
+			children = (
+				19BB1FE92AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift */,
+			);
+			path = ShopConsole;
+			sourceTree = "<group>";
+		};
+		1938BD4D2B512F4600390A34 /* ShopDetail */ = {
+			isa = PBXGroup;
+			children = (
+				19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */,
+				19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */,
+				19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */,
+			);
+			path = ShopDetail;
+			sourceTree = "<group>";
+		};
+		1938BD4E2B51316200390A34 /* VerticalViews */ = {
+			isa = PBXGroup;
+			children = (
+				7CD675412A2740F8008354C1 /* CNCustomIndexView.swift */,
+				1938BD482B512C5800390A34 /* DownSlide */,
+				1938BD4A2B512CCE00390A34 /* MainView */,
+				1938BD492B512CA300390A34 /* UpSlide */,
+			);
+			path = VerticalViews;
+			sourceTree = "<group>";
+		};
 		19565EC32AF8ACC2007D6727 /* GoodsManager */ = {
 			isa = PBXGroup;
 			children = (
@@ -1333,26 +1407,8 @@
 		7CD675232A26F8F8008354C1 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				191733402B284D4A007BCC04 /* ShopCoupon */,
-				19565ED02AF8D904007D6727 /* GoodsManager */,
-				7CD675372A2740B0008354C1 /* CNUpSlideViewRemindView.swift */,
-				7CD6753B2A2740B0008354C1 /* CNDownSlideView.swift */,
-				7CD675382A2740B0008354C1 /* CNMainView.swift */,
-				7CD6753A2A2740B0008354C1 /* CNDownSlideViewRemindView.swift */,
-				7CD675392A2740B0008354C1 /* CNUpSlideView.swift */,
-				7CD675412A2740F8008354C1 /* CNCustomIndexView.swift */,
-				7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */,
-				7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
-				7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */,
-				19F1C2322AB5728B0083D06C /* CNIDCardView.swift */,
-				19FA20162AE22D3C001F7186 /* CNLiveDownSlideRecommendCell.swift */,
-				19FA20182AE22D98001F7186 /* CNLiveDownSlideTodayRecommendCell.swift */,
-				19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */,
-				19BB1FE92AEF7B4A0094D962 /* CNLiveShopConsoleCell.swift */,
-				19BB1FF12AF21A950094D962 /* CNLliveShopDetailBannerCell.swift */,
-				19CC4D462ADD006600308E2A /* CNDownSlideSingleCourseCell.swift */,
-				19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */,
-				19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */,
+				1938BD4E2B51316200390A34 /* VerticalViews */,
+				1938BD4B2B512D3000390A34 /* Shop */,
 			);
 			name = View;
 			path = HomePage/View;
@@ -370,8 +370,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         return true
     }
  
-    // MARK: - NewPagedFlowView代理
-    
+    // MARK: - NewPagedFlowView代理 水平方向滑动
     func numberOfPages(in flowView: NewPagedFlowView!) -> Int {
         self.dataArray.count
     }
@@ -411,39 +410,38 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         return CGSize(width: MainViewW, height: Height)
     }
  
-    ///NewPagedFlowView 开始滑动
+    ///NewPagedFlowView 水平方向开始滑动
     func willBeginScroll(_ scrollView: UIScrollView!) {
         beginOffset = scrollView.contentOffset.x
     }
     ///NewPagedFlowView 滑动中
     func didScroll(_ scrollView: UIScrollView!) {
-        
         let currentOffset:CGFloat = scrollView.contentOffset.x
  
         if(currentOffset > beginOffset){
  
             if let rightView = self.backgroupView.getRightView(){
-                
+                scrollView.isScrollEnabled = true
                 if let currentApearView = self.backgroupView.currentApearView{
                     self.backgroupView.insertSubview(rightView, belowSubview: currentApearView)
                 }
  
                 self.backgroupView.currentApearView?.maskLayer.right = KSreenWidth - (currentOffset-beginOffset)*2.5
             }else{
-                
+                scrollView.isScrollEnabled = false
             }
         }
  
         if(currentOffset < beginOffset){
             if let leftView = self.backgroupView.getLeftView(){
-                
+                scrollView.isScrollEnabled = true
                 if let currentApearView = self.backgroupView.currentApearView{
                     self.backgroupView.insertSubview(leftView, belowSubview: currentApearView)
                 }
  
                 self.backgroupView.currentApearView?.maskLayer.left = (beginOffset-currentOffset)*2.5
             }else{
-                
+                scrollView.isScrollEnabled = false
             }
         }
     }
-//
-//  CNCertificationView.swift
-//  metaCode
-//
-//  Created by daojian on 2023/6/12.
-//
-
-import Foundation
-
-///身份认证View
-class CNCertificationView : UIView{
-    ///添加身份点击事件回调
-    var addCertificationAction: closeBlock?
-    
-    lazy var contentView: UIView = {
-        let W = self.width-50
-        let H = W*1.5
-        let contentView = UIView.init(frame: CGRect(x: 25, y: KSreenHeight*0.16, width: W, height: H ))
-        contentView.backgroundColor = UIColor.white
-        contentView.clipsToBounds = true
-        contentView.layer.cornerRadius = 20
-        
-        return contentView
-        
-    }()
-    
-//    ///添加身份认证按钮
-//    lazy var addCerBtn: UIButton = {
-//        let addCerBtn = UIButton(type: .custom)
-//        addCerBtn.frame = CGRect(x: 0, y: 0, width: 145, height: 141)
-//        addCerBtn.centerX = self.contentView.width/2
-//        addCerBtn.centerY = self.contentView.height/2
-//        addCerBtn.setImage(UIImage(named: "homePage_addCertification_icon"), for: .normal)
-//        addCerBtn.addTarget(self, action: #selector(addCerBtnAction), for: .touchUpInside)
-//        return addCerBtn
-//    }()
-//
-//    ///添加身份按钮底部标题
-//    lazy var addCerBtnBottomTitle: UILabel = {
-//        let addCerBtnBottomTitle = UILabel(frame: CGRect(x: 0, y: self.addCerBtn.bottom - 10, width: 100, height: 22))
-//        addCerBtnBottomTitle.centerX = self.addCerBtn.centerX
-//        addCerBtnBottomTitle.textColor = UIColor("#0066FE")
-//        addCerBtnBottomTitle.textAlignment = .center
-//        addCerBtnBottomTitle.font = UIFont.systemFont(ofSize: 15, weight: .regular)
-//        addCerBtnBottomTitle.text = "身份认证"
-//        return addCerBtnBottomTitle
-//
-//    }()
-    
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        self.initUI()
-        
-    }
-    
-    required init?(coder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    func initUI()
-    {
-        self.addSubview(self.contentView)
-//        self.contentView.addSubview(self.addCerBtn)
-//        self.contentView.addSubview(self.addCerBtnBottomTitle)
-//    }
-    
-//    @objc func addCerBtnAction(){
-//
-//        if(self.addCertificationAction != nil){
-//            self.addCertificationAction!()
-//        }
-//
-    }
-}
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/10/30.
-//
+//  电商控制台cell
  
 import Foundation
  
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/11/3.
-//
+//  电商上滑详情页(下面的页) banner下的按钮cell
  
 import Foundation
  
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/11/4.
-//  我的订单,我的资产
+//  电商上滑详情页(下面的页) banner下的 我的订单,我的资产cell
  
 import Foundation
 enum CNLiveShopDetailDisplayType {
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/11/1.
-//
+//  电商上滑详情页(下面的页) bannercell
  
 import Foundation
 import FSPagerView
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by daojian on 2023/5/31.
-//
+//  认证-上下滑的容器View
  
 import Foundation
  
+////
+////  CNCertificationView.swift
+////  metaCode
+////
+////  Created by daojian on 2023/6/12.
+////  旧卡片(废弃)
+//
+//import Foundation
+//
+/////身份认证View
+//class CNCertificationView : UIView{
+//    ///添加身份点击事件回调
+//    var addCertificationAction: closeBlock?
+//    
+//    lazy var contentView: UIView = {
+//        let W = self.width-50
+//        let H = W*1.5
+//        let contentView = UIView.init(frame: CGRect(x: 25, y: KSreenHeight*0.16, width: W, height: H ))
+//        contentView.backgroundColor = UIColor.white
+//        contentView.clipsToBounds = true
+//        contentView.layer.cornerRadius = 20
+//        
+//        return contentView
+//        
+//    }()
+//    
+////    ///添加身份认证按钮
+////    lazy var addCerBtn: UIButton = {
+////        let addCerBtn = UIButton(type: .custom)
+////        addCerBtn.frame = CGRect(x: 0, y: 0, width: 145, height: 141)
+////        addCerBtn.centerX = self.contentView.width/2
+////        addCerBtn.centerY = self.contentView.height/2
+////        addCerBtn.setImage(UIImage(named: "homePage_addCertification_icon"), for: .normal)
+////        addCerBtn.addTarget(self, action: #selector(addCerBtnAction), for: .touchUpInside)
+////        return addCerBtn
+////    }()
+////
+////    ///添加身份按钮底部标题
+////    lazy var addCerBtnBottomTitle: UILabel = {
+////        let addCerBtnBottomTitle = UILabel(frame: CGRect(x: 0, y: self.addCerBtn.bottom - 10, width: 100, height: 22))
+////        addCerBtnBottomTitle.centerX = self.addCerBtn.centerX
+////        addCerBtnBottomTitle.textColor = UIColor("#0066FE")
+////        addCerBtnBottomTitle.textAlignment = .center
+////        addCerBtnBottomTitle.font = UIFont.systemFont(ofSize: 15, weight: .regular)
+////        addCerBtnBottomTitle.text = "身份认证"
+////        return addCerBtnBottomTitle
+////
+////    }()
+//    
+//    override init(frame: CGRect) {
+//        super.init(frame: frame)
+//        self.initUI()
+//        
+//    }
+//    
+//    required init?(coder: NSCoder) {
+//        fatalError("init(coder:) has not been implemented")
+//    }
+//    
+//    func initUI()
+//    {
+//        self.addSubview(self.contentView)
+////        self.contentView.addSubview(self.addCerBtn)
+////        self.contentView.addSubview(self.addCerBtnBottomTitle)
+////    }
+//    
+////    @objc func addCerBtnAction(){
+////
+////        if(self.addCertificationAction != nil){
+////            self.addCertificationAction!()
+////        }
+////
+//    }
+//}
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by daojian on 2023/6/6.
-//
+//  认证-添加身份背景视图
  
 import Foundation
 import UIKit
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/9/16.
-//
+//  身份认证卡片
  
 import Foundation
  
@@ -175,7 +175,9 @@ class CNHomepageDetailViewController: CNLiveBaseViewController  ,UITableViewData
  
     // MARK: - 获取全部专辑列表
     func getBlockContents(page:NSInteger){
+        showLoading(message: "")
         CNLiveHomePageViewModel.getBlockContents(blockId: self.slideModel!.blockId ?? "", page: page) {[weak self] result, status in
+            hiddenLoading()
             if status == .success{
                 if self!.pageNum > 1 {
                     self!.dataArray.addObjects(from: result as! [CNLiveAlbumModel])