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

liushiyu
2 parents 84517028 66c6f404
Showing 8 changed files with 97 additions and 73 deletions
metaCode/Classes/Main/HomePage/Controller/AuthMainController/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/CNCustomIndexView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNIDCardView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/UpSlide/CNUpSlideView.swift
metaCode/Classes/Vendors/WJColorChange.h
metaCode/Classes/Vendors/WJColorChange.m
@@ -500,9 +500,27 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         //让背景view也跟随scrollView平移量的3倍速进行移动
         self.backgroupView.top = -fabsOffset*3
     }
-   
-    
+    func customIndexViewDidEndDragging(scrollView: UIScrollView, decelerate: Bool) {
+        print("EndDragging\(scrollView.contentOffset.y)")
+        if decelerate == false{
+            //慢拖动时处理
+            if scrollView.contentOffset.y > 0 && scrollView.contentOffset.y < KSreenHeight/2{
+                scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: 0), animated: true)
+            }else if scrollView.contentOffset.y >= KSreenHeight/2 && scrollView.contentOffset.y < KSreenHeight+KSreenHeight/2{
+                scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: KSreenHeight), animated: true)
+            }else if scrollView.contentOffset.y >= KSreenHeight+KSreenHeight/2 && scrollView.contentOffset.y < KSreenHeight*2+KSreenHeight/2{
+                scrollView.setContentOffset(CGPoint(x: scrollView.contentOffset.x, y: KSreenHeight*2), animated: true)
+            }else{
+                
+            }
+            
+        }else{
+            
+        }
+    }
     func customIndexViewDidEndScroll(scrollView: UIScrollView) {
+        print("EndScroll\(scrollView.contentOffset.y)")
+
         if scrollView.contentOffset.y == 0{//下滑页
             self.tabBarController?.tabBar.isHidden = true
             vNumPage = .VNumPageDown
@@ -74,6 +74,7 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
         tableView.dataSource = self
         tableView.delegate = self
         tableView.separatorStyle = .none
+        tableView.bounces = false
 //        tableView.register(CNDownSlideSingleCourseCell.self, forCellReuseIdentifier: kCNLiveDownSlideCellIdentifier)
         tableView.register(CNLiveDownSlideRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideRecommendCellIdentifier)
         tableView.register(CNLiveDownSlideTodayRecommendCell.self, forCellReuseIdentifier: kCNLiveDownSlideTodayRecommendCellIdentifier)
@@ -72,12 +72,13 @@ class CNCustomIndexTopView : UIView{
 protocol CNCustomIndexViewDelegate:NSObjectProtocol{
     /// 当前scrollView  将要开始滚动
-    func customIndexViewWillBeiginScroll(scrollView :UIScrollView);
+    func customIndexViewWillBeiginScroll(scrollView :UIScrollView)
     ///当前scrollView 滚动中
-    func customIndexViewDidScroll(scrollView :UIScrollView);
-    ///当前scrollView 已经结束滚动
-    func customIndexViewDidEndScroll(scrollView :UIScrollView);
-
+    func customIndexViewDidScroll(scrollView :UIScrollView)
+    ///当前scrollView 已经结束滚动(清扫 减速的结束)
+    func customIndexViewDidEndScroll(scrollView :UIScrollView)
+    ///当前scrollView 已经结束拖拽滚动(慢拖动结束)
+    func customIndexViewDidEndDragging(scrollView :UIScrollView,decelerate:Bool)
 }
 class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChangeDelegate{
@@ -302,8 +303,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     ///WJColorChange 代理方法 滚动时候回调 传出当前的滚动视图
     func wjColorScrollViewScroll(_ scrollView: UIScrollView!) {
-        
-        let tag: NSInteger = self.tag 
+        let tag: NSInteger = self.tag
         let defaultOffset: CGFloat = self.frame.size.height 
         let currentOffset: CGFloat = scrollView.contentOffset.y 
@@ -323,7 +323,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         }
         //当self.baseScrollView的偏移量大于 self.baseScrollView.height时,显示上滑提醒view
-        if(currentOffset > self.baseScrollView.height){
+        if(currentOffset >= self.baseScrollView.height){
             self.upSlideViewRemindView.top =  self.height - (currentOffset - self.baseScrollView.height)*1.5
         }
         //上滑滑动到临近值,让upSlideViewRemindView位置一直停留在底部,并慢慢消失
@@ -351,29 +351,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
             let downSlideViewRemindViewMinOffset: CGFloat = self.baseScrollView.height-self.downSlideViewRemindView.height
             self.downSlideViewRemindView.alpha = (20-(downSlideViewRemindViewMinOffset - currentOffset))/20.00
-            //让系统及时更新downSlideViewRemindView
-//            self.downSlideViewRemindView.setNeedsLayout()
-//            self.downSlideViewRemindView.layoutIfNeeded()
         }
-        
-        
-        /**控制缩放范围在一定范围*/
-//        let mainViewOffset:CGFloat = abs(currentOffset - self.baseScrollView.height)
-//        if (mainViewOffset < 100) {
-//            var scale: CGFloat = 1.0
-//            
-//            if (currentOffset < self.baseScrollView.height) {
-//                //下滑时,计算scale方法
-//                scale = currentOffset/self.baseScrollView.height
-//            }
-//            else {
-//                //上滑时,计算scale方法
-//                scale = self.baseScrollView.height/currentOffset
-//            }
-//
-//            self.mainView.scaledView(scale: scale)
-//        }
-        
+                
         /**隐藏顶部导航**/
         let topNavViewAlpha: CGFloat = 1.0 - (self.baseScrollView.height * 2 - currentOffset)/(self.baseScrollView.height*0.5)
         if(topNavViewAlpha > 0){
@@ -397,10 +376,23 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     }
+    //结束拖拽时 , 慢拖动时不走wjColorEndScroll 走本方法
+    func wjColorScrollViewDidEndDragging(_ scrollView: UIScrollView!, decelerate: Bool) {
+        self.wjColorEndScrollOrEndDragging(scrollView)
+        //外部代理
+        self.delegate?.customIndexViewDidEndDragging(scrollView: scrollView, decelerate: decelerate)
+    }
+    
     ///WJColorChange 代理方法 滚动结束时候回调
     func wjColorEndScroll(_ scrollView: UIScrollView!) {
-        
-        
+            
+        self.wjColorEndScrollOrEndDragging(scrollView)
+        //外部代理
+        self.delegate?.customIndexViewDidEndScroll(scrollView: scrollView)
+    }
+    
+    //公用方法
+    func wjColorEndScrollOrEndDragging(_ scrollView: UIScrollView!){
         let defaultOffset: CGFloat = self.frame.size.height
         let currentOffset: CGFloat = scrollView.contentOffset.y
@@ -440,9 +432,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         //下滑提醒View回到初始位置
         self.downSlideViewRemindView.top = -(self.downSlideViewRemindView.height + 50)
-        
-        //外部代理
-        self.delegate?.customIndexViewDidEndScroll(scrollView: scrollView)
+
     }
 }
@@ -142,21 +142,21 @@ class CNDownSlideView:UIView{
         backBtn.addTarget(self, action: #selector(backBtnAction), for: .touchUpInside)
         backBtn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 8)
         bottomView.addSubview(backBtn)
-        
+        bottomView.isUserInteractionEnabled = true
         return bottomView
     }()
     override init(frame: CGRect) {
         super.init(frame: frame)
-        let tap = UITapGestureRecognizer.init(target: self, action: #selector(slideViewTap))
-        tap.cancelsTouchesInView = false
-        self.addGestureRecognizer(tap)
+//        let tap = UITapGestureRecognizer.init(target: self, action: #selector(slideViewTap))
+//        tap.cancelsTouchesInView = false
+//        self.addGestureRecognizer(tap)
         self.initUI()
     }
-    @objc func slideViewTap() {
-        print("slideViewTap")
-    }
+//    @objc func slideViewTap() {
+//        print("slideViewTap")
+//    }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
@@ -63,31 +63,35 @@ class CNIDCardView: UIView{
             hiddenLoading()
             if respStatue == .success {
                 let cardArray = result as! NSMutableArray
-                for i in (0..<cardArray.count){
-                    let idCardModel = cardArray[i] as! MineStandInfoModel
-                    switch idCardModel.name {
-                    case "姓名":
-                        self.nameValueLabel.text =  idCardModel.userInfo
-                    case "性别":
-                        self.sexValueLabel.text = idCardModel.userInfo
-                    case "认证时间":
-                        self.dateValueLabel.text = idCardModel.userInfo
-                    case "编号":
-                        self.IDValueLabel.text =  idCardModel.userInfo
-                    case "证件照":
-                        let str:String = idCardModel.userInfo!
-                        if(str.isEmpty){
-                            self.iDIconImgView.isHidden = true
-                        }else
-                        {
-                            self.iDIconImgView.isHidden = false
-                            self.iDIconImgView.kf.setImage(with: URL(string: str))
+                if cardArray.count > 0{
+                    for i in (0..<cardArray.count){
+                        let idCardModel = cardArray[i] as! MineStandInfoModel
+                        switch idCardModel.name {
+                        case "姓名":
+                            self.nameValueLabel.text =  idCardModel.userInfo
+                        case "性别":
+                            self.sexValueLabel.text = idCardModel.userInfo
+                        case "认证时间":
+                            self.dateValueLabel.text = idCardModel.userInfo
+                        case "编号":
+                            self.IDValueLabel.text =  idCardModel.userInfo
+                        case "证件照":
+                            let str:String = idCardModel.userInfo!
+                            if(str.isEmpty){
+                                self.iDIconImgView.isHidden = true
+                            }else
+                            {
+                                self.iDIconImgView.isHidden = false
+                                self.iDIconImgView.kf.setImage(with: URL(string: str))
+                            }
+                            
+                            self.iDCardBGView.kf.setImage(with: URL(string: self._idModel!.cardImg), placeholder: UIImage(named: "homePage_idCardBG"))
+                        default:
+                            break
                         }
-                        
-                        self.iDCardBGView.kf.setImage(with: URL(string: self._idModel!.cardImg), placeholder: UIImage(named: "homePage_idCardBG"))
-                    default:
-                        break
                     }
+                }else{
+                    //没数据
                 }
             }
         }
@@ -65,15 +65,15 @@ class CNUpSlideView:UIView{
     override init(frame: CGRect) {
         super.init(frame: frame)
-        let tap = UITapGestureRecognizer.init(target: self, action: #selector(upSlideViewTap))
-        tap.cancelsTouchesInView = false
-        self.addGestureRecognizer(tap)
+//        let tap = UITapGestureRecognizer.init(target: self, action: #selector(upSlideViewTap))
+//        tap.cancelsTouchesInView = false
+//        self.addGestureRecognizer(tap)
         self.initUI()
     }
-    @objc func upSlideViewTap() {
-        print("upSlideViewTap")
-    }
+//    @objc func upSlideViewTap() {
+//        print("upSlideViewTap")
+//    }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -15,6 +15,11 @@
  @param scrollView 滚动视图
  */
 - (void)WJColorScrollViewWillBeginDragging:(UIScrollView *)scrollView;
+/**
+ 结束拖拽
+ @param scrollView 滚动视图
+ */
+- (void)WJColorScrollViewDidEndDragging:(UIScrollView *)scrollView decelerate:(BOOL)decelerate;
 /**
  滚动时候回调 传出当前的滚动视图
@@ -201,7 +201,13 @@
     }
 }
+- (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate
+{
+    if ([self.delegate respondsToSelector:@selector(WJColorScrollViewDidEndDragging:decelerate:)]) {
+        [self.delegate WJColorScrollViewDidEndDragging:scrollView decelerate:decelerate];
+    }
+}
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView {
     if ([self.delegate respondsToSelector:@selector(WJColorEndScroll:)]) {