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

liushiyu
2 parents b25a90f2 5601f31b
Showing 3 changed files with 10 additions and 7 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideSingleCourseCell.swift
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
@@ -2078,7 +2078,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.7.24.03.01.16;
+				CURRENT_PROJECT_VERSION = 1.0.8.24.03.07.16;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -2150,7 +2150,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.7;
+				MARKETING_VERSION = 1.0.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -2332,7 +2332,7 @@
 				CODE_SIGN_ENTITLEMENTS = metaCode/metaCode.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1.0.7.24.03.01.16;
+				CURRENT_PROJECT_VERSION = 1.0.8.24.03.07.16;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				ENABLE_BITCODE = NO;
 				ENABLE_MODULE_VERIFIER = NO;
@@ -2404,7 +2404,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.7;
+				MARKETING_VERSION = 1.0.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-all_load",
@@ -136,7 +136,7 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
                 //小icon
                 let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, titleLbl.bottom+DownSlideRecommendLeftGap+CGFloat(i)*(DownSlideAllCourseRowTopYGap+DownSlideAllCourseRowImageWH+DownSlideAllCourseRowBottomYGap), CGFloat(DownSlideAllCourseRowImageWH), CGFloat(DownSlideAllCourseRowImageWH)))
-                imageView.kf.setImage(with: URL(string:contentMdl.poster!))
+                imageView.kf.setImage(with: URL(string:contentMdl.poster ?? ""))
                 imageView.layer.cornerRadius = 12
                 imageView.clipsToBounds = true
                 imageView.contentMode = .scaleAspectFill
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2023/10/25.
-//
+//  跳转
 import Foundation
@@ -96,7 +96,7 @@ class CNLiveDownSlideTool:NSObject{
             let webVC = CNWebViewController()
             webVC.url = URL(string: (contentMdl.thirdUrl)!)
             viewController.navigationController?.pushViewController(webVC, animated: true)
-        }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
+        }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum) || (contentMdl.model == kCNDownSlideContentsModelModelAlbum_video){
             let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
             let queryItem = URLQueryItem(name: "aid", value: contentMdl.contentId)
@@ -107,6 +107,9 @@ class CNLiveDownSlideTool:NSObject{
             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{
             return
         }