iOS Team / CNLiveMateCode · Commits

Commit 01c5e518bbed923410db960547921d1301032377

Authored by “张旭”
1 parent 9938271f

部分幼教需求

Inline Side-by-side
Showing 3 changed files with 87 additions and 3 deletions
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
  View file @01c5e51
... ... @@ -241,4 +241,21 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
241 241 }
242 242 //
243 243 }
  244 + //MARK: - 幼教中国获取 我的课程
  245 + func getYjzgMyCurriculumApi()
  246 + {
  247 +// showLoading(message: "")
  248 + CNLiveDownSlideViewModel.getYjzgMyCurriculum(page: 1) { result, status in
  249 + hiddenLoading()
  250 + if status == .success{
  251 + let albumBaseModel = result as! CNLiveAlbumBaseModel
  252 +
  253 + }else if (status == .failed){
  254 +// self.NetApiStatus = .apiError
  255 + }else if (status == .noNetwork){
  256 +
  257 +// self.NetApiStatus = .notNetwork
  258 + }
  259 + }
  260 + }
244 261 }
... ...
metaCode/Classes/Main/HomePage/ViewModel/CNLiveDownSlideViewModel.swift
  View file @01c5e51
... ... @@ -53,4 +53,32 @@ class CNLiveDownSlideViewModel:NSObject{
53 53 }
54 54 }
55 55  
  56 + /// 获取下滑页-幼教原生页面-我的课程数据
  57 + static func getYjzgMyCurriculum(page:NSInteger,resultBlock: @escaping downSlideResultBlock) {
  58 + let param = NSMutableDictionary()
  59 + param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
  60 + param.setValue("\(page)", forKey: "page")
  61 +// param.setValue("10", forKey: "pageSize")
  62 + CNLiveNetworking.setAllowRequestDefaultArgument(true)
  63 + CNLiveNetworking.setupShowDataResult(false)
  64 + let custom_param = NSMutableDictionary()
  65 + custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
  66 + custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
  67 + CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
  68 + CNLiveNetworking.requestNetwork(with: .GET, urlString: APPBaseCMSUrl+"/contentApi/yjzgMyCurriculum", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
  69 + hiddenLoading()
  70 + if (error == nil) {
  71 + let resp = result as! NSDictionary
  72 + let errorCode = "\(resp["errorCode"] ?? "0")"
  73 + if (errorCode == "0") {
  74 + let dataDic = resp["data"] as! Dictionary<String, Any>
  75 + let dataMdl = newDictionaryToModel(dataDic , CNLiveAlbumBaseModel.self)
  76 + resultBlock(dataMdl,.success)
  77 + }
  78 + else{
  79 + resultBlock(NSNull(),.failed)
  80 + }
  81 + }
  82 + }
  83 + }
56 84 }
... ...
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
  View file @01c5e51
... ... @@ -25,7 +25,7 @@ class CNLiveDownSlideTool:NSObject{
25 25 let webVC = CNWebViewController()
26 26 webVC.url = URL(string: (contentMdl.thirdUrl)!)
27 27 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
28   - }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
  28 + }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum){
29 29  
30 30 let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
31 31 let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
... ... @@ -36,6 +36,19 @@ class CNLiveDownSlideTool:NSObject{
36 36 let webVC = CNWebViewController()
37 37 webVC.url = regURL
38 38 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
  39 + }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
  40 + let urlString = "http://wjjh5.cnlive.com/cnYjzgAlbumVideo.html"
  41 + let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
  42 + let queryItem1 = URLQueryItem(name: "title", value: contentMdl.title)
  43 + let queryItem2 = URLQueryItem(name: "channelName", value: "yjzg")
  44 + let queryItem3 = URLQueryItem(name: "isShowTitle", value: "true")
  45 + let queryItem4 = URLQueryItem(name: "isWjjReport", value: "true")
  46 + let urlComponents = NSURLComponents(string: urlString)
  47 + urlComponents!.queryItems = [queryItem, queryItem1]
  48 + let regURL = urlComponents?.url
  49 + let webVC = CNWebViewController()
  50 + webVC.url = regURL
  51 + navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
39 52 }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc){
40 53  
41 54 //短剧-跳转短剧播放页
... ... @@ -75,7 +88,7 @@ class CNLiveDownSlideTool:NSObject{
75 88 let webVC = CNWebViewController()
76 89 webVC.url = URL(string: (albumModel.thirdUrl))
77 90 controller.navigationController?.pushViewController(webVC, animated: pushAnimated)
78   - }else if (albumModel.model == kCNDownSlideContentsModelModelAlbum) || (albumModel.model == kCNDownSlideContentsModelModelAlbum_video){
  91 + }else if albumModel.model == kCNDownSlideContentsModelModelAlbum{
79 92  
80 93 let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
81 94 let queryItem = URLQueryItem(name: "aid", value: albumModel.contentId)
... ... @@ -86,6 +99,19 @@ class CNLiveDownSlideTool:NSObject{
86 99 let webVC = CNWebViewController()
87 100 webVC.url = regURL
88 101 navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
  102 + }else if (albumModel.model == kCNDownSlideContentsModelModelAlbum_video){
  103 + let urlString = "http://wjjh5.cnlive.com/cnYjzgAlbumVideo.html"
  104 + let queryItem = URLQueryItem(name: "aid", value: albumModel.contentId)
  105 + let queryItem1 = URLQueryItem(name: "title", value: albumModel.title)
  106 + let queryItem2 = URLQueryItem(name: "channelName", value: "yjzg")
  107 + let queryItem3 = URLQueryItem(name: "isShowTitle", value: "true")
  108 + let queryItem4 = URLQueryItem(name: "isWjjReport", value: "true")
  109 + let urlComponents = NSURLComponents(string: urlString)
  110 + urlComponents!.queryItems = [queryItem, queryItem1]
  111 + let regURL = urlComponents?.url
  112 + let webVC = CNWebViewController()
  113 + webVC.url = regURL
  114 + navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
89 115 }else if (albumModel.model == kCNDownSlideContentsModelModelAlbum_ugc){
90 116 //短剧-跳转短剧播放页
91 117 navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: albumModel.contentId), animated: pushAnimated)
... ... @@ -127,7 +153,7 @@ class CNLiveDownSlideTool:NSObject{
127 153 let webVC = CNWebViewController()
128 154 webVC.url = URL(string: (contentMdl.thirdUrl)!)
129 155 viewController.navigationController?.pushViewController(webVC, animated: true)
130   - }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
  156 + }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum){
131 157  
132 158 let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
133 159 let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
... ... @@ -138,6 +164,19 @@ class CNLiveDownSlideTool:NSObject{
138 164 let webVC = CNWebViewController()
139 165 webVC.url = regURL
140 166 viewController.navigationController?.pushViewController(webVC, animated: true)
  167 + }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
  168 + let urlString = "http://wjjh5.cnlive.com/cnYjzgAlbumVideo.html"
  169 + let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
  170 + let queryItem1 = URLQueryItem(name: "title", value: contentMdl.title)
  171 + let queryItem2 = URLQueryItem(name: "channelName", value: "yjzg")
  172 + let queryItem3 = URLQueryItem(name: "isShowTitle", value: "true")
  173 + let queryItem4 = URLQueryItem(name: "isWjjReport", value: "true")
  174 + let urlComponents = NSURLComponents(string: urlString)
  175 + urlComponents!.queryItems = [queryItem, queryItem1]
  176 + let regURL = urlComponents?.url
  177 + let webVC = CNWebViewController()
  178 + webVC.url = regURL
  179 + navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
141 180 }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc){
142 181 //短剧-跳转短剧播放页
143 182 navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: contentMdl.contentId!), animated: pushAnimated)
... ...