iOS Team / CNLiveMateCode · Commits

Commit def2d4db61194deefa5f15d29d82983e4247afea

Authored by liushiyu
2 parents b25a90f2 5601f31b

Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

Inline Side-by-side
Showing 3 changed files with 10 additions and 7 deletions
metaCode.xcodeproj/project.pbxproj
  View file @def2d4d
... ... @@ -2078,7 +2078,7 @@
2078 2078 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2079 2079 CODE_SIGN_IDENTITY = "Apple Development";
2080 2080 CODE_SIGN_STYLE = Automatic;
2081   - CURRENT_PROJECT_VERSION = 1.0.7.24.03.01.16;
  2081 + CURRENT_PROJECT_VERSION = 1.0.8.24.03.07.16;
2082 2082 DEVELOPMENT_TEAM = 94X49GG3ZW;
2083 2083 ENABLE_BITCODE = NO;
2084 2084 ENABLE_MODULE_VERIFIER = NO;
... ... @@ -2150,7 +2150,7 @@
2150 2150 "$(inherited)",
2151 2151 "@executable_path/Frameworks",
2152 2152 );
2153   - MARKETING_VERSION = 1.0.7;
  2153 + MARKETING_VERSION = 1.0.8;
2154 2154 OTHER_LDFLAGS = (
2155 2155 "$(inherited)",
2156 2156 "-all_load",
... ... @@ -2332,7 +2332,7 @@
2332 2332 CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
2333 2333 CODE_SIGN_IDENTITY = "Apple Development";
2334 2334 CODE_SIGN_STYLE = Automatic;
2335   - CURRENT_PROJECT_VERSION = 1.0.7.24.03.01.16;
  2335 + CURRENT_PROJECT_VERSION = 1.0.8.24.03.07.16;
2336 2336 DEVELOPMENT_TEAM = 94X49GG3ZW;
2337 2337 ENABLE_BITCODE = NO;
2338 2338 ENABLE_MODULE_VERIFIER = NO;
... ... @@ -2404,7 +2404,7 @@
2404 2404 "$(inherited)",
2405 2405 "@executable_path/Frameworks",
2406 2406 );
2407   - MARKETING_VERSION = 1.0.7;
  2407 + MARKETING_VERSION = 1.0.8;
2408 2408 OTHER_LDFLAGS = (
2409 2409 "$(inherited)",
2410 2410 "-all_load",
... ...
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideSingleCourseCell.swift
  View file @def2d4d
... ... @@ -136,7 +136,7 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
136 136  
137 137 //小icon
138 138 let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, titleLbl.bottom+DownSlideRecommendLeftGap+CGFloat(i)*(DownSlideAllCourseRowTopYGap+DownSlideAllCourseRowImageWH+DownSlideAllCourseRowBottomYGap), CGFloat(DownSlideAllCourseRowImageWH), CGFloat(DownSlideAllCourseRowImageWH)))
139   - imageView.kf.setImage(with: URL(string:contentMdl.poster!))
  139 + imageView.kf.setImage(with: URL(string:contentMdl.poster ?? ""))
140 140 imageView.layer.cornerRadius = 12
141 141 imageView.clipsToBounds = true
142 142 imageView.contentMode = .scaleAspectFill
... ...
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
  View file @def2d4d
... ... @@ -3,7 +3,7 @@
3 3 // metaCode
4 4 //
5 5 // Created by zx on 2023/10/25.
6   -//
  6 +// 跳转
7 7  
8 8 import Foundation
9 9  
... ... @@ -96,7 +96,7 @@ class CNLiveDownSlideTool:NSObject{
96 96 let webVC = CNWebViewController()
97 97 webVC.url = URL(string: (contentMdl.thirdUrl)!)
98 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 101 let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
102 102 let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
... ... @@ -107,6 +107,9 @@ class CNLiveDownSlideTool:NSObject{
107 107 let webVC = CNWebViewController()
108 108 webVC.url = regURL
109 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 113 }else{
111 114 return
112 115 }
... ...