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

liushiyu
2 parents d40b154d ec93256e
Showing 3 changed files with 11 additions and 3 deletions
metaCode/Classes/Common/Util/CNLiveIntegralAlertTool.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideRecommendCell.swift
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideTodayRecommendCell.swift
@@ -333,14 +333,13 @@ class CNLiveIntegralAlertTool:NSObject{
             navigationViewController().pushViewController(CNLiveMineQuestViewController(checkModel: self.checkInModel!), animated: pushAnimated)
         }else if self.currentIntegralPayStatus == .paying{
-            self.integralStatusChangedBlock!(.paying)
+            
         }else if self.currentIntegralPayStatus == .paySuccess{
             self.hiddenIntegralAlert()
-            self.integralStatusChangedBlock!(.paySuccess)
+            
         }else if self.currentIntegralPayStatus == .payFailed{
             self.currentIntegralPayStatus = .integralEnough
             self.initUI()
-            self.integralStatusChangedBlock!(.payFailed)
         }else{
         }
@@ -348,6 +347,7 @@ class CNLiveIntegralAlertTool:NSObject{
     // MARK: - 积分付费接口
     func postOrderVideoByPoint(){
         self.currentIntegralPayStatus = .paying
+        self.integralStatusChangedBlock!(.paying)
         self.initUI()
         //付费接口
         CNLiveHomePageViewModel.orderVideoByPoint(prdId: self.productId) { result, status in
@@ -357,6 +357,7 @@ class CNLiveIntegralAlertTool:NSObject{
                 self.initUI()
                 //刷新短剧首页数据
                 self.homePageNeedReloadActionBlock!()
+                self.integralStatusChangedBlock!(.paySuccess)
             }else{
                 //购买失败
                 if self.point > Int(self.integralCount)!{
@@ -369,6 +370,7 @@ class CNLiveIntegralAlertTool:NSObject{
                 self.initUI()
                 let errMsg = result as! String
                 showMessage(message: errMsg)
+                self.integralStatusChangedBlock!(.payFailed)
             }
         }
@@ -31,6 +31,7 @@ class CNLiveDownSlideRecommendCell: UITableViewCell {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
         contentView.backgroundColor =  HexColor(kCNDownSlideBackgroundColorHex)
+        contentView.clipsToBounds = true
     }
     required init?(coder: NSCoder) {
@@ -58,6 +59,8 @@ class CNLiveDownSlideRecommendCell: UITableViewCell {
                 let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, CGFloat(hangIndex-1)*DownSlideRecommendWH+DownSlideRecommendLeftGap*CGFloat(hangIndex-1), CGFloat(DownSlideRecommendWH), CGFloat(DownSlideRecommendWH)))
                 imageView.kf.setImage(with: URL(string:contentMdl.poster!))
                 imageView.tag = i
+                imageView.layer.cornerRadius = 14
+                imageView.clipsToBounds = true
                 imageView.isUserInteractionEnabled = true
                 imageView.addGestureRecognizer(UITapGestureRecognizer.init(target: self, action: #selector(pushWebAction)))
                 contentView.addSubview(imageView)
@@ -68,6 +71,8 @@ class CNLiveDownSlideRecommendCell: UITableViewCell {
                 let imageView = UIImageView(frame: CGRectMake(CGFloat(DownSlideRecommendLeftGap*2)+CGFloat(DownSlideRecommendWH), CGFloat(hangIndex-1)*DownSlideRecommendWH+DownSlideRecommendLeftGap*CGFloat(hangIndex-1), CGFloat(DownSlideRecommendWH), CGFloat(DownSlideRecommendWH)))
                 imageView.kf.setImage(with: URL(string:contentMdl.poster!))
                 imageView.tag = i
+                imageView.layer.cornerRadius = 14
+                imageView.clipsToBounds = true
                 imageView.isUserInteractionEnabled = true
                 imageView.addGestureRecognizer(UITapGestureRecognizer.init(target: self, action: #selector(pushWebAction)))
                 contentView.addSubview(imageView)
@@ -32,6 +32,7 @@ class CNLiveDownSlideTodayRecommendCell: UITableViewCell {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
         self.selectionStyle = .none
         contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
+        contentView.clipsToBounds = true
     }
     required init?(coder: NSCoder) {