Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

liushiyu
2 parents feaeaa87 d84fd0ec
Showing 7 changed files with 224 additions and 9 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Constant/CNLiveHotButton.swift → metaCode/Classes/CNLiveHotButton.swift
metaCode/Classes/Extensions/CNLiveTips.swift → metaCode/Classes/CNLiveTips.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNHomePageBackgroupView.swift
metaCode/Classes/Vendors/NewPagedFlowView.h
metaCode/Classes/Vendors/NewPagedFlowView.m
@@ -188,7 +188,6 @@
 				790D01842A2D89E100C5978D /* UIColor+CNHexColor.swift */,
 				7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */,
 				790D019C2A2DCBD000C5978D /* UIView+CNGradient.swift */,
-				790D01A02A2DD69200C5978D /* CNLiveTips.swift */,
 				79282A3B2A2EDC2500B5F8CF /* NSString+CNLiveExtensions.swift */,
 				798A44EF2A305BC200815935 /* UIButton+CNLiveExtension.swift */,
 			);
@@ -261,6 +260,7 @@
 		7963988A2A260B3300D045EB /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				7C4931322A3076BE000E44B4 /* CustomView */,
 				790D01832A2D89E100C5978D /* Extensions */,
 				7CD675502A29C036008354C1 /* Constant */,
 				796398912A260C0100D045EB /* Common */,
@@ -370,6 +370,15 @@
 			path = ViewModel;
 			sourceTree = "<group>";
 		};
+		7C4931322A3076BE000E44B4 /* CustomView */ = {
+			isa = PBXGroup;
+			children = (
+				79282A412A2F173300B5F8CF /* CNLiveHotButton.swift */,
+				790D01A02A2DD69200C5978D /* CNLiveTips.swift */,
+			);
+			name = CustomView;
+			sourceTree = "<group>";
+		};
 		7CD675212A26F844008354C1 /* HomePage */ = {
 			isa = PBXGroup;
 			children = (
@@ -407,7 +416,6 @@
 			isa = PBXGroup;
 			children = (
 				7CD675512A29C04B008354C1 /* CNLiveConstant.swift */,
-				79282A412A2F173300B5F8CF /* CNLiveHotButton.swift */,
 			);
 			path = Constant;
 			sourceTree = "<group>";
@@ -14,7 +14,8 @@ let Height: CGFloat = UIScreen.main.bounds.size.height
 class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDelegate, NewPagedFlowViewDataSource, CNCustomIndexViewDelegate{
-    
+    ///NewPagedFlowView 开始滑动时的偏移量
+    private var beginOffset = 0.0
     private var tabBarY:CGFloat = 0.0
@@ -57,7 +58,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         self.tabBarY = (self.tabBarController?.tabBar.top)!
-        for i in (0..<6) {
+        for i in (0..<5) {
             self.dataArray.add("122")
         }
@@ -102,14 +103,75 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         bannerView?.superScrollView = flowView.scrollView
         bannerView?.associatedVCView = self.view
         bannerView?.delegate  = self
-        return bannerView 
+        return bannerView
     }
     func sizeForPage(in flowView: NewPagedFlowView!) -> CGSize {
         return CGSize(width: Width-50, height: Height)
     }
+    ///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(){
+                
+                if let currentApearView = self.backgroupView.currentApearView{
+                    self.backgroupView.insertSubview(rightView, belowSubview: currentApearView)
+                }
+                
+                self.backgroupView.currentApearView?.maskLayer.right = KSreenWidth - (currentOffset-beginOffset)*2.5
+            }else{
+                
+            }
+        }
+        
+        if(currentOffset < beginOffset){
+            if let leftView = self.backgroupView.getLeftView(){
+                
+                if let currentApearView = self.backgroupView.currentApearView{
+                    self.backgroupView.insertSubview(leftView, belowSubview: currentApearView)
+                }
+                
+                self.backgroupView.currentApearView?.maskLayer.left = (beginOffset-currentOffset)*2.5
+            }else{
+                
+            }
+        }
+    }
+    
+    ///NewPagedFlowView 滑动将要结束
+    func willEndScroll(_ scrollView: UIScrollView!) {
+        
+        //暂时禁止再次滑动,后期优化通过自定义UIScrollView 结束动画来实现
+        scrollView.isScrollEnabled = false
+    }
+    ///NewPagedFlowView 滑动结束
+    func didEndScroll(_ scrollView: UIScrollView!) {
+        print("scrollView.contentOffset.x = ",scrollView.contentOffset.x)
+        let toIndex:Int = Int(scrollView.contentOffset.x/(Width-50))
+        
+        if toIndex == self.backgroupView.currentApearViewIndex{
+            return
+        }
+        
+        self.backgroupView.replaceCurerrentApearView(fromIndex: self.backgroupView.currentApearViewIndex, toIndex: toIndex)
+        
+        scrollView.isScrollEnabled = true
+
+    }
+    
+    
     //MARK: - CNCustomIndexView 代理方法
+    
     func customIndexViewWillBeiginScroll(scrollView: UIScrollView) {
         self.view.height = KSreenHeight
     }
@@ -9,7 +9,12 @@ import Foundation
 import UIKit
 class CNHomePageBackgroupSubView : UIView
 {
+    ///前面的视图
+    var preSubView: CNHomePageBackgroupSubView?
+    ///后面的视图
+    var nextSubView: CNHomePageBackgroupSubView?
+    var name: String = ""
     lazy var imageView: UIImageView = {
         let imageView: UIImageView = UIImageView(image: UIImage(named: "homePage_backgroup_blue"))
         imageView.frame = self.bounds
@@ -23,6 +28,16 @@ class CNHomePageBackgroupSubView : UIView
         return titleLabel
     }()
+    ///自定义mask
+    lazy var maskLayer: CALayer = {
+        let  maskLayer = CALayer.init()
+        maskLayer.frame = self.bounds;
+        maskLayer.backgroundColor = UIColor.gray.cgColor
+        self.layer.mask = maskLayer
+
+        return maskLayer
+    }()
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -42,13 +57,27 @@ class CNHomePageBackgroupSubView : UIView
         self.titleLabel.text = title
     }
     ///设置图片
-    func setImage(image:UIImage)->Void{
-        self.imageView.image = image
+    func setImage(image:UIImage?)->Void{
+        if let tempImage = image{
+            self.imageView.image = tempImage
+        }else{
+            
+        }
     }
 }
 class CNHomePageBackgroupView: UIView{
+    ///当前显示的view所处的位置
+    var currentApearViewIndex: Int = 0
+    ///当前在屏幕显示的view
+    var currentApearView: CNHomePageBackgroupSubView?
+    ///数据源
+    lazy var dataArray:Array<CNHomePageBackgroupSubView> = {
+        let dataArray = Array<CNHomePageBackgroupSubView>()
+        return dataArray
+    }()
+    
     // MARK: - 初始化
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -61,11 +90,116 @@ class CNHomePageBackgroupView: UIView{
     //创建UI
     func initUI(){
+        
+        for i in (0..<5){
+            
+            let subView: CNHomePageBackgroupSubView = CNHomePageBackgroupSubView.init(frame: self.bounds)
+            subView.frame = self.bounds
+            
+            
+            if (i == 0) {
+                subView.setTitle(title: "志愿者")
+                subView.setImage(image: UIImage(named: "homePage_backgroup_red"))
+                subView.name = "志愿者"
+            }
+            else if(i == 1){
+                subView.setTitle(title: "退伍军人")
+                subView.setImage(image: UIImage(named: "homePage_backgroup_blue"))
+                subView.name = "退伍军人"
+
+            }
+            else if(i == 2){
+                subView.setTitle(title: "慈善家")
+                subView.setImage(image: UIImage(named: "homePage_backgroup_red"))
+                subView.name = "慈善家"
+
+            }
+            else if(i == 3){
+                subView.setTitle(title: "退休干部")
+                subView.setImage(image: UIImage(named: "homePage_backgroup_blue"))
+                subView.name = "退休干部"
+
+            }
+            else if(i == 4){
+                subView.setTitle(title: "退休医生")
+                subView.setImage(image: UIImage(named: "homePage_backgroup_red"))
+                subView.name = "退伍军人"
+
+            }
+            
+            //更新双向链表
+            let lastSubView: CNHomePageBackgroupSubView? = self.dataArray.last
+            lastSubView?.nextSubView = subView
+            subView.preSubView = lastSubView
+            
+            self.dataArray.append(subView)
+
+            if i==0 {
+                self.currentApearView = subView
+                self.currentApearViewIndex = i
+            }
+        }
+        
+        //倒序添加子view
+        for i in self.dataArray.enumerated().reversed() {
+
+            let subview: CNHomePageBackgroupSubView = i.element
+            self.addSubview(subview)
+
+        }
+
+        
         let subView: CNHomePageBackgroupSubView = CNHomePageBackgroupSubView.init(frame: self.bounds)
         subView.frame = self.bounds
-        subView.setTitle(title: "志愿者")
-        self.addSubview(subView)
+    }
+    
+    //MARK: - 公开方法
+    ///获取当前视图左边的子视图
+    func getLeftView()->CNHomePageBackgroupSubView?{
+        if(currentApearViewIndex == 0){
+            return nil
+        }
+        return dataArray[currentApearViewIndex - 1]
+    }
+    ///获取当前视图右边的子视图
+    func getRightView()->CNHomePageBackgroupSubView?{
+        if(currentApearViewIndex == self.dataArray.count - 1){
+            return nil
+        }
+        return dataArray[currentApearViewIndex + 1]
+    }
+    
+    /// 替换当前显示的子view
+    /// - Parameters:
+    ///   - fromIndex: 原来显示的view索引
+    ///   - toIndex: 将要显示的view索引
+    /// - Returns: 无返回值
+    func replaceCurerrentApearView(fromIndex:Int ,toIndex:Int)->Void{
+         
+        //先保存之前显示的view
+        let tempSubView: CNHomePageBackgroupSubView? = self.currentApearView
+
+        //找到下一个要显示的view
+        if(toIndex < fromIndex){
+            self.currentApearView = self.currentApearView?.preSubView
+        }
+        else{
+            self.currentApearView = self.currentApearView?.nextSubView
+        }
+        
+        //把要显示的view放到最顶层
+        if let subView = self.currentApearView{
+            self.bringSubviewToFront(subView)
+        }
+        //更新当前显示的view所处的位置
+        self.currentApearViewIndex = toIndex
+        
+ 
+        //重置之前的currentApearView的Left 和 right
+        tempSubView?.maskLayer.left = 0;
+        tempSubView?.maskLayer.right = KSreenWidth;
+        
     }
 }
@@ -182,6 +182,11 @@ typedef NS_ENUM (NSUInteger, NewPagedFlowViewOrientation) {
 /// @param scrollView 滚动的scrollView
 - (void)didScroll:(UIScrollView *)scrollView;
+
+/// 将要结束滚动
+/// @param scrollView 滚动的scrollView
+- (void)willEndScroll:(UIScrollView *)scrollView;
+
 /// 已经结束滚动
 /// @param scrollView 滚动的scrollView
 - (void)didEndScroll:(UIScrollView *)scrollView;
@@ -664,11 +664,17 @@ static NSString *subviewClassName;
 #pragma mark --将要开始拖拽
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
     [self stopTimer];
+    if(self.delegate && [self.delegate respondsToSelector:@selector(willBeginScroll:)]){
+        [self.delegate willBeginScroll:scrollView];
+    }
 }
 #pragma mark --结束拖拽
 - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate {
     [self startTimer];
+    if(self.delegate && [self.delegate respondsToSelector:@selector(willEndScroll:)]){
+        [self.delegate willEndScroll:scrollView];
+    }
 }
 //结束滑动
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView