视频播放完成

RainbowPlanet/RainbowPlanet/Model/RootModel/PaginationModel.swift

@@ -75,4 +75,4 @@ class PaginationModel : NSObject, NSCoding, Mappable{
 
 	}
 
-}
+}

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/PopularVideo/PopularVideoTableViewCell.swift

@@ -89,7 +89,7 @@ extension PopularVideoTableViewCell: UICollectionViewDelegateFlowLayout,UICollec
     
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         let communityRecommendTypeDataModel = communityRecommendTypeDataModels?[indexPath.row]
-        NotificationCenter.default.post(name: NSNotification.Name("CommunityContentVideoClosure"), object: communityRecommendTypeDataModel?.id)
+        NotificationCenter.default.post(name: NSNotification.Name("CommunityPopularVideo"), object: communityRecommendTypeDataModel?.id)
     }
     
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Main/CommunityViewController.swift

@@ -177,7 +177,6 @@ class CommunityViewController: BaseViewController {
             let id = notification.object as? Int
             let vc = CommunityVideoListController()
             vc.contentId = id ?? 0
-            vc.departureVc = .hotVideos
             self?.navigationController?.pushViewController(vc, animated: true)
         }
         

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/CommunityVideoContent/ViewController/CommunityVideoListController.swift

@@ -102,8 +102,7 @@ class CommunityVideoListController: BaseViewController {
         view.backgroundColor = UIColor.black
         self.view.addSubview(collectionView)
         collectionView.snp.makeConstraints { (make) in
-            make.top.equalTo(0)
-            make.left.right.bottom.equalToSuperview()
+            make.left.top.right.bottom.equalToSuperview()
         }
         
         // 个人中心页进入，不可滑动
@@ -122,17 +121,22 @@ class CommunityVideoListController: BaseViewController {
     }
     
     override func setupData() {
-        self.communityVideoListApi()
+        
+        collectionView.addHeader(withBeginRefresh: true, animation: false) {
+            [weak self] (page) in
+            self?.communityVideoListApi(page:page)
+            self?.collectionView.mj_header.isHidden = true
+        }
         
         collectionView.addFooterPreload(withAutomaticallyRefresh: true) {
             [weak self] (page) in
-            if page <= self?.videoListMdl?.pagination?.totalPages ?? 1 {
-                self?.communityVideoListApi(page:page)
-            }
+
+            self?.communityVideoListApi(page:page)
         }
     }
     
     private lazy var collectionView: UICollectionView = {
+        [unowned self] in
         let collectionView = UICollectionView.init(frame: CGRect.zero, collectionViewLayout: collectionViewLayout)
         collectionView.backgroundColor = UIColor.black
         collectionView.delegate = self;
@@ -340,40 +344,17 @@ extension CommunityVideoListController {
         SwiftMoyaNetWorkServiceCommunity.shared().communityVideoListApi(id: contentId ?? 0, type: paraType ?? "", topicId: topicId ?? 0, page: page) {
             [weak self] (communityVideoListModel) -> (Void) in
             self?.videoListMdl = communityVideoListModel as? CommunityVideoListModel
-            if self?.videoListMdl?.pagination?.currentPage ?? 1  <= self?.videoListMdl?.pagination?.totalPages ?? 1 {
-                if self?.videoListMdl?.pagination?.currentPage == 1{
-                    self?.videoItemList.removeAll()
-                    self?.collectionView.resetNoMoreData()
-                }
-                self?.videoItemList = self!.videoItemList + (self?.videoListMdl?.data!)!
-                self?.collectionView.reloadData()
-                if  self?.videoListMdl?.pagination?.currentPage ?? 1 >= self?.videoListMdl?.pagination?.totalPages ?? 1 {
-                    self?.collectionView.endFooterNoMoreData()
-                }
-            }else {
+            if self?.videoListMdl?.pagination?.currentPage == 1{
+                self?.videoItemList.removeAll()
+                self?.collectionView.resetNoMoreData()
+            }
+            self?.videoItemList = self!.videoItemList + (self?.videoListMdl?.data!)!
+            if  self?.videoListMdl?.pagination?.currentPage ?? 1 >= self?.videoListMdl?.pagination?.totalPages ?? 1 {
                 self?.collectionView.endFooterNoMoreData()
+                self?.collectionView.isHiddenFooter(true)
             }
+            self?.collectionView.reloadData()
         }
-        
-        
-//        SwiftMoyaNetWorkServiceCommunity.shared().communityVideoListApi(id: contentId ?? 0, page:page) {
-//            [weak self] (communityVideoListModel) -> (Void) in
-//            self?.videoListMdl = communityVideoListModel as? CommunityVideoListModel
-//            if self?.videoListMdl?.pagination?.currentPage ?? 1  <= self?.videoListMdl?.pagination?.totalPages ?? 1 {
-//                if self?.videoListMdl?.pagination?.currentPage == 1{
-//                    self?.videoItemList.removeAll()
-//                    self?.collectionView.resetNoMoreData()
-//                }
-//                self?.videoItemList = self!.videoItemList + (self?.videoListMdl?.data!)!
-//                self?.collectionView.reloadData()
-//                if  self?.videoListMdl?.pagination?.currentPage ?? 1 >= self?.videoListMdl?.pagination?.totalPages ?? 1 {
-//                    self?.collectionView.endFooterNoMoreData()
-//                }
-//            }else {
-//                self?.collectionView.endFooterNoMoreData()
-//            }
-//
-//        }
     }
     
     /// 阅读virue