产品反馈问题部分

“张旭”
1 parent 119cdd1a
Showing 8 changed files with 55 additions and 12 deletions
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideDetailViewController.swift
metaCode/Classes/Main/HomePage/Controller/DownSlideController/CNUpSlideViewController.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNDownSlideSingleCourseCell.swift
metaCode/Classes/Main/HomePages/Controller/AuthController/CNLiveAuthViewController.swift
metaCode/Classes/Main/HomePages/Model/CNLiveAlbumModel.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumImageCell.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveDuanjuTitleCell.swift
@@ -100,7 +100,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         self.view.layer.masksToBounds = true
         self.view.backgroundColor = .white
         self.view.addSubview(self.tableView)
-        self.tableView.frame = CGRect(x: 0, y: KStatusBarHeight, width: KSreenWidth, height: KSreenHeight-KStatusBarHeight)
+        self.tableView.frame = CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenHeight)
         view.addSubview(closeBtn)
         view.addGestureRecognizer(dismissPanGesture)
     }
@@ -217,6 +217,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
                     return cell
                 }
                 cell.iconImgView.image = self.cell.bgImageView.image
+                cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
                 return cell
             }else if self.cellType == .course || self.cellType == .playletToCourse{
  
@@ -239,6 +240,7 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
                         return cell
                     }
                     cell.iconImgView.image = self.cell.bgImageView.image
+                    cell.titleLabel.text = self.cell.slideModel?.contents[0].title ?? ""
                     return cell
  
                 }
@@ -269,10 +271,10 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
             }else if self.cellType == .course || self.cellType == .playletToCourse{
                 if self.slideModel?.type == SlideModelTypeAllCourse12{
                     //全部课程
-                    return allCourseCellHeight
+                    return allCourseCellHeight+get_system_statusBar_height()
                 }else if self.slideModel?.type == SlideModelTypeOneCourse75{
                     //大图课程
-                    return KSreenWidth*(KSreenWidth/DownSlideSingleCourseW)
+                    return KSreenWidth
                 }
             }
         }else{
@@ -281,6 +283,37 @@ class CNUpSlideDetailViewController: CNLiveBaseViewController,UITableViewDataSou
         return 75
     }
  
+    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)
+            }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)
+                }
+            }
+        }else{
+            //视频跳转播放页;课程跳转h5
+            if albumModel.model == kCNDownSlideContentsModelModelAlbum_ugc{
+                //视频
+                //短剧-跳转短剧播放页
+                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: albumModel.contentId), animated: pushAnimated)
+                
+            }else if albumModel.model == "1" || albumModel.model == "2" || albumModel.model == "3" || albumModel.model == "4"{
+                //课程
+                CNLiveDownSlideTool.pushWebVCWithCNLiveAlbumMdl(albumModel: albumModel,controller: self)
+            }else{
+                
+            }
+        }
+    }
+    
     // MARK: - 在追短剧--获取全部专辑列表
     func getBlockContents(page:NSInteger){
         showLoading(message: "")
@@ -165,7 +165,7 @@ class CNUpSlideViewController: CNLiveBaseViewController,UITableViewDelegate,UITa
         ///(3)“album”,“album_video”,“album_ugc” -> http://wjjh5.cnlive.com/cnYmAlbumVideoList.html?aid=contentId&title=titlle
         if slideModel.contents.first?.model ?? "0" == "1" || slideModel.contents.first?.model ?? "0" == "2" || slideModel.contents.first?.model ?? "0" == "3" || slideModel.contents.first?.model ?? "0" == "4"{
             cellType = .course
-        }else if slideModel.contents.first?.model ?? "0" == "album_ugc"{
+        }else if slideModel.contents.first?.model ?? "0" == kCNDownSlideContentsModelModelAlbum_ugc{
             cellType = .playlet
         }else{
             //新类型
@@ -128,6 +128,8 @@ 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.layer.cornerRadius = 12
+                imageView.clipsToBounds = true
                 bgBackView.addSubview(imageView)
  
                 let titleLbl = UILabel(frame: CGRect(x: imageView.right+DownSlideRecommendLeftGap, y: imageView.top, width: DownSlideSingleCourseW-90-imageView.right, height: 21))
@@ -202,7 +204,7 @@ class CNDownSlideSingleCourseCell: UITableViewCell {
  
             let moreLabel = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: 15, width: DownSlideSingleCourseW - 50 - DownSlideRecommendLeftGap   , height: 30))
             moreLabel.text = model.blockName ?? "更多"
-            moreLabel.font = Font_15
+            moreLabel.font = BoldFont_15_Fit
             moreLabel.textColor = HexColor("#333333")
             singleCourseBottomView.addSubview(moreLabel)
  
@@ -221,7 +221,7 @@ class CNLiveAuthViewController:CNLiveBaseViewController,UITableViewDelegate,UITa
             ///(3)“album”,“album_video”,“album_ugc” -> http://wjjh5.cnlive.com/cnYmAlbumVideoList.html?aid=contentId&title=titlle
             if slideModel.contents.first?.model ?? "0" == "1" || slideModel.contents.first?.model ?? "0" == "2" || slideModel.contents.first?.model ?? "0" == "3" || slideModel.contents.first?.model ?? "0" == "4"{
                 cellType = .playletToCourse
-            }else if slideModel.contents.first?.model ?? "0" == "album_ugc"{
+            }else if slideModel.contents.first?.model ?? "0" == kCNDownSlideContentsModelModelAlbum_ugc{
                 cellType = .playlet
             }else{
                 //新类型
@@ -36,7 +36,7 @@ class CNLiveAlbumModel:BaseModel{
     var contentId = ""
     var pid = ""
     var tag = ""
-    var model = ""
+    var model = ""//1,2,3,4课程 album_ugc短剧
     var thirdUrl = ""
     var publishTime = ""
     var shareUrl = ""
@@ -97,7 +97,7 @@ class CNLiveAlbumCell:UITableViewCell{
             //课程-跳转h5网页
             self.cellType = .course
             self.playBtn.setTitle("进入", for: .normal)
-        }else if model.model == "album_ugc"{
+        }else if model.model == kCNDownSlideContentsModelModelAlbum_ugc{
             //短剧-跳转短剧播放页
             self.cellType = .playlet
             self.playBtn.setTitle("播放", for: .normal)
@@ -121,6 +121,7 @@ class CNLiveAlbumCell:UITableViewCell{
             self.playBtn.left = KSreenWidth-80-30
         }
     }
+  
     @objc func playBtnAction(){
         var aid = ""
         if self.albumModel != nil{
@@ -134,7 +135,7 @@ class CNLiveAlbumCell:UITableViewCell{
             if (self.albumModel?.model == "1" || self.albumModel?.model == "2" || self.albumModel?.model == "3" || self.albumModel?.model == "4"){
                 //课程-跳转h5网页
                 self.enterBlock!(self.albumModel!)
-            }else if self.albumModel?.model == "album_ugc"{
+            }else if self.albumModel?.model == kCNDownSlideContentsModelModelAlbum_ugc{
                 //短剧-跳转短剧播放页
                 navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(aid: aid), animated: pushAnimated)
             }
@@ -11,11 +11,18 @@ class CNLiveAlbumImageCell:UITableViewCell{
  
     //MARK: - 懒加载
     lazy var iconImgView :UIImageView = {
-        let iconImgView = UIImageView(frame: CGRect(x: (KSreenWidth - KSreenWidth*(KSreenWidth/DownSlideSingleCourseW))/2, y: 0, width: KSreenWidth*(KSreenWidth/DownSlideSingleCourseW), height: KSreenWidth*(KSreenWidth/DownSlideSingleCourseW)))
+        let iconImgView = UIImageView(frame: CGRect(x: 0, y: 0, width: KSreenWidth, height: KSreenWidth))
         iconImgView.contentMode = .scaleAspectFill
         return iconImgView
     }()
  
+    lazy var titleLabel: UILabel = {
+        let titleLbl = UILabel(frame: CGRect(x: DownSlideRecommendLeftGap, y: DownSlideRecommendLeftGap+get_system_statusBar_height(), width: KSreenWidth-DownSlideRecommendLeftGap*2, height: 30))
+        titleLbl.font = BoldFont_21
+        titleLbl.textColor = HexColor("#FFFFFF")
+        return titleLbl
+    }()
+    
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
@@ -29,6 +36,7 @@ class CNLiveAlbumImageCell:UITableViewCell{
     private func setupUI() {
         contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
         self.contentView.addSubview(self.iconImgView)
+        self.contentView.addSubview(self.titleLabel)
         self.contentView.clipsToBounds = true
     }
  
@@ -18,11 +18,10 @@ class CNLiveDuanjuTitleCell:UITableViewCell{
  
             if self.cellType == .course || self.cellType == .playletToCourse{
                 self.blockTitleLabl.text = _blockName ?? "全部课程"
-                self.blockTitleLabl.top = (allCourseCellHeight-30)/2
+                self.blockTitleLabl.top = (allCourseCellHeight-30)/2+get_system_statusBar_height()
             }else if self.cellType == .playlet{
                 self.blockTitleLabl.text = _blockName ?? "在追短剧"
                 self.blockTitleLabl.top = (45-30)/2
-
             }
         }
     }