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

“zhangxu@cnlive.com”
2 parents 8873cee2 ddddcbe5
Showing 9 changed files with 106 additions and 17 deletions
metaCode/Classes/Common/Util/CNLiveCommonQiniuTool.swift
metaCode/Classes/Main/VideoPage/View/CNLiveShortVideoContentListView.swift
metaCode/Classes/Main/VideoPage/View/CNLiveShortVideoListTableViewCell.swift
metaCode/Supporting Files/Assets.xcassets/Video/short_video_free.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Video/short_video_free.imageset/short_video_free@2x.png
metaCode/Supporting Files/Assets.xcassets/Video/short_video_free.imageset/short_video_free@3x.png
metaCode/Supporting Files/Assets.xcassets/Video/short_video_pay.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/Video/short_video_pay.imageset/short_video_pay@2x.png
metaCode/Supporting Files/Assets.xcassets/Video/short_video_pay.imageset/short_video_pay@3x.png
@@ -94,11 +94,15 @@ class UploadManager: NSObject {
         param.setValue("POST", forKey: "verb")
         param.setValue("2", forKey: "storageType")
         param.setValue(kBucketName_QN, forKey: "bucket")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveEnvironmentManager.shared.appId, forKey: "appId")
+        custom_param.setValue(CNLiveEnvironmentManager.shared.appKey, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
         CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.setupSignRequestKey(APPKey)//APPKey_wjj APPKey
-
+        
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveEnvironmentManager.shared.img_token_url)/vod_epg/getUploadAuthForApp", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
  
@@ -181,6 +181,16 @@ class CNLiveShortVideoContentListTableViewCell: UITableViewCell {
         return imageView
     }()
  
+    lazy var tipView: UIImageView = {
+        let imageView = UIImageView.init()
+        imageView.contentMode = .scaleAspectFill
+        imageView.layer.cornerRadius = 5
+        imageView.layer.masksToBounds = true
+        imageView.clipsToBounds = true
+        imageView.isHidden = true
+        return imageView
+    }()
+    
     lazy var titleLabel: UILabel = {
         let titleLabel = UILabel.init()
         titleLabel.textColor = .white
@@ -210,6 +220,12 @@ class CNLiveShortVideoContentListTableViewCell: UITableViewCell {
             make.width.equalTo(50)
             make.height.equalTo(70)
         }
+        contentView.addSubview(tipView)
+        tipView.snp.makeConstraints { make in
+            make.left.top.equalToSuperview().offset(20)
+            make.width.equalTo(50)
+            make.height.equalTo(10)
+        }
         contentView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
             make.left.equalTo(iconView.snp.right).offset(10)
@@ -231,6 +247,18 @@ class CNLiveShortVideoContentListTableViewCell: UITableViewCell {
         paragraphStyle.lineSpacing = 6
         titleLabel.attributedText = NSAttributedString(string: listModel.title, attributes: [NSAttributedString.Key.paragraphStyle: paragraphStyle, ])
         timeLabel.text = listModel.duration
+        
+        if listModel.product?.check == true {
+            if listModel.product?.albumProductType != "0" {
+                tipView.isHidden = false
+                tipView.image = UIImage(named: "short_video_free")
+            }
+        } else {
+            if listModel.product?.albumProductType != "0" {
+                tipView.isHidden = false
+                tipView.image = UIImage(named: "short_video_pay")
+            }
+        }
     }
  
     required init?(coder: NSCoder) {
@@ -189,36 +189,35 @@ class CNLiveShortVideoListTableViewCell: UITableViewCell {
         faviBtn.isHidden = model.albumMsgModel!.collection
         listBtn.setTitle(model.albumMsgModel?.albumName, for: .normal)
  
-        
-        
-
-        
-
-        
         let imageV: UIImageView = payView.viewWithTag(1000) as! UIImageView
         imageV.kf.indicatorType = .activity
         imageV.kf.setImage(with: URL(string: model.poster))
-        let titleL: UILabel = payView.viewWithTag(1001) as! UILabel
+        let titleL: UILabel = payView.viewWithTag(1002) as! UILabel
         titleL.text = model.title
-        let timeL: UILabel = payView.viewWithTag(1002) as! UILabel
+        let timeL: UILabel = payView.viewWithTag(1003) as! UILabel
         timeL.text = model.duration
-        let payButton: APButton = payView.viewWithTag(1003) as! APButton
+        let payButton: APButton = payView.viewWithTag(1004) as! APButton
  
+        let tipV: UIImageView = payView.viewWithTag(1001) as! UIImageView
         if model.product?.check == true {
             //免费
             if model.product?.albumProductType == "0" {
-                hiddenView(isHidden: true)
-            } else {
                 hiddenView(isHidden: false)
+            } else {
+                hiddenView(isHidden: true)
                 payButton.setTitle("\(model.product!.point)积分解锁全集", for: .normal)
+                tipV.isHidden = false
+                tipV.image = UIImage(named: "short_video_free")
             }
         } else {
             //需要付费
             if model.product?.albumProductType == "0" {
-                hiddenView(isHidden: true)
-            } else {
                 hiddenView(isHidden: false)
+            } else {
+                hiddenView(isHidden: true)
                 payButton.setTitle("\(model.product!.point)积分解锁全集", for: .normal)
+                tipV.isHidden = false
+                tipV.image = UIImage(named: "short_video_pay")
             }
         }
     }
@@ -380,11 +379,25 @@ extension CNLiveShortVideoListTableViewCell {
             make.height.equalTo(70)
         }
  
+        let tipView = UIImageView.init()
+        tipView.contentMode = .scaleAspectFill
+        tipView.isHidden = true
+        tipView.layer.cornerRadius = 5
+        tipView.layer.masksToBounds = true
+        tipView.clipsToBounds = true
+        tipView.tag = 1001
+        view.addSubview(tipView)
+        tipView.snp.makeConstraints { make in
+            make.left.top.equalToSuperview().offset(20)
+            make.width.equalTo(50)
+            make.height.equalTo(10)
+        }
+        
         let titleLabel = UILabel.init()
         titleLabel.textColor = .white
         titleLabel.lineBreakMode = .byTruncatingTail
         titleLabel.numberOfLines = 2
-        titleLabel.tag = 1001
+        titleLabel.tag = 1002
         titleLabel.font = medium_adapt_font(pointSize: 12)
         view.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
@@ -395,7 +408,7 @@ extension CNLiveShortVideoListTableViewCell {
  
         let timeLabel = UILabel.init()
         timeLabel.textColor = .white
-        timeLabel.tag = 1002
+        timeLabel.tag = 1003
         timeLabel.font = light_adapt_font(pointSize: 13)
         view.addSubview(timeLabel)
         timeLabel.snp.makeConstraints { make in
@@ -419,7 +432,7 @@ extension CNLiveShortVideoListTableViewCell {
         payButton.layer.cornerRadius = 20
         payButton.activityIndicator.color = .white
         payButton.layer.masksToBounds = true
-        payButton.tag = 1003
+        payButton.tag = 1004
         payButton.backgroundColor = HexColor("#67C5FF")
         payButton.titleLabel?.font = medium_adapt_font(pointSize: 15)
         payButton.addTarget(self, action: #selector(payMethod), for: .touchUpInside)
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "short_video_free@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "short_video_free@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "short_video_pay@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "short_video_pay@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}