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

liushiyu
2 parents 077cabd1 1bfe11f0
Showing 10 changed files with 184 additions and 27 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/GlobalBlock/CNLiveGlobalBlock.swift
metaCode/Classes/Main/HomePage/Controller/CNMetaCodeHomePageController.swift
metaCode/Classes/Main/HomePage/View/CNCertificationView.swift
metaCode/Classes/Main/HomePage/View/CNCustomIndexView.swift
metaCode/Classes/Main/HomePage/View/CNMainView.swift
metaCode/Classes/Other/AppDelegate.swift
metaCode/Supporting Files/Assets.xcassets/Home/homePage_addCertification_icon.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Home/homePage_addCertification_icon.imageset/添加@2x.png
metaCode/Supporting Files/Assets.xcassets/Home/homePage_addCertification_icon.imageset/添加@3x.png
@@ -42,6 +42,8 @@
 		798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 798A44FE2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift */; };
 		79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
 		79A68C4C2A26EA6000DC3B43 /* (null) in Sources */ = {isa = PBXBuildFile; };
+		7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */; };
+		7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */; };
 		79F4B1162A32B96B00993C03 /* CNLiveMineInfoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */; };
 		79F4B1182A32C5FA00993C03 /* CNLiveBaseMoel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1172A32C5FA00993C03 /* CNLiveBaseMoel.swift */; };
 		79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */; };
@@ -128,6 +130,8 @@
 		798A44FC2A309EBA00815935 /* CNLiveTypeFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveTypeFeedBackViewController.swift; sourceTree = "<group>"; };
 		798A44FE2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveInputFeedBackViewController.swift; sourceTree = "<group>"; };
 		79A68C512A26F59C00DC3B43 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = metaCode/Info.plist; sourceTree = "<group>"; };
+		7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNCertificationView.swift; sourceTree = "<group>"; };
+		7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveGlobalBlock.swift; sourceTree = "<group>"; };
 		79F4B1152A32B96B00993C03 /* CNLiveMineInfoViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineInfoViewController.swift; sourceTree = "<group>"; };
 		79F4B1172A32C5FA00993C03 /* CNLiveBaseMoel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveBaseMoel.swift; sourceTree = "<group>"; };
 		79F4B1192A32F21400993C03 /* CNLiveMineNickViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveMineNickViewController.swift; sourceTree = "<group>"; };
@@ -293,6 +297,7 @@
 		7963988A2A260B3300D045EB /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				7C2703312A36CC430061EC50 /* GlobalBlock */,
 				798A44F32A3077ED00815935 /* CustomView */,
 				790D01832A2D89E100C5978D /* Extensions */,
 				7CD675502A29C036008354C1 /* Constant */,
@@ -407,6 +412,14 @@
 			path = ViewModel;
 			sourceTree = "<group>";
 		};
+		7C2703312A36CC430061EC50 /* GlobalBlock */ = {
+			isa = PBXGroup;
+			children = (
+				7C2703322A36CC660061EC50 /* CNLiveGlobalBlock.swift */,
+			);
+			path = GlobalBlock;
+			sourceTree = "<group>";
+		};
 		798A44F32A3077ED00815935 /* CustomView */ = {
 			isa = PBXGroup;
 			children = (
@@ -437,6 +450,7 @@
 				7CD675412A2740F8008354C1 /* CNCustomIndexView.swift */,
 				7C4931302A2F142F000E44B4 /* CNHomePageBackgroupView.swift */,
 				7C4931372A307BDB000E44B4 /* CNHomePageGuideView.swift */,
+				7C27032F2A36CBE30061EC50 /* CNCertificationView.swift */,
 			);
 			name = View;
 			path = HomePage/View;
@@ -788,7 +802,9 @@
 				79F4B11A2A32F21400993C03 /* CNLiveMineNickViewController.swift in Sources */,
 				798A44FF2A30A0A800815935 /* CNLiveInputFeedBackViewController.swift in Sources */,
 				79282A442A2F1C1E00B5F8CF /* CNLiveLoginAuthView.swift in Sources */,
+				7C2703302A36CBE30061EC50 /* CNCertificationView.swift in Sources */,
 				790D01A32A2DDBA300C5978D /* CNLiveConfigManager.swift in Sources */,
+				7C2703332A36CC660061EC50 /* CNLiveGlobalBlock.swift in Sources */,
 				798A44EA2A30135D00815935 /* CNLiveMineBodyListView.swift in Sources */,
 				798A44F92A30835400815935 /* CNLiveHelpFeedBackViewController.swift in Sources */,
 				79A68C4A2A26E6CE00DC3B43 /* (null) in Sources */,
+//
+//  CNLiveGlobalBlock.swift
+//  metaCode
+//
+//  Created by daojian on 2023/6/12.
+//
+
+import Foundation
+
+///点击事件回调
+typealias closureBlock = ()->Void;
@@ -18,8 +18,33 @@ let CNKeyIsFirstAppearUpSlideHomeGuide: String = &quot;isFirstAppearUpSlideHomeGuideK
 ///存储是否第一次显示首页下滑引导
 let CNKeyIsFirstAppearDownSlideHomeGuide: String = "isFirstAppearDownSlideHomeGuideKey"
  
+///用户身份认证状态
+enum UserIdentityStatus {
+    ///未认证
+    case notCertified
+    ///已经认证
+    case haveBeenCertified
+}
+
 class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDelegate, NewPagedFlowViewDataSource, CNCustomIndexViewDelegate{
  
+    ///添加认证View
+    lazy var addCertificationView: CNCertificationView = {
+        let addCertificationView = CNCertificationView(frame: self.view.bounds)
+        
+        addCertificationView.addCertificationAction = {
+            [weak self] in
+            print("添加认证")
+            //模拟认证成功刷新主页面
+            let time = DispatchTime.now() + 2.0
+            DispatchQueue.main.asyncAfter(deadline: time, execute: DispatchWorkItem(block: {
+                self?.addCertificationView.isHidden = true
+                self?.addCertificationView.removeFromSuperview()
+                self?.addPageView()
+            }))
+        }
+        return addCertificationView
+    }()
     ///上滑引导View
     lazy var upSlideGuideView:CNHomePageGuideView = {
         let upSlideGuideView = CNHomePageGuideView.init(frame: UIScreen.main.bounds)
@@ -69,9 +94,12 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
  
     ///NewPagedFlowView 开始滑动时的偏移量
     private var beginOffset = 0.0
-    
+    ///tabBar 的Y坐标位置
     private var tabBarY:CGFloat = 0.0
  
+    ///用户身份认证状态
+    private var identityStatus: UserIdentityStatus = .haveBeenCertified
+    
     // MARK: - 懒加载
     ///数据源
     lazy var dataArray: NSMutableArray = {
@@ -130,32 +158,25 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
  
         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(){
         self.view.backgroundColor = KVCBackgroupColor
         self.view.addSubview(self.backgroupView)
+        
+        switch self.identityStatus{
+            
+        case .notCertified:
+            self.view.addSubview(self.addCertificationView)
+        case .haveBeenCertified:
+            self.addPageView()
+        }
+       
+        
+    }
+    
+    ///添加主View
+    func addPageView(){
         self.view.addSubview(self.pageFlowView)
         self.pageFlowView.reloadData()
  
@@ -182,7 +203,6 @@ class CNMetaCodeHomePageController:CNLiveBaseViewController, NewPagedFlowViewDel
             self.view.addSubview(self.upSlideGuideView)
             self.view.addSubview(self.upSlideGifView)
         }
-        
     }
  
     // MARK: - NewPagedFlowView代理
+//
+//  CNCertificationView.swift
+//  metaCode
+//
+//  Created by daojian on 2023/6/12.
+//
+
+import Foundation
+
+///身份认证View
+class CNCertificationView : UIView{
+    ///添加身份点击事件回调
+    var addCertificationAction: closeBlock?
+    
+    lazy var contentView: UIView = {
+        let W = self.width-50
+        let H = W*1.5
+        let contentView = UIView.init(frame: CGRect(x: 25, y: KSreenHeight*0.16, width: W, height: H ))
+        contentView.backgroundColor = UIColor.white
+        contentView.clipsToBounds = true
+        contentView.layer.cornerRadius = 20
+        
+        return contentView
+        
+    }()
+    
+    ///添加身份认证按钮
+    lazy var addCerBtn: UIButton = {
+        let addCerBtn = UIButton(type: .custom)
+        addCerBtn.frame = CGRect(x: 0, y: 0, width: 145, height: 141)
+        addCerBtn.centerX = self.contentView.width/2
+        addCerBtn.centerY = self.contentView.height/2
+        addCerBtn.setImage(UIImage(named: "homePage_addCertification_icon"), for: .normal)
+        addCerBtn.addTarget(self, action: #selector(addCerBtnAction), for: .touchUpInside)
+        return addCerBtn
+    }()
+    
+    ///添加身份按钮底部标题
+    lazy var addCerBtnBottomTitle: UILabel = {
+        let addCerBtnBottomTitle = UILabel(frame: CGRect(x: 0, y: self.addCerBtn.bottom - 10, width: 100, height: 22))
+        addCerBtnBottomTitle.centerX = self.addCerBtn.centerX
+        addCerBtnBottomTitle.textColor = UIColor("#0066FE")
+        addCerBtnBottomTitle.textAlignment = .center
+        addCerBtnBottomTitle.font = UIFont.systemFont(ofSize: 15, weight: .regular)
+        addCerBtnBottomTitle.text = "身份认证"
+        return addCerBtnBottomTitle
+        
+    }()
+    
+    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.contentView)
+        self.contentView.addSubview(self.addCerBtn)
+        self.contentView.addSubview(self.addCerBtnBottomTitle)
+    }
+    
+    @objc func addCerBtnAction(){
+        
+        if(self.addCertificationAction != nil){
+            self.addCertificationAction!()
+        }
+        
+    }
+}
@@ -142,6 +142,13 @@ class CNCustomIndexView:PGIndexBannerSubiew, UIScrollViewDelegate, WJColorChange
         collectionView.backAction = {[weak self] in
             self?.baseScrollView.setContentOffset(CGPoint(x: 0, y: (self!.baseScrollView.height)), animated: true)
             self?.superScrollView?.isScrollEnabled = true
+            
+            let time = DispatchTime.now() + 0.5
+            DispatchQueue.main.asyncAfter(deadline:time, execute: DispatchWorkItem(block: {
+                //下滑提醒View回到初始位置
+                self?.topCollectMoneyRemindView.top = -((self?.topCollectMoneyRemindView.height)! + 50)
+            }))
+           
         }
         return collectionView
     }()
@@ -10,8 +10,8 @@ import YYCategories
  
 ///旋转动画时间
 let KTransformAnimationTime:CGFloat  = 0.75;
-///点击事件回调
-typealias closureBlock = ()->Void;
+
+
  
 ///正面View
 class CNFrontMainView : UIView{
@@ -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.systemFont(ofSize: 15, weight: .regular)
+        bottomBackBtn.titleLabel?.font = UIFont.systemFont(ofSize: 15)
  
         bottomBackBtn.addTarget(self, action: #selector(tapAction), for: .touchUpInside)
         return bottomBackBtn
@@ -148,6 +148,7 @@ class CNMainView : UIView{
         fatalError("init(coder:) has not been implemented")
     }
  
+    ///正面View
     lazy var frontView:CNFrontMainView = {
  
         let frontView = CNFrontMainView.init(frame: self.bounds)
@@ -157,6 +158,7 @@ class CNMainView : UIView{
         return frontView
     }()
  
+    ///背面View
     lazy var backView:CNBackMainView = {
         let backView = CNBackMainView.init(frame: self.bounds)
         backView.tapTransformAciton = { [weak self] in
@@ -165,11 +167,15 @@ class CNMainView : UIView{
         return backView
     }()
  
+    
+    
+    
     func initUI()
     {
         self.addSubview(self.frontView)
         self.addSubview(self.backView)
  
+        
         self.backView.isHidden = true;
  
 //        self.layer.cornerRadius = 20;
@@ -21,7 +21,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
  
         window = UIWindow.init(frame: UIScreen.main.bounds)
         window?.backgroundColor = KVCBackgroupColor
-        window?.rootViewController = UserInfoManager.shared.is_login ? CNLiveBaseTabBarViewController.init() : CNLiveLoginViewController.init()
+//        window?.rootViewController = UserInfoManager.shared.is_login ? CNLiveBaseTabBarViewController.init() : CNLiveLoginViewController.init()
+        window?.rootViewController = CNLiveBaseTabBarViewController.init()
         window?.makeKeyAndVisible()
  
  
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "添加@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "添加@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}