栏目 ,电商分类icon修改

“张旭”
1 parent d84f6c89
Showing 8 changed files with 166 additions and 98 deletions
metaCode/Classes/Main/HuBiLieHomePage/Controller/CNLiveTVHomeViewController.swift
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeADCell.swift
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeLanmuCell.swift
metaCode/Classes/Main/HuBiLieHomePage/View/Home/Home/CNLiveHomeShopCategoryCell.swift
metaCode/Classes/Main/Model/CNLiveDownSlideModelLayout.swift
metaCode/Supporting Files/Assets.xcassets/HomePage/home_allProduct.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/HomePage/home_allProduct.imageset/home_allProduct@2x.png
metaCode/Supporting Files/Assets.xcassets/HomePage/home_allProduct.imageset/home_allProduct@3x.png
@@ -371,12 +371,15 @@ class CNLiveTVHomeViewController:CNLiveBaseViewController, UITableViewDataSource
             return 50.0+15.0//80
         }else if let slideModel = self.dataArray[indexPath.row] as? CNLiveHomeShopCategoryModel{
             //商品分类 一排三个
-            let maxCount = slideModel.group.count > 6 ? 6 : slideModel.group.count
-            let hangNum = Int(ceil(Double(maxCount)/3.0))
-            let imgW = (KSreenWidth-15*4)/3.0
-            let imgH = imgW*32.0/105.0
-            let rowH = imgH+15.0
-            let height = CGFloat(hangNum)*rowH
+            let maxCount = slideModel.group.count > 4 ? 4 : slideModel.group.count
+//            let hangNum = Int(ceil(Double(maxCount)/3.0))
+//            let imgW = (KSreenWidth-15*4)/3.0
+//            let imgH = imgW*32.0/105.0
+            let imgWH = 44.0
+            let titleH = 22.0
+            let rowH = imgWH+titleH+15.0
+//            let height = CGFloat(hangNum)*rowH
+            let height = rowH
             return height
         }else{
             return 60
@@ -82,7 +82,8 @@ class CNLiveHomeADCell: UITableViewCell ,FSPagerViewDataSource,FSPagerViewDelega
     let kCNLliveShopDetailBannerCellID = "kCNLliveShopDetailBannerCellID"
     lazy var viewPager: FSPagerView = {
         let viewPager = FSPagerView()
-        viewPager.frame = CGRect(x: 15, y: 0, width: KSreenWidth-30, height: 190.0*(KSreenWidth-30)/345.0)
+//        viewPager.frame = CGRect(x: 15, y: 0, width: KSreenWidth-30, height: 190.0*(KSreenWidth-30)/345.0)
+        viewPager.frame = CGRect(x: 15, y: 0, width: CGFloat(DownSlideTodayRecommendW), height: CGFloat(CNLiveHomeADH))
         viewPager.dataSource = self
         viewPager.delegate = self
         viewPager.register(FSPagerViewCell.self, forCellWithReuseIdentifier: kCNLliveShopDetailBannerCellID)
@@ -102,7 +103,8 @@ class CNLiveHomeADCell: UITableViewCell ,FSPagerViewDataSource,FSPagerViewDelega
  
     // 懒加载滚动图片浏下标
     lazy var pagerControl:FSPageControl = {
-        let pageControl = FSPageControl(frame: CGRect(x: KSreenWidth-30-100, y: 190.0*(KSreenWidth-30)/345.0-14, width: 100, height: 4))
+//        let pageControl = FSPageControl(frame: CGRect(x: KSreenWidth-30-100, y: 190.0*(KSreenWidth-30)/345.0-14, width: 100, height: 4))
+        let pageControl = FSPageControl(frame: CGRect(x: self.viewPager.right-100-15, y: self.viewPager.height-14, width: 100, height: 4))
         //设置下标位置
         pageControl.contentHorizontalAlignment = .right
         //设置下标指示器颜色（选中状态和普通状态）
@@ -157,12 +159,13 @@ class CNLiveHomeADCell: UITableViewCell ,FSPagerViewDataSource,FSPagerViewDelega
         if self.slideModel?.contents.count ?? 0 >= (index+1){
             let imgUrl = self.slideModel?.contents[index].poster
             cell.imageView?.kf.setImage(with: URL(string: imgUrl!))
-            cell.textLabel?.text = self.slideModel?.contents[index].title
+            cell.imageView?.contentMode = .scaleAspectFill
+//            cell.textLabel?.text = self.slideModel?.contents[index].title
  
         }
         cell.imageView?.layer.cornerRadius = 9
         cell.imageView?.clipsToBounds = true
-        cell.textLabel?.font = BoldFont_18
+//        cell.textLabel?.font = BoldFont_18
         return cell
     }
  
@@ -20,36 +20,15 @@ class CNLiveHomeLanmuCell:UITableViewCell{
         }
         set{
             _slideModel = newValue!
+            for obj in contentView.subviews{
+                if obj.tag > 100{
+                    obj.removeFromSuperview()
+                }
+            }
             self.setupNewUI(model: slideModel!)
         }
     }
-    
-    //MARK: - 懒加载
-    lazy var iconImgView1 :UIImageView = {
-        let iconImgView = UIImageView(frame: CGRect(x: 15, y: 0, width: (KSreenWidth-60)/3.0, height: 32))
-        iconImgView.contentMode = .scaleAspectFill
-        iconImgView.tag = 1001
-        iconImgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(iconImgViewAction)))
-        iconImgView.isUserInteractionEnabled = true
-        return iconImgView
-    }()
-    lazy var iconImgView2 :UIImageView = {
-        let iconImgView = UIImageView(frame: CGRect(x: iconImgView1.right+15, y: 0, width: iconImgView1.width, height: iconImgView1.height))
-        iconImgView.contentMode = .scaleAspectFill
-        iconImgView.tag = 1002
-        iconImgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(iconImgViewAction)))
-        iconImgView.isUserInteractionEnabled = true
-        return iconImgView
-    }()
-    lazy var iconImgView3 :UIImageView = {
-        let iconImgView = UIImageView(frame: CGRect(x: iconImgView2.right+15, y: 0, width: iconImgView1.width, height: iconImgView1.height))
-        iconImgView.contentMode = .scaleAspectFill
-        iconImgView.tag = 1003
-        iconImgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(iconImgViewAction)))
-        iconImgView.isUserInteractionEnabled = true
-        return iconImgView
-    }()
-    
+        
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
@@ -62,29 +41,45 @@ class CNLiveHomeLanmuCell:UITableViewCell{
  
     private func setupUI() {
         contentView.backgroundColor = .white
-        self.contentView.addSubview(self.iconImgView1)
-        self.contentView.addSubview(self.iconImgView2)
-        self.contentView.addSubview(self.iconImgView3)
         self.contentView.clipsToBounds = true
     }
  
     func setupNewUI(model:CNLiveDownSlideModel){
+        var showNum:Int = model.contents.count>=4 ? 4 : model.contents.count
         for (idx,mdl) in model.contents.enumerated(){
-            if idx == 0{
-                self.iconImgView1.kf.setImage(with: URL(string: mdl.poster))
-            }else if idx == 1{
-                self.iconImgView2.kf.setImage(with: URL(string: mdl.poster))
-            }else if idx == 2{
-                self.iconImgView3.kf.setImage(with: URL(string: mdl.poster))
-            }else{
-                
+            if idx >= 4 { break}
+            
+            let leftPadding:CGFloat = 30.0
+            let imgWH:CGFloat = 44.0
+            let jianJuPadding:CGFloat = (KSreenWidth-2*leftPadding-CGFloat(showNum)*imgWH)/CGFloat(showNum-1)
+            let imgX:CGFloat = leftPadding+CGFloat(idx)*(imgWH+jianJuPadding)
+            let imgY:CGFloat = 0.0
+            let iconImgView = UIImageView(frame: CGRect(x: imgX, y: imgY, width: imgWH, height: imgWH))
+            iconImgView.contentMode = .scaleAspectFill
+            iconImgView.tag = 1000+idx
+            iconImgView.kf.setImage(with: URL(string: mdl.poster))
+            iconImgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(iconImgViewAction)))
+            iconImgView.isUserInteractionEnabled = true
+            self.contentView.addSubview(iconImgView)
+            
+            
+            let titleLbl = UILabel(frame: CGRect(x: 0, y: iconImgView.bottom+2.5, width: 50, height: 20))
+            titleLbl.centerX = iconImgView.centerX
+            titleLbl.font = Font_15
+            titleLbl.textColor = HexColor("#000102")
+            titleLbl.text = mdl.title
+            titleLbl.tag = 1000+idx
+            self.contentView.addSubview(titleLbl)
+            titleLbl.snp.makeConstraints { make in
+                make.centerX.equalTo(iconImgView.snp.centerX)
+                make.top.equalTo(iconImgView.snp.bottom).offset(2.5)
             }
         }
  
     }
     @objc func iconImgViewAction(ges: UITapGestureRecognizer){
         let imageView = ges.view as! UIImageView
-        let index = imageView.tag-1001
+        let index = imageView.tag-1000
         if let slideModel = self.slideModel?.contents[index]{
             self.imgClickBlock?(slideModel)
         }
@@ -7,11 +7,8 @@
  
 import Foundation
  
-//typealias CNLiveHomeLanmuImgClickBlock = (_ imgModel:CNLiveDownSlideContentsModel)->Void;
-
 class CNLiveHomeShopCategoryCell:UITableViewCell{
  
-//    var imgClickBlock : CNLiveHomeLanmuImgClickBlock?
     //slideModel
     var _slideModel : CNLiveHomeShopCategoryModel?
     var slideModel : CNLiveHomeShopCategoryModel? {
@@ -44,57 +41,94 @@ class CNLiveHomeShopCategoryCell:UITableViewCell{
     }
  
     func setupNewUI(model:CNLiveHomeShopCategoryModel){
-        
-        //总块数
-        let totalNum = model.group.count
-        //lieIndex 当前是contents的第0列还是第1列
-        var lieIndex = 0
-        //hangIndex 当前是第几行,1...n
-        var hangIndex = 1
-        
-        let imgW = (KSreenWidth-15*4)/3.0
-        let imgH = imgW*32.0/105.0
-        let rowH = imgH+15
-        let yiHangNum = 3 //一行几块
-        for i in 0..<totalNum{//i是第几行
-            let groupMdl = model.group[(hangIndex-1)*yiHangNum+(lieIndex)]
-
-            //
-            let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap+CGFloat(lieIndex)*(imgW+DownSlideRecommendLeftGap), CGFloat(hangIndex-1)*rowH, CGFloat(imgW), CGFloat(imgH)))
-            if groupMdl.title == "全部商品"{
-                imageView.image = UIImage(named: "home_allProducts")
+        var showNum:Int = model.group.count>=4 ? 4 : model.group.count
+        for (idx,mdl) in model.group.enumerated(){
+            if idx >= 4 { break}
+            
+            let leftPadding:CGFloat = 30.0
+            let imgWH:CGFloat = 44.0
+            let jianJuPadding:CGFloat = (KSreenWidth-2*leftPadding-CGFloat(showNum)*imgWH)/CGFloat(showNum-1)
+            let imgX:CGFloat = leftPadding+CGFloat(idx)*(imgWH+jianJuPadding)
+            let imgY:CGFloat = 0.0
+            let iconImgView = UIImageView(frame: CGRect(x: imgX, y: imgY, width: imgWH, height: imgWH))
+            iconImgView.contentMode = .scaleAspectFill
+            iconImgView.tag = 1000+idx
+            if mdl.title == "全部商品"{
+                iconImgView.image = UIImage(named: "home_allProduct")
             }else{
-                imageView.kf.setImage(with: URL(string:groupMdl.simg) ,placeholder: UIImage(color: .lightGray, size: imageView.size))
+                iconImgView.kf.setImage(with: URL(string:mdl.simg) ,placeholder: UIImage(color: .lightGray, size: iconImgView.size))
             }
-            imageView.tag = i
-            imageView.layer.cornerRadius = 9
-            imageView.contentMode = .scaleAspectFill
-
-            imageView.clipsToBounds = true
-            imageView.isUserInteractionEnabled = true
-            imageView.addGestureRecognizer(UITapGestureRecognizer.init(target: self, action: #selector(imgTapAction)))
-            contentView.addSubview(imageView)
+//            iconImgView.kf.setImage(with: URL(string: mdl.simg))
+            iconImgView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(iconImgViewAction)))
+            iconImgView.isUserInteractionEnabled = true
+            self.contentView.addSubview(iconImgView)
+            
  
-            let titleLbl = UILabel(frame: CGRect(x: imageView.left, y: 0, width: imageView.width, height: 20))
-            titleLbl.center = imageView.center
-            titleLbl.font = Font_18
-            titleLbl.textColor = HexColor("#FFFFFF")
-            titleLbl.text = groupMdl.title
-            titleLbl.textAlignment = .center
-            contentView.addSubview(titleLbl)
-            if lieIndex == 0{
-                lieIndex = 1
-            }else if lieIndex == 1{
-                lieIndex = 2
-            }else if lieIndex == 2{
-                lieIndex = 0
-                hangIndex += 1
+            let titleLbl = UILabel(frame: CGRect(x: 0, y: iconImgView.bottom+2.5, width: 50, height: 20))
+            titleLbl.centerX = iconImgView.centerX
+            titleLbl.font = Font_15
+            titleLbl.textColor = HexColor("#000102")
+            titleLbl.text = mdl.title
+            titleLbl.tag = 1000+idx
+            self.contentView.addSubview(titleLbl)
+            titleLbl.snp.makeConstraints { make in
+                make.centerX.equalTo(iconImgView.snp.centerX)
+                make.top.equalTo(iconImgView.snp.bottom).offset(2.5)
             }
         }
+
+        
+//        
+//        //总块数
+//        let totalNum = model.group.count
+//        //lieIndex 当前是contents的第0列还是第1列
+//        var lieIndex = 0
+//        //hangIndex 当前是第几行,1...n
+//        var hangIndex = 1
+//        
+//        let imgW = (KSreenWidth-15*4)/3.0
+//        let imgH = imgW*32.0/105.0
+//        let rowH = imgH+15
+//        let yiHangNum = 3 //一行几块
+//        for i in 0..<totalNum{//i是第几行
+//            let groupMdl = model.group[(hangIndex-1)*yiHangNum+(lieIndex)]
+//
+//            //
+//            let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap+CGFloat(lieIndex)*(imgW+DownSlideRecommendLeftGap), CGFloat(hangIndex-1)*rowH, CGFloat(imgW), CGFloat(imgH)))
+//            if groupMdl.title == "全部商品"{
+//                imageView.image = UIImage(named: "home_allProducts")
+//            }else{
+//                imageView.kf.setImage(with: URL(string:groupMdl.simg) ,placeholder: UIImage(color: .lightGray, size: imageView.size))
+//            }
+//            imageView.tag = i
+//            imageView.layer.cornerRadius = 9
+//            imageView.contentMode = .scaleAspectFill
+//
+//            imageView.clipsToBounds = true
+//            imageView.isUserInteractionEnabled = true
+//            imageView.addGestureRecognizer(UITapGestureRecognizer.init(target: self, action: #selector(imgTapAction)))
+//            contentView.addSubview(imageView)
+//            
+//            let titleLbl = UILabel(frame: CGRect(x: imageView.left, y: 0, width: imageView.width, height: 20))
+//            titleLbl.center = imageView.center
+//            titleLbl.font = Font_18
+//            titleLbl.textColor = HexColor("#FFFFFF")
+//            titleLbl.text = groupMdl.title
+//            titleLbl.textAlignment = .center
+//            contentView.addSubview(titleLbl)
+//            if lieIndex == 0{
+//                lieIndex = 1
+//            }else if lieIndex == 1{
+//                lieIndex = 2
+//            }else if lieIndex == 2{
+//                lieIndex = 0
+//                hangIndex += 1
+//            }
+//        }
     }
-    @objc func imgTapAction(ges: UITapGestureRecognizer){
+    @objc func iconImgViewAction(ges: UITapGestureRecognizer){
         let imageView = ges.view as! UIImageView
-        let index = imageView.tag
+        let index = imageView.tag-1000
         if let slideModel = self.slideModel?.group[index]{
  
             let urlString = "https://managemall.cnlive.com/html/mall/1/#/pages/goods/category/category?categoryId=\(slideModel.id)&uid=\(UserInfoManager.shared.userInfo.uid)&scene=app"
@@ -111,4 +145,15 @@ class CNLiveHomeShopCategoryCell:UITableViewCell{
         }
     }
  
+//    func setupNewUI(model:CNLiveDownSlideModel){
+//
+//    }
+//    @objc func iconImgViewAction(ges: UITapGestureRecognizer){
+//        let imageView = ges.view as! UIImageView
+//        let index = imageView.tag-1000
+//        if let slideModel = self.slideModel?.contents[index]{
+//            self.imgClickBlock?(slideModel)
+//        }
+//    }
+    
 }
@@ -103,9 +103,9 @@ class CNLiveDownSlideModelLayout:NSObject{
         }else if(_slideModel?.type == SlideModelTypeRealHotList7){//7实时热榜
  
             _slideModel?.cellH = Float(DownSlideRealHotListH)+Float(DownSlideRecommendLeftGap)
-        }else if (_slideModel?.type == SlideModelTypeLanmu22){//22 首页栏目 电影 电视剧 纪录片
+        }else if (_slideModel?.type == SlideModelTypeLanmu22){//22 首页栏目 电影 电视剧 纪录片 音乐
  
-            _slideModel?.cellH = 32.0+15.0
+            _slideModel?.cellH = 44.0+38.0//+15.0
         }else if (_slideModel?.type == SlideModelTypeFollow77){// 正在追
             _slideModel?.cellH = 50.0+15.0//80.0
         }else if (_slideModel?.type == SlideModelTypeTVOneBigTwoSmall2){//2 一大图2-6小图
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "home_allProduct@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "home_allProduct@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}