下滑动画的效果

张旭
1 parent d2a651c3
Showing 16 changed files with 766 additions and 10 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Extensions/String+Extension.swift
metaCode/Classes/Extensions/UITableView+Extension.swift
metaCode/Classes/Extensions/UIView+CNLiveExtensions.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/CNUpSlideCardPresentationController.swift
metaCode/Classes/Main/HomePage/Controller/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
metaCode/Classes/Main/HomePage/View/CNDownSlideCell.swift
metaCode/Classes/Main/HomePage/View/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/CNUpSlideDetailScrollView.swift
metaCode/Classes/Main/HomePage/View/CNUpSlideView.swift
metaCode/Classes/Main/Util/CNUpSlideAnimationTransition.swift
metaCode/Supporting Files/Assets.xcassets/Home/close_button.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/close_button.imageset/close_button@2x.png
@@ -9,6 +9,14 @@
 /* Begin PBXBuildFile section */
 		0D39E93D7229931C86EB1161 /* Pods_metaCode_metaCodeUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 63D879B49B1E42F1584DD75E /* Pods_metaCode_metaCodeUITests.framework */; };
 		19123FC12ABC11170075C883 /* CNWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19123FC02ABC11170075C883 /* CNWebViewController.swift */; };
+		192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */; };
+		19CC4D472ADD006600308E2A /* CNDownSlideCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D462ADD006600308E2A /* CNDownSlideCell.swift */; };
+		19CC4D492ADD06C500308E2A /* UITableView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */; };
+		19CC4D4B2ADD086F00308E2A /* CNUpSlideDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */; };
+		19CC4D4F2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */; };
+		19CC4D522ADD129800308E2A /* CNUpSlideAnimationTransition.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D512ADD129800308E2A /* CNUpSlideAnimationTransition.swift */; };
+		19CC4D542ADD163D00308E2A /* CNUpSlideCardPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D532ADD163D00308E2A /* CNUpSlideCardPresentationController.swift */; };
+		19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19CC4D552ADD19C200308E2A /* String+Extension.swift */; };
 		19F1C2332AB5728B0083D06C /* CNIDCardView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19F1C2322AB5728B0083D06C /* CNIDCardView.swift */; };
 		1DD2808DF02C120276F99F4D /* Pods_metaCode.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F1C55A719CFEE073C06D37CE /* Pods_metaCode.framework */; };
 		7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7905BB482AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift */; };
@@ -116,6 +124,14 @@
 		0EC910AB9EBD717B04432BC4 /* Pods-metaCode-metaCodeUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode-metaCodeUITests.debug.xcconfig"; path = "Target Support Files/Pods-metaCode-metaCodeUITests/Pods-metaCode-metaCodeUITests.debug.xcconfig"; sourceTree = "<group>"; };
 		170BC5D0622EA2969D110A3B /* Pods-metaCode.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-metaCode.release.xcconfig"; path = "Target Support Files/Pods-metaCode/Pods-metaCode.release.xcconfig"; sourceTree = "<group>"; };
 		19123FC02ABC11170075C883 /* CNWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNWebViewController.swift; sourceTree = "<group>"; };
+		192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideViewController.swift; sourceTree = "<group>"; };
+		19CC4D462ADD006600308E2A /* CNDownSlideCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNDownSlideCell.swift; sourceTree = "<group>"; };
+		19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableView+Extension.swift"; sourceTree = "<group>"; };
+		19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideDetailViewController.swift; sourceTree = "<group>"; };
+		19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideDetailScrollView.swift; sourceTree = "<group>"; };
+		19CC4D512ADD129800308E2A /* CNUpSlideAnimationTransition.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNUpSlideAnimationTransition.swift; sourceTree = "<group>"; };
+		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>"; };
 		19F1C2322AB5728B0083D06C /* CNIDCardView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNIDCardView.swift; sourceTree = "<group>"; };
 		54E09C540E13D78166D71395 /* Pods_metaCodeTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_metaCodeTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		63D879B49B1E42F1584DD75E /* Pods_metaCode_metaCodeUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_metaCode_metaCodeUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -241,6 +257,14 @@
 /* End PBXFrameworksBuildPhase section */
 /* Begin PBXGroup section */
+		19CC4D502ADD126D00308E2A /* Util */ = {
+			isa = PBXGroup;
+			children = (
+				19CC4D512ADD129800308E2A /* CNUpSlideAnimationTransition.swift */,
+			);
+			path = Util;
+			sourceTree = "<group>";
+		};
 		20238A324E444EF8C813D9FA /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -268,6 +292,8 @@
 				7C83B4432A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift */,
 				79E496E22AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift */,
 				79E496E72AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift */,
+				19CC4D482ADD06C500308E2A /* UITableView+Extension.swift */,
+				19CC4D552ADD19C200308E2A /* String+Extension.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -534,6 +560,7 @@
 		7CD675212A26F844008354C1 /* HomePage */ = {
 			isa = PBXGroup;
 			children = (
+				19CC4D502ADD126D00308E2A /* Util */,
 				7C83B43C2A52B899004BF4A4 /* ViewModel */,
 				7CD6754D2A2840B9008354C1 /* Controller */,
 				7CD675232A26F8F8008354C1 /* View */,
@@ -554,6 +581,8 @@
 				7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
 				7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */,
 				19F1C2322AB5728B0083D06C /* CNIDCardView.swift */,
+				19CC4D462ADD006600308E2A /* CNDownSlideCell.swift */,
+				19CC4D4E2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift */,
 			);
 			name = View;
 			path = HomePage/View;
@@ -564,6 +593,9 @@
 			children = (
 				7CD6754E2A2840B9008354C1 /* CNMetaCodeHomePageController.swift */,
 				19123FC02ABC11170075C883 /* CNWebViewController.swift */,
+				192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */,
+				19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */,
+				19CC4D532ADD163D00308E2A /* CNUpSlideCardPresentationController.swift */,
 			);
 			name = Controller;
 			path = HomePage/Controller;
@@ -877,6 +909,7 @@
 				796398942A260C0100D045EB /* AppDelegate.swift in Sources */,
 				7989B5C72A4BDC7200A19B10 /* CNLiveMineEarnListViewController.swift in Sources */,
 				79396EF12A31C21B0053E1AF /* CNLiveInfoShowViewController.swift in Sources */,
+				192336EB2AD9224300D47CD4 /* CNUpSlideViewController.swift in Sources */,
 				7963989D2A260E6200D045EB /* CNLiveBaseViewController.swift in Sources */,
 				798A44FB2A30999900815935 /* CNLiveAlertTool.swift in Sources */,
 				790D01A52A2DF65E00C5978D /* CNLiveLoginPickerView.swift in Sources */,
@@ -885,11 +918,13 @@
 				790B1FB82A41B6A60074CF00 /* CNLiveMineMessageViewController.swift in Sources */,
 				798A44F22A30674200815935 /* CNLiveMineSubBodyListView.swift in Sources */,
 				790D01822A2D88FC00C5978D /* CNLiveConfigMacro.swift in Sources */,
+				19CC4D4B2ADD086F00308E2A /* CNUpSlideDetailViewController.swift in Sources */,
 				7C83B4402A52BB2B004BF4A4 /* CNGlobalEnum.swift in Sources */,
 				7C83B4442A541F36004BF4A4 /* NSDate+CNLiveExtensions.swift in Sources */,
 				7CD675482A274167008354C1 /* PGIndexBannerSubiew.m in Sources */,
 				790D019F2A2DD66E00C5978D /* CNLiveLoginViewModel.swift in Sources */,
 				7C7C62F62A4D72E9007A912E /* CNLiveIdentityDB.swift in Sources */,
+				19CC4D4F2ADD0FC200308E2A /* CNUpSlideDetailScrollView.swift in Sources */,
 				79EABB892AB4497700F3A4E2 /* CNLiveSaveStandDB.swift in Sources */,
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
@@ -900,6 +935,7 @@
 				790B1FB62A41938F0074CF00 /* UIImage+CNLiveExtensions.swift in Sources */,
 				790D019D2A2DCBD000C5978D /* UIView+CNLiveExtensions.swift in Sources */,
 				79E496E82AB9674300127BF8 /* NSMutableAttributedString+CNLiveExtensions.swift in Sources */,
+				19CC4D472ADD006600308E2A /* CNDownSlideCell.swift in Sources */,
 				79E496E32AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift in Sources */,
 				7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
@@ -917,6 +953,7 @@
 				7C2703362A3AFD3A0061EC50 /* CNLiveEnvironment.swift in Sources */,
 				798A44FD2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift in Sources */,
 				79656E382AAEBA8E00119A61 /* CNLiveMineInputViewController.swift in Sources */,
+				19CC4D522ADD129800308E2A /* CNUpSlideAnimationTransition.swift in Sources */,
 				7CD6754F2A2840B9008354C1 /* CNMetaCodeHomePageController.swift in Sources */,
 				7989B5C52A4BDC6000A19B10 /* CNLiveMineEarnViewController.swift in Sources */,
 				792E57DB2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift in Sources */,
@@ -925,7 +962,9 @@
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
 				7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
+				19CC4D542ADD163D00308E2A /* CNUpSlideCardPresentationController.swift in Sources */,
 				790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */,
+				19CC4D492ADD06C500308E2A /* UITableView+Extension.swift in Sources */,
 				7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */,
 				7987BF3D2A497644000A1ABC /* CNLiveMineQuestViewController.swift in Sources */,
 				798A44EA2A30135D00815935 /* CNLiveMineBodyListView.swift in Sources */,
@@ -935,6 +974,7 @@
 				79396EED2A319F220053E1AF /* NSObject+CNLiveExtensions.swift in Sources */,
 				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
 				790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
+				19CC4D562ADD19C200308E2A /* String+Extension.swift in Sources */,
 				7905BB492AB0588B0089BC50 /* CNLiveMineAuthResultViewController.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
+//
+//  String+Extension.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+
+import UIKit
+
+
+extension String {
+    /// Calculate text's height from `width` and `front`.
+    func calculateHeightWith(width: CGFloat, font: UIFont)-> CGFloat {
+        let attr = [NSAttributedString.Key.font: font]
+        let maxSize: CGSize = CGSize(width: width, height: CGFloat(MAXFLOAT))
+        let option = NSStringDrawingOptions.usesLineFragmentOrigin
+        return self.boundingRect(with: (maxSize), options: option, attributes: attr, context: nil).size.height
+    }
+}
+//
+//  UITableView+Extension.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+
+import UIKit
+
+extension UITableView {
+    // 注册有nib的cell
+    func ut_registerNibCell<T>(_ cellType: T.Type) where T: UITableViewCell {
+        let nib = UINib(nibName: "\(cellType)", bundle: nil)
+        let identifier = "\(cellType)"
+        register(nib, forCellReuseIdentifier: identifier)
+    }
+    // 注册无nib的cell
+    func ut_registerClassCell<T>(_ cellType: T.Type) where T: UITableViewCell {
+        let identifier = "\(cellType)"
+        register(cellType, forCellReuseIdentifier: identifier)
+    }
+    // 从缓存池池出队已经存在的 cell
+    func ut_dequeueReusable<T: UITableViewCell>(_ cell: T.Type, for indexPath: IndexPath) -> T {
+        let cell = dequeueReusableCell(withIdentifier: "\(T.self)", for: indexPath) as! T
+        return cell
+    }
+    
+    // 注册有nib的headerFooterView
+    func ut_registerNibHeaderFooterView<T>(_ viewType: T.Type) where T: UITableViewHeaderFooterView {
+        let nib = UINib(nibName: "\(viewType)", bundle: nil)
+        let identifier = "\(viewType)"
+        register(nib, forHeaderFooterViewReuseIdentifier: identifier)
+    }
+    
+    // 注册无nib的headerFooterView
+    func ut_registerClassHeaderFooterView<T>(_ viewType: T.Type) where T: UITableViewHeaderFooterView {
+        let identifier = "\(viewType)"
+        register(viewType, forHeaderFooterViewReuseIdentifier: identifier)
+    }
+    
+    // 从缓存池里取出已注册的headerFooterView
+    func ut_dequeueReusableHeaderFooterView<T: UITableViewHeaderFooterView>(_ view: T.Type) -> T {
+        let headerFooterView = dequeueReusableHeaderFooterView(withIdentifier: "\(T.self)") as! T
+        return headerFooterView
+    }
+}
+
+extension UICollectionView {
+    // 注册有nib的cell
+    func ut_registerNibCell<T>(_ cellType: T.Type) where T: UICollectionViewCell {
+        let nib = UINib(nibName: "\(cellType)", bundle: nil)
+        let identifier = "\(cellType)"
+        register(nib, forCellWithReuseIdentifier: identifier)
+    }
+    // 注册无nib的cell
+    func ut_registerClassCell<T>(_ cellType: T.Type) where T: UICollectionViewCell {
+        let identifier = "\(cellType)"
+        register(cellType, forCellWithReuseIdentifier: identifier)
+    }
+    // 从缓存池池出队已经存在的 cell
+    func ut_dequeueReusable<T: UICollectionViewCell>(_ cell: T.Type, for indexPath: IndexPath) -> T {
+        let cell = dequeueReusableCell(withReuseIdentifier: "\(T.self)", for: indexPath) as! T
+        return cell
+    }
+}
@@ -235,4 +235,14 @@ extension UIView {
             return self.frame.size
         }
     }
+    
+    // Constrain 4 edges of `self` to specified `view`.
+    func edges(to view: UIView, top: CGFloat=0, left: CGFloat=0, bottom: CGFloat=0, right: CGFloat=0) {
+        NSLayoutConstraint.activate([
+            self.leftAnchor.constraint(equalTo: view.leftAnchor, constant: left),
+            self.rightAnchor.constraint(equalTo: view.rightAnchor, constant: right),
+            self.topAnchor.constraint(equalTo: view.topAnchor, constant: top),
+            self.bottomAnchor.constraint(equalTo: view.bottomAnchor, constant: bottom)
+            ])
+    }
 }
@@ -18,6 +18,8 @@ let LeftGap: CGFloat = UIScreen.main.bounds.size.width &lt;= 375 ? 23 : 40
 ///主窗口宽度
 let MainViewW: CGFloat = Width-LeftGap*2//Width-50
+///下滑页底部工具条高度
+let DownSllideBottomViewHeight: CGFloat = 74
 ///存储是否第一次显示首页上滑引导
 let CNKeyIsFirstAppearUpSlideHomeGuide: String = "isFirstAppearUpSlideHomeGuideKey"
+//
+//  CNUpSlideCardPresentationController.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+import UIKit
+
+class CNUpSlideCardPresentationController: UIPresentationController {
+    
+    private lazy var blurView = UIVisualEffectView(effect: nil)
+    
+    override var shouldRemovePresentersView: Bool {
+        return false
+    }
+    
+    override func presentationTransitionWillBegin() {
+        let container = containerView!
+        blurView.translatesAutoresizingMaskIntoConstraints = false
+        container.addSubview(blurView)
+        blurView.edges(to: container)
+        blurView.alpha = 0.0
+        
+        presentingViewController.beginAppearanceTransition(false, animated: false)
+        presentedViewController.transitionCoordinator!.animate(alongsideTransition: { (ctx) in
+            self.blurView.effect = UIBlurEffect(style: .light)
+            self.blurView.alpha = 1
+        }) { (ctx) in }
+    }
+    
+    override func presentationTransitionDidEnd(_ completed: Bool) {
+        presentingViewController.endAppearanceTransition()
+    }
+    
+    override func dismissalTransitionWillBegin() {
+        presentingViewController.beginAppearanceTransition(true, animated: true)
+        presentedViewController.transitionCoordinator!.animate(alongsideTransition: { (ctx) in
+            self.blurView.alpha = 0.0
+        }, completion: nil)
+    }
+    
+    override func dismissalTransitionDidEnd(_ completed: Bool) {
+        presentingViewController.endAppearanceTransition()
+        if completed {
+            blurView.removeFromSuperview()
+        }
+    }
+}
+//
+//  CNUpSlideDetailViewController.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+import Foundation
+
+class CNUpSlideDetailViewController: UIViewController {
+    
+    override var prefersStatusBarHidden: Bool {
+        return true
+    }
+    
+    var dismissClosure: (()->())?
+    //the point when start to interactive
+    var interactiveStartingPoint: CGPoint? = nil
+
+    var draggingDownToDismiss = false
+    
+    let cell: CNDownSlideCell!
+    
+    private lazy var dismissPanGesture: UIPanGestureRecognizer = {
+        let ges = UIPanGestureRecognizer()
+        ges.maximumNumberOfTouches = 1
+        ges.addTarget(self, action: #selector(handleDismissPan(gesture:)))
+        ges.delegate = self
+        return ges
+    }()
+    
+    lazy var scrollView: CNUpSlideDetailScrollView = {
+        let frame = self.view.bounds
+        let view = CNUpSlideDetailScrollView(frame: frame)
+        view.delegate = self
+        return view
+    }()
+    
+    lazy var closeBtn: UIButton = {
+        let btn = UIButton()
+        btn.frame = CGRect(x: KSreenWidth - 20 - 30, y: 20, width: 30, height: 30)
+        btn.setImage(#imageLiteral(resourceName: "close_button"), for: .normal)
+        btn.addTarget(self, action: #selector(closeAction), for: .touchUpInside)
+        return btn
+    }()
+    
+    init(cell: CNDownSlideCell) {
+        self.cell = cell
+        super.init(nibName: nil, bundle: nil)
+        self.setupTranstion()
+    }
+    
+    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
+        print("DetailtouchesBegan")
+    }
+    
+    private func setupTranstion() {
+        modalPresentationStyle = .custom
+        transitioningDelegate = self
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+        getImageFromCell()
+    }
+    
+    private func setupUI() {
+        self.view.backgroundColor = .white
+        self.view.layer.masksToBounds = true
+        view.addSubview(scrollView)
+        view.addSubview(closeBtn)
+        view.addGestureRecognizer(dismissPanGesture)
+        
+        if #available(iOS 11.0, *) {
+            scrollView.contentInsetAdjustmentBehavior = .never
+        } else {
+            automaticallyAdjustsScrollViewInsets = false
+        }
+    }
+    
+    private func getImageFromCell() {
+        scrollView.imageView.image = cell.bgImageView.image
+    }
+    
+    @objc private func closeAction() {
+        dismiss(animated: true, completion: nil)
+        dismissClosure?()
+    }
+    
+    @objc private func handleDismissPan(gesture: UIPanGestureRecognizer) {
+        if !draggingDownToDismiss {
+            return
+        }
+        
+        let startingPoint: CGPoint
+        
+        if let p = interactiveStartingPoint {
+            startingPoint = p
+        } else {
+            startingPoint = gesture.location(in: nil)
+            interactiveStartingPoint = startingPoint
+        }
+
+        let currentLocation = gesture.location(in: nil)
+        
+        var progress = (currentLocation.y - startingPoint.y) / 100
+        
+        //prevent viewController bigger when scrolling up
+        if currentLocation.y <= startingPoint.y {
+            progress = 0
+        }
+        
+        if progress >= 1.0 {
+            dismiss(animated: true, completion: nil)
+            dismissClosure?()
+            stopDismissPanGesture(gesture)
+            return
+        }
+
+        let targetShrinkScale: CGFloat = 0.86
+        let currentScale: CGFloat = 1 - (1 - targetShrinkScale) * progress
+        
+        switch gesture.state {
+        case .began,.changed:
+            scrollView.isScrollEnabled = false
+            gesture.view?.transform = CGAffineTransform(scaleX: currentScale, y: currentScale)
+            gesture.view?.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius * (progress)
+            scrollView.showsVerticalScrollIndicator = false
+        case .cancelled,.ended:
+            scrollView.isScrollEnabled = true
+            stopDismissPanGesture(gesture)
+        default:
+            break
+        }
+    }
+    
+    //当下拉Offset超过100或取消下拉手势时，执行此方法
+    private func stopDismissPanGesture(_ gesture: UIPanGestureRecognizer) {
+        draggingDownToDismiss = false
+        interactiveStartingPoint = nil
+        scrollView.showsVerticalScrollIndicator = true
+        
+        UIView.animate(withDuration: 0.2) {
+            gesture.view?.transform = CGAffineTransform.identity
+        }
+    }
+
+}
+
+extension CNUpSlideDetailViewController: UIViewControllerTransitioningDelegate {
+    
+    func animationController(forPresented presented: UIViewController, presenting: UIViewController, source: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        return CNUpSlideAnimationTransition(animationType: .present)
+    }
+    
+    func animationController(forDismissed dismissed: UIViewController) -> UIViewControllerAnimatedTransitioning? {
+        return CNUpSlideAnimationTransition(animationType: .dismiss)
+    }
+    
+    func presentationController(forPresented presented: UIViewController, presenting: UIViewController?, source: UIViewController) -> UIPresentationController? {
+        return CNUpSlideCardPresentationController(presentedViewController: presented, presenting: presenting)
+    }
+}
+
+extension CNUpSlideDetailViewController: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        
+        if scrollView.contentOffset.y < 0 {
+            scrollView.contentOffset = .zero
+            draggingDownToDismiss = true
+        }
+    }
+}
+
+extension CNUpSlideDetailViewController: UIGestureRecognizerDelegate {
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+        return true
+    }
+}
+//
+//  CNUpSlideViewController.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/13.
+//
+
+import Foundation
+import UIKit
+
+class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITableViewDataSource{//UITableViewController {
+    
+    let kCNLiveDownSlideCellIdentifier = "kCNLiveDownSlideCellIdentifier"
+    
+    var selectedCell: CNDownSlideCell?
+    
+    var statusBarShouldBeHidden = false
+    //we need to set `View controller-based status bar appearance = YES` in info.plist.
+    //so we can be able to hide statusBar.
+    override var prefersStatusBarHidden: Bool {
+        return statusBarShouldBeHidden
+    }
+    
+    override var preferredStatusBarUpdateAnimation: UIStatusBarAnimation {
+        return .slide
+    }
+
+    override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
+        print("slidetouchesBegan")
+    }
+    
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+    }
+
+    lazy var tableView : UITableView = {
+        let tableView = UITableView(frame: .zero, style: .grouped)
+        tableView.dataSource = self
+        tableView.delegate = self
+        tableView.separatorStyle = .none
+        tableView.register(CNDownSlideCell.self, forCellReuseIdentifier: kCNLiveDownSlideCellIdentifier)
+        tableView.rowHeight = GlobalConstants.toDayCardRowH
+        return tableView
+    }()
+    
+    private func updateStatusBarAndTabbarFrame(visible: Bool) {
+        statusBarShouldBeHidden = !visible
+        UIView.animate(withDuration: 0.25) {
+            self.setNeedsStatusBarAppearanceUpdate()
+        }
+    }
+
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 2
+    }
+
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideCellIdentifier) as! CNDownSlideCell
+        cell.selectionStyle = .none
+        cell.bgImageView.backgroundColor = .red
+        cell.bgImageView.kf.setImage(with: URL(string: "https://wjj.ys2.cnliveimg.com/769/img_new/1697162534497.jpg"))
+
+        return cell
+    }
+    
+    
+    func tableView(_ tableView: UITableView, didHighlightRowAt indexPath: IndexPath) {
+        guard let row = tableView.cellForRow(at: indexPath) as? CNDownSlideCell else { return }
+        UIView.animate(withDuration: 0.1) {
+            row.bgBackView.transform = CGAffineTransform(scaleX: 0.95, y: 0.95)
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, didUnhighlightRowAt indexPath: IndexPath) {
+        guard let row = tableView.cellForRow(at: indexPath) as? CNDownSlideCell else { return }
+        UIView.animate(withDuration: 0.3) {
+            row.bgBackView.transform = CGAffineTransform(scaleX: 1.0, y: 1.0)
+        }
+    }
+
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        print("点击了cell")
+        guard let cell = tableView.cellForRow(at: indexPath) as? CNDownSlideCell else { return }
+        selectedCell = cell
+
+        let detailVC = CNUpSlideDetailViewController(cell: cell)
+        
+        detailVC.dismissClosure = { [weak self] in
+            guard let StrongSelf = self else { return }
+            StrongSelf.updateStatusBarAndTabbarFrame(visible: true)
+        }
+        
+        updateStatusBarAndTabbarFrame(visible: false)
+        
+        present(detailVC, animated: true, completion: nil)
+
+    }
+}
@@ -118,11 +118,11 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         set{
             self.mainView.idModel = newValue!
             _idModel = newValue
-            self.upSlideView.type = _idModel?.downType
-            self.upSlideView.url = _idModel?.downPath
+            self.upSlideView.type = _idModel?.upType
+            self.upSlideView.url = _idModel?.upPath
-            self.downSlideView.type = _idModel?.upType
-            self.downSlideView.url = _idModel?.upPath
+            self.downSlideView.type = _idModel?.downType
+            self.downSlideView.url = _idModel?.downPath
             self.topNavView.setTitleString(title:(_idModel?.name)!)
         }
@@ -184,7 +184,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     ///下滑显示的VIew
     lazy var downSlideView: CNDownSlideView = {
-        let collectionView = CNDownSlideView.init(frame: CGRectMake(-25, 0, self.frame.size.width + 50, self.frame.size.height))
+        let collectionView = CNDownSlideView.init(frame: CGRectMake(-LeftGap, 0, self.frame.size.width+LeftGap*2, self.frame.size.height))
         collectionView.backgroundColor = .clear
         collectionView.backAction = {[weak self] in
             self?.baseScrollView.setContentOffset(CGPoint(x: 0, y: (self!.baseScrollView.height)), animated: true)
+//
+//  CNDownSlideCell.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+import Foundation
+import UIKit
+
+enum GlobalConstants {
+    static let leftMargin: CGFloat = 20
+    
+    static let toDayCardRowH: CGFloat = 440
+    static let toDayCardCornerRadius: CGFloat = 15.0
+    static let todayCardSize: CGSize = CGSize(width: KSreenWidth - 2 * 20, height: 410)
+    static let cardDetailTopImageH: CGFloat = 500
+    
+    static let iconBorderColor: CGColor = UIColor(red: 239/255.0, green: 240/255.0, blue: 241/255.0, alpha: 1).cgColor
+    static let iconBorderWidth: CGFloat = 0.8
+    static let iconCornerRadius: CGFloat = 17.5
+    
+    static let textBlueColor = UIColor(red: 0/255.0, green: 122/255.0, blue: 255/255.0, alpha: 1.0)   //007AFF
+    static let speratorLineColor = UIColor(red: 224/255.0, green: 224/255.0, blue: 224/255.0, alpha: 1)
+
+}
+
+class CNDownSlideCell: UITableViewCell {
+    
+    let bgBackView = UIView()
+    let bgImageView = UIImageView()
+    let emptyView = UIView()
+
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private func setupUI() {
+        
+        contentView.addSubview(bgBackView)
+        bgBackView.addSubview(bgImageView)
+        contentView.addSubview(emptyView)
+        
+        bgBackView.frame = CGRect(x: GlobalConstants.leftMargin, y: 0, width: GlobalConstants.todayCardSize.width, height: GlobalConstants.todayCardSize.height)
+        bgBackView.layer.shadowColor = UIColor.black.cgColor
+        bgBackView.layer.shadowOpacity = 0.4
+        bgBackView.layer.shadowOffset = CGSize(width: 0, height: 1)
+        
+        bgImageView.frame = bgBackView.bounds
+        bgImageView.contentMode = .scaleAspectFill
+        bgImageView.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
+        bgImageView.layer.masksToBounds = true
+        
+        emptyView.backgroundColor = UIColor.white.withAlphaComponent(0)
+        emptyView.frame = CGRect(x: 0, y: bgImageView.frame.size.height, width: GlobalConstants.todayCardSize.width, height: GlobalConstants.toDayCardRowH - GlobalConstants.todayCardSize.height)
+    }
+    
+}
@@ -16,6 +16,7 @@ class CNDownSlideView:UIView{
     //返回首页
     var backAction:backBlock?
+    
     //MARK: - 懒加载
     lazy var contentView:UIView = {
@@ -47,6 +48,34 @@ class CNDownSlideView:UIView{
         return webView
     }()
+//    var upSlideVCView:UIView  = {
+////        let upSlideVCView = CNUpSlideViewController.init().view
+//        let upSlideVCView:UIView = UIView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth/2.0, height: KSreenHeight/2.0))
+//        upSlideVCView.backgroundColor = .red
+////        upSlideVCView?.width = KSreenWidth
+////        upSlideVCView?.height = KSreenHeight
+//        return upSlideVCView
+//    }()
+    
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        let view = super.hitTest(point, with: event)
+        guard view == self else {
+            return view
+        }
+        guard let superView = view?.superview else {
+            return view
+        }
+        print(String(format: "self:%p, view:%p", self, view!))
+        return view
+    }
+    
+    var upSlideVCView:CNUpSlideViewController  = {
+        let upSlideVCView = CNUpSlideViewController.init()
+        upSlideVCView.view.width = KSreenWidth
+        upSlideVCView.view.height = KSreenHeight-DownSllideBottomViewHeight
+        return upSlideVCView
+    }()
+    
     var type:Int?
     var _url:String?
@@ -56,9 +85,21 @@ class CNDownSlideView:UIView{
         }
         set{
             _url = newValue!
-            if (_url != ""){
-                let webUrl: URL! = URL.init(string: _url!)
-                webView.load(URLRequest.init(url:webUrl))
+            
+            if(type == UpDownTypeH5){
+                if (_url != ""){
+                    let webUrl: URL! = URL.init(string: _url!)
+                    webView.load(URLRequest.init(url:webUrl))
+                }
+            }else if(type == UpDownTypePage){
+                print("UpDownTypePage")
+                self.webView.isHidden = true
+//                self.upSlideVC.isHidden = false
+                
+            }else if(type == UpDownTypeShopDetail){
+                
+            }else if(type == UpDownTypeShopControlConsole){
+                
             }
         }
     }
@@ -100,9 +141,15 @@ class CNDownSlideView:UIView{
     override init(frame: CGRect) {
         super.init(frame: frame)
+        
+        let tap = UITapGestureRecognizer.init(target: self, action: #selector(slideViewTap))
+        tap.cancelsTouchesInView = false
+        self.addGestureRecognizer(tap)
         self.initUI()
     }
-    
+    @objc func slideViewTap() {
+        print("slideViewTap")
+    }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -110,10 +157,12 @@ class CNDownSlideView:UIView{
     ///初始化UI
     func initUI(){
+        self.isUserInteractionEnabled = true
         self.addSubview(self.contentView)
         self.contentView.addSubview(self.webView)
 //        self.addSubview(self.topView)
         self.addSubview(self.bottomView)
+        self.addSubview(self.upSlideVCView.view)
     }
+//
+//  CNUpSlideDetailScrollView.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+import UIKit
+
+class CNUpSlideDetailScrollView: UIScrollView {
+    
+    let bgBackView = UIView()
+    let imageView = UIImageView()
+    let textView = UITextView()
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupUI()
+    }
+    
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private func setupUI() {
+        bgBackView.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: GlobalConstants.cardDetailTopImageH)
+        bgBackView.layer.masksToBounds = true
+        
+        imageView.frame = bgBackView.bounds
+        imageView.isUserInteractionEnabled = true
+        imageView.contentMode = .scaleAspectFill
+        
+        let textViewWidth = KSreenWidth - 2 * textViewLeftMargin
+        let font = UIFont.boldSystemFont(ofSize: 15)
+        let textHeight = textViewText.calculateHeightWith(width: textViewWidth, font: font)
+        textView.frame = CGRect(x: textViewLeftMargin, y: bgBackView.frame.height + textViewTopMargin, width: textViewWidth, height: textHeight + textViewBottomMargin)
+        textView.text = textViewText
+        textView.font = font
+        textView.textColor = .gray
+        
+        bgBackView.addSubview(imageView)
+        addSubview(bgBackView)
+        addSubview(textView)
+    
+        contentSize = CGSize(width: KSreenWidth, height: bgBackView.frame.height + textViewTopMargin + textView.frame.height + textViewBottomMargin)
+    }
+
+}
+
+
+fileprivate let textViewLeftMargin: CGFloat = 20
+fileprivate let textViewTopMargin: CGFloat = 40
+fileprivate let textViewBottomMargin: CGFloat = 50
+fileprivate let textViewText = "Thank you. I'm honored to be with you today for your commencement from one of the finest universities in the world. Truth be told, i never graduated from college and this is the closest I've ever gotten to a college gradution. \n\nToday i want to tell you three stories from my life. That's it. No big deal. Just three stories. The first story is about connecting the dots. \n\ndropped out of Reed College after the first 6 months, but then stayed around as a drop-in for another 18 months or so before I really quit. So why did I drop out? \n\nIt started before I was born. My biological mother was a young,unwed college graduate student, and she decided to put me up for adoption. She felt very strongly that I should be adopted by college graduates, so everything was all set for me to be adopted at birth by a lawyer and his wife. Except that when I popped out they decided at the last minute that they really wanted a girl. So my parents, who were on a waiting list, got a call in the middle of the night asking: 'We got an unexpected baby boy; do you want him?' They said: 'Of course.' My biological mother found out later that my mother had never graduated from college and  my father had never graduated from high school. She refused to sign the final adoption papers. She only relented a few months later when my parents promised that I would  go to college."
@@ -24,6 +24,11 @@ class CNUpSlideView:UIView{
         return webView
     }()
+    var upSlideVC: CNUpSlideViewController = {
+        let upSlideVC = CNUpSlideViewController.init()
+        return upSlideVC
+    }()
+    
     var type:Int?
     var _url:String?
@@ -38,8 +43,11 @@ class CNUpSlideView:UIView{
                     let webUrl: URL! = URL.init(string: _url!)
                     webView.load(URLRequest.init(url:webUrl))
                 }
-            }else if(type == UpDownTypePage){
+            }
+            else if(type == UpDownTypePage){
                 print("UpDownTypePage")
+                self.webView.isHidden = true
+                self.upSlideVC.view.isHidden = false
             }else if(type == UpDownTypeShopDetail){
             }else if(type == UpDownTypeShopControlConsole){
@@ -64,6 +72,7 @@ class CNUpSlideView:UIView{
         self.clipsToBounds = true;
         self.layer.cornerRadius = 20;
         self.addSubview(self.webView)
+//        self.addSubview(self.upSlideVC.view)
 //        let imageview : UIImageView = UIImageView.init(frame: CGRect(x: 20, y: 10, width: self.width - 40, height: self.height - 20))
+//
+//  CNUpSlideAnimationTransition.swift
+//  metaCode
+//
+//  Created by zx on 2023/10/16.
+//
+
+import UIKit
+
+fileprivate let transitonDuration: TimeInterval = 1.0
+
+
+enum AnimationType {
+    case present
+    case dismiss
+}
+
+class CNUpSlideAnimationTransition: NSObject {
+    let animationType: AnimationType!
+    
+    init(animationType: AnimationType) {
+        self.animationType = animationType
+        super.init()
+    }
+}
+
+extension CNUpSlideAnimationTransition: UIViewControllerAnimatedTransitioning {
+    func transitionDuration(using transitionContext: UIViewControllerContextTransitioning?) -> TimeInterval {
+        return transitonDuration
+    }
+    
+    func animateTransition(using transitionContext: UIViewControllerContextTransitioning) {
+        if animationType == .present {
+            animationForPresent(using: transitionContext)
+        } else {
+            animationForDismiss(using: transitionContext)
+        }
+    }
+    
+    func animationForPresent(using transitionContext: UIViewControllerContextTransitioning) {
+        let containerView = transitionContext.containerView
+        //1.Get fromVC and toVC
+        guard let fromVC = transitionContext.viewController(forKey: .from) as? CNUpSlideViewController else { return }
+        guard let toVC = transitionContext.viewController(forKey: .to) as? CNUpSlideDetailViewController else { return }
+        guard let selectedCell = fromVC.selectedCell else { return }
+        
+        let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: fromVC.view)
+        //2.Set presentation original size.
+        toVC.view.frame = frame
+        toVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
+        toVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
+        
+        containerView.addSubview(toVC.view)
+        
+        //3.Change original size to final size with animation.
+        UIView.animate(withDuration: transitonDuration, delay: 0, usingSpringWithDamping: 0.5, initialSpringVelocity: 0, options: [], animations: {
+            toVC.view.frame = UIScreen.main.bounds
+            toVC.scrollView.imageView.frame.size.width = KSreenWidth
+            toVC.scrollView.imageView.frame.size.height = GlobalConstants.cardDetailTopImageH
+            toVC.closeBtn.alpha = 1
+            
+        }) { (completed) in
+            transitionContext.completeTransition(completed)
+        }
+    }
+    
+    func animationForDismiss(using transitionContext: UIViewControllerContextTransitioning) {
+        guard let fromVC = transitionContext.viewController(forKey: .from) as? CNUpSlideDetailViewController else { return }
+        guard let toVC = transitionContext.viewController(forKey: .to) as? CNUpSlideViewController else { return }
+        guard let selectedCell = toVC.selectedCell else { return }
+        
+        UIView.animate(withDuration: transitonDuration - 0.3, delay: 0, usingSpringWithDamping: 0.8, initialSpringVelocity: 0, options: [], animations: {
+            let frame = selectedCell.convert(selectedCell.bgBackView.frame, to: toVC.view)
+            fromVC.view.frame = frame
+            fromVC.view.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
+            fromVC.scrollView.imageView.frame.size.width = GlobalConstants.todayCardSize.width
+            fromVC.scrollView.imageView.frame.size.height = GlobalConstants.todayCardSize.height
+            fromVC.closeBtn.alpha = 0
+            
+        }) { (completed) in
+            transitionContext.completeTransition(completed)
+        }
+    }
+    
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "close_button@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}