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

liushiyu
2 parents c5150f31 bad7f367
Showing 8 changed files with 150 additions and 70 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Config/CNLiveConfigManager.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePages/Controller/PlayletHomePage/CNLivePlayletHomePageController.swift
metaCode/Classes/Main/HomePages/Model/CNLiveAlbumListModel.swift
metaCode/Classes/Main/HomePages/View/PlayletHomePage/CNLivePlayletHomePageHeaderCell.swift
metaCode/Classes/Main/HomePages/ViewModel/CNLiveHomePageViewModel.swift
metaCode/Classes/Vendors/metaCode-Bridging-Header.h
@@ -2076,6 +2076,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1.0.4.24.01.15.15;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
@@ -2308,6 +2309,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
@@ -2328,6 +2330,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
 				CLANG_ENABLE_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1.0.4.24.01.15.15;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
@@ -2560,6 +2563,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.metaCode;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
@@ -83,4 +83,8 @@ extension Notification.Name {
         //搜索确认处理
         public static let kDSSelectGoodsNotification = Notification.Name("kDSSelectGoodsNotification")
     }
+    struct PlayerManage {
+        //销毁播放器通知
+        public static let kPlayerDestroyNotification = Notification.Name("kPlayerDestroyNotification")
+    }
 }
@@ -91,34 +91,13 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
     override func viewDidLoad() {
         super.viewDidLoad()
         setupUI()
-//        getImageFromCell()
-//        if self.cellType == .playlet{
-            self.getBlockContents(page: 1)
-//        }
+        self.getBlockContents(page: 1)
     }
     private func setupUI() {
         self.view.layer.masksToBounds = true
         self.view.addSubview(self.tableView)
         self.tableView.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)
-        
-        if self.cellType == .playlet{//短剧 大图
-//            self.view.addSubview(self.tableView)
-//            self.tableView.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)
-        }else if self.cellType == .course{//课程 大图
-            if self.slideModel!.type == SlideModelTypeAllCourse12{
-                //全部课程
-                
-            }else if self.slideModel!.type == SlideModelTypeOneCourse75{
-                //大图课程
-                
-            }
-//            view.addSubview(scrollView)
-//            scrollView.slideModel = _slideModel
-        }else if self.cellType == .playletToCourse{
-            //首页->课程
-            
-        }
         view.addSubview(closeBtn)
         view.addGestureRecognizer(dismissPanGesture)
     }
@@ -314,8 +293,6 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
                     self!.dataArray.addObjects(from: albumBaseModel.list)
                     if self!.dataArray.count > 0 && self!.tableView.mj_header == nil && self!.tableView.mj_footer == nil {
                         self!.addRefreshView()
-//                        self!.pageNum = self!.pageNum + 1
-//                        self!.getBlockContents(page: self!.pageNum)
                     }
                 }
@@ -6,16 +6,22 @@
 //  短剧主页
 import Foundation
-
+import MJRefresh
 class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataSource, UITableViewDelegate{
+    var pageNum: NSInteger = 1
     var jianjieLblHeight:CGFloat = 36
     let kCNLivePlayletCellIdentifier = "kCNLivePlayletCellIdentifier"
     let kCNLivePlayletHeaderCellIdentifier = "kCNLivePlayletHeaderCellIdentifier"
     ///数据源
-    var albumModelArr:Array<CNLiveAlbumListModel> = [CNLiveAlbumListModel]()
-    var albumId = ""
+//    var albumModelArr:Array<CNLiveAlbumListModel> = [CNLiveAlbumListModel]()
+    lazy var albumModelArr: NSMutableArray = {
+        var dataArray = NSMutableArray()
+        return dataArray
+    }()
+    var albumMsgModel:CNLiveAlbumMsgModel?
+    var albumId = ""//aid
     // MARK: - 懒加载
     lazy var tableView : UITableView = {
@@ -32,13 +38,13 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
     init(aid:String){
         super.init(nibName: nil, bundle: nil)
         self.albumId = aid
-        self.getAlbumList(aid: aid)// self.albumModel!.contentId 或 self.albumMsgModel!.albumId
-    }
-    init(albumModelArr:Array<CNLiveAlbumListModel>) {
-        self.albumModelArr = Array(albumModelArr)
-        super.init(nibName: nil, bundle: nil)
-        self.tableView.reloadData()
+        self.getAlbumMsg(aid: aid)// self.albumModel!.contentId 或 self.albumMsgModel!.albumId
     }
+//    init(albumModelArr:NSMutableArray) {
+//        self.albumModelArr = NSMutableArray(array: albumModelArr)
+//        super.init(nibName: nil, bundle: nil)
+//        self.tableView.reloadData()
+//    }
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
@@ -54,36 +60,67 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
     }
     // MARK: - 获取短剧主页数据
-    //获取专辑视频列表详情(播放地址 ,点赞数等信息)
-    func getAlbumList(aid:String){
-        showLoading(message: "")
-        CNLiveHomePageViewModel.getAlbumList(aid: aid){ result, status in
+    //获取专辑详情(简介等)
+    func getAlbumMsg(aid:String){
+        CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { [weak self] result, status in
             hiddenLoading()
             if status == .success{
-                let arr = result as! Array<CNLiveAlbumListModel>
-                self.albumModelArr = Array(arr)
-                self.getAlbumMsg(aid: aid)
+                let model = result as! CNLiveAlbumMsgModel
+                self!.albumMsgModel = model
+                self!.getAlbumList(aid: aid, page: self!.pageNum)
             }else{
             }
         }
     }
-    //获取专辑详情(简介等)
-    func getAlbumMsg(aid:String){
-        CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { result, status in
+    //获取专辑视频列表详情(播放地址 ,点赞数等信息)
+    func getAlbumList(aid:String, page:NSInteger){
+        showLoading(message: "")
+        CNLiveHomePageViewModel.getAlbumList(aid: aid, page: page){[weak self] result, status in
             hiddenLoading()
             if status == .success{
-                let model = result as! CNLiveAlbumMsgModel
-                for listModel in self.albumModelArr {
-                    listModel.albumMsgModel = model
+                let dataMdl = result as! CNLiveAlbumListBaseModel
+                let arr = dataMdl.list
+                for listModel in arr {
+                    listModel.albumMsgModel = self?.albumMsgModel
+                }
+                
+                if self!.pageNum > 1 && self!.albumModelArr.count > 0 {
+                    self!.albumModelArr.addObjects(from: arr)
+                }
+                if self!.pageNum == 1 {
+                    self!.albumModelArr.removeAllObjects()
+                    self!.albumModelArr.addObjects(from: arr)
+                    if self!.albumModelArr.count > 0 && self!.tableView.mj_header == nil && self!.tableView.mj_footer == nil {
+                        self!.addRefreshView()
+                    }
+                }
+                
+                self!.tableView.mj_header?.endRefreshing()
+                
+                self!.tableView.reloadData()
+                if dataMdl.hasNextPage{
+                    self!.tableView.mj_footer?.endRefreshing()
+                }else{
+                    self!.tableView.mj_footer?.endRefreshingWithNoMoreData()
                 }
-                self.tableView.reloadData()
             }else{
             }
         }
     }
+    func addRefreshView() {
+        tableView.mj_header = MJRefreshNormalHeader.init(refreshingBlock: {[weak self] in
+            self!.pageNum = 1
+            self!.getAlbumList(aid: self!.albumId , page: 1)
+        })
+        
+        tableView.mj_footer = MJRefreshAutoNormalFooter.init(refreshingBlock: {[weak self] in
+            self!.pageNum = self!.pageNum + 1
+            self!.getAlbumList(aid: self!.albumId, page: self!.pageNum)
+        })
+    }
     func numberOfSections(in tableView: UITableView) -> Int {
         2
@@ -109,11 +146,11 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
             }
             cell.homePageNeedReloadActionBlock = {
                 DispatchQueue.main.asyncAfter(deadline: .now()+0.5) { [self] in
-                    self.getAlbumList(aid: self.albumId)
+                    self.getAlbumMsg(aid: self.albumId)
                 }
             }
             if self.albumModelArr.count > 0{
-                let albumListModel = self.albumModelArr[0]
+                let albumListModel = self.albumModelArr[0] as! CNLiveAlbumListModel
                 cell.albumListModel = albumListModel
             }
             return cell
@@ -123,7 +160,7 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
                 let cell = CNLivePlayletHomePageCell()
                 return cell
             }
-            let albumListModel = self.albumModelArr[indexPath.row] 
+            let albumListModel = self.albumModelArr[indexPath.row] as! CNLiveAlbumListModel
             cell.albumListModel = albumListModel
             return cell
         }
@@ -138,10 +175,23 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if indexPath.section == 0{
         }else{
-            let albumListModel = self.albumModelArr[indexPath.row]
+            let albumListModel = self.albumModelArr[indexPath.row] as! CNLiveAlbumListModel
             let aid = albumListModel.albumMsgModel?.albumId ?? ""
+            //发播放器销毁通知
+            NotificationCenter.default.post(name: Notification.Name.PlayerManage.kPlayerDestroyNotification, object: nil)
+            //在当前堆栈里遍历删除 播放控制器CNLiveShortVideoViewController
+            let tempArray = NSMutableArray.init()
+            self.navigationController?.viewControllers.forEach({ item in
+                if (item.isKind(of: CNLiveShortVideoViewController.self)) {
+                    tempArray.remove(item)
+                }else{
+                    tempArray.add(item)
+                }
+            })
+            self.navigationController?.viewControllers = tempArray as! [CNLiveBaseViewController]
             //跳转播放页
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+            let dataArray = Array(self.albumModelArr) as! [CNLiveAlbumListModel]
+            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid, page: self.pageNum, currentIndex: indexPath.row, dataArray: dataArray), animated: pushAnimated)
         }
     }
 }
@@ -7,6 +7,28 @@
 import Foundation
+class CNLiveAlbumListBaseModel:BaseModel{
+    var endRow = 0
+    var firstPage = 0
+    var hasNextPage = false
+    var nextPage = 0
+    var hasPreviousPage = false
+    var isFirstPage = true
+    var isLastPage = true
+    var lastPage = 0
+    var list = [CNLiveAlbumListModel]()
+    var navigateFirstPage = 0
+    var navigateLastPage = 0
+    var navigatePages = 0
+    var navigatepageNums:Array<Any> = []
+    var pageNum = 0
+    var pageSize = 0
+    var pages = 0
+    var prePage = 0
+    var size = 0
+    var startRow = 0
+    var total = 0
+}
 class CNLiveAlbumListModel:BaseModel{
     var title = ""
     var shortTitle = ""
@@ -73,13 +73,19 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         titleLabel.height = height
         return titleLabel
     }()
+    ///简介背景
+    lazy var jianjieBgView :UIView = {
+        let jianjieBgView = UIView(frame: CGRect(x: self.iconImgView.left, y: self.iconImgView.bottom+10, width: KSreenWidth-2*self.iconImgView.left, height: 21))
+        jianjieBgView.backgroundColor = UIColor(red:0.98, green:0.98, blue:0.98, alpha:1.00)
+        return jianjieBgView
+    }()
     ///简介
     lazy var jianjieLabel: UILabel = {
-        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.left, self.iconImgView.bottom+10, KSreenWidth-2*self.iconImgView.left, 21))
+        let titleLabel = UILabel.init(frame: CGRectMake(self.iconImgView.left+10, self.iconImgView.bottom+20, KSreenWidth-2*self.iconImgView.left-13, 21))
         titleLabel.textColor = HexColor("#333333")
         titleLabel.textAlignment = .left
         titleLabel.font = Font_12
-        titleLabel.backgroundColor = UIColor(red:0.98, green:0.98, blue:0.98, alpha:1.00)
+        titleLabel.backgroundColor = .clear// UIColor(red:0.98, green:0.98, blue:0.98, alpha:1.00)
         titleLabel.text = "简介"
         titleLabel.numberOfLines = 0
         var lines = titleLabel.getRealLabelTextLines()
@@ -93,9 +99,9 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
     //展开,收起
     lazy var expandBtn: UIButton = {
         let expandBtn = UIButton.init(type: .custom)
-        expandBtn.backgroundColor = .white
+        expandBtn.backgroundColor = .clear
-        expandBtn.frame = CGRect(x: self.jianjieLabel.right-60, y: self.jianjieLabel.bottom, width: 60, height: 30)
+        expandBtn.frame = CGRect(x: self.jianjieBgView.right-60, y: self.jianjieBgView.bottom-10, width: 60, height: 30)
         expandBtn.setTitle("展开", for: .normal)
         expandBtn.setTitle("收起", for: .selected)
@@ -168,6 +174,7 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         self.iconImgView.addSubview(self.payIconImgView)
         self.contentView.addSubview(self.titleLabl)
         self.contentView.addSubview(self.jishuLabel)
+        self.contentView.addSubview(self.jianjieBgView)
         self.contentView.addSubview(self.jianjieLabel)
         self.contentView.addSubview(self.expandBtn)
         self.contentView.addSubview(self.followBtn)
@@ -182,7 +189,7 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         }
         self.followBtn.snp.makeConstraints { make in
-            make.top.equalTo(self.jianjieLabel.snp.bottom).offset(25)
+            make.top.equalTo(self.jianjieBgView.snp.bottom).offset(25)
             make.left.equalTo(self.iconImgView.snp.left)
             make.width.equalTo(140)
             make.height.equalTo(40)
@@ -267,8 +274,16 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         }else{
             //收起状态
-            self.jianjieLabel.height = 2*height
+            if lines <= 2{
+                //小于2行,按实际行数
+                self.jianjieLabel.height = CGFloat(lines)*height
+            }else{
+                //大于2行, 显示2行
+                self.jianjieLabel.height = 2*height
+            }
         }
+        self.jianjieBgView.height = self.jianjieLabel.height+20
+        self.expandBtn.top = self.jianjieBgView.bottom-10
         if model.albumMsgModel!.collection{
             self.followChangeStatus(isFollowed: true)
         }else{
@@ -289,8 +304,10 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
             //文本展开状态,点击收起
             self.jianjieLabel.height = 2*height
         }
+        self.jianjieBgView.height = self.jianjieLabel.height+20
         self.homePageHeaderCellChangedBlock!(self, self.jianjieLabel.height)
-        self.expandBtn.top = self.jianjieLabel.bottom
+        
+        self.expandBtn.top = self.jianjieBgView.bottom-10
     }
     @objc func followBtnAction(button:UIButton){
@@ -390,7 +407,7 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
             // 这里可以对获取到的子图层进行操作或者访问其属性等
             return subLayer
         } else {
-            print("未找到指定名称的图层")
+//            print("未找到指定名称的图层")
             return nil
         }
     }
@@ -141,10 +141,12 @@ class CNLiveHomePageViewModel:NSObject{
     }
     /// 获取首页-专辑视频列表详情
-    static func getAlbumList(aid:String,resultBlock: @escaping downSlideResultBlock) {
+    static func getAlbumList(aid:String, page:NSInteger,resultBlock: @escaping downSlideResultBlock) {
         let param = NSMutableDictionary()
         param.setValue(aid, forKey: "aid")
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue("\(page)", forKey: "page")
+
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/ugcApi/albumList", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
@@ -154,14 +156,18 @@ class CNLiveHomePageViewModel:NSObject{
                 let errorCode = "\(resp["errorCode"] ?? "0")"
                 if (errorCode == "0") {
                     let dataDic = resp["data"] as! Dictionary<String, Any>
-                    let dataList = dataDic["list"] as! Array<Any>
-                    var listArr = Array<Any>()
-                    for listDic in dataList{
-                        let dataMdl = newDictionaryToModel(listDic as! [String : Any], CNLiveAlbumListModel.self)
-                        listArr.append(dataMdl)
-                    }
+                    let dataMdl = newDictionaryToModel(dataDic , CNLiveAlbumListBaseModel.self)
+                    resultBlock(dataMdl,.success)
-                    resultBlock(listArr,.success)
+//                    let dataDic = resp["data"] as! Dictionary<String, Any>
+//                    let dataList = dataDic["list"] as! Array<Any>
+//                    var listArr = Array<Any>()
+//                    for listDic in dataList{
+//                        let dataMdl = newDictionaryToModel(listDic as! [String : Any], CNLiveAlbumListModel.self)
+//                        listArr.append(dataMdl)
+//                    }
+//                    
+//                    resultBlock(listArr,.success)
                 }else{
                     resultBlock(NSNull(),.failed)
                 }
@@ -5,5 +5,5 @@
 #import "WJColorChange.h"
 #import "NewPagedFlowView.h"
-#import <WXApi.h>
-#import <WXApiObject.h>
+//#import <WXApi.h>
+//#import <WXApiObject.h>