适配h5播放直播的参数 , 跳转工具优化方法

“张旭”
1 parent 715aa40e
Showing 7 changed files with 57 additions and 146 deletions
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideSingleCourseCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideRecommendCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideTodayRecommendCell.swift
metaCode/Classes/Main/HomePages/Model/CNLiveAlbumModel.swift
metaCode/Classes/Main/Model/CNLiveDownSlideModel.swift
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
@@ -69,7 +69,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         let frame = self.view.bounds
         let view = CNUpSlideDetailScrollView(frame: frame)
         view.callBack = {(contentMdl:CNLiveDownSlideContentsModel)->Void in
-            CNLiveDownSlideTool.detailPushWebVCWithContentsMdl(contentMdl: contentMdl, viewController: self)
+            CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: contentMdl.model, contentId: contentMdl.contentId, pid: contentMdl.pid, shareUrl: contentMdl.shareUrl, thirdUrl: contentMdl.thirdUrl, title: contentMdl.title, s_to: contentMdl.s_to, trailerId: contentMdl.trailerId, controller: self)
         }
         view.delegate = self
         return view
@@ -289,7 +289,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
             }
             cell.albumModel = albumModel
             cell.enterBlock = { albumModel in
-                CNLiveDownSlideTool.pushWebVCWithCNLiveAlbumMdl(albumModel: albumModel,controller: self)
+                CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: albumModel.model, contentId: albumModel.contentId, pid: albumModel.pid, shareUrl: albumModel.shareUrl, thirdUrl: albumModel.thirdUrl, title: albumModel.title, s_to: albumModel.s_to, trailerId: albumModel.trailerId, controller: self)
             }
             return cell
         }
@@ -328,11 +328,10 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
  
                 }else if self.slideModel?.type == SlideModelTypeOneCourse75{
                     //大图课程,跳转h5
-//                    CNLiveDownSlideTool.pushWebVCWithCNLiveAlbumMdl(albumModel: albumModel,controller: self)
                 }
             }
         }else{
-            CNLiveDownSlideTool.pushWebVCWithCNLiveAlbumMdl(albumModel: albumModel,controller: self)
+            CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: albumModel.model, contentId: albumModel.contentId, pid: albumModel.pid, shareUrl: albumModel.shareUrl, thirdUrl: albumModel.thirdUrl, title: albumModel.title, s_to: albumModel.s_to, trailerId: albumModel.trailerId, controller: self)
         }
     }
  
@@ -320,11 +320,10 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
         let tag = sender.tag
         if self.myCurriculum?.list.count ?? 0 > 0{
             let albumMdl = self.myCurriculum?.list[tag]
-            CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: albumMdl?.model ?? "", contentId: albumMdl?.contentId ?? "", pid: albumMdl?.pid ?? "", shareUrl: albumMdl?.shareUrl ?? "", thirdUrl: albumMdl?.thirdUrl ?? "", title: albumMdl?.title ?? "", s_to: albumMdl?.s_to ?? "")
-
+            CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: albumMdl?.model ?? "", contentId: albumMdl?.contentId ?? "", pid: albumMdl?.pid ?? "", shareUrl: albumMdl?.shareUrl ?? "", thirdUrl: albumMdl?.thirdUrl ?? "", title: albumMdl?.title ?? "", s_to: albumMdl?.s_to ?? "",trailerId: albumMdl?.trailerId ?? "", controller: nil)
         }else if self.slideModel?.contents.count ?? 0 > 0{
             let contentMdl = self.slideModel?.contents[tag]
-            CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: contentMdl?.model ?? "", contentId: contentMdl?.contentId ?? "", pid: contentMdl?.pid ?? "", shareUrl: contentMdl?.shareUrl ?? "", thirdUrl: contentMdl?.thirdUrl ?? "", title: contentMdl?.title ?? "", s_to: contentMdl?.s_to ?? "")
+            CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: contentMdl?.model ?? "", contentId: contentMdl?.contentId ?? "", pid: contentMdl?.pid ?? "", shareUrl: contentMdl?.shareUrl ?? "", thirdUrl: contentMdl?.thirdUrl ?? "", title: contentMdl?.title ?? "", s_to: contentMdl?.s_to ?? "",trailerId: contentMdl?.trailerId ?? "", controller: nil)
         }
     }
 }
@@ -86,7 +86,7 @@ class CNLiveDownSlideRecommendCell: UITableViewCell {
         let imageView = ges.view as! UIImageView
         let i = imageView.tag
         let contentMdl = (self.slideModel?.contents[i])!
-        CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: contentMdl.model ?? "", contentId: contentMdl.contentId ?? "", pid: contentMdl.pid ?? "", shareUrl: contentMdl.shareUrl ?? "", thirdUrl: contentMdl.thirdUrl ?? "", title: contentMdl.title ?? "", s_to: contentMdl.s_to ?? "")
+        CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: contentMdl.model , contentId: contentMdl.contentId , pid: contentMdl.pid , shareUrl: contentMdl.shareUrl , thirdUrl: contentMdl.thirdUrl , title: contentMdl.title , s_to: contentMdl.s_to ,trailerId: contentMdl.trailerId , controller: nil)
     }
  
 }
@@ -66,6 +66,6 @@ class CNLiveDownSlideTodayRecommendCell: UITableViewCell {
         let imageView = ges.view as! UIImageView
         let i = imageView.tag
         let contentMdl = self.slideModel?.contents[i]
-        CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: contentMdl?.model ?? "", contentId: contentMdl?.contentId ?? "", pid: contentMdl?.pid ?? "", shareUrl: contentMdl?.shareUrl ?? "", thirdUrl: contentMdl?.thirdUrl ?? "", title: contentMdl?.title ?? "", s_to: contentMdl?.s_to ?? "")
+        CNLiveDownSlideTool.pushWebVCWithContentsMdl(model: contentMdl?.model ?? "", contentId: contentMdl?.contentId ?? "", pid: contentMdl?.pid ?? "", shareUrl: contentMdl?.shareUrl ?? "", thirdUrl: contentMdl?.thirdUrl ?? "", title: contentMdl?.title ?? "", s_to: contentMdl?.s_to ?? "",trailerId: contentMdl?.trailerId ?? "", controller: nil)
     }
 }
@@ -6,7 +6,7 @@
 //  全部专辑列表数据
  
 import Foundation
-
+///contentApi/getBlockContent
 class CNLiveAlbumBaseModel:BaseModel{
     var endRow = 0
     var firstPage = 0
@@ -38,16 +38,18 @@ class CNLiveAlbumModel:BaseModel{
     var tag = ""
     var model = ""//1,2,3,4课程 album_ugc短剧 ,album_video专辑h5
     var thirdUrl = ""
+    //model2 直播时用
+    var trailerId = ""
     var publishTime = ""
     var shareUrl = ""
     var spIcon = ""
     var product:CNLiveAlbumProductModel?
     ///小程序地址和小程序id {"path":"page/login_hint/login_hint","id":"gh_234d4ed615a3"}
-    var s_to: String?
+    var s_to = ""
     ///103时为微信小程序
-    var s_type: String?
+    var s_type = ""
     ///"weixin://dl/business/?t=NnvptiuER3k"
-    var s_showType: String?
+    var s_showType = ""
     //还有部分属性没写
 }
 class CNLiveAlbumProductModel:BaseModel{
@@ -31,6 +31,8 @@ class CNLiveDownSlideModel: BaseModel {
     var rowNum: Int = 0
     ///具体内容 title subTitle poster thirdUrl或者shareUrl
     var contents = [CNLiveDownSlideContentsModel]()
+    
+    
     ///cell高度
     var cellH: Float = 0
  
@@ -67,6 +69,8 @@ class CNLiveDownSlideContentsModel: BaseModel {
     var model: String = ""
     ///model为1,2时
     var shareUrl: String = ""
+    ///model为2时 直播用
+    var trailerId: String = ""
     ///model为3,4时跳转url
     var thirdUrl: String = ""
     ///小程序地址和小程序id {"path":"page/login_hint/login_hint","id":"gh_234d4ed615a3"}
@@ -75,4 +79,6 @@ class CNLiveDownSlideContentsModel: BaseModel {
     var s_type: String = ""
     ///"weixin://dl/business/?t=NnvptiuER3k"
     var s_showType: String = ""
+    
+    
 }
@@ -9,9 +9,9 @@ import Foundation
 import CNLiveShareToolKit
  
 class CNLiveDownSlideTool:NSObject{
-    class func pushWebVCWithContentsMdl(model:String,contentId:String,pid:String,shareUrl:String,thirdUrl:String,title:String,s_to:String){//contentMdl:CNLiveDownSlideContentsModel
+    class func pushWebVCWithContentsMdl(model:String,contentId:String,pid:String,shareUrl:String,thirdUrl:String,title:String,s_to:String,trailerId:String,controller:UIViewController?){//contentMdl:CNLiveDownSlideContentsModel
  
-        if (model == kCNDownSlideContentsModelModel1) || (model == kCNDownSlideContentsModelModel2){
+        if (model == kCNDownSlideContentsModelModel1) {
  
             let queryItem = URLQueryItem(name: "contentId", value: contentId)
             let queryItem1 = URLQueryItem(name: "videoId", value: pid)
@@ -20,11 +20,35 @@ class CNLiveDownSlideTool:NSObject{
             let regURL = urlComponents.url
             let webVC = CNWebViewController()
             webVC.url = regURL
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)           
+            if controller != nil{
+                controller!.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            }else{
+                navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            }
+        }else if (model == kCNDownSlideContentsModelModel2){
+            
+            let queryItem = URLQueryItem(name: "contentId", value: contentId)
+            let queryItem1 = URLQueryItem(name: "activityId", value: pid)
+            let queryItem2 = URLQueryItem(name: "pid", value: pid)
+            let queryItem3 = URLQueryItem(name: "trailerId", value: trailerId)
+            let urlComponents = NSURLComponents(string: shareUrl)!
+            urlComponents.queryItems = [queryItem, queryItem1, queryItem2, queryItem3]
+            let regURL = urlComponents.url
+            let webVC = CNWebViewController()
+            webVC.url = regURL
+            if controller != nil{
+                controller!.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            }else{
+                navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            }
         }else if (model == kCNDownSlideContentsModelModel3) || (model == kCNDownSlideContentsModelModel4){
             let webVC = CNWebViewController()
             webVC.url = URL(string: thirdUrl)
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            if controller != nil{
+                controller!.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            }else{
+                navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            }
         }else if (model == kCNDownSlideContentsModelModelAlbum){
  
             let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
@@ -35,7 +59,11 @@ class CNLiveDownSlideTool:NSObject{
             let regURL = urlComponents?.url
             let webVC = CNWebViewController()
             webVC.url = regURL
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            if controller != nil{
+                controller!.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            }else{
+                navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            }
         }else if (model == kCNDownSlideContentsModelModelAlbum_video){
             let urlString = "http://wjjh5.cnlive.com/cnYjzgAlbumVideo.html"
             let queryItem = URLQueryItem(name: "aid", value: contentId)
@@ -48,7 +76,11 @@ class CNLiveDownSlideTool:NSObject{
             let regURL = urlComponents?.url
             let webVC = CNWebViewController()
             webVC.url = regURL
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            if controller != nil{
+                controller!.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            }else{
+                navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+            }
         }else if (model == kCNDownSlideContentsModelModelAlbum_ugc){
  
             //短剧-跳转短剧播放页
@@ -72,131 +104,4 @@ class CNLiveDownSlideTool:NSObject{
             return
         }
     }
-    class func pushWebVCWithCNLiveAlbumMdl(albumModel:CNLiveAlbumModel,controller:UIViewController){
-        
-        if (albumModel.model == kCNDownSlideContentsModelModel1) || (albumModel.model == kCNDownSlideContentsModelModel2){
-            
-            let queryItem = URLQueryItem(name: "contentId", value: albumModel.contentId)
-            let queryItem1 = URLQueryItem(name: "videoId", value: albumModel.pid)
-            let urlComponents = NSURLComponents(string: (albumModel.shareUrl))!
-            urlComponents.queryItems = [queryItem, queryItem1]
-            let regURL = urlComponents.url
-            let webVC = CNWebViewController()
-            webVC.url = regURL
-            controller.navigationController?.pushViewController(webVC, animated: pushAnimated)
-        }else if (albumModel.model == kCNDownSlideContentsModelModel3) || (albumModel.model == kCNDownSlideContentsModelModel4){
-            let webVC = CNWebViewController()
-            webVC.url = URL(string: (albumModel.thirdUrl))
-            controller.navigationController?.pushViewController(webVC, animated: pushAnimated)
-        }else if albumModel.model == kCNDownSlideContentsModelModelAlbum{
-            
-            let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
-            let queryItem = URLQueryItem(name: "aid", value: albumModel.contentId)
-            let queryItem1 = URLQueryItem(name: "title", value: albumModel.title)
-            let urlComponents = NSURLComponents(string: urlString)
-            urlComponents!.queryItems = [queryItem, queryItem1]
-            let regURL = urlComponents?.url
-            let webVC = CNWebViewController()
-            webVC.url = regURL
-            controller.navigationController?.pushViewController(webVC, animated: true)
-        }else if (albumModel.model == kCNDownSlideContentsModelModelAlbum_video){
-            let urlString = "http://wjjh5.cnlive.com/cnYjzgAlbumVideo.html"
-            let queryItem = URLQueryItem(name: "aid", value: albumModel.contentId)
-            let queryItem1 = URLQueryItem(name: "title", value: albumModel.title)
-            let queryItem2 = URLQueryItem(name: "channelName", value: "yjzg")
-            let queryItem3 = URLQueryItem(name: "isShowTitle", value: "true")
-            let queryItem4 = URLQueryItem(name: "isWjjReport", value: "true")
-            let urlComponents = NSURLComponents(string: urlString)
-            urlComponents!.queryItems = [queryItem, queryItem1,queryItem2,queryItem3,queryItem4]
-            let regURL = urlComponents?.url
-            let webVC = CNWebViewController()
-            webVC.url = regURL
-            controller.navigationController?.pushViewController(webVC, animated: true)
-        }else if (albumModel.model == kCNDownSlideContentsModelModelAlbum_ugc){
-            //短剧-跳转短剧播放页
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: albumModel.contentId), animated: pushAnimated)
-            
-        }else if albumModel.model == kCNDownSlideContentsModelModelServing{
-            //跳转微信小程序
-            if let data = (albumModel.s_to ?? "").data(using: .utf8) {
-                do {
-                    let jsonResult = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any]
-                    let miniAppId = jsonResult!["id"] as! String
-                    let miniPath = jsonResult!["path"] as! String
-                    CNLiveShareImageManager.pushWeChatMiniProgrem(withMiniAppId: miniAppId, path: miniPath, extMsg: "", extDic: [:])
-                    
-                } catch {
-                    print("JSON 解析错误")
-                }
-            } else {
-                print("无法将字符串转换为数据")
-            }
-        }else{
-            return
-        }
-    }
-    
-    class func detailPushWebVCWithContentsMdl(contentMdl:CNLiveDownSlideContentsModel,viewController:UIViewController){
-        
-        if (contentMdl.model == kCNDownSlideContentsModelModel1) || (contentMdl.model == kCNDownSlideContentsModelModel2){
-            
-            let queryItem = URLQueryItem(name: "contentId", value: contentMdl.contentId)
-            let queryItem1 = URLQueryItem(name: "videoId", value: contentMdl.pid)
-            let urlComponents = NSURLComponents(string: (contentMdl.shareUrl))!
-            urlComponents.queryItems = [queryItem, queryItem1]
-            let regURL = urlComponents.url
-            let webVC = CNWebViewController()
-            webVC.url = regURL
-            viewController.navigationController?.pushViewController(webVC, animated: true)
-           
-        }else if (contentMdl.model == kCNDownSlideContentsModelModel3) || (contentMdl.model == kCNDownSlideContentsModelModel4){
-            let webVC = CNWebViewController()
-            webVC.url = URL(string: (contentMdl.thirdUrl))
-            viewController.navigationController?.pushViewController(webVC, animated: true)
-        }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum){
-            
-            let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
-            let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
-            let queryItem1 = URLQueryItem(name: "title", value: contentMdl.title)
-            let urlComponents = NSURLComponents(string: urlString)
-            urlComponents!.queryItems = [queryItem, queryItem1]
-            let regURL = urlComponents?.url
-            let webVC = CNWebViewController()
-            webVC.url = regURL
-            viewController.navigationController?.pushViewController(webVC, animated: true)
-        }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
-            let urlString = "http://wjjh5.cnlive.com/cnYjzgAlbumVideo.html"
-            let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
-            let queryItem1 = URLQueryItem(name: "title", value: contentMdl.title)
-            let queryItem2 = URLQueryItem(name: "channelName", value: "yjzg")
-            let queryItem3 = URLQueryItem(name: "isShowTitle", value: "true")
-            let queryItem4 = URLQueryItem(name: "isWjjReport", value: "true")
-            let urlComponents = NSURLComponents(string: urlString)
-            urlComponents!.queryItems = [queryItem, queryItem1,queryItem2,queryItem3,queryItem4]
-            let regURL = urlComponents?.url
-            let webVC = CNWebViewController()
-            webVC.url = regURL
-            viewController.navigationController?.pushViewController(webVC, animated: true)
-        }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc){
-            //短剧-跳转短剧播放页
-            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: contentMdl.contentId), animated: pushAnimated)
-        }else if contentMdl.model == kCNDownSlideContentsModelModelServing{
-            //跳转微信小程序
-            if let data = (contentMdl.s_to ?? "").data(using: .utf8) {
-                do {
-                    let jsonResult = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any]
-                    let miniAppId = jsonResult!["id"] as! String
-                    let miniPath = jsonResult!["path"] as! String
-                    CNLiveShareImageManager.pushWeChatMiniProgrem(withMiniAppId: miniAppId, path: miniPath, extMsg: "", extDic: [:])
-                    
-                } catch {
-                    print("JSON 解析错误")
-                }
-            } else {
-                print("无法将字符串转换为数据")
-            }
-        }else{
-            return
-        }
-    }
 }