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

# Conflicts: # Podfile

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode
# Conflicts: # Podfile
liushiyu
2 parents 2f2183cf aac8a0db
Showing 9 changed files with 252 additions and 15 deletions
Podfile
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
metaCode/Classes/Main/HomePage/View/CNHomePageGuideView.swift
metaCode/Classes/Resources/slide_down.gif
metaCode/Classes/Resources/slide_up.gif
metaCode/Classes/Vendors/NewPagedFlowView.h
metaCode/Classes/Vendors/NewPagedFlowView.m
@@ -30,6 +30,8 @@ target &#39;metaCode&#39; do
   pod 'SwiftyUserDefaults'
   #图片视频选择器
   pod 'HXPHPicker'
+  #加载GIF
+  pod 'SwiftGifOrigin', '~> 1.7.0'
   target 'metaCodeTests' do
     inherit! :search_paths
@@ -49,6 +49,9 @@
 		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 */; };
+		7C4931342A307B58000E44B4 /* slide_down.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931332A307B58000E44B4 /* slide_down.gif */; };
+		7C4931362A307B60000E44B4 /* slide_up.gif in Resources */ = {isa = PBXBuildFile; fileRef = 7C4931352A307B60000E44B4 /* slide_up.gif */; };
+		7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C4931372A307BDB000E44B4 /* CNHomePageGuideView.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 */; };
@@ -132,6 +135,9 @@
 		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>"; };
+		7C4931332A307B58000E44B4 /* slide_down.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_down.gif; sourceTree = "<group>"; };
+		7C4931352A307B60000E44B4 /* slide_up.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = slide_up.gif; sourceTree = "<group>"; };
+		7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomePageGuideView.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>"; };
@@ -313,6 +319,8 @@
 			isa = PBXGroup;
 			children = (
 				790D01A62A2DF84C00C5978D /* countries.plist */,
+				7C4931332A307B58000E44B4 /* slide_down.gif */,
+				7C4931352A307B60000E44B4 /* slide_up.gif */,
 			);
 			path = Resources;
 			sourceTree = "<group>";
@@ -428,6 +436,7 @@
 				7CD6753A2A2740B0008354C1 /* CNTopCollectMoneyRemindView.swift */,
 				7CD675412A2740F8008354C1 /* CNCustomIndexView.swift */,
 				7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */,
+				7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
 			);
 			name = View;
 			path = HomePage/View;
@@ -622,7 +631,9 @@
 				818163C82A25CFCF00579C86 /* LaunchScreen.storyboard in Resources */,
 				790D01A72A2DF84C00C5978D /* countries.plist in Resources */,
 				818163C52A25CFCF00579C86 /* Assets.xcassets in Resources */,
+				7C4931342A307B58000E44B4 /* slide_down.gif in Resources */,
 				818163C32A25CFCC00579C86 /* Main.storyboard in Resources */,
+				7C4931362A307B60000E44B4 /* slide_up.gif in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -767,6 +778,7 @@
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
 				7CD675522A29C04B008354C1 /* CNLiveConstant.swift in Sources */,
 				79282A402A2F055100B5F8CF /* CNLiveConfigUserInfo.swift in Sources */,
+				7C4931382A307BDB000E44B4 /* CNHomePageGuideView.swift in Sources */,
 				7CD6753E2A2740B0008354C1 /* CNPayMoneyCodeView.swift in Sources */,
 				7CD675402A2740B0008354C1 /* CNCollectMoneyCodeView.swift in Sources */,
 				798A44FD2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift in Sources */,
@@ -8,12 +8,65 @@
 import Foundation
 import UIKit
 import YYCategories
+import SwiftGifOrigin
 let Width: CGFloat  = UIScreen.main.bounds.size.width
 let Height: CGFloat = UIScreen.main.bounds.size.height
+///存储是否第一次显示首页上滑引导
+let CNKeyIsFirstAppearUpSlideHomeGuide: String = "isFirstAppearUpSlideHomeGuideKey"
+///存储是否第一次显示首页下滑引导
+let CNKeyIsFirstAppearDownSlideHomeGuide: String = "isFirstAppearDownSlideHomeGuideKey"
+
 class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDelegate, NewPagedFlowViewDataSource, CNCustomIndexViewDelegate{
+    ///上滑引导View
+    lazy var upSlideGuideView:CNHomePageGuideView = {
+        let upSlideGuideView = CNHomePageGuideView.init(frame: UIScreen.main.bounds)
+        upSlideGuideView.setBottomText(text: "向上滑动")
+        upSlideGuideView.skipAction = {
+            [weak self] in
+            self?.upSlideGuideView.removeFromSuperview()
+            self?.upSlideGifView.removeFromSuperview()
+            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearUpSlideHomeGuide)
+            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
+            self?.pageFlowView.scrollView.isScrollEnabled = true
+        }
+        return upSlideGuideView
+    }()
+    ///上滑引导动图
+    lazy var upSlideGifView:UIImageView = {
+        let gif: UIImageView = UIImageView(frame: CGRect(x: 200, y: 30, width: 40, height: 80))
+        gif.loadGif(name: "slide_up")
+        gif.center = self.view.center
+        gif.contentMode = .scaleAspectFill
+        
+        return gif
+    }()
+    
+    ///下滑引导View
+    lazy var downSlideGuideView:CNHomePageGuideView = {
+        let downSlideGuideView = CNHomePageGuideView.init(frame: UIScreen.main.bounds)
+        downSlideGuideView.setBottomText(text: "向下滑动")
+        downSlideGuideView.skipAction = {
+            [weak self ] in
+            self?.downSlideGuideView.removeFromSuperview()
+            self?.downSlideGifView.removeFromSuperview()
+            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
+            self?.pageFlowView.scrollView.isScrollEnabled = true
+        }
+        return downSlideGuideView
+    }()
+    ///下滑引导动图
+    lazy var downSlideGifView:UIImageView = {
+        let gif: UIImageView = UIImageView(frame: CGRect(x: 0, y: 0, width: 40, height: 80))
+        gif.center = self.view.center
+        gif.loadGif(name: "slide_down")
+        gif.contentMode = .scaleAspectFill
+        return gif
+    }()
+    
+    
     ///NewPagedFlowView 开始滑动时的偏移量
     private var beginOffset = 0.0
@@ -66,6 +119,7 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
 //        self.tabBarController?.tabBar.top = self.tabBarY + KSreenHeight
+        
     }
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
@@ -74,7 +128,29 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         super.viewDidAppear(animated)
         self.view.height = KSreenHeight
+        self.topNavView.isHidden = true
+        
+//
+//
+//        let maskView = UIView.init(frame: UIScreen.main.bounds)
+//        maskView.backgroundColor = .black.withAlphaComponent(0.7)
+//        maskView.isUserInteractionEnabled = false
+//
+//        let path:UIBezierPath = UIBezierPath.init(rect: UIScreen.main.bounds)
+//
+//        let W = KSreenWidth-50
+//        let H = W*1.5
+//        let rect = CGRectMake(25, (KSreenHeight-H)/2,W, H)
+//
+//        let appendPath: UIBezierPath = UIBezierPath.init(roundedRect: rect, cornerRadius: 20)
+//        path.append(appendPath.reversing())
+//        let shapeLayer: CAShapeLayer = CAShapeLayer()
+//        shapeLayer.path = path.cgPath;
+//        maskView.layer.mask = shapeLayer;
+//
+//        self.view.addSubview(maskView)
+        
     }
     // MARK: - 添加UI
     func setupUI(){
@@ -83,6 +159,30 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         self.view.addSubview(self.pageFlowView)
         self.pageFlowView.reloadData()
+        //首选判断是否显示了上滑引导
+        let isFirstAppearUpSlideHomeGuide:Any? =  UserDefaults.standard.object(forKey: CNKeyIsFirstAppearUpSlideHomeGuide)
+        
+        if let tempGuide = isFirstAppearUpSlideHomeGuide{
+            //已经显示过上滑引导
+            
+            //判断是否显示过下滑引导
+            let isFirstAppearDownSlideHomeGuide:Any? =  UserDefaults.standard.object(forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
+            if let  tempDownGuide = isFirstAppearDownSlideHomeGuide{
+                
+            }else{
+                //没有显示下滑引导
+                self.pageFlowView.scrollView.isScrollEnabled = false
+                self.view.addSubview(self.downSlideGuideView)
+                self.view.addSubview(self.downSlideGifView)
+            }
+            
+        }else{
+            //没显示过上滑引导
+            self.pageFlowView.scrollView.isScrollEnabled = false
+            self.view.addSubview(self.upSlideGuideView)
+            self.view.addSubview(self.upSlideGifView)
+        }
+        
     }
     // MARK: - NewPagedFlowView代理
@@ -147,16 +247,19 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             }
         }
     }
-    
     ///NewPagedFlowView 滑动将要结束
-    func willEndScroll(_ scrollView: UIScrollView!) {
+    func willEndScroll(_ scrollView: UIScrollView!, willDecelerate decelerate: Bool) {
         //暂时禁止再次滑动,后期优化通过自定义UIScrollView 结束动画来实现
-        scrollView.isScrollEnabled = false
+        if(decelerate == true){
+            scrollView.isScrollEnabled = false
+        }
     }
     ///NewPagedFlowView 滑动结束
     func didEndScroll(_ scrollView: UIScrollView!) {
-        print("scrollView.contentOffset.x = ",scrollView.contentOffset.x)
+        
+        scrollView.isScrollEnabled = true
+
         let toIndex:Int = Int(scrollView.contentOffset.x/(Width-50))
         if toIndex == self.backgroupView.currentApearViewIndex{
@@ -165,8 +268,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
         self.backgroupView.replaceCurerrentApearView(fromIndex: self.backgroupView.currentApearViewIndex, toIndex: toIndex)
-        scrollView.isScrollEnabled = true
-
     }
@@ -174,6 +275,25 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     func customIndexViewWillBeiginScroll(scrollView: UIScrollView) {
         self.view.height = KSreenHeight
+        
+        /**开始拖拽移除引导View**/
+        
+        //移除上滑引导
+        if(self.upSlideGuideView.superview != nil){
+            self.upSlideGuideView.removeFromSuperview()
+            self.upSlideGifView.removeFromSuperview()
+            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearUpSlideHomeGuide)
+        }
+        
+        //移除下滑引导
+        if (self.downSlideGuideView.superview != nil) {
+            self.downSlideGuideView.removeFromSuperview()
+            self.downSlideGifView.removeFromSuperview()
+            UserDefaults.standard.set("flase", forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
+            self.pageFlowView.scrollView.isScrollEnabled = true
+        }
+       
+        
     }
     func customIndexViewDidScroll(scrollView: UIScrollView) {
         //让tabbar跟随scrollView平移量进行移动
@@ -188,6 +308,17 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
     func customIndexViewDidEndScroll(scrollView: UIScrollView) {
         if scrollView.contentOffset.y == KSreenHeight {
             self.view.height = self.tabBarY
+            
+            //判断是否显示过下滑引导
+            let isFirstAppearDownSlideHomeGuide:Any? =  UserDefaults.standard.object(forKey: CNKeyIsFirstAppearDownSlideHomeGuide)
+            if let  tempDownGuide = isFirstAppearDownSlideHomeGuide{
+                print("不该进来")
+            }else{
+                //没有显示下滑引导
+                self.view.addSubview(self.downSlideGuideView)
+                self.view.addSubview(self.downSlideGifView)
+                self.pageFlowView.scrollView.isScrollEnabled = false
+            }
         }
     }
@@ -131,8 +131,8 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
     ///中间主界面
     lazy var mainView:CNMainView = {
         let W = self.width 
-        let H = W*1.5 
-        let mainView = CNMainView.init(frame: CGRectMake(0, self.frame.size.height + (self.frame.size.height-H)/2,W, H))
+        let H = W*1.5
+        let mainView = CNMainView.init(frame: CGRectMake(0, self.frame.size.height + KSreenHeight*0.16,W, H))
         return mainView
     }()
@@ -141,6 +141,7 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         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)
+            self?.superScrollView?.isScrollEnabled = true
         }
         return collectionView
     }()
@@ -357,16 +358,15 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
             self.collectMoneyCodeView.contentView.backgroundColor = KVCBackgroupColor
         }
-        //外部代理
-        self.delegate?.customIndexViewDidEndScroll(scrollView: scrollView)
-        
-        
         //滑动结束 把topNavView 放到scrollView的上层
         self.bringSubviewToFront(self.topNavView)
         //下滑提醒View回到初始位置
         self.topCollectMoneyRemindView.top = -(self.topCollectMoneyRemindView.height + 50)
+        
+        //外部代理
+        self.delegate?.customIndexViewDidEndScroll(scrollView: scrollView)
     }
 }
+//
+//  CNHomePageGuideView.swift
+//  metaCode
+//
+//  Created by daojian on 2023/6/7.
+//  首页引导
+
+import Foundation
+
+typealias skipGuideBlock = ()->Void
+
+class CNHomePageGuideView: UIView{
+    ///跳过引导事件回调
+    var skipAction: skipGuideBlock?
+    
+   lazy var skipButtom: UIButton = {
+       
+       let skipButtom = UIButton(type: .custom)
+       skipButtom.frame = CGRect(x: 0, y: 0, width: 90, height: 30)
+       skipButtom.right = self.width - 30
+       skipButtom.top   = KStatusBarHeight + 30
+       skipButtom.setTitle("跳过引导", for: .normal)
+       skipButtom.setTitleColor(.white, for: .normal)
+       skipButtom.titleLabel?.font = UIFont.systemFont(ofSize: 13, weight: .medium)
+       skipButtom.clipsToBounds = true
+       skipButtom.layer.cornerRadius = skipButtom.height/2
+       skipButtom.layer.borderColor = UIColor("#979797")?.cgColor
+       skipButtom.layer.borderWidth = 0.5
+       
+      return skipButtom
+        
+    }()
+    
+    lazy var bottomLabel: UILabel = {
+        let bottomLabel = UILabel.init(frame: CGRect(x: 0, y: 0, width: 150, height: 20))
+        bottomLabel.textColor = .white
+        bottomLabel.font = UIFont.systemFont(ofSize: 18, weight: .medium)
+        bottomLabel.textAlignment = .center
+        return bottomLabel
+    }()
+    
+    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.skipButtom)
+        
+        self.backgroundColor = .black.withAlphaComponent(0.7)
+        self.isUserInteractionEnabled = false
+        
+        //通过设置mask透明区域来实现镂空效果
+        let path:UIBezierPath = UIBezierPath.init(rect: UIScreen.main.bounds)
+        
+        //rect 首页被镂空的区域
+        let W = KSreenWidth-50
+        let H = W*1.5
+        let rect = CGRectMake(25, KSreenHeight*0.16,W, H)
+        
+        let appendPath: UIBezierPath = UIBezierPath.init(roundedRect: rect, cornerRadius: 20)
+        path.append(appendPath.reversing())
+        
+        let shapeLayer: CAShapeLayer = CAShapeLayer()
+        shapeLayer.path = path.cgPath;
+        self.layer.mask = shapeLayer
+        
+        //更新bottomLabel位置
+        self.bottomLabel.centerX = self.centerX
+        self.bottomLabel.top = CGRectGetMaxY(rect) + 20
+        self.addSubview(self.bottomLabel)
+    }
+    
+    override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+        
+        if((self.skipButtom.layer.hitTest(point)) != nil){
+//            print("点击了跳过")
+            self.skipAction!()
+        }
+        //让事件响应链进行执行
+        return super.hitTest(point, with: event)
+    }
+    
+    func setBottomText(text: String)->Void{
+        self.bottomLabel.text = text
+    }
+}
@@ -185,7 +185,7 @@ typedef NS_ENUM (NSUInteger, NewPagedFlowViewOrientation) {
 /// 将要结束滚动
 /// @param scrollView 滚动的scrollView
-- (void)willEndScroll:(UIScrollView *)scrollView;
+- (void)willEndScroll:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate;
 /// 已经结束滚动
 /// @param scrollView 滚动的scrollView
@@ -672,8 +672,9 @@ static NSString *subviewClassName;
 #pragma mark --结束拖拽
 - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate {
     [self startTimer];
-    if(self.delegate && [self.delegate respondsToSelector:@selector(willEndScroll:)]){
-        [self.delegate willEndScroll:scrollView];
+    
+    if(self.delegate && [self.delegate respondsToSelector:@selector(willEndScroll: willDecelerate:)]){
+        [self.delegate willEndScroll:scrollView willDecelerate:decelerate];
     }
 }
 //结束滑动