积分支付逻辑调整

张旭
1 parent d0fa5d6a
Showing 15 changed files with 477 additions and 64 deletions
metaCode.xcodeproj/project.pbxproj
metaCode/Classes/Common/Util/CNLiveIntegralAlertTool.swift
metaCode/Classes/Extensions/NSObject+CNLiveExtensions.swift
metaCode/Classes/Main/HomePages/View/HomepageDetail/CNLiveAlbumCell.swift
metaCode/Classes/Main/HomePages/View/PlayletHomePage/CNLivePlayletHomePageHeaderCell.swift
metaCode/Classes/Main/HomePages/ViewModel/CNLiveHomePageViewModel.swift
metaCode/Supporting Files/Assets.xcassets/HomePage/jifen_paySuccess.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/HomePage/jifen_paySuccess.imageset/jifen_paySuccess@2x.png
metaCode/Supporting Files/Assets.xcassets/HomePage/jifen_paySuccess.imageset/jifen_paySuccess@3x.png
metaCode/Supporting Files/Assets.xcassets/HomePage/jifen_paying.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/HomePage/jifen_paying.imageset/jifen_paying@2x.png
metaCode/Supporting Files/Assets.xcassets/HomePage/jifen_paying.imageset/jifen_paying@3x.png
metaCode/Supporting Files/Assets.xcassets/HomePage/point_alert_close.imageset/Contents.json
metaCode/Supporting Files/Assets.xcassets/HomePage/point_alert_close.imageset/point_alert_close@2x.png
metaCode/Supporting Files/Assets.xcassets/HomePage/point_alert_close.imageset/point_alert_close@3x.png
@@ -92,6 +92,7 @@
 		1938BD412B4BEC6900390A34 /* CNLiveAlbumListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD402B4BEC6900390A34 /* CNLiveAlbumListModel.swift */; };
 		1938BD432B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD422B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift */; };
 		1938BD452B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD442B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift */; };
+		1938BD472B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1938BD462B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift */; };
 		19565EC02AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */; };
 		19565EC22AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */; };
 		19565EC52AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */; };
@@ -346,6 +347,7 @@
 		1938BD402B4BEC6900390A34 /* CNLiveAlbumListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveAlbumListModel.swift; sourceTree = "<group>"; };
 		1938BD422B4E34B200390A34 /* CNHomepageDuanJuDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNHomepageDuanJuDetailViewController.swift; sourceTree = "<group>"; };
 		1938BD442B4E49CA00390A34 /* CNLiveDuanjuTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveDuanjuTitleCell.swift; sourceTree = "<group>"; };
+		1938BD462B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveIntegralAlertTool.swift; sourceTree = "<group>"; };
 		19565EBF2AF4DE0E007D6727 /* CNLiveShopDetailBtnsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailBtnsCell.swift; sourceTree = "<group>"; };
 		19565EC12AF616CA007D6727 /* CNLiveShopDetailOrderAssetCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopDetailOrderAssetCell.swift; sourceTree = "<group>"; };
 		19565EC42AF8AD1F007D6727 /* CNLiveShopProductManagerController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CNLiveShopProductManagerController.swift; sourceTree = "<group>"; };
@@ -982,6 +984,7 @@
 			children = (
 				792E57D82A3AA2F2005834DB /* CNLiveCommonBaseModel.swift */,
 				792E57DA2A3AE9F4005834DB /* CNLiveCommonQiniuTool.swift */,
+				1938BD462B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift */,
 			);
 			path = Util;
 			sourceTree = "<group>";
@@ -1688,6 +1691,7 @@
 				191732FE2B0B3EBF007BCC04 /* CNLiveShopGoodsDetailsViewController.swift in Sources */,
 				79E496E32AB9357000127BF8 /* UITableViewCell+CNLiveExtension.swift in Sources */,
 				7C83B4422A541EBF004BF4A4 /* CALayer+CNLiveExtensions.swift in Sources */,
+				1938BD472B4FD5A500390A34 /* CNLiveIntegralAlertTool.swift in Sources */,
 				19565EC72AF8AD38007D6727 /* CNLiveShopNewProductController.swift in Sources */,
 				798A44F72A3077ED00815935 /* CNLiveHotButton.swift in Sources */,
 				7CD6753D2A2740B0008354C1 /* CNMainView.swift in Sources */,
+//
+//  CNLiveIntegralAlertTool.swift
+//  metaCode
+//
+//  Created by zx on 2024/1/11.
+//  积分支付弹窗
+
+import Foundation
+import QMUIKit
+import SnapKit
+
+///积分支付状态类型
+enum CNLiveIntegralPayStatus {
+    ///积分充足
+    case integralEnough
+    ///积分不足
+    case integralNotEnough
+    ///支付中
+    case paying
+    ///支付成功
+    case paySuccess
+    ///支付失败
+    case payFailed
+    
+}
+
+class CNLiveIntegralAlertTool:NSObject{
+    static let shared = CNLiveIntegralAlertTool()
+    
+    var homePageNeedReloadActionBlock:homePageNeedReloadBlockActionBlock?
+
+    ///当前积分支付状态
+    var currentIntegralPayStatus: CNLiveIntegralPayStatus = .integralEnough
+
+    let delegate = UIApplication.shared.delegate as! AppDelegate
+    /// 专辑名称
+    var title:String = ""
+    
+    /// 专辑积分值
+    var integralCount:String = "0"
+    /// 支付的商品id
+    var productId:String = ""
+    /// 用户积分值
+    var point:Int = 0
+    /// 用户积分model
+    var checkInModel:MinePointCheckInModel?
+
+    lazy var bgBtnView: UIButton = {
+        let bgBtnView = UIButton(frame: self.delegate.window!.bounds)
+        bgBtnView.backgroundColor = HexColor("#000000")
+        bgBtnView.alpha = 0.6
+        bgBtnView.addTarget(self, action: #selector(bgBtnViewAction), for: .touchUpInside)
+        return bgBtnView
+    }()
+
+    lazy var bottomBgView :UIView = {
+        let bottomBgView = UIView(frame: CGRect(x: 0, y: KSreenHeight-267, width: KSreenWidth, height: 267))
+        bottomBgView.backgroundColor = HexColor("#FFFFFF")
+        bottomBgView.layer.cornerRadius = 9
+        bottomBgView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMaxXMinYCorner]
+        bottomBgView.tag = 10000
+        return bottomBgView
+    }()
+    
+    ///专辑标题
+    lazy var albumTitleLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(15, 15, KSreenWidth-15-60, 20))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_16
+        titleLabel.text = "剧集名称45集"
+        return titleLabel
+    }()
+    
+    lazy var closeBtn: UIButton = {
+        let  closeBtn = UIButton(type: .custom)
+        closeBtn.frame = CGRect(x: self.albumTitleLabel.right, y: 0, width: 50, height: 50)
+        closeBtn.setImage(UIImage(named: "point_alert_close"), for: .normal)
+        closeBtn.addTarget(self, action: #selector(closeBtnAction), for: .touchUpInside)
+        return closeBtn
+    }()
+
+    lazy var bottomLineView :UIView = {
+        let bottomLineView = UIView(frame: CGRect(x: 0, y: self.closeBtn.bottom+2, width: KSreenWidth, height: 1))
+        bottomLineView.backgroundColor = HexColor("#E4E4E4")
+        return bottomLineView
+    }()
+    
+    ///积分数量
+    lazy var integralCountLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(0, self.bottomLineView.bottom+30, 100, 66))
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .left
+        titleLabel.font = UIFont.boldSystemFont(ofSize: 55)
+        titleLabel.text = "8000"
+        return titleLabel
+    }()
+    ///余额XXX积分
+    lazy var balanceIntegralLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(0, 0, 100, 20))
+        titleLabel.textColor = HexColor("#696969")
+        titleLabel.textAlignment = .left
+        titleLabel.font = Font_14
+        return titleLabel
+    }()
+    
+    lazy var payBtn: UIButton = {
+        let  payBtn = UIButton(type: .custom)
+        payBtn.frame = CGRect(x: 15, y: self.bottomBgView.height-15-44, width: KSreenWidth-30, height: 44)
+        payBtn.setTitleColor(HexColor("#FFFFFF"), for: .normal)
+        // fillCode
+        let bgLayer1 = CAGradientLayer()
+        bgLayer1.colors = [UIColor(red: 0.4, green: 0.77, blue: 1, alpha: 1).cgColor, UIColor(red: 0.38, green: 0.6, blue: 1, alpha: 1).cgColor]
+        bgLayer1.locations = [0, 1]
+        bgLayer1.frame = payBtn.bounds
+        bgLayer1.startPoint = CGPoint(x: 0, y: 0.5)
+        bgLayer1.endPoint = CGPoint(x: 0.5, y: 0.5)
+        payBtn.layer.addSublayer(bgLayer1)
+        payBtn.addTarget(self, action: #selector(payBtnAction), for: .touchUpInside)
+        return payBtn
+    }()
+    
+    ///支付中img
+    lazy var payingImgView :UIImageView = {
+        let payingImgView = UIImageView(frame: CGRect(x: (KSreenWidth-45)/2.0, y: self.bottomLineView.bottom+65, width: 45, height: 43))
+        payingImgView.image = UIImage(named: "jifen_paying")
+        return payingImgView
+    }()
+    ///支付成功img
+    lazy var paySuccessImgView :UIImageView = {
+        let paySuccessImgView = UIImageView(frame: CGRect(x: (KSreenWidth-78)/2.0, y: 60, width: 78, height: 78))
+        paySuccessImgView.image = UIImage(named: "jifen_paySuccess")
+        return paySuccessImgView
+    }()
+
+    ///支付中
+    lazy var payingLabel: UILabel = {
+        let titleLabel = UILabel.init(frame: CGRectMake(0, self.payingImgView.bottom+15, KSreenWidth-40, 20))
+        titleLabel.centerX = self.payingImgView.centerX
+        titleLabel.textColor = HexColor("#333333")
+        titleLabel.textAlignment = .center
+        titleLabel.font = Font_14
+        return titleLabel
+    }()
+    
+    // MARK: - show
+    ///弹出积分购买弹窗
+    func showIntegralAlert(title:String,integralCount:String,productId:String){
+        self.title = title
+        self.integralCount = integralCount
+        self.productId = productId
+        
+        delegate.window?.addSubview(self.bgBtnView)
+        delegate.window?.addSubview(self.bottomBgView)
+
+        //专辑所需积分值
+        let intIntegralCount = Int(integralCount)!
+        //用户积分值
+        self.getCheckIn { result, status in
+            let checkInModel = result as! MinePointCheckInModel
+            self.checkInModel = checkInModel
+            let pointStr = checkInModel.integral ?? "0"
+            let intPoint = Int(pointStr)!
+            self.point = intPoint
+            if intPoint > intIntegralCount{
+                //可以支付积分
+                self.currentIntegralPayStatus = .integralEnough
+                
+            }else{
+                //积分不足
+                self.currentIntegralPayStatus = .integralNotEnough
+            }
+            self.initUI()
+
+        }
+    }
+    
+    //隐藏积分购买弹窗
+    func hiddenIntegralAlert(){
+        delegate.window?.subviews.forEach({ view in
+            if view.tag == 10000{
+                UIView.animate(withDuration: 0.25) {
+                    view.removeFromSuperview()
+                    self.bgBtnView.removeFromSuperview()
+                }
+            }
+        })
+    }
+    
+    func initUI(){
+        self.bottomBgView.subviews.forEach { view in
+            view.removeFromSuperview()
+        }
+
+        if self.currentIntegralPayStatus == .integralEnough{
+            //积分充足
+            self.bottomBgView.addSubview(self.albumTitleLabel)
+            self.albumTitleLabel.text = self.title
+            self.bottomBgView.addSubview(self.closeBtn)
+            self.bottomBgView.addSubview(self.bottomLineView)
+            self.bottomBgView.addSubview(self.integralCountLabel)
+            let integralCountStr = "\(self.integralCount)积分"
+            let priceAttri = NSMutableAttributedString.init(string: integralCountStr)
+            priceAttri.addAttribute(.font, value: regular_adapt_font(pointSize: 55), range: NSMakeRange(0, integralCountStr.count-2))
+            priceAttri.addAttribute(.foregroundColor, value: HexColor("#333333")!, range: NSMakeRange(0, integralCountStr.count-2))
+            priceAttri.addAttribute(.font, value: regular_adapt_font(pointSize: 16), range: NSMakeRange(integralCountStr.count-2, 2))
+            priceAttri.addAttribute(.foregroundColor, value: HexColor("#333333")!, range: NSMakeRange(integralCountStr.count-2, 2))
+            self.integralCountLabel.attributedText = priceAttri
+
+            self.bottomBgView.addSubview(self.balanceIntegralLabel)
+            
+            self.balanceIntegralLabel.text = String(format: "余额%d积分", self.point)
+            
+            self.bottomBgView.addSubview(self.payBtn)
+            self.payBtn.setTitle("确认支付", for: .normal)
+            
+            self.integralCountLabel.snp.makeConstraints { make in
+                make.centerX.equalTo(self.bottomBgView.snp.centerX)
+                make.top.equalTo(self.bottomLineView.snp.bottom).offset(30)
+                make.width.lessThanOrEqualToSuperview().offset(-10)
+            }
+            self.balanceIntegralLabel.snp.makeConstraints { make in
+                make.centerX.equalTo(self.bottomBgView.snp.centerX)
+                make.top.equalTo(self.integralCountLabel.snp.bottom).offset(5)
+                make.width.lessThanOrEqualToSuperview()
+            }
+            
+        }else if self.currentIntegralPayStatus == .integralNotEnough{
+            //积分不足
+            self.bottomBgView.addSubview(self.albumTitleLabel)
+            self.albumTitleLabel.text = self.title
+            self.bottomBgView.addSubview(self.closeBtn)
+            self.bottomBgView.addSubview(self.bottomLineView)
+            self.bottomBgView.addSubview(self.integralCountLabel)
+            let integralCountStr = "\(self.integralCount)积分"
+            let priceAttri = NSMutableAttributedString.init(string: integralCountStr)
+            priceAttri.addAttribute(.font, value: regular_adapt_font(pointSize: 55), range: NSMakeRange(0, integralCountStr.count-2))
+            priceAttri.addAttribute(.foregroundColor, value: HexColor("#333333")!, range: NSMakeRange(0, integralCountStr.count-2))
+            priceAttri.addAttribute(.font, value: regular_adapt_font(pointSize: 16), range: NSMakeRange(integralCountStr.count-2, 2))
+            priceAttri.addAttribute(.foregroundColor, value: HexColor("#333333")!, range: NSMakeRange(integralCountStr.count-2, 2))
+            self.integralCountLabel.attributedText = priceAttri
+
+            self.bottomBgView.addSubview(self.balanceIntegralLabel)
+            self.balanceIntegralLabel.text = String(format: "余额%d积分   积分不足", self.point)
+
+            self.bottomBgView.addSubview(self.payBtn)
+            self.payBtn.setTitle("去赚积分", for: .normal)
+
+            self.integralCountLabel.snp.makeConstraints { make in
+                make.centerX.equalTo(self.bottomBgView.snp.centerX)
+                make.top.equalTo(self.bottomLineView.snp.bottom).offset(30)
+                make.width.lessThanOrEqualToSuperview().offset(-10)
+            }
+            self.balanceIntegralLabel.snp.makeConstraints { make in
+                make.centerX.equalTo(self.bottomBgView.snp.centerX)
+                make.top.equalTo(self.integralCountLabel.snp.bottom).offset(5)
+                make.width.lessThanOrEqualToSuperview()
+            }
+        }else if self.currentIntegralPayStatus == .paying{
+            //支付中
+            self.bottomBgView.addSubview(self.albumTitleLabel)
+            self.albumTitleLabel.text = self.title
+            self.bottomBgView.addSubview(self.closeBtn)
+            self.bottomBgView.addSubview(self.bottomLineView)
+            self.bottomBgView.addSubview(self.payingImgView)
+            self.payingImgView = UIImageView(frame: CGRect(x: (KSreenWidth-45)/2.0, y: self.bottomLineView.bottom+65, width: 45, height: 43))
+            self.payingImgView.image = UIImage(named: "jifen_paying")
+            
+            self.bottomBgView.addSubview(self.payingLabel)
+            self.payingLabel.text = "支付中..."
+            
+        }else if self.currentIntegralPayStatus == .paySuccess{
+            //支付成功
+            self.bottomBgView.addSubview(self.paySuccessImgView)
+            self.paySuccessImgView = UIImageView(frame: CGRect(x: (KSreenWidth-78)/2.0, y: 60, width: 78, height: 78))
+            self.paySuccessImgView.image = UIImage(named: "jifen_paySuccess")
+
+            self.bottomBgView.addSubview(self.payingLabel)
+            self.payingLabel.text = "支付成功\(self.integralCount)积分"
+            
+            self.bottomBgView.addSubview(self.payBtn)
+            self.payBtn.setTitle("完成", for: .normal)
+            
+        }else if self.currentIntegralPayStatus == .payFailed{
+            //支付失败
+        }else{
+            //其他
+        }
+    }
+    
+    //获取用户积分
+    func getCheckIn(resultBlock: @escaping downSlideResultBlock){
+        CNLiveMineViewModel.requestWithCheckIn { result, respStatue in
+            if respStatue == .success {
+                let checkModel = result as! MinePointCheckInModel
+                resultBlock(checkModel, .success)
+            } else {
+                resultBlock(NSNull(), .failed)
+            }
+        }
+    }
+    
+    // MARK: - BtnAction
+    @objc func bgBtnViewAction(){
+        self.hiddenIntegralAlert()
+    }
+    @objc func closeBtnAction(){
+        self.hiddenIntegralAlert()
+    }
+    @objc func payBtnAction(){
+        if self.currentIntegralPayStatus == .integralEnough{
+            self.postOrderVideoByPoint()
+        }else if self.currentIntegralPayStatus == .integralNotEnough{
+            self.hiddenIntegralAlert()
+            //跳转任务中心
+            navigationViewController().pushViewController(CNLiveMineQuestViewController(checkModel: self.checkInModel!), animated: pushAnimated)
+
+        }else if self.currentIntegralPayStatus == .paying{
+            
+        }else if self.currentIntegralPayStatus == .paySuccess{
+            self.hiddenIntegralAlert()
+        }else if self.currentIntegralPayStatus == .payFailed{
+            self.currentIntegralPayStatus = .integralEnough
+            self.initUI()
+        }else{
+            
+        }
+    }
+    // MARK: - 积分付费接口
+    func postOrderVideoByPoint(){
+        self.currentIntegralPayStatus = .paying
+        self.initUI()
+        //付费接口
+        CNLiveHomePageViewModel.orderVideoByPoint(prdId: self.productId) { result, status in
+            if status == .success{
+                //购买成功
+                self.currentIntegralPayStatus = .paySuccess
+                self.initUI()
+                //刷新短剧首页数据
+                self.homePageNeedReloadActionBlock!()
+            }else{
+                //购买失败
+                if self.point > Int(self.integralCount)!{
+                    //可以支付积分
+                    self.currentIntegralPayStatus = .integralEnough
+                }else{
+                    //积分不足
+                    self.currentIntegralPayStatus = .integralNotEnough
+                }
+                self.initUI()
+                let errMsg = result as! String
+                showMessage(message: errMsg)
+            }
+        }
+        
+    }
+
+    
+}
@@ -166,7 +166,6 @@ func hiddenLoading() {
     MBProgressHUD.hide(for: delegate.window!, animated: true)
 }
-
 ///####模型转换#########
 /**
  *  Json转对象
@@ -105,29 +105,30 @@ class CNLiveAlbumCell:UITableViewCell{
     }
     //获取专辑详情(简介等)
-//    func getAlbumMsg(){
-//        var aid = ""
-//        if self.albumModel != nil{
-//            aid = self.albumModel!.contentId
-//        }else if self.albumMsgModel != nil{
-//            aid = self.albumMsgModel!.albumId
-//        }else{
-//            aid = ""
-//        }
-//        CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { result, status in
-//            hiddenLoading()
-//            if status == .success{
-//                let model = result as! CNLiveAlbumMsgModel
-//                for listModel in self.albumModelArr! {
-//                    listModel.albumMsgModel = model
-//                }
-//                print("暂时跳转主页")
-//                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLivePlayletHomePageController(albumModelArr: self.albumModelArr!), animated: true)
-//            }else{
-//                
-//            }
-//        }
-//    }
+    func getAlbumMsg(){
+        var aid = ""
+        if self.albumModel != nil{
+            aid = self.albumModel!.contentId
+        }else if self.albumMsgModel != nil{
+            aid = self.albumMsgModel!.albumId
+        }else{
+            aid = ""
+        }
+        CNLiveHomePageViewModel.getAlbumMsg(aid: aid) { result, status in
+            hiddenLoading()
+            if status == .success{
+                let model = result as! CNLiveAlbumMsgModel
+                for listModel in self.albumModelArr! {
+                    listModel.albumMsgModel = model
+                }
+                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLiveShortVideoViewController(), animated: pushAnimated)
+                
+                navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLivePlayletHomePageController(aid: aid), animated: true)
+            }else{
+                
+            }
+        }
+    }
     //获取专辑视频列表详情(播放地址 ,点赞数等信息)
     func getAlbumList(){
         showLoading(message: "")
@@ -140,18 +141,15 @@ class CNLiveAlbumCell:UITableViewCell{
             aid = ""
         }
-        navigationViewController().visibleViewController?.navigationController?.pushViewController(CNLivePlayletHomePageController(aid: aid), animated: true)
-        return
-//        
-//        CNLiveHomePageViewModel.getAlbumList(aid: aid){ result, status in
-//            hiddenLoading()
-//            if status == .success{
-//                let arr = result as! Array<CNLiveAlbumListModel>
-//                self.albumModelArr = Array(arr)
-//                self.getAlbumMsg()
-//            }else{
-//                
-//            }
-//        }
+        CNLiveHomePageViewModel.getAlbumList(aid: aid){ result, status in
+            hiddenLoading()
+            if status == .success{
+                let arr = result as! Array<CNLiveAlbumListModel>
+                self.albumModelArr = Array(arr)
+                self.getAlbumMsg()
+            }else{
+                
+            }
+        }
     }
 }
@@ -311,11 +311,13 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         button.isSelected = !button.isSelected
         if self.albumListModel?.product?.check == false{
             //未购买->购买
-            //弹窗购买,再调用接口
-            
-            
-//            self.postOrderVideoByPoint()
-
+            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)
+                }
+            }
         }
     }
     func paymentChangeStatus(isPayed:Bool){
@@ -382,23 +384,6 @@ class CNLivePlayletHomePageHeaderCell:UITableViewCell{
         }
     }
-    // MARK: - 积分付费接口
-    func postOrderVideoByPoint(){
-        //付费接口
-        CNLiveHomePageViewModel.orderVideoByPoint(prdId: self.albumListModel?.product?.productId ?? "") { result, status in
-            if status == .success{
-                //购买成功
-                
-                //刷新短剧首页数据
-                self.homePageNeedReloadActionBlock!()
-            }else{
-                //购买失败
-                let errMsg = result as! String
-                showMessage(message: errMsg)
-            }
-        }
-        
-    }
     // MARK: - 网络请求 追剧1/取消追剧2
     func postAlbumCollect(type:NSInteger){
         CNLiveHomePageViewModel.postAlbumCollect(aid: self.albumListModel?.albumMsgModel?.albumId ?? "", type: type) { result, status in
@@ -182,16 +182,18 @@ class CNLiveHomePageViewModel:NSObject{
     static func orderVideoByPoint(prdId:String,resultBlock: @escaping downSlideResultBlock) {
         let param = NSMutableDictionary()
         param.setValue(UserInfoManager.shared.userInfo.uid, forKey: "sid")
-        param.setValue(APPId, forKey: "sp_id")
+        param.setValue(APPId_wjj, forKey: "sp_id")
         param.setValue(prdId, forKey: "prdId")
         param.setValue("apple", forKey: "frmId")
         param.setValue(CNLiveHomePageViewModel.getRandomOrderId(), forKey: "srvOrderId")
-        
+        let customParam = NSMutableDictionary()
+        customParam.setValue(APPId, forKey: "appId")
+        customParam.setValue(APPKey, forKey: "appKey")
+
         CNLiveNetworking.setupShowResult(true)
         CNLiveNetworking.setAllowRequestDefaultArgument(true)
         CNLiveNetworking.setupShowDataResult(false)
-        CNLiveNetworking.setupSignRequestKey(APPKey)//APPKey_wjj APPKey
-
+        CNLiveNetworking.setupCustomParam(customParam as? [String : String])
         CNLiveNetworking.requestNetwork(with: .POST, urlString: "\(CNLiveEnvironmentManager.shared.img_token_url)/pom/orderVideoByPoint", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -222,7 +224,7 @@ class CNLiveHomePageViewModel:NSObject{
         //取毫秒时间戳
         let timestamp13 = String(format: "%ld",self.getNow13Timestamp())//timeStamp)
         //拼接
-        randomOrderId = String(format: "%@%@%@%d", APPId, currentDateString, timestamp13, Int.random(in: 0..<10))
+        randomOrderId = String(format: "%@%@%@%d", APPId_wjj, currentDateString, timestamp13, Int.random(in: 0..<10))
         return randomOrderId
     }
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "jifen_paySuccess@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "jifen_paySuccess@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "jifen_paying@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "jifen_paying@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "point_alert_close@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "point_alert_close@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}