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

liushiyu
2 parents 61d64c58 833c632f
Showing 8 changed files with 30 additions and 19 deletions
metaCode/Classes/Common/Util/CNLiveIntegralAlertTool.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/WebController/CNWebView.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideSingleCourseCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumImageCell.swift
metaCode/Classes/Main/Model/CNLiveDownSlideModel.swift
metaCode/Classes/Main/Util/CNLiveDownSlideTool.swift
@@ -334,12 +334,11 @@ class CNLiveIntegralAlertTool:NSObject{
     @objc func payBtnAction(){
         if self.currentIntegralPayStatus == .integralEnough{
             self.postOrderVideoByPoint()
-//            self.integralStatusChangedBlock!(self.currentIntegralPayStatus)
         }else if self.currentIntegralPayStatus == .integralNotEnough{
             self.hiddenIntegralAlert()
-//            self.integralStatusChangedBlock!(self.currentIntegralPayStatus)
+            self.integralStatusChangedBlock!(.payCancel)
             //跳转任务中心
-            navigationViewController().pushViewController(CNLiveMineQuestViewController(checkModel: self.checkInModel!), animated: pushAnimated)
+            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveMineQuestViewController(checkModel: self.checkInModel!), animated: pushAnimated)
  
         }else if self.currentIntegralPayStatus == .paying{
  
@@ -370,14 +369,12 @@ class CNLiveIntegralAlertTool:NSObject{
                 if self.point > Int(self.integralCount)!{
                     //可以支付积分
                     self.currentIntegralPayStatus = .integralEnough
-//                    self.integralStatusChangedBlock!(.integralEnough)
-
                 }else{
                     //积分不足
                     self.currentIntegralPayStatus = .integralNotEnough
-//                    self.integralStatusChangedBlock!(.integralEnough)
                 }
                 self.initUI()
+                self.integralStatusChangedBlock!(.payCancel)
                 let errMsg = result as! String
                 showMessage(message: errMsg)
             }
@@ -286,16 +286,17 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let albumModel = self.dataArray[indexPath.row] as! CNLiveAlbumModel
         if indexPath.section == 0{
+            //大图统一不能点击跳转
             if self.cellType == .playlet{
                 //短剧大图,跳转播放页
-                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: albumModel.contentId), animated: pushAnimated)
+//                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: albumModel.contentId), animated: pushAnimated)
             }else if self.cellType == .course || self.cellType == .playletToCourse{
                 if self.slideModel?.type == SlideModelTypeAllCourse12{
                     //全部课程,跳转h5
  
                 }else if self.slideModel?.type == SlideModelTypeOneCourse75{
                     //大图课程,跳转h5
-                    CNLiveDownSlideTool.pushWebVCWithCNLiveAlbumMdl(albumModel: albumModel,controller: self)
+//                    CNLiveDownSlideTool.pushWebVCWithCNLiveAlbumMdl(albumModel: albumModel,controller: self)
                 }
             }
         }else{
@@ -123,7 +123,6 @@ class CNWebView:UIView,WKNavigationDelegate{
         let dateStr = formatter.string(from: date)
         let sidStr = String(format: "%@%@", UserInfoManager.shared.userInfo.uid,dateStr)
         let signStr = sidStr.crypt(operation:  CCOperation(kCCEncrypt), key: CNLiveMCEnvironmentManager.shared.appKey)
-        //看是 appKey还是appKeywjj
         let sidSignStr = (signStr ?? "").isEmpty ?  "" : signStr
         let sourceArray = str.components(separatedBy: "?")
         let buildVersion = Bundle.main.infoDictionary!["CFBundleVersion"] as! String
@@ -190,19 +190,23 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
             bgImageView.layer.cornerRadius = GlobalConstants.toDayCardCornerRadius
             bgImageView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
             bgImageView.layer.masksToBounds = true
-            bgImageView.kf.setImage(with: URL(string: model.contents[0].poster ?? ""))
-            
+            if let bgImgStr = model.background{
+                bgImageView.kf.setImage(with: URL(string: bgImgStr))
+            }else{
+                bgImageView.kf.setImage(with: URL(string: model.contents[0].poster ?? ""))
+            }
+                        
             let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap, width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
             titleLbl.text = model.contents[0].title ?? ""
             titleLbl.font = BoldFont_21
             titleLbl.textColor = HexColor("#FFFFFF")
-            bgImageView.addSubview(titleLbl)
+//            bgImageView.addSubview(titleLbl)
  
             let subTitleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y:titleLbl.bottom , width: DownSlideSingleCourseW-DownSlideRecommendLeftGap*2, height: 30))
             subTitleLbl.text = model.contents[0].subTitle ?? ""
             subTitleLbl.font = Font_12
             subTitleLbl.textColor = HexColor("#FFFFFF")
-            bgImageView.addSubview(subTitleLbl)
+//            bgImageView.addSubview(subTitleLbl)
  
             //单节底部视图
             let singleCourseBottomView = UIView(frame: CGRect(x: 0, y: DownSlideSingleCourseImgH, width: DownSlideSingleCourseW, height: DownSlideSingleCourseMoreH))
@@ -123,7 +123,7 @@ class CNLiveAlbumCell:UITableViewCell{
  
         //在追短剧model
         self.titleLabl.text = model.albumName
-        self.subTitleLabel.text = model.subTitle
+        self.subTitleLabel.text = model.desc
         self.iconImgView.kf.setImage(with: URL(string: model.albumImg))
         self.titleLabl.width = KSreenWidth-(self.iconImgView.right+15)-80-30
         self.subTitleLabel.width = self.titleLabl.width
@@ -3,7 +3,7 @@
 //  metaCode
 //
 //  Created by zx on 2024/1/8.
-//
+//  短剧详情页大图cell
  
 import Foundation
  
@@ -36,7 +36,7 @@ class CNLiveAlbumImageCell:UITableViewCell{
     private func setupUI() {
         contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
         self.contentView.addSubview(self.iconImgView)
-        self.contentView.addSubview(self.titleLabel)
+//        self.contentView.addSubview(self.titleLabel)
         self.contentView.clipsToBounds = true
     }
  
@@ -15,8 +15,10 @@ class CNLiveDownSlideModel: BaseModel {
     var blockName: String?
     ///大块副标题
     var blockSubTitle: String?
-    ///类型 type=4一排两个 74今日推荐 12列表全部课程 75单课程大图/
+    ///类型 type=4一排两个 74今日推荐 12列表全部课程 75单课程大图
     var type: String?
+    ///区块封面图
+    var background: String?
     ///显示几行
     var rowNum: Int = 0
     ///具体内容 title subTitle poster thirdUrl或者shareUrl
@@ -24,7 +24,7 @@ class CNLiveDownSlideTool:NSObject{
             let webVC = CNWebViewController()
             webVC.url = URL(string: (contentMdl.thirdUrl)!)
             navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
-        }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)
@@ -35,6 +35,10 @@ class CNLiveDownSlideTool:NSObject{
             let webVC = CNWebViewController()
             webVC.url = regURL
             navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+        }else if (contentMdl.model == kCNDownSlideContentsModelModelAlbum_ugc){
+            
+            //短剧-跳转短剧播放页
+            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: contentMdl.contentId ?? ""), animated: pushAnimated)
         }else{
             return
         }
@@ -55,7 +59,7 @@ class CNLiveDownSlideTool:NSObject{
             let webVC = CNWebViewController()
             webVC.url = URL(string: (albumModel.thirdUrl))
             controller.navigationController?.pushViewController(webVC, animated: pushAnimated)
-        }else if (albumModel.model == kCNDownSlideContentsModelModelAlbum) || (albumModel.model == kCNDownSlideContentsModelModelAlbum_ugc) || (albumModel.model == kCNDownSlideContentsModelModelAlbum_video){
+        }else if (albumModel.model == kCNDownSlideContentsModelModelAlbum) || (albumModel.model == kCNDownSlideContentsModelModelAlbum_video){
  
             let urlString = "http://wjjh5.cnlive.com/cnYmAlbumVideoList.html"
             let queryItem = URLQueryItem(name: "aid", value: albumModel.contentId)
@@ -66,6 +70,10 @@ class CNLiveDownSlideTool:NSObject{
             let webVC = CNWebViewController()
             webVC.url = regURL
             navigationViewController().visibleViewController?.navigationController?.pushViewController(webVC, animated: pushAnimated)
+        }else if (albumModel.model == kCNDownSlideContentsModelModelAlbum_ugc){
+            //短剧-跳转短剧播放页
+            navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: albumModel.contentId), animated: pushAnimated)
+            
         }else{
             return
         }