跳转播放页

“张旭”
1 parent f7882b76
Showing 7 changed files with 81 additions and 13 deletions
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideSingleCourseCell.swift
metaCode/Classes/Main/HomePages/Controller/PlayletHomePage/CNLivePlayletHomePageController.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/Model/CNLiveDownSlideModelLayout.swift
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
metaCode/Classes/Main/VideoPage/ViewModel/CNLiveShortVideoViewModel.swift
@@ -385,7 +385,7 @@ class CNDownSlideSingleCourseCell: UITableViewCell, UICollectionViewDelegate, UI
             //实时热榜
             contentView.addSubview(bgBackView)
  
-            bgBackView.frame = CGRect(x: DownSlideRecommendLeftGap, y: 0,width:DownSlideSingleCourseW , height:CGFloat(model.cellH))
+            bgBackView.frame = CGRect(x: DownSlideRecommendLeftGap, y: 0,width:DownSlideSingleCourseW , height:CGFloat(model.cellH)-DownSlideRecommendLeftGap)
             // 设置阴影效果
             bgBackView.layer.masksToBounds = false
             //定义view的阴影颜色
@@ -185,7 +185,7 @@ class CNLivePlayletHomePageController:CNLiveBaseViewController, UITableViewDataS
             self.navigationController?.viewControllers = tempArray as! [CNLiveBaseViewController]
             //跳转播放页
             let dataArray = Array(self.albumModelArr) as! [CNLiveAlbumListModel]
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid, page: self.pageNum, currentIndex: indexPath.row, dataArray: dataArray), animated: pushAnimated)
+            CNLiveDownSlideTool.pushShortVideoController(aid: aid, page: self.pageNum, currentIndex: indexPath.row, dataArray: dataArray, navigationVC: navigationViewController().visibleViewController?.navigationController)
         }
     }
 }
@@ -157,7 +157,7 @@ class CNLiveAlbumCell:UITableViewCell{
                 self.enterBlock!(self.albumModel!)
             }else if self.albumModel?.model == kCNDownSlideContentsModelModelAlbum_ugc{
                 //短剧-跳转短剧播放页
-                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+                CNLiveDownSlideTool.pushShortVideoController(contentId: aid, navigationVC: navigationViewController().visibleViewController?.navigationController)
             }else if self.albumModel?.model == kCNDownSlideContentsModelModelAlbum_video{
                 //课程-跳转h5视频专辑页
                 self.enterBlock!(self.albumModel!)
@@ -166,7 +166,7 @@ class CNLiveAlbumCell:UITableViewCell{
             }
         }else if (self.albumMsgModel != nil){
             //短剧-跳转短剧播放页
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+            CNLiveDownSlideTool.pushShortVideoController(contentId: aid, navigationVC: navigationViewController().visibleViewController?.navigationController)
  
         }
  
@@ -271,7 +271,7 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
                 threeModel.refresh_token = userModel.refresh_token ?? ""
                 threeModel.type = CNLiveSendAuthRespWX
 //                threeModel.countryName = self!.countryStr
-                threeModel.countryCode = self!.countryCode 
+                threeModel.countryCode = self?.countryCode ?? "86"
                 threeModel.frmId = "Apple"//[CNTools getFrmId]
                 switch resp {
                 case CNLiveSendAuthRespApple:
@@ -285,9 +285,9 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
                     break
                 }
                 if resp == CNLiveSendAuthRespApple{
-                    self!.appleLogin(model: threeModel)
+                    self?.appleLogin(model: threeModel)
                 }else{
-                    self!.thirdPartyLoginWithType(type: resp, model: threeModel)
+                    self?.thirdPartyLoginWithType(type: resp, model: threeModel)
                 }
             }else{
  
@@ -68,7 +68,7 @@ class CNLiveDownSlideModelLayout:NSObject{
             _slideModel?.cellH = Float(ceil(CGFloat(totalNum)*0.5)*(DownSlideTwoDuanJuH))
         }else if(_slideModel?.type == SlideModelTypeRealHotList7){//7实时热榜
  
-            _slideModel?.cellH = Float(DownSlideRealHotListH)//+Float(DownSlideRecommendLeftGap)
+            _slideModel?.cellH = Float(DownSlideRealHotListH)+Float(DownSlideRecommendLeftGap)
         }else{
             _slideModel?.cellH = 0
         }        
@@ -83,8 +83,8 @@ class CNLiveDownSlideTool:NSObject{
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
             }
         }else if (model == kCNDownSlideContentsModelModelAlbum_ugc){
-            //短剧-跳转短剧播放页
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: contentId), animated: pushAnimated)
+            showLoading(message: "")
+            self.pushShortVideoController(contentId: contentId, navigationVC: navigationViewController().visibleViewController?.navigationController)
         }else if model == kCNDownSlideContentsModelModelServing{
             //跳转微信小程序
             if let data = s_to.data(using: .utf8) {
@@ -104,4 +104,39 @@ class CNLiveDownSlideTool:NSObject{
             return
         }
     }
+    
+    class func pushShortVideoController(contentId:String,navigationVC:UINavigationController?){
+        //请求getAlbumMsg获取上次播放集数
+        //获取专辑详情(简介等)
+        CNLiveHomePageViewModel.getAlbumMsg(aid: contentId) { result, status in
+            hiddenLoading()
+            if status == .success{
+                let model = result as! CNLiveAlbumMsgModel
+                //短剧-跳转短剧播放页
+                let toIndex = model.episodeLast-1 <= 0 ? 0 : model.episodeLast-1
+                navigationVC?.pushViewController( CNLiveShortVideoViewController(aid: contentId, currentIndex: toIndex), animated: pushAnimated)
+            }else{
+                //短剧-跳转短剧播放页
+                navigationVC?.pushViewController(CNLiveShortVideoViewController(aid: contentId), animated: pushAnimated)
+            }
+        }
+    }
+    
+    class func pushShortVideoController(aid:String,page: NSInteger, currentIndex: NSInteger, dataArray: [CNLiveAlbumListModel],navigationVC:UINavigationController?){
+        //请求getAlbumMsg获取上次播放集数
+        //获取专辑详情(简介等)
+        CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { result, status in
+            hiddenLoading()
+            if status == .success{
+                let model = result as! CNLiveAlbumMsgModel
+                //短剧-跳转短剧播放页
+                let toIndex = model.episodeLast-1 <= 0 ? 0 : model.episodeLast-1
+                
+                navigationVC?.pushViewController( CNLiveShortVideoViewController(aid: aid, page: page, currentIndex: currentIndex, dataArray: dataArray), animated: pushAnimated)
+            }else{
+                //短剧-跳转短剧播放页
+                navigationVC?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
+            }
+        }
+    }
 }
@@ -15,12 +15,12 @@ class CNLiveShortVideoViewModel: NSObject {
     /// - Parameters:
     ///   - aid: 专辑 id
     ///   - reultShortVideoBlock: 返回
-    static func requstWithShortVideo(aid: String,page: NSInteger,reultShortVideoBlock: @escaping resultShortVideoBlock) {
+    static func requstWithShortVideo(aid: String,page: NSInteger,pageSize:String,reultShortVideoBlock: @escaping resultShortVideoBlock) {
         let param = NSMutableDictionary()
         param.setValue(aid, forKey: "aid")
         param.setValue("", forKey: "app_channel_id")
         param.setValue("\(page)", forKey: "page")
-        param.setValue("10", forKey: "pageSize")
+        param.setValue(pageSize, forKey: "pageSize")
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
         let custom_param = NSMutableDictionary()
         custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
@@ -222,7 +222,40 @@ class CNLiveShortVideoViewModel: NSObject {
         }
     }
  
-    
+    //!!!: 上报播放了视频
+    /// 上报播放了某一集视频
+    /// - Parameters:
+    ///   - contentId: 内容 id
+    ///   - channelName:
+    ///   - model:
+    static func requestAudioPlayRecordEnd(contentId: String, channelName: String) {
+        let param = NSMutableDictionary()
+        param.setValue("0", forKey: "schedule")
+        param.setValue(contentId, forKey: "contentId")
+        param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
+        param.setValue(channelName, forKey: "channelName")
+        param.setValue("album_ugc", forKey: "model")
+        
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setAllowRequestDefaultArgument(true)
+        CNLiveNetworking.setupShowDataResult(false)
+        CNLiveNetworking.setupShowResult(true)
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
+        CNLiveNetworking.requestNetwork(with: .POST, urlString: APPBaseCMSClassUrl+"/recordApi/end", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
+            hiddenLoading()
+            if (error == nil) {
+                let resp = result as! NSDictionary
+                let errorCode = "\(resp["errorCode"] ?? "0")"
+                if (errorCode == "0") {
+                    print(resp)
+                } else {
+                }
+            } else {
+            }
+        }
+    }
  
     //!!!: 评论相关