iOS Team / CNLiveMateCode · Commits

Commit c44d078f70b4b47c442859985991c9983da54805

Authored by liushiyu
2 parents d40b154d ec93256e

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

Inline Side-by-side
Showing 3 changed files with 11 additions and 3 deletions
metaCode/Classes/Common/Util/CNLiveIntegralAlertTool.swift
  View file @c44d078
... ... @@ -333,14 +333,13 @@ class CNLiveIntegralAlertTool:NSObject{
333 333 navigationViewController().pushViewController(CNLiveMineQuestViewController(checkModel: self.checkInModel!), animated: pushAnimated)
334 334  
335 335 }else if self.currentIntegralPayStatus == .paying{
336   - self.integralStatusChangedBlock!(.paying)
  336 +
337 337 }else if self.currentIntegralPayStatus == .paySuccess{
338 338 self.hiddenIntegralAlert()
339   - self.integralStatusChangedBlock!(.paySuccess)
  339 +
340 340 }else if self.currentIntegralPayStatus == .payFailed{
341 341 self.currentIntegralPayStatus = .integralEnough
342 342 self.initUI()
343   - self.integralStatusChangedBlock!(.payFailed)
344 343 }else{
345 344  
346 345 }
... ... @@ -348,6 +347,7 @@ class CNLiveIntegralAlertTool:NSObject{
348 347 // MARK: - 积分付费接口
349 348 func postOrderVideoByPoint(){
350 349 self.currentIntegralPayStatus = .paying
  350 + self.integralStatusChangedBlock!(.paying)
351 351 self.initUI()
352 352 //付费接口
353 353 CNLiveHomePageViewModel.orderVideoByPoint(prdId: self.productId) { result, status in
... ... @@ -357,6 +357,7 @@ class CNLiveIntegralAlertTool:NSObject{
357 357 self.initUI()
358 358 //刷新短剧首页数据
359 359 self.homePageNeedReloadActionBlock!()
  360 + self.integralStatusChangedBlock!(.paySuccess)
360 361 }else{
361 362 //购买失败
362 363 if self.point > Int(self.integralCount)!{
... ... @@ -369,6 +370,7 @@ class CNLiveIntegralAlertTool:NSObject{
369 370 self.initUI()
370 371 let errMsg = result as! String
371 372 showMessage(message: errMsg)
  373 + self.integralStatusChangedBlock!(.payFailed)
372 374 }
373 375 }
374 376  
... ...
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideRecommendCell.swift
  View file @c44d078
... ... @@ -31,6 +31,7 @@ class CNLiveDownSlideRecommendCell: UITableViewCell {
31 31 super.init(style: style, reuseIdentifier: reuseIdentifier)
32 32 self.selectionStyle = .none
33 33 contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
  34 + contentView.clipsToBounds = true
34 35 }
35 36  
36 37 required init?(coder: NSCoder) {
... ... @@ -58,6 +59,8 @@ class CNLiveDownSlideRecommendCell: UITableViewCell {
58 59 let imageView = UIImageView(frame: CGRectMake(DownSlideRecommendLeftGap, CGFloat(hangIndex-1)*DownSlideRecommendWH+DownSlideRecommendLeftGap*CGFloat(hangIndex-1), CGFloat(DownSlideRecommendWH), CGFloat(DownSlideRecommendWH)))
59 60 imageView.kf.setImage(with: URL(string:contentMdl.poster!))
60 61 imageView.tag = i
  62 + imageView.layer.cornerRadius = 14
  63 + imageView.clipsToBounds = true
61 64 imageView.isUserInteractionEnabled = true
62 65 imageView.addGestureRecognizer(UITapGestureRecognizer.init(target: self, action: #selector(pushWebAction)))
63 66 contentView.addSubview(imageView)
... ... @@ -68,6 +71,8 @@ class CNLiveDownSlideRecommendCell: UITableViewCell {
68 71 let imageView = UIImageView(frame: CGRectMake(CGFloat(DownSlideRecommendLeftGap*2)+CGFloat(DownSlideRecommendWH), CGFloat(hangIndex-1)*DownSlideRecommendWH+DownSlideRecommendLeftGap*CGFloat(hangIndex-1), CGFloat(DownSlideRecommendWH), CGFloat(DownSlideRecommendWH)))
69 72 imageView.kf.setImage(with: URL(string:contentMdl.poster!))
70 73 imageView.tag = i
  74 + imageView.layer.cornerRadius = 14
  75 + imageView.clipsToBounds = true
71 76 imageView.isUserInteractionEnabled = true
72 77 imageView.addGestureRecognizer(UITapGestureRecognizer.init(target: self, action: #selector(pushWebAction)))
73 78 contentView.addSubview(imageView)
... ...
metaCode/Classes/Main/HomePage/View/VerticalViews/DownSlide/CNLiveDownSlideTodayRecommendCell.swift
  View file @c44d078
... ... @@ -32,6 +32,7 @@ class CNLiveDownSlideTodayRecommendCell: UITableViewCell {
32 32 super.init(style: style, reuseIdentifier: reuseIdentifier)
33 33 self.selectionStyle = .none
34 34 contentView.backgroundColor = HexColor(kCNDownSlideBackgroundColorHex)
  35 + contentView.clipsToBounds = true
35 36 }
36 37  
37 38 required init?(coder: NSCoder) {
... ...