iOS Team / CNLiveMateCode · Commits

Commit 84f5c170da7cb7f4a7616b861e05d42eb4795c55

Authored by “张旭”
1 parent f24b496c

跳转短剧

Inline Side-by-side
Showing 2 changed files with 7 additions and 4 deletions
metaCode.xcodeproj/project.pbxproj
  View file @84f5c17
@@ -2078,7 +2078,7 @@ @@ -2078,7 +2078,7 @@
2078 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; 2078 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2079 CODE_SIGN_IDENTITY = "Apple Development"; 2079 CODE_SIGN_IDENTITY = "Apple Development";
2080 CODE_SIGN_STYLE = Automatic; 2080 CODE_SIGN_STYLE = Automatic;
2081 - CURRENT_PROJECT_VERSION = 1.0.8.24.03.07.12; 2081 + CURRENT_PROJECT_VERSION = 1.0.8.24.03.07.16;
2082 DEVELOPMENT_TEAM = 94X49GG3ZW; 2082 DEVELOPMENT_TEAM = 94X49GG3ZW;
2083 ENABLE_BITCODE = NO; 2083 ENABLE_BITCODE = NO;
2084 ENABLE_MODULE_VERIFIER = NO; 2084 ENABLE_MODULE_VERIFIER = NO;
@@ -2332,7 +2332,7 @@ @@ -2332,7 +2332,7 @@
2332 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements; 2332 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2333 CODE_SIGN_IDENTITY = "Apple Development"; 2333 CODE_SIGN_IDENTITY = "Apple Development";
2334 CODE_SIGN_STYLE = Automatic; 2334 CODE_SIGN_STYLE = Automatic;
2335 - CURRENT_PROJECT_VERSION = 1.0.8.24.03.07.12; 2335 + CURRENT_PROJECT_VERSION = 1.0.8.24.03.07.16;
2336 DEVELOPMENT_TEAM = 94X49GG3ZW; 2336 DEVELOPMENT_TEAM = 94X49GG3ZW;
2337 ENABLE_BITCODE = NO; 2337 ENABLE_BITCODE = NO;
2338 ENABLE_MODULE_VERIFIER = NO; 2338 ENABLE_MODULE_VERIFIER = NO;
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
  View file @84f5c17
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 // metaCode 3 // metaCode
4 // 4 //
5 // Created by zx on 2023/10/25. 5 // Created by zx on 2023/10/25.
6 -// 6 +// 跳转
7 7
8 import Foundation 8 import Foundation
9 9
@@ -96,7 +96,7 @@ class CNLiveDownSlideTool:NSObject{ @@ -96,7 +96,7 @@ class CNLiveDownSlideTool:NSObject{
96 let webVC = CNWebViewController() 96 let webVC = CNWebViewController()
97 webVC.url = URL(string: (contentMdl.thirdUrl)!) 97 webVC.url = URL(string: (contentMdl.thirdUrl)!)
98 viewController.navigationController?.pushViewController(webVC, animated: true) 98 viewController.navigationController?.pushViewController(webVC, animated: true)
99 - }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){ 99 + }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
100 100
101 let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html" 101 let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
102 let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId) 102 let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
@@ -107,6 +107,9 @@ class CNLiveDownSlideTool:NSObject{ @@ -107,6 +107,9 @@ class CNLiveDownSlideTool:NSObject{
107 let webVC = CNWebViewController() 107 let webVC = CNWebViewController()
108 webVC.url = regURL 108 webVC.url = regURL
109 viewController.navigationController?.pushViewController(webVC, animated: true) 109 viewController.navigationController?.pushViewController(webVC, animated: true)
  110 + }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc){
  111 + //短剧-跳转短剧播放页
  112 + navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: contentMdl.contentId!), animated: pushAnimated)
110 }else{ 113 }else{
111 return 114 return
112 } 115 }