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

# Conflicts: # metaCode/Classes/Other/AppDelegate.swift

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # metaCode/Classes/Other/AppDelegate.swift
liushiyu
2 parents a0d44c80 a64e13ef
Showing 32 changed files with 731 additions and 287 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Base/CNLiveBaseTabBarViewController.swift
metaCode/Classes/Constant/CNLiveConstant.swift
metaCode/Classes/Extensions/UITabBar+CNBadge.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNBottomPayMoneyRemindView.swift
metaCode/Classes/Main/HomePage/View/CNCollectMoneyCodeView.swift
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
metaCode/Classes/Main/HomePage/View/CNHomePageBackgroupView.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Main/HomePage/View/CNPayMoneyCodeView.swift
metaCode/Classes/Main/HomePage/View/CNTopCollectMoneyRemindView.swift
metaCode/Classes/Vendors/WJColorChange.h
metaCode/Classes/Vendors/WJColorChange.m
metaCode/Supporting Files/Assets.xcassets/Home/homePage_backgroup_blue.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/homePage_backgroup_blue.imageset/背景-蓝@2x.png
metaCode/Supporting Files/Assets.xcassets/Home/homePage_backgroup_blue.imageset/背景-蓝@3x.png
metaCode/Supporting Files/Assets.xcassets/Home/homePage_backgroup_red.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/homePage_backgroup_red.imageset/背景-红@2x.png
metaCode/Supporting Files/Assets.xcassets/Home/homePage_backgroup_red.imageset/背景-红@3x.png
@@ -37,6 +37,7 @@
 		79A68C4C2A26EA6000DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		7C4931292A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */; };
 		7C49312D2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */; };
+		7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */; };
 		7CD675292A270F6A008354C1 /* WJColorChange.m in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675282A270F6A008354C1 /* WJColorChange.m */; };
 		7CD6753C2A2740B0008354C1 /* CNBottomPayMoneyRemindView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675372A2740B0008354C1 /* CNBottomPayMoneyRemindView.swift */; };
 		7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CD675382A2740B0008354C1 /* CNMainView.swift */; };
@@ -108,6 +109,7 @@
 		79A68C512A26F59C00DC3B43 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = metaCode/Info.plist; sourceTree = "<group>"; };
 		7C4931282A2D8BA8000E44B4 /* CNLiveBaseTabBarViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseTabBarViewController.swift; sourceTree = "<group>"; };
 		7C49312C2A2DB9FA000E44B4 /* UITabBar+CNBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITabBar+CNBadge.swift"; sourceTree = "<group>"; };
+		7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageBackgroupView.swift; sourceTree = "<group>"; };
 		7CD675262A270F69008354C1 /* metaCode-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "metaCode-Bridging-Header.h"; sourceTree = "<group>"; };
 		7CD675272A270F6A008354C1 /* WJColorChange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WJColorChange.h; sourceTree = "<group>"; };
 		7CD675282A270F6A008354C1 /* WJColorChange.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WJColorChange.m; sourceTree = "<group>"; };
@@ -383,6 +385,7 @@
 				7CD675392A2740B0008354C1 /* CNPayMoneyCodeView.swift */,
 				7CD6753A2A2740B0008354C1 /* CNTopCollectMoneyRemindView.swift */,
 				7CD675412A2740F8008354C1 /* CNCustomIndexView.swift */,
+				7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */,
 			);
 			name = View;
 			path = HomePage/View;
@@ -729,6 +732,7 @@
 				79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */,
 				79282A3E2A2EFDA000B5F8CF /* CNLiveLoginModel.swift in Sources */,
 				790D01852A2D89E100C5978D /* UIColor+CNHexColor.swift in Sources */,
+				7C4931312A2F142F000E44B4 /* CNHomePageBackgroupView.swift in Sources */,
 				790D018B2A2D8B3300C5978D /* CNLiveLoginViewController.swift in Sources */,
 				798A44EC2A302DBE00815935 /* CNLiveMineAddInfoViewController.swift in Sources */,
 				7CD675422A2740F8008354C1 /* CNCustomIndexView.swift in Sources */,
@@ -8,17 +8,38 @@
 import Foundation
 import UIKit
-class CNLiveBaseTabBarViewController:UITabBarController
+class CNTabBar:UITabBar{
+    
+    override var frame: CGRect {
+        
+        willSet
+        {
+            
+        }
+        //我们需要在age属性发生变化后，更新一下nickName这个属性
+        didSet
+        {
+           print("frame = ", frame)
+           print("完成")
+        }
+    }
+}
+
+class CNLiveBaseTabBarViewController: UITabBarController
 {
     override func viewDidLoad() {
         super.viewDidLoad()
+        self.setValue(CNTabBar.init(), forKey: "tabBar")
+        
+        self.setUpTabBar()
+        self.setupBackgroup()
+
     }
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        self.setUpTabBar()
-        self.setupBackgroup()
+       
         self.selectedIndex = 1
@@ -26,6 +47,7 @@ class CNLiveBaseTabBarViewController:UITabBarController
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
+        
     }
     // MARK: - 控制器的信息
     func setUpTabBar() {
@@ -13,11 +13,11 @@ let KSreenWidth = UIScreen.main.bounds.width
 let KSreenHeight = UIScreen.main.bounds.height
 ///状态栏高度
-let KStatusBarHeight = UIApplication.shared.statusBarFrame.height;
+let KStatusBarHeight:CGFloat = UIApplication.shared.statusBarFrame.height;
 ///导航栏高度
-let KNavigationHeight = (KStatusBarHeight + 44)
+let KNavigationHeight:CGFloat = (KStatusBarHeight + 44)
 ///tabbar高度
-let KTabBarHeight = (KStatusBarHeight == 44 ? 83 : 49)
+let KTabBarHeight:CGFloat = (KStatusBarHeight == 44 ? 83 : 49)
 //MARK: - 常用背景色
 ///控制器背景色
@@ -8,208 +8,208 @@
 import Foundation
 import UIKit
-extension UITabBar {
-    /**
-     tabbar  tag
-     */
-    private var badgeTag:Int! {
-        get{
-            return 1000
-        }
-        set{
-            
-        }
-    }
-    
-    /**
-    运行时对应的key值
-    */
-    private struct AssociatedKeys {
-        static var kBadgeSize:String! = "kBadgeSize"
-        static var kBadgeColor:String! = "kBadgeColor"
-        static var kBadgeImage:String! = "kBadgeImage"
-        static var kBadgePoint:String! = "kBadgePoint"
-        static var kBadgeValue:String! = "kBadgeValue"
-    }
-    
-    
-    // 小红点size
-    public var badgeSize:CGSize! {
-        get{
-            return objc_getAssociatedObject(self, &AssociatedKeys.kBadgeSize) as? CGSize
-        }
-        set{
-            objc_setAssociatedObject(self, &AssociatedKeys.kBadgeSize, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-        }
-    }
-    
-    // 小红点图片
-    public var badgeImage:UIImage! {
-        get{
-            return objc_getAssociatedObject(self, &AssociatedKeys.kBadgeImage) as? UIImage
-        }
-        set{
-            objc_setAssociatedObject(self, &AssociatedKeys.kBadgeImage, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-        }
-    }
-    
-    // 小红点颜色
-    public var badgeColor:UIColor! {
-        get{
-            return objc_getAssociatedObject(self, &AssociatedKeys.kBadgeColor) as? UIColor
-        }
-        set{
-            objc_setAssociatedObject(self, &AssociatedKeys.kBadgeColor, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-        }
-    }
-    
-    // 小红点的x、y值
-    public var badgePoint:CGPoint! {
-        get{
-            return objc_getAssociatedObject(self, &AssociatedKeys.kBadgePoint) as? CGPoint
-        }
-        set{
-            objc_setAssociatedObject(self, &AssociatedKeys.kBadgePoint, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-        }
-    }
-    
-    // 小红点的数字
-    public var badgeValue:String! {
-        get{
-            return objc_getAssociatedObject(self, &AssociatedKeys.kBadgeValue) as? String
-        }
-        set{
-            objc_setAssociatedObject(self, &AssociatedKeys.kBadgeValue, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
-        }
-    }
-    
-    // MARK:-显示小红点
-    public func showBadgeOnItemIndex(index:Int){
-        // 移除
-        self.removeRedPointOnIndex(index: index, animation: false)
-        
-        // 防止是空的
-        if self.badgeColor == nil {
-            self.badgeColor = UIColor()
-            self.badgeColor = UIColor.red
-        }
-        
-        if self.badgePoint == nil {
-            self.badgePoint = CGPoint()
-            self.badgePoint = CGPoint.zero
-        }
-        
-        if self.badgeSize == nil {
-            self.badgeSize = CGSize.zero
-        }
-        
-        if self.badgeImage == nil {
-            self.badgeImage = UIImage()
-        }
-        
-        if self.badgeValue == nil {
-            self.badgeValue = String()
-        }
-        
-        // 小红点背景默认值大小设置
-        if __CGSizeEqualToSize(self.badgeSize, CGSize.zero) {
-            self.badgeSize = CGSize(width: 12, height: 12)
-        }
-        
-        
-        let badgeView = UIView()
-        badgeView.backgroundColor = self.badgeColor
-        badgeView.layer.cornerRadius = self.badgeSize.width / 2
-        badgeView.tag = badgeTag + 1
-        
-        let barButtonView = self.getBarButttonViewWithIndex(index: index)
-        //（图片的imageView）
-        var iconView = UIView()
-        for swappableImageView in barButtonView.subviews {
-            
-            if swappableImageView.isKind(of: UIImageView.self) {
-                iconView = swappableImageView
-                break
-            }
-            
-        }
-        
-        // 小红点背景默认值Point设置
-        if __CGPointEqualToPoint(self.badgePoint, CGPoint.zero) {
-            let iconViewSize = iconView.frame.size
-            badgeView.frame = CGRect(x: iconViewSize.width - self.badgeSize.width / 2, y: -self.badgeSize.width / 2, width: self.badgeSize.width, height: self.badgeSize.height)
-        }else{
-            badgeView.frame = CGRect(x: self.badgePoint.x, y: self.badgePoint.y, width: self.badgeSize.width, height: self.badgeSize.height)
-        }
-        
-        // 添加图片到小红点上
-        let imageview = UIImageView(frame: badgeView.bounds)
-        imageview.image = self.badgeImage
-        if self.badgeImage != nil {
-            self.backgroundColor = UIColor.red
-        }
-        badgeView.addSubview(imageview)
-        
-        if self.badgeValue != nil {
-            let badgeLabel = UILabel(frame: badgeView.bounds)
-            badgeLabel.text = self.badgeValue
-            badgeLabel.textAlignment = .center
-            badgeLabel.font = UIFont.systemFont(ofSize: 13)
-            badgeLabel.textColor = UIColor.white
-            badgeView.addSubview(badgeLabel)
-        }
-        
-        iconView.addSubview(badgeView)
-    }
-    
-    // MARK:-隐藏小红点
-    public func hiddenRedPointOnIndex(index:Int, animation:Bool){
-        self.removeRedPointOnIndex(index: index, animation: animation)
-    }
-    
-    private func removeRedPointOnIndex(index:Int, animation:Bool) {
-        let barButtonView = self.getBarButttonViewWithIndex(index: index)
-        
-        for swapView in barButtonView.subviews {
-            
-            if swapView.isKind(of: UIImageView.self) {
-                
-                for view1 in swapView.subviews {
-                    
-                    if view1.tag == (badgeTag + 1) {
-                        
-                        if animation {
-                            UIView.animate(withDuration: 0.2, animations: {
-                                view1.transform = CGAffineTransform(translationX: 2, y: 2)
-                                view1.alpha = 0
-                            }) { (finished) in
-                                view1.removeFromSuperview()
-                            }
-                        }else{
-                            view1.removeFromSuperview()
-                        }
-                        
-                    }
-                    
-                }
-                
-            }
-            
-        }
-        
-    }
-    
-    // 获取barButtonView
-    private func getBarButttonViewWithIndex(index:Int) -> UIView {
-
-        if let itemss = self.items {
-            let item = itemss[index]
-            let barButtonView = item.value(forKey: "view")
-            return barButtonView as! UIView
-        }
-        
-        let vw = UIView()
-        return vw
-    }
-    
-}
+//extension UITabBar {
+//    /**
+//     tabbar  tag
+//     */
+//    private var badgeTag:Int! {
+//        get{
+//            return 1000
+//        }
+//        set{
+//            
+//        }
+//    }
+//    
+//    /**
+//    运行时对应的key值
+//    */
+//    private struct AssociatedKeys {
+//        static var kBadgeSize:String! = "kBadgeSize"
+//        static var kBadgeColor:String! = "kBadgeColor"
+//        static var kBadgeImage:String! = "kBadgeImage"
+//        static var kBadgePoint:String! = "kBadgePoint"
+//        static var kBadgeValue:String! = "kBadgeValue"
+//    }
+//    
+//    
+//    // 小红点size
+//    public var badgeSize:CGSize! {
+//        get{
+//            return objc_getAssociatedObject(self, &AssociatedKeys.kBadgeSize) as? CGSize
+//        }
+//        set{
+//            objc_setAssociatedObject(self, &AssociatedKeys.kBadgeSize, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+//        }
+//    }
+//    
+//    // 小红点图片
+//    public var badgeImage:UIImage! {
+//        get{
+//            return objc_getAssociatedObject(self, &AssociatedKeys.kBadgeImage) as? UIImage
+//        }
+//        set{
+//            objc_setAssociatedObject(self, &AssociatedKeys.kBadgeImage, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+//        }
+//    }
+//    
+//    // 小红点颜色
+//    public var badgeColor:UIColor! {
+//        get{
+//            return objc_getAssociatedObject(self, &AssociatedKeys.kBadgeColor) as? UIColor
+//        }
+//        set{
+//            objc_setAssociatedObject(self, &AssociatedKeys.kBadgeColor, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+//        }
+//    }
+//    
+//    // 小红点的x、y值
+//    public var badgePoint:CGPoint! {
+//        get{
+//            return objc_getAssociatedObject(self, &AssociatedKeys.kBadgePoint) as? CGPoint
+//        }
+//        set{
+//            objc_setAssociatedObject(self, &AssociatedKeys.kBadgePoint, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+//        }
+//    }
+//    
+//    // 小红点的数字
+//    public var badgeValue:String! {
+//        get{
+//            return objc_getAssociatedObject(self, &AssociatedKeys.kBadgeValue) as? String
+//        }
+//        set{
+//            objc_setAssociatedObject(self, &AssociatedKeys.kBadgeValue, newValue, .OBJC_ASSOCIATION_RETAIN_NONATOMIC)
+//        }
+//    }
+//    
+//    // MARK:-显示小红点
+//    public func showBadgeOnItemIndex(index:Int){
+//        // 移除
+//        self.removeRedPointOnIndex(index: index, animation: false)
+//        
+//        // 防止是空的
+//        if self.badgeColor == nil {
+//            self.badgeColor = UIColor()
+//            self.badgeColor = UIColor.red
+//        }
+//        
+//        if self.badgePoint == nil {
+//            self.badgePoint = CGPoint()
+//            self.badgePoint = CGPoint.zero
+//        }
+//        
+//        if self.badgeSize == nil {
+//            self.badgeSize = CGSize.zero
+//        }
+//        
+//        if self.badgeImage == nil {
+//            self.badgeImage = UIImage()
+//        }
+//        
+//        if self.badgeValue == nil {
+//            self.badgeValue = String()
+//        }
+//        
+//        // 小红点背景默认值大小设置
+//        if __CGSizeEqualToSize(self.badgeSize, CGSize.zero) {
+//            self.badgeSize = CGSize(width: 12, height: 12)
+//        }
+//        
+//        
+//        let badgeView = UIView()
+//        badgeView.backgroundColor = self.badgeColor
+//        badgeView.layer.cornerRadius = self.badgeSize.width / 2
+//        badgeView.tag = badgeTag + 1
+//        
+//        let barButtonView = self.getBarButttonViewWithIndex(index: index)
+//        //（图片的imageView）
+//        var iconView = UIView()
+//        for swappableImageView in barButtonView.subviews {
+//            
+//            if swappableImageView.isKind(of: UIImageView.self) {
+//                iconView = swappableImageView
+//                break
+//            }
+//            
+//        }
+//        
+//        // 小红点背景默认值Point设置
+//        if __CGPointEqualToPoint(self.badgePoint, CGPoint.zero) {
+//            let iconViewSize = iconView.frame.size
+//            badgeView.frame = CGRect(x: iconViewSize.width - self.badgeSize.width / 2, y: -self.badgeSize.width / 2, width: self.badgeSize.width, height: self.badgeSize.height)
+//        }else{
+//            badgeView.frame = CGRect(x: self.badgePoint.x, y: self.badgePoint.y, width: self.badgeSize.width, height: self.badgeSize.height)
+//        }
+//        
+//        // 添加图片到小红点上
+//        let imageview = UIImageView(frame: badgeView.bounds)
+//        imageview.image = self.badgeImage
+//        if self.badgeImage != nil {
+//            self.backgroundColor = UIColor.red
+//        }
+//        badgeView.addSubview(imageview)
+//        
+//        if self.badgeValue != nil {
+//            let badgeLabel = UILabel(frame: badgeView.bounds)
+//            badgeLabel.text = self.badgeValue
+//            badgeLabel.textAlignment = .center
+//            badgeLabel.font = UIFont.systemFont(ofSize: 13)
+//            badgeLabel.textColor = UIColor.white
+//            badgeView.addSubview(badgeLabel)
+//        }
+//        
+//        iconView.addSubview(badgeView)
+//    }
+//    
+//    // MARK:-隐藏小红点
+//    public func hiddenRedPointOnIndex(index:Int, animation:Bool){
+//        self.removeRedPointOnIndex(index: index, animation: animation)
+//    }
+//    
+//    private func removeRedPointOnIndex(index:Int, animation:Bool) {
+//        let barButtonView = self.getBarButttonViewWithIndex(index: index)
+//        
+//        for swapView in barButtonView.subviews {
+//            
+//            if swapView.isKind(of: UIImageView.self) {
+//                
+//                for view1 in swapView.subviews {
+//                    
+//                    if view1.tag == (badgeTag + 1) {
+//                        
+//                        if animation {
+//                            UIView.animate(withDuration: 0.2, animations: {
+//                                view1.transform = CGAffineTransform(translationX: 2, y: 2)
+//                                view1.alpha = 0
+//                            }) { (finished) in
+//                                view1.removeFromSuperview()
+//                            }
+//                        }else{
+//                            view1.removeFromSuperview()
+//                        }
+//                        
+//                    }
+//                    
+//                }
+//                
+//            }
+//            
+//        }
+//        
+//    }
+//    
+//    // 获取barButtonView
+//    private func getBarButttonViewWithIndex(index:Int) -> UIView {
+//
+//        if let itemss = self.items {
+//            let item = itemss[index]
+//            let barButtonView = item.value(forKey: "view")
+//            return barButtonView as! UIView
+//        }
+//        
+//        let vw = UIView()
+//        return vw
+//    }
+//    
+//}
@@ -14,6 +14,8 @@ let Height: CGFloat = UIScreen.main.bounds.size.height
 class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDelegate, NewPagedFlowViewDataSource, CNCustomIndexViewDelegate{
+    
+    
     private var tabBarY:CGFloat = 0.0
     // MARK: - 懒加载
@@ -25,42 +27,61 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     ///左右滑动分页view
     lazy var pageFlowView: NewPagedFlowView = {
-        let pageFlowView = NewPagedFlowView.init(frame: CGRectMake(0, 0, Width, Height));
+        let pageFlowView = NewPagedFlowView.init(frame: CGRectMake(0, 0, Width, Height))
-        pageFlowView.delegate = self;
-        pageFlowView.dataSource = self;
-        pageFlowView.minimumPageAlpha = 0.1;
-        pageFlowView.isCarousel = false;
-        pageFlowView.orientation = .horizontal;
-        pageFlowView.leftRightMargin = 20;
-        pageFlowView.isOpenAutoScroll = false;
+        pageFlowView.delegate = self
+        pageFlowView.dataSource = self
+        pageFlowView.minimumPageAlpha = 0.1
+        pageFlowView.isCarousel = false
+        pageFlowView.orientation = .horizontal
+        pageFlowView.leftRightMargin = 20
+        pageFlowView.isOpenAutoScroll = false
         //左右图片的距离顶部和底部的高度
-        pageFlowView.topBottomMargin = 100;
+        pageFlowView.topBottomMargin = 100
         return pageFlowView
     }()
+    ///背景
+    var backgroupView: CNHomePageBackgroupView = {
+        let backgroupView = CNHomePageBackgroupView.init(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenWidth*1.333))
+        return backgroupView
+    }()
+    
     //MARK: 生命周期方法
     override func viewDidLoad() {
         super.viewDidLoad()
         self.tabBarY = (self.tabBarController?.tabBar.top)!
-        self.view.backgroundColor = KVCBackgroupColor
-        for i in (0..<2) {
+        for i in (0..<6) {
             self.dataArray.add("122")
         }
         self.setupUI()
+        
+//        self.tabBarController?.tabBar.top = self.tabBarY + KSreenHeight
+
+    }
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+    }
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        self.view.height = KSreenHeight
+        
+
     }
-    
     // MARK: - 添加UI
     func setupUI(){
+        self.view.backgroundColor = KVCBackgroupColor
+        self.view.addSubview(self.backgroupView)
         self.view.addSubview(self.pageFlowView)
         self.pageFlowView.reloadData()
+        
     }
     // MARK: - NewPagedFlowView代理
@@ -70,18 +91,18 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     }
     func flowView(_ flowView: NewPagedFlowView!, cellForPageAt index: Int) -> PGIndexBannerSubiew! {
-        var bannerView:CNCustomIndexView? = flowView.dequeueReusableCell() as? CNCustomIndexView;
+        var bannerView:CNCustomIndexView? = flowView.dequeueReusableCell() as? CNCustomIndexView
         if (bannerView == nil) {
-            bannerView = CNCustomIndexView.init(frame: CGRectMake(0, 0, Width-50, Height));
-            bannerView?.tag = index + 100;
-            bannerView?.layer.cornerRadius = 4;
-            bannerView?.layer.masksToBounds = false;
+            bannerView = CNCustomIndexView.init(frame: CGRectMake(0, 0, Width-50, Height))
+            bannerView?.tag = index + 100
+            bannerView?.layer.cornerRadius = 4
+            bannerView?.layer.masksToBounds = false
         }
-        bannerView?.superScrollView = flowView.scrollView;
-        bannerView?.associatedVCView = self.view;
+        bannerView?.superScrollView = flowView.scrollView
+        bannerView?.associatedVCView = self.view
         bannerView?.delegate  = self
-        return bannerView;
+        return bannerView 
     }
     func sizeForPage(in flowView: NewPagedFlowView!) -> CGSize {
@@ -89,9 +110,23 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     }
     //MARK: - CNCustomIndexView 代理方法
+    func customIndexViewWillBeiginScroll(scrollView: UIScrollView) {
+        self.view.height = KSreenHeight
+    }
     func customIndexViewDidScroll(scrollView: UIScrollView) {
+        //让tabbar跟随scrollView平移量进行移动
         let fabsOffset: CGFloat = abs(scrollView.contentOffset.y - KSreenHeight)
         self.tabBarController?.tabBar.top = self.tabBarY + fabsOffset
+        
+        //让背景view也跟随scrollView平移量的3倍速进行移动
+        self.backgroupView.top = -fabsOffset*3
+    }
+   
+    
+    func customIndexViewDidEndScroll(scrollView: UIScrollView) {
+        if scrollView.contentOffset.y == KSreenHeight {
+            self.view.height = self.tabBarY
+        }
     }
 }
@@ -27,13 +27,17 @@ class CNBottomPayMoneyRemindView:UIView{
         let bottomShapeLayer = CAShapeLayer()
         bottomShapeLayer.path = bottomCircle.cgPath
-        bottomShapeLayer.fillColor = UIColor("#FCE0E0")?.cgColor
+        bottomShapeLayer.fillColor = UIColor("#F0F5FD")?.cgColor
         self.layer.addSublayer(bottomShapeLayer)
+        let imageView:UIImageView = UIImageView.init(image: UIImage(named: "homePage_up_icon"))
+        imageView.frame = CGRect(x: (self.width - 15)/2, y: 19, width: 15, height: 15)
+        self.addSubview(imageView)
+        
         let btn = UIButton(type: .custom)
-        btn.frame = CGRect(x: (self.width - 50)/2, y: 20, width: 50, height: 50)
-        btn.setTitle("付钱", for: .normal)
-        btn.setTitleColor(UIColor.red, for: .normal)
+        btn.frame = CGRect(x: (self.width - 50)/2, y: imageView.bottom, width: 50, height: 25)
+        btn.setTitle("上滑", for: .normal)
+        btn.setTitleColor(UIColor("#004FE0"), for: .normal)
         btn.titleLabel?.font = UIFont(name: "KohinoorTelugu-Regular", size: 17)
         btn.isUserInteractionEnabled = false
@@ -9,25 +9,29 @@ import Foundation
 import UIKit
 import YYCategories
+typealias backBlock = ()->Void;
+
 ///收钱码View
 class CNCollectMoneyCodeView:UIView{
+    //返回首页
+    var backAction:backBlock?
-    ///懒加载
+    //MARK: - 懒加载
     lazy var contentView:UIView = {
-        let contentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height-150))
-        contentView.backgroundColor = UIColor.white
-        
-        let path:UIBezierPath = UIBezierPath.init(roundedRect: contentView.bounds, byRoundingCorners: [.bottomLeft, .bottomRight], cornerRadii: CGSize.init(width: 20, height: 20))
+        let contentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height-KTabBarHeight))
+        contentView.backgroundColor = UIColor.clear
-        let maskLayer:CAShapeLayer = CAShapeLayer()
-        maskLayer.frame = contentView.bounds
-        maskLayer.path  = path.cgPath
-        contentView.layer.mask = maskLayer
+//        let path:UIBezierPath = UIBezierPath.init(roundedRect: contentView.bounds, byRoundingCorners: [.bottomLeft, .bottomRight], cornerRadii: CGSize.init(width: 20, height: 20))
+//
+//        let maskLayer:CAShapeLayer = CAShapeLayer()
+//        maskLayer.frame = contentView.bounds
+//        maskLayer.path  = path.cgPath
+//        contentView.layer.mask = maskLayer
-        let imageView = UIImageView(frame: CGRect(x: 10, y: 20, width: contentView.width - 20, height: contentView.height - 40))
-        imageView.image = UIImage(named: "homePage_collectMoneyImage")
-        contentView.addSubview(imageView)
+//        let imageView = UIImageView(frame: CGRect(x: 10, y: 20, width: contentView.width - 20, height: contentView.height - 40))
+//        imageView.image = UIImage(named: "homePage_collectMoneyImage")
+//        contentView.addSubview(imageView)
         return contentView
     }()
@@ -39,6 +43,34 @@ class CNCollectMoneyCodeView:UIView{
         return tempTopView
     }()
+    lazy var bottomView:UIView = {
+        
+        let bottomView = UIView(frame: CGRect(x:0, y:self.height - KTabBarHeight, width: self.width, height: KTabBarHeight))
+        bottomView.backgroundColor = .white
+        bottomView.isHidden = true
+        
+        let path:UIBezierPath = UIBezierPath.init(roundedRect: bottomView.bounds, byRoundingCorners: [.topLeft, .topRight], cornerRadii: CGSize.init(width: 20, height: 20))
+        
+        let maskLayer:CAShapeLayer = CAShapeLayer()
+        maskLayer.frame = bottomView.bounds
+        maskLayer.path  = path.cgPath
+        bottomView.layer.mask = maskLayer
+        
+        let backBtn: UIButton = UIButton(type: .custom)
+        backBtn.frame = CGRectMake(0, 0, 100, 30)
+        backBtn.centerX = bottomView.width/2
+        backBtn.centerY = bottomView.height/2
+        backBtn.setImage(UIImage(named: "homePage_backhome_icon"), for: .normal)
+        backBtn.setTitle("回到首页", for: .normal)
+        backBtn.setTitleColor(UIColor("#2076FF"), for: .normal)
+        backBtn.titleLabel?.font = UIFont.systemFont(ofSize: 18, weight: .medium)
+        backBtn.addTarget(self, action: #selector(backBtnAction), for: .touchUpInside)
+        backBtn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 8)
+        bottomView.addSubview(backBtn)
+        
+        return bottomView
+    }()
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
         self.initUI()
@@ -53,6 +85,11 @@ class CNCollectMoneyCodeView:UIView{
     func initUI(){
         self.addSubview(self.contentView)
         self.addSubview(self.topView)
+        self.addSubview(self.bottomView)
+    }
+    
+    @objc func backBtnAction(){
+        self.backAction!()
     }
 }
@@ -7,14 +7,74 @@
 import Foundation
+typealias closeBlock = ()->Void;
+
+class CNCustomIndexTopView : UIView{
+    ///关闭按钮事件回调
+    var closeAction: closeBlock?
+    
+    
+    //MARK: - 懒加载
+    ///标题
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(10, 0, 75, 35))
+        titleLabel.bottom = self.bottom - 5
+        titleLabel.textColor = .white
+        titleLabel.font = UIFont.systemFont(ofSize: 24, weight: .semibold)
+        return titleLabel
+    }()
+    ///关闭按钮
+    lazy var closeBtn: UIButton = {
+        let  closeBtn = UIButton(type: .custom)
+        closeBtn.frame = CGRect(x: self.width - 30, y: 0, width: 30, height: 30)
+        closeBtn.centerY = self.titleLabel.centerY
+        closeBtn.setImage(UIImage(named: "homePage_close_icon"), for: .normal)
+        closeBtn.addTarget(self, action: #selector(closeBtnAction), for: .touchUpInside)
+        return closeBtn
+    }()
+    //MARK: - 初始化
+    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.titleLabel)
+        self.addSubview(self.closeBtn)
+    }
+    
+    //MARK: - 公开方法
+    public func setTitleString(title:String)->Void{
+        self.titleLabel.text = title
+    }
+    
+    //MARK: - 事件
+    @objc func closeBtnAction(){
+        closeAction?()
+    }
+}
+
 protocol CNCustomIndexViewDelegate:NSObjectProtocol{
-    ///当前scrollView 发送滚动
+    /// 当前scrollView  将要开始滚动
+    func customIndexViewWillBeiginScroll(scrollView :UIScrollView);
+    ///当前scrollView 滚动中
     func customIndexViewDidScroll(scrollView :UIScrollView);
+    ///当前scrollView 已经结束滚动
+    func customIndexViewDidEndScroll(scrollView :UIScrollView);
+
 }
 class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChangeDelegate{
+   
+    ///记录开始拖拽时偏移量
+    var beginDragOffset: CGFloat = 0.0
+    ///颜色管理
     var colorChange: WJColorChange!
     ///代理
@@ -79,31 +139,47 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     ///收钱view
     lazy var collectMoneyCodeView: CNCollectMoneyCodeView = {
         let collectionView = CNCollectMoneyCodeView.init(frame: CGRectMake(-25, 0, self.frame.size.width + 50, self.frame.size.height))
+        collectionView.backAction = {[weak self] in
+            self?.baseScrollView.setContentOffset(CGPoint(x: 0, y: (self!.baseScrollView.height)), animated: true)
+        }
         return collectionView
     }()
     ///付钱view
     lazy var payMoneyCodeView : CNPayMoneyCodeView = {
-        let payMoneyCodeView = CNPayMoneyCodeView(frame: CGRectMake(-25, self.frame.size.height*2 + 150,self.frame.size.width+50, self.frame.size.height - 150))
+        let payMoneyCodeView = CNPayMoneyCodeView(frame: CGRectMake(-25, self.frame.size.height*2 + 120,self.frame.size.width+50, self.frame.size.height - 120))
         return payMoneyCodeView
     }()
-    ///底部付钱提前view
+    ///上滑付钱提醒view
     lazy var bottomPayMoneyRemindView: CNBottomPayMoneyRemindView = {
         let W: CGFloat = UIScreen.main.bounds.width-100
-        let bottomView = CNBottomPayMoneyRemindView.init(frame: CGRectMake(25, self.baseScrollView.height*2, W,W/2))
+        let H: CGFloat = W/2
+        let bottomView = CNBottomPayMoneyRemindView.init(frame: CGRectMake(25, self.height, W,H))
         bottomView.backgroundColor = UIColor.clear 
         return bottomView
     }()
-    /// 顶部收钱提前view
+    /// 下滑收钱提醒view
     lazy var topCollectMoneyRemindView:CNTopCollectMoneyRemindView = {
         let W: CGFloat = UIScreen.main.bounds.width-100
-        let topView = CNTopCollectMoneyRemindView.init(frame: CGRectMake(25, self.baseScrollView.height-W/2, W,W/2))
-        topView.backgroundColor = .clear 
+        let H: CGFloat = W/2
+        let topView = CNTopCollectMoneyRemindView.init(frame: CGRectMake(25, -H - 50, W,H))
+        topView.backgroundColor = .clear
+        
         return topView
     }()
+    /// 顶部自定义导航
+    lazy var topNavView: CNCustomIndexTopView = {
+        let topNavView = CNCustomIndexTopView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: KNavigationHeight))
+        topNavView.alpha = 0
+        topNavView.closeAction = { [weak self ] in
+            self!.baseScrollView.setContentOffset(CGPoint(x: 0, y: self!.baseScrollView.height), animated: true)
+        }
+        return topNavView
+    }()
+    
     // MARK: - 初始化方法
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -116,13 +192,16 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     // MARK: - 添加UI
     func initUI(){
-        self.addSubview(self.baseScrollView) 
-        self.baseScrollView.addSubview(self.collectMoneyCodeView)
+        self.addSubview(self.bottomPayMoneyRemindView)
+        self.addSubview(self.topCollectMoneyRemindView)
+
+        self.addSubview(self.baseScrollView)
+        self.addSubview(self.topNavView)
+        self.topNavView.setTitleString(title: "志愿者")
+        self.baseScrollView.addSubview(self.collectMoneyCodeView)
         self.baseScrollView.addSubview(self.mainView)
         self.baseScrollView.addSubview(self.payMoneyCodeView)
-        self.baseScrollView.addSubview(self.bottomPayMoneyRemindView)
-        self.baseScrollView.addSubview(self.topCollectMoneyRemindView)
         //默认偏移到中间
         self.baseScrollView.setContentOffset(CGPointMake(0, self.frame.size.height), animated: false)
@@ -148,6 +227,19 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     }
     // MARK: - WJColorChange代理
+    ///将要开始拖拽滚动
+    func wjColorScrollViewWillBeginDragging(_ scrollView: UIScrollView!) {
+        
+        self.beginDragOffset = scrollView.contentOffset.y
+        
+        self.delegate?.customIndexViewWillBeiginScroll(scrollView: scrollView)
+        
+        //开始滑动把 baseScrollView 放到导航的上层
+        self.bringSubviewToFront(self.baseScrollView)
+        
+        
+    }
+    
     ///WJColorChange 代理方法 滚动时候回调 传出当前的滚动视图
     func wjColorScrollViewScroll(_ scrollView: UIScrollView!) {
@@ -170,30 +262,34 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
             rightView?.alpha = (70-fabsOffset)/70.00
         }
+        //当self.baseScrollView的偏移量大于 self.baseScrollView.height时,显示上滑提醒view
+        if(currentOffset > self.baseScrollView.height){
+            self.bottomPayMoneyRemindView.top =  self.height - (currentOffset - self.baseScrollView.height)*1.5
+        }
         //上滑滑动到临近值,让bottomPayMoneyRemindView位置一直停留在底部,并慢慢消失
-        let bottomPayMoneyRemindViewMaxOffset: CGFloat = self.baseScrollView.height+self.bottomPayMoneyRemindView.height
-        if (currentOffset > bottomPayMoneyRemindViewMaxOffset) {
+        if (self.bottomPayMoneyRemindView.top < self.height - self.bottomPayMoneyRemindView.height) {
             /**让bottomPayMoneyRemindView位置一直停留在底部*/
-            self.bottomPayMoneyRemindView.top = currentOffset+self.baseScrollView.height-self.bottomPayMoneyRemindView.height
+            self.bottomPayMoneyRemindView.top = self.height - self.bottomPayMoneyRemindView.height
-            /**渐渐隐藏bottomPayMoneyRemindView,缓冲距离为40*/
-            self.bottomPayMoneyRemindView.alpha = (40-(currentOffset - bottomPayMoneyRemindViewMaxOffset))/40.00
+            /**渐渐隐藏bottomPayMoneyRemindView,缓冲距离为20*/
+            let bottomPayMoneyRemindViewMaxOffset: CGFloat = self.baseScrollView.height+self.bottomPayMoneyRemindView.height
+            self.bottomPayMoneyRemindView.alpha = (20-(currentOffset - bottomPayMoneyRemindViewMaxOffset))/20.00
-            //让系统及时更新bottomPayMoneyRemindView
-//            self.bottomPayMoneyRemindView.setNeedsLayout()
-//            self.bottomPayMoneyRemindView.layoutIfNeeded()
         }
-        //下滑滑动到临近值,让topCollectMoneyRemindView位置一直停留在底部,并慢慢消失
-        let topCollectMoneyRemindViewMinOffset: CGFloat = self.baseScrollView.height-self.topCollectMoneyRemindView.height
-        if (currentOffset < topCollectMoneyRemindViewMinOffset) {
+        //当self.baseScrollView的偏移量小于 self.baseScrollView.height时,显示下滑提醒view
+        if(currentOffset < self.baseScrollView.height){
+            self.topCollectMoneyRemindView.bottom = (self.baseScrollView.height - currentOffset)*1.5
+        }
+        //下滑滑动到临近值,让topCollectMoneyRemindView位置一直停留在顶部,并慢慢消失
+        if (self.topCollectMoneyRemindView.bottom > self.topCollectMoneyRemindView.height) {
+            
             /**让topCollectMoneyRemindView位置一直停留在底部*/
-            self.topCollectMoneyRemindView.bottom = currentOffset+self.topCollectMoneyRemindView.height
+            self.topCollectMoneyRemindView.bottom = self.topCollectMoneyRemindView.height
-            /**渐渐隐藏topCollectMoneyRemindView,缓冲距离为40*/
-            print("currentOffset =", topCollectMoneyRemindViewMinOffset - currentOffset)
-            
-            self.topCollectMoneyRemindView.alpha = (40-(topCollectMoneyRemindViewMinOffset - currentOffset))/40.00
+            /**渐渐隐藏topCollectMoneyRemindView,缓冲距离为20*/
+            let topCollectMoneyRemindViewMinOffset: CGFloat = self.baseScrollView.height-self.topCollectMoneyRemindView.height
+            self.topCollectMoneyRemindView.alpha = (20-(topCollectMoneyRemindViewMinOffset - currentOffset))/20.00
             //让系统及时更新topCollectMoneyRemindView
 //            self.topCollectMoneyRemindView.setNeedsLayout()
@@ -218,6 +314,20 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
 //            self.mainView.scaledView(scale: scale)
 //        }
+        /**隐藏顶部导航**/
+        let topNavViewAlpha: CGFloat = 1.0 - (self.baseScrollView.height * 2 - currentOffset)/(self.baseScrollView.height*0.5)
+        if(topNavViewAlpha > 0){
+            self.topNavView.alpha = topNavViewAlpha
+        }
+        else{
+            self.topNavView.alpha = 0
+        }
+    
+        //隐藏collectMoneyCodeView的bottomView
+        if scrollView.contentOffset.y > 10{
+            self.collectMoneyCodeView.bottomView.isHidden = true
+            self.collectMoneyCodeView.contentView.backgroundColor = .clear
+        }
         delegate?.customIndexViewDidScroll(scrollView: self.baseScrollView)
@@ -239,7 +349,24 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         else{
             self.superScrollView?.isScrollEnabled = false
         }
-            
+        
+        
+        if scrollView.contentOffset.y == 0{
+            //滚动到第一页,显示collectMoneyCodeView的底部view
+            self.collectMoneyCodeView.bottomView.isHidden = false
+            self.collectMoneyCodeView.contentView.backgroundColor = KVCBackgroupColor
+        }
+        
+        //外部代理
+        self.delegate?.customIndexViewDidEndScroll(scrollView: scrollView)
+        
+        
+        
+        //滑动结束 把topNavView 放到scrollView的上层
+        self.bringSubviewToFront(self.topNavView)
+        
+        //下滑提醒View回到初始位置
+        self.topCollectMoneyRemindView.top = -(self.topCollectMoneyRemindView.height + 50)
     }
 }
+//
+//  CNHomePageBackgroupView.swift
+//  metaCode
+//
+//  Created by daojian on 2023/6/6.
+//
+
+import Foundation
+import UIKit
+class CNHomePageBackgroupSubView : UIView
+{
+    
+    lazy var imageView: UIImageView = {
+        let imageView: UIImageView = UIImageView(image: UIImage(named: "homePage_backgroup_blue"))
+        imageView.frame = self.bounds
+        return imageView
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(25, KNavigationHeight - 20, KSreenWidth - 100, 35))
+        titleLabel.textColor = .white
+        titleLabel.font = UIFont.systemFont(ofSize: 24, weight: .semibold)
+        return titleLabel
+    }()
+    
+    
+    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.imageView)
+        self.addSubview(self.titleLabel)
+    }
+    ///设置title
+    func setTitle(title:String)->Void{
+        self.titleLabel.text = title
+    }
+    ///设置图片
+    func setImage(image:UIImage)->Void{
+        self.imageView.image = image
+    }
+}
+
+class CNHomePageBackgroupView: UIView{
+    
+    // MARK: - 初始化
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.initUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    //创建UI
+    func initUI(){
+        let subView: CNHomePageBackgroupSubView = CNHomePageBackgroupSubView.init(frame: self.bounds)
+        subView.frame = self.bounds
+        subView.setTitle(title: "志愿者")
+        
+        self.addSubview(subView)
+    }
+    
+}
@@ -47,7 +47,7 @@ class CNFrontMainView : UIView{
     lazy var contentView : UIView = {
         let contentView = UIView.init(frame: CGRect(x: 0, y: 0, width: self.width, height: self.height ))
-        contentView.backgroundColor = UIColor.red
+        contentView.backgroundColor = UIColor.white
         contentView.clipsToBounds = true
         contentView.layer.cornerRadius = 20
@@ -105,7 +105,7 @@ class CNBackMainView : UIView{
         bottomBackBtn.setTitleColor(UIColor("#333333"), for: .normal)
         bottomBackBtn.setImage(UIImage(named: "homePage_backBtn_icon"), for: .normal)
         bottomBackBtn.imageEdgeInsets = UIEdgeInsets(top: 0, left: 0, bottom: 0, right: 8)
-        bottomBackBtn.titleLabel?.font = UIFont(name: "KohinoorTelugu-Regular", size: 15)
+        bottomBackBtn.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .regular)
         bottomBackBtn.addTarget(self, action: #selector(tapAction), for: .touchUpInside)
         return bottomBackBtn
@@ -26,10 +26,10 @@ class CNPayMoneyCodeView:UIView{
         self.clipsToBounds = true;
         self.layer.cornerRadius = 20;
-        let imageview : UIImageView = UIImageView.init(frame: CGRect(x: 20, y: 10, width: self.width - 40, height: self.height - 20))
-        imageview.image = UIImage(named: "homePage_payMoneyImage")
-        
-        self.addSubview(imageview)
+//        let imageview : UIImageView = UIImageView.init(frame: CGRect(x: 20, y: 10, width: self.width - 40, height: self.height - 20))
+//        imageview.image = UIImage(named: "homePage_payMoneyImage")
+//        
+//        self.addSubview(imageview)
     }
@@ -40,17 +40,20 @@ class CNTopCollectMoneyRemindView : UIView{
         let bottomShapeLayer = CAShapeLayer()
         bottomShapeLayer.path = bottomCircle.cgPath
-        bottomShapeLayer.fillColor = UIColor("#FCE0E0")?.cgColor
+        bottomShapeLayer.fillColor = UIColor("#F0F5FD")?.cgColor
         self.layer.addSublayer(bottomShapeLayer)
         let btn = UIButton(type: .custom)
-        btn.frame = CGRect(x: (self.width - 50)/2, y: self.height-70, width: 50, height: 50)
-        btn.setTitle("收钱", for: .normal)
-        btn.setTitleColor(UIColor.red, for: .normal)
+        btn.frame = CGRect(x: (self.width - 50)/2, y: self.height-70, width: 50, height: 25)
+        btn.setTitle("下滑", for: .normal)
+        btn.setTitleColor(UIColor("#004FE0"), for: .normal)
         btn.titleLabel?.font = UIFont(name: "KohinoorTelugu-Regular", size: 17)
         btn.isUserInteractionEnabled = false
-        
         self.addSubview(btn)
+        
+        let imageView:UIImageView = UIImageView.init(image: UIImage(named: "homePage_down_icon"))
+        imageView.frame = CGRect(x: (self.width - 15)/2, y: btn.bottom, width: 15, height: 15)
+        self.addSubview(imageView)
     }
 }
@@ -10,7 +10,11 @@
 @protocol WJColorChangeDelegate <NSObject>
-
+/**
+ 将要开始拖拽滚动
+ @param scrollView 滚动视图
+ */
+- (void)WJColorScrollViewWillBeginDragging:(UIScrollView *)scrollView;
 /**
  滚动时候回调 传出当前的滚动视图
@@ -123,8 +123,13 @@
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView
 {
     _startOffsetY = scrollView.contentOffset.y;
+    if ([self.delegate respondsToSelector:@selector(WJColorScrollViewWillBeginDragging:)]) {
+        
+        [self.delegate WJColorScrollViewWillBeginDragging:scrollView];
+    }
 }
+
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "背景-蓝@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "背景-蓝@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "背景-红@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "背景-红@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "返回@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "返回@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "关闭@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "关闭@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "下滑@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "下滑@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "上滑@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "上滑@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}