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

liushiyu
2 parents f27172aa 41dedb44
Showing 8 changed files with 124 additions and 52 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideSingleCourseCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideTodayRecommendCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNUpSlideDetailScrollView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/MainView/CNMainView.swift
metaCode/Classes/Main/MinePage/ViewModel/CNLiveMineBaseModel.swift
metaCode/Classes/Main/Util/CNLiveDownSlideModelLayout.swift → metaCode/Classes/Main/Model/CNLiveDownSlideModelLayout.swift
@@ -722,10 +722,10 @@
 		1938BD1B2B45557700390A34 /* DownSlideController */ = {
 			isa = PBXGroup;
 			children = (
-				19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */,
-				19CC4D532ADD163D00308E2A /* CNUpSlideCardPresentationController.swift */,
 				192336EA2AD9224300D47CD4 /* CNUpSlideViewController.swift */,
 				19CC4D4A2ADD086F00308E2A /* CNUpSlideDetailViewController.swift */,
+				19BB1FDE2AEA3A450094D962 /* CNSlideBaseNavigationController.swift */,
+				19CC4D532ADD163D00308E2A /* CNUpSlideCardPresentationController.swift */,
 			);
 			path = DownSlideController;
 			sourceTree = "<group>";
@@ -932,6 +932,7 @@
 				191732F92B0AF329007BCC04 /* GoodsDetail */,
 				19565ED22AF9FE67007D6727 /* GoodsManager */,
 				1926C2902AE0FD4500C71DC3 /* CNLiveDownSlideModel.swift */,
+				19FA201A2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift */,
 				19BB1FE52AEB93B80094D962 /* CNLiveShopUserInfoModel.swift */,
 				19BB1FE72AECAD060094D962 /* CNLiveShopConsoleModel.swift */,
 				19BB1FEF2AF0E5B30094D962 /* CNLiveShopDetailModel.swift */,
@@ -944,7 +945,6 @@
 			children = (
 				1917330B2B109691007BCC04 /* CNLivePlayer */,
 				19CC4D512ADD129800308E2A /* CNUpSlideAnimationTransition.swift */,
-				19FA201A2AE60423001F7186 /* CNLiveDownSlideModelLayout.swift */,
 				19D2CE622AE8B65D00691757 /* CNLiveDownSlideTool.swift */,
 				19BB202A2AF382150094D962 /* CNLiveAdaptTool.swift */,
 				191733302B170537007BCC04 /* CNLiveCommonManager.swift */,
@@ -2066,7 +2066,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.4.24.01.22.11;
+				CURRENT_PROJECT_VERSION = 1.0.4.24.01.22.17;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -2320,7 +2320,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.4.24.01.22.11;
+				CURRENT_PROJECT_VERSION = 1.0.4.24.01.22.17;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -104,8 +104,6 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
         if slideModel.type == SlideModelTypeRecommend4{
             guard let cell = tableView.dequeueReusableCell(withIdentifier: kCNLiveDownSlideRecommendCellIdentifier) as? CNLiveDownSlideRecommendCell 
             else {
-//                let cell = CNLiveDownSlideRecommendCell()
-//                cell.slideModel = slideModel
                 return CNLiveDownSlideRecommendCell()
             }
             cell.slideModel = slideModel
@@ -131,13 +131,13 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
                 bgBackView.addSubview(imageView)
                 let titleLbl = UILabel(frame: CGRect(x: imageView.right+DownSlideRecommendLeftGap, y: imageView.top, width: DownSlideSingleCourseW-90-imageView.right, height: 21))
-                titleLbl.text = contentMdl.title ?? "婴儿课程"
+                titleLbl.text = contentMdl.title ?? ""
                 titleLbl.font = Font_15
                 titleLbl.textColor = HexColor("#333333")
                 bgBackView.addSubview(titleLbl)
                 let subTitleLbl = UILabel(frame: CGRect(x: titleLbl.left, y:titleLbl.bottom+3 , width: titleLbl.width, height: 17))
-                subTitleLbl.text = contentMdl.subTitle ?? "适应3-6岁"
+                subTitleLbl.text = contentMdl.subTitle ?? ""
                 subTitleLbl.font = Font_12
                 subTitleLbl.textColor = HexColor("#999999")
                 bgBackView.addSubview(subTitleLbl)
@@ -181,13 +181,13 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
             bgImageView.kf.setImage(with: URL(string: model.contents[0].poster ?? ""))
             let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
-            titleLbl.text = model.contents[0].title ?? "婴儿课程"
+            titleLbl.text = model.contents[0].title ?? ""
             titleLbl.font = BoldFont_21
             titleLbl.textColor = HexColor("#FFFFFF")
             bgImageView.addSubview(titleLbl)
             let subTitleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y:titleLbl.bottom , width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
-            subTitleLbl.text = model.contents[0].subTitle ?? "适应3-6岁"
+            subTitleLbl.text = model.contents[0].subTitle ?? ""
             subTitleLbl.font = Font_12
             subTitleLbl.textColor = HexColor("#FFFFFF")
             bgImageView.addSubview(subTitleLbl)
@@ -8,7 +8,7 @@
 import Foundation
 ///今日推荐高度
-let DownSlideTodayRecommendH: CGFloat = 105
+let DownSlideTodayRecommendH: CGFloat = DownSlideTodayRecommendW*105/345
 ///今日推荐宽度
 let DownSlideTodayRecommendW: CGFloat = KSreenWidth-DownSlideRecommendLeftGap*2
@@ -76,13 +76,13 @@ class CNUpSlideDetailScrollView: UIScrollView {
                 bgBackView.addSubview(imageView)
                 let titleLbl = UILabel(frame: CGRect(x: imageView.right+DownSlideRecommendLeftGap, y: imageView.top, width: DownSlideSingleCourseW-90-imageView.right, height: 21))
-                titleLbl.text = contentMdl.title ?? "婴儿课程"
+                titleLbl.text = contentMdl.title ?? ""
                 titleLbl.font = Font_15
                 titleLbl.textColor = HexColor("#333333")
                 bgBackView.addSubview(titleLbl)
                 let subTitleLbl = UILabel(frame: CGRect(x: titleLbl.left, y:titleLbl.bottom+3 , width: titleLbl.width, height: 17))
-                subTitleLbl.text = contentMdl.subTitle ?? "适应3-6岁"
+                subTitleLbl.text = contentMdl.subTitle ?? ""
                 subTitleLbl.font = Font_12
                 subTitleLbl.textColor = HexColor("#999999")
                 bgBackView.addSubview(subTitleLbl)
@@ -102,13 +102,13 @@ class CNUpSlideDetailScrollView: UIScrollView {
             //单图课程
             let topTitleLbl = UILabel(frame: CGRect(x: 0, y: KStatusBarHeight+DownSlideRecommendLeftGap, width:bgBackView.width - 50 , height: 30))
-            topTitleLbl.text = model.contents[0].title ?? "婴儿课程"
+            topTitleLbl.text = model.contents[0].title ?? ""
             topTitleLbl.font = BoldFont_21
             topTitleLbl.textColor = HexColor("#FFFFFF")
             imageView.addSubview(topTitleLbl)
             let topSubTitleLbl = UILabel(frame: CGRect(x: topTitleLbl.left, y:topTitleLbl.bottom , width: topTitleLbl.width, height: 30))
-            topSubTitleLbl.text = model.contents[0].subTitle ?? "适应3-6岁"
+            topSubTitleLbl.text = model.contents[0].subTitle ?? ""
             topSubTitleLbl.font = Font_12
             topSubTitleLbl.textColor = HexColor("#FFFFFF")
             imageView.addSubview(topSubTitleLbl)
@@ -131,13 +131,13 @@ class CNUpSlideDetailScrollView: UIScrollView {
                 bgBackView.addSubview(imgView)
                 let titleLbl = UILabel(frame: CGRect(x: imgView.right+DownSlideRecommendLeftGap, y: imgView.top, width: DownSlideSingleCourseW-90-imgView.right, height: 21))
-                titleLbl.text = contentMdl.title ?? "婴儿课程"
+                titleLbl.text = contentMdl.title ?? ""
                 titleLbl.font = Font_15
                 titleLbl.textColor = HexColor("#333333")
                 bgBackView.addSubview(titleLbl)
                 let subTitleLbl = UILabel(frame: CGRect(x: titleLbl.left, y:titleLbl.bottom+3 , width: titleLbl.width, height: 17))
-                subTitleLbl.text = contentMdl.subTitle ?? "适应3-6岁"
+                subTitleLbl.text = contentMdl.subTitle ?? ""
                 subTitleLbl.font = Font_12
                 subTitleLbl.textColor = HexColor("#999999")
                 bgBackView.addSubview(subTitleLbl)
@@ -7,6 +7,8 @@
 import Foundation
 import UIKit
+import Kingfisher
+
 ///旋转动画时间
 let KTransformAnimationTime:CGFloat  = 0.75;
@@ -51,20 +53,43 @@ class CNFrontMainView : UIView{
             make.bottom.equalToSuperview()
         }
-        frontDescContentView.addSubview(self.addStandBtn)
-        addStandBtn.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-30)
-            make.width.equalTo(150)
-            make.height.equalTo(39)
+        frontDescContentView.addSubview(self.upMoreGIF)
+        upMoreGIF.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(5)
+            make.right.equalToSuperview().offset(-self.width/2+24)
+            make.width.equalTo(48)
+            make.height.equalTo(30)
         }
-                
+        
+        frontDescContentView.addSubview(self.personalStandBtn)
+        personalStandBtn.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-self.width/2)
+            make.bottom.equalToSuperview().offset(-45)
+            make.width.equalTo(120)
+            make.height.equalTo(36)
+        }
+        frontDescContentView.addSubview(self.enterpriseStandBtn)
+        enterpriseStandBtn.snp.makeConstraints { make in
+            make.left.equalTo(self.personalStandBtn.snp.right)
+            make.bottom.equalToSuperview().offset(-45)
+            make.width.equalTo(120)
+            make.height.equalTo(36)
+        }
+               
+        frontDescContentView.addSubview(self.downMoreGIF)
+        downMoreGIF.snp.makeConstraints { make in
+            make.top.equalTo(self.personalStandBtn.snp.bottom).offset((45-30)/2.0)
+            make.centerX.equalTo(self.personalStandBtn.snp.right)
+            make.width.equalTo(96)
+            make.height.equalTo(30)
+        }
+        
         frontDescContentView.addSubview(self.textView)
         textView.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(40)
             make.left.equalToSuperview().offset(30)
             make.right.equalToSuperview().offset(-30)
-            make.bottom.equalTo(addStandBtn.snp.top).offset(-30)
+            make.bottom.equalTo(enterpriseStandBtn.snp.top).offset(-30)
         }
         return frontDescContentView
@@ -86,17 +111,41 @@ class CNFrontMainView : UIView{
         textView.backgroundColor = .clear
         return textView
     }()
-    ///未认证-点击添加身份 按钮
-    lazy var addStandBtn: UIButton = {
-        let addStandBtn = UIButton(type: .custom)
-        addStandBtn.clipsToBounds = true
-        addStandBtn.layer.cornerRadius = 19.5
-        addStandBtn.backgroundColor = HexColor("#004FE0")
-        addStandBtn.setTitle("点击添加身份", for: .normal)
-        addStandBtn.setTitleColor(.white, for: .normal)
-        addStandBtn.titleLabel?.font = UIFont.init(name: "PingFangSC-Medium", size: 14)
-        addStandBtn.addTarget(self, action: #selector(addStandBtnAction), for: .touchUpInside)
-        return addStandBtn
+    
+    ///未认证-个人认证 按钮
+    lazy var personalStandBtn: UIButton = {
+        let personalStandBtn = UIButton(type: .custom)
+        personalStandBtn.layer.cornerRadius = 19.5
+        personalStandBtn.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
+        personalStandBtn.setTitle("个人认证", for: .normal)
+        personalStandBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        personalStandBtn.titleLabel?.font = UIFont.init(name: "PingFangSC-Medium", size: 14)
+        personalStandBtn.addTarget(self, action: #selector(personalStandBtnAction), for: .touchUpInside)
+        return personalStandBtn
+    }()
+    ///未认证-企业认证 按钮
+    lazy var enterpriseStandBtn: UIButton = {
+        let enterpriseStandBtn = UIButton(type: .custom)
+        enterpriseStandBtn.layer.cornerRadius = 19.5
+        enterpriseStandBtn.layer.maskedCorners = [.layerMaxXMinYCorner, .layerMaxXMaxYCorner]
+        enterpriseStandBtn.setTitle("企业认证", for: .normal)
+        enterpriseStandBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        enterpriseStandBtn.titleLabel?.font = UIFont.init(name: "PingFangSC-Medium", size: 14)
+        enterpriseStandBtn.addTarget(self, action: #selector(enterpriseStandBtnAction), for: .touchUpInside)
+        return enterpriseStandBtn
+    }()
+    
+    //上滑更多Gif
+    lazy var upMoreGIF: UIImageView = {
+        let  upMoreGIF = UIImageView()
+        upMoreGIF.frame = CGRect(x: self.width - 50, y: 0, width: 50, height: 30)
+        return upMoreGIF
+    }()
+    //下滑更多Gif
+    lazy var downMoreGIF: UIImageView = {
+        let  downMoreGIF = UIImageView()
+        downMoreGIF.frame = CGRect(x: self.width - 50, y: 0, width: 96, height: 30)
+        return downMoreGIF
     }()
     ///已认证-前置视图卡片容器
@@ -171,7 +220,23 @@ class CNFrontMainView : UIView{
                 //显示textview 添加身份
                 frontDescContentView.isHidden = false
                 textView.text = newValue!.description
-                addStandBtn.backgroundColor = HexColor(newValue!.backgroundColor)
+                
+                //上滑 下滑引导gif
+                upMoreGIF.kf.setImage(with: URL(string: newValue!.upGuideImg))
+                downMoreGIF.kf.setImage(with: URL(string: newValue!.downGuideImg))
+                if idModel?.id == 9{
+                    //电商 ,隐藏上滑下滑gif
+                    upMoreGIF.isHidden = true
+                    downMoreGIF.isHidden = true
+                }else{
+                    //非电商 ,显示上滑下滑gif
+                    upMoreGIF.isHidden = false
+                    downMoreGIF.isHidden = false
+                }
+
+                //个人认证,企业认证
+                personalStandBtn.backgroundColor = HexColor(newValue!.atPersonageColour)
+                enterpriseStandBtn.backgroundColor = HexColor(newValue!.backgroundColor)
                 textViewBgImgView.kf.setImage(with: URL(string: _idModel!.descBackgroundImg), placeholder: UIImage(named: "homepage_desc_bgImg"))
             }
         } 
@@ -183,7 +248,6 @@ class CNFrontMainView : UIView{
         self.frontTotolContentView.addSubview(self.frontDescContentView)
         self.frontTotolContentView.addSubview(self.frontCardContentView)
-        
         self.makeConstraints()
     }
     func makeConstraints(){
@@ -194,27 +258,29 @@ class CNFrontMainView : UIView{
     @objc func tapAction(){
         tapTransformAciton!()
     }
-
-    @objc func addStandBtnAction() {
-        //跳转到添加身份页面
-//        currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: _idModel!), animated: pushAnimated)
-//        DispatchQueue.main.asyncAfter(deadline: .now()+0.25){
+    
+    @objc func personalStandBtnAction() {
+        //跳转到 个人认证页面
+        self.pushStandVC()
+    }
+    @objc func enterpriseStandBtnAction() {
+        //跳转到 企业认证页面
+        self.pushStandVC()
+    }
+    
+    func pushStandVC(){
+        //跳转到 个人认证&企业认证 页面
         if _idModel!.id == 9 {
             showLoading(message: "")
             CNLiveMineViewModel.requestApplyShopInfo { [weak self] result, respStatue in
                 if respStatue == .success {
                     navigationViewController().pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: pushAnimated)
-//                    currentViewController()?.navigationController?.pushViewController(CNLiveMineShopViewController.init(showType: .one, listModel: (self?.idModel)!, tempArray: []), animated: pushAnimated)
                 }
             }
         }else{
             navigationViewController().pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: pushAnimated)
-//            currentViewController()?.navigationController?.pushViewController(CNLiveMineInputViewController.init(listModel: self._idModel!), animated: pushAnimated)
         }
-            
-//        }
-
     }
 }
@@ -135,13 +135,16 @@ class StandListBaseModel: BaseModel {
 final class StandListModel: BaseModel {//, TableCodable {
-    var id: Int = 0//ID号-
+    var id: Int = 0//ID号- 9:电商,其他非电商
     var name: String?//名称-
     var icon: String?//小圆图标-
     var createTime: Int = 0//注册时间-
     var enable: Bool = false//没用-
     var backgroundImg: String = ""//首页背景图-
-    var backgroundColor: String = ""//添加身份按钮背景色-
+    var upGuideImg: String = ""//顶部引导图GiF url-
+    var downGuideImg: String = ""//底部引导图GiF url-
+    var backgroundColor: String = kCNDownSlideBackgroundColorHex//企业认证按钮背景色-
+    var atPersonageColour: String = kCNDownSlideBackgroundColorHex//个人认证按钮背景色-
     var backgroundColour: String = ""//-
     var description: String = ""//首页身份说明描述-
     var descBackgroundImg: String = ""//首页文字背景图
@@ -47,8 +47,13 @@ class CNLiveDownSlideModelLayout:NSObject{
             }
             _slideModel?.cellH = CGFloat(totalNum)*(DownSlideTodayRecommendH + DownSlideRecommendLeftGap)
         }else if(_slideModel?.type == SlideModelTypeAllCourse12){//全部课程
+            //总显示块数/循环数
+            var totalNum = (contentsNum >= row) ? row : contentsNum
+            if row == 0{//row为0 , contents全部显示
+                totalNum = contentsNum
+            }
-            _slideModel?.cellH = DownSlideAllCourseTitleH + DownSlideAllCourseRowH * CGFloat(_slideModel!.rowNum)+DownSlideRecommendLeftGap
+            _slideModel?.cellH = DownSlideAllCourseTitleH + DownSlideAllCourseRowH * CGFloat(totalNum)+DownSlideRecommendLeftGap
         }else if(_slideModel?.type == SlideModelTypeOneCourse75){//单节课程