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

liushiyu
2 parents 06885f88 e4af402e
Showing 2 changed files with 19 additions and 11 deletions
metaCode/Classes/Common/Util/CNLiveIntegralAlertTool.swift
metaCode/Classes/Main/HomePages/View/PlayletHomePage/CNLivePlayletHomePageHeaderCell.swift
@@ -21,6 +21,8 @@ enum CNLiveIntegralPayStatus {
     case paySuccess
     ///支付失败
     case payFailed
+    ///支付取消
+    case payCancel
 }
 typealias integralStatusChangeBlock = (_ integralPayStatus:CNLiveIntegralPayStatus) -> Void
@@ -28,7 +30,6 @@ typealias integralStatusChangeBlock = (_ integralPayStatus:CNLiveIntegralPayStat
 class CNLiveIntegralAlertTool:NSObject{
     static let shared = CNLiveIntegralAlertTool()
-    var homePageNeedReloadActionBlock:homePageNeedReloadBlockActionBlock?
     var integralStatusChangedBlock:integralStatusChangeBlock?
     ///当前积分支付状态
@@ -317,18 +318,24 @@ class CNLiveIntegralAlertTool:NSObject{
     // MARK: - BtnAction
     @objc func bgBtnViewAction(){
+        self.currentIntegralPayStatus = .payCancel
+        self.initUI()
+        self.integralStatusChangedBlock!(.payCancel)
         self.hiddenIntegralAlert()
     }
     @objc func closeBtnAction(){
+        self.currentIntegralPayStatus = .payCancel
+        self.initUI()
+        self.integralStatusChangedBlock!(.payCancel)
         self.hiddenIntegralAlert()
     }
     @objc func payBtnAction(){
         if self.currentIntegralPayStatus == .integralEnough{
             self.postOrderVideoByPoint()
-            self.integralStatusChangedBlock!(.integralEnough)
+//            self.integralStatusChangedBlock!(self.currentIntegralPayStatus)
         }else if self.currentIntegralPayStatus == .integralNotEnough{
             self.hiddenIntegralAlert()
-            self.integralStatusChangedBlock!(.integralNotEnough)
+//            self.integralStatusChangedBlock!(self.currentIntegralPayStatus)
             //跳转任务中心
             navigationViewController().pushViewController(CNLiveMineQuestViewController(checkModel: self.checkInModel!), animated: pushAnimated)
@@ -347,7 +354,6 @@ class CNLiveIntegralAlertTool:NSObject{
     // MARK: - 积分付费接口
     func postOrderVideoByPoint(){
         self.currentIntegralPayStatus = .paying
-        self.integralStatusChangedBlock!(.paying)
         self.initUI()
         //付费接口
         CNLiveHomePageViewModel.orderVideoByPoint(prdId: self.productId) { result, status in
@@ -356,24 +362,24 @@ class CNLiveIntegralAlertTool:NSObject{
                 self.currentIntegralPayStatus = .paySuccess
                 self.initUI()
                 //刷新短剧首页数据
-                self.homePageNeedReloadActionBlock!()
                 self.integralStatusChangedBlock!(.paySuccess)
             }else{
                 //购买失败
                 if self.point > Int(self.integralCount)!{
                     //可以支付积分
                     self.currentIntegralPayStatus = .integralEnough
+//                    self.integralStatusChangedBlock!(.integralEnough)
+
                 }else{
                     //积分不足
                     self.currentIntegralPayStatus = .integralNotEnough
+//                    self.integralStatusChangedBlock!(.integralEnough)
                 }
                 self.initUI()
                 let errMsg = result as! String
                 showMessage(message: errMsg)
-                self.integralStatusChangedBlock!(.payFailed)
             }
         }
-        
     }
@@ -329,10 +329,12 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         if self.albumListModel?.product?.check == false{
             //未购买->购买
             CNLiveIntegralAlertTool.shared.showIntegralAlert(title: "\(self.albumListModel?.albumMsgModel?.albumName ?? "")共\(self.albumListModel?.albumMsgModel?.episodeNow ?? "1")集", integralCount: self.albumListModel?.albumMsgModel?.product?.point ?? "0", productId: self.albumListModel?.product?.productId ?? "")
-            CNLiveIntegralAlertTool.shared.homePageNeedReloadActionBlock = {
-                self.homePageNeedReloadActionBlock!()
-                DispatchQueue.main.asyncAfter(deadline: .now()+1.5) { [self] in
-                    self.followChangeStatus(isFollowed: true)
+            CNLiveIntegralAlertTool.shared.integralStatusChangedBlock = { integralPayStatus in
+                if integralPayStatus == .paySuccess{
+                    self.homePageNeedReloadActionBlock!()
+                    DispatchQueue.main.asyncAfter(deadline: .now()+1.5) { [self] in
+                        self.followChangeStatus(isFollowed: true)
+                    }
                 }
             }
         }