Merge branch 'develop' into feature/jeremy

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

@@ -147,6 +147,7 @@ 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)
         }
         
@@ -176,6 +177,7 @@ 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/CommunityFeaturedTopics/ViewController/CommunityFeaturedTopicsViewController.swift

@@ -471,6 +471,7 @@ extension CommunityFeaturedTopicsViewController : UITableViewDelegate,UITableVie
             if PostType(rawValue: communityRecommendDataModel.type ?? "video") == .video {
                 let vc = CommunityVideoListController()
                 vc.contentId = communityRecommendDataModel.id ?? 0
+                vc.topicId = self.id
                 self.navigationController?.pushViewController(vc, animated: true)
             }else {
                 let vc = CommunityRecommendController()

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

@@ -11,19 +11,27 @@ import RxSwift
 
 public enum DepartureVCType{
     case personal   // 个人中心
+    case hotVideos  // 热门视频
     case others
 }
 
 class CommunityVideoListController: BaseViewController {
     
     // 内容Id
-    var contentId: Int? {
+    var contentId: Int?
+    // 来源Vc
+    var departureVc : DepartureVCType? {
         didSet {
-            setupData()
+            if departureVc == .personal {
+                paraType = "one"
+            } else if departureVc == .hotVideos {
+                paraType = "hot"
+            }
         }
     }
-    // 来源Vc
-    var departureVc : DepartureVCType = .others
+    var paraType: String?
+    // 单个话题id
+    var topicId: Int?
     
     var videoItemList = Array<CommunityVideoItemModel>()
     
@@ -47,6 +55,7 @@ class CommunityVideoListController: BaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
+        setupData()
         setUpAppStatusNotification()
         statusBarStyle = .lightContent
     }
@@ -328,7 +337,7 @@ extension CommunityVideoListController {
 extension CommunityVideoListController {
     /// 视频列表
     func communityVideoListApi(page:Int = 1) {
-        SwiftMoyaNetWorkServiceCommunity.shared().communityVideoListApi(id: contentId ?? 0, page:page) {
+        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 {
@@ -344,8 +353,27 @@ extension CommunityVideoListController {
             }else {
                 self?.collectionView.endFooterNoMoreData()
             }
-            
         }
+        
+        
+//        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

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCommunity/SwiftMoyaNetWorkServiceCommunity.swift

@@ -222,9 +222,13 @@ public class SwiftMoyaNetWorkServiceCommunity: NSObject {
     ///
     /// - Parameters:
     ///   - id: 内容id（过滤用）
-    func communityVideoListApi(id:Int = 0, page:Int = 1, completion: @escaping successCallBack) {
+    ///   - type: 视频类型（hot热门视频，one一个内容）
+    ///   - topicId: 话题id（过滤用）
+    func communityVideoListApi(id:Int = 0, type:String = "", topicId:Int = 0, page:Int = 1, completion: @escaping successCallBack) {
         var parameters = Dictionary<String,Any>()
         parameters.updateValue(id, forKey: "id")
+        parameters.updateValue(type, forKey: "type")
+        parameters.updateValue(topicId, forKey: "topicId")
         parameters.updateValue(page, forKey: "page")
         
         SwiftMoyaNetWorkManager.shared.requestObject(CommunityVideoListModel.self, target: MultiTarget(SwiftMoyaServiceCommunityApi.communityVideoList(parameters: parameters))) { (communityVideoListModel) in