处理退款，修复保留bug,首页视频播放

PhoneManager/Class/Manager/IAPManager/IAPManager.swift

@@ -188,6 +188,7 @@ extension IAPManager {
         verifyReceiptWithApple { result in
             switch result {
             case .success(let receipt):
+               // print("收据信息：\(receipt)")
                 let status = self.checkSubscriptionStatus(receiptInfo: receipt)
                 DispatchQueue.main.async {
                     completion(status.isActive, status.subscriptionType, status.expiresDate)
@@ -570,12 +571,18 @@ extension IAPManager{
          if let receipt = receiptInfo["receipt"] as? [String: Any],
             let inAppPurchases = receipt["in_app"] as? [[String: Any]] {
              // 检查是否存在永久商品购买记录
-             let hasLifetimePurchase = inAppPurchases.contains { purchase in
-                 return purchase["product_id"] as? String == ProductID.lifetimeMember
+             let hasValidLifetimePurchase = inAppPurchases.contains { purchase in
+                 let productId = purchase["product_id"] as? String
+                 let cancelled = purchase["cancellation_date"] != nil
+                 let ownershipType = purchase["in_app_ownership_type"] as? String
+                 
+                 return productId == ProductID.lifetimeMember && 
+                        !cancelled && 
+                        ownershipType == "PURCHASED"
              }
              
-             if hasLifetimePurchase {
-                 print("检测到永久商品购买记录")
+             if hasValidLifetimePurchase {
+                 print("检测到有效的永久商品购买记录")
                  return (true, false, .lifetime, nil)
              }
          }
@@ -600,9 +607,10 @@ extension IAPManager{
          // 解析试用期状态
          let isTrial = (lastReceipt["is_trial_period"] as? String) == "true"
          
-         // 获取过期时间
+         // 获取过期时间和退款状态
          let expiresDate = getExpiryDate(from: lastReceipt)
-         let isActive = expiresDate?.compare(Date()) == .orderedDescending
+         let isCancelled = lastReceipt["cancellation_date"] != nil
+         let isActive = !isCancelled && (expiresDate?.compare(Date()) == .orderedDescending)
          
          // 确定订阅类型
          let productId = lastReceipt["product_id"] as? String

PhoneManager/Class/Manager/PMPhotoManager/PHImageLoad.swift

@@ -79,7 +79,7 @@ extension UIImageView {
         options.progressHandler = { progress, error, stop, info in
             DispatchQueue.main.async {
                 // 可以在这里添加加载进度的处理
-                print("Loading progress: \(progress)")
+               // print("Loading progress: \(progress)")
                 if let error = error {
                     print("Loading error: \(error.localizedDescription)")
                 }

PhoneManager/Class/Manager/PMPhotoManager/PhotoManager.swift

@@ -215,6 +215,7 @@ class PhotoManager{
             
             let start = CFAbsoluteTimeGetCurrent()
             self.videoModels = await convertAssetsToModel(for: self.videoAssets, mediaType: 2)
+            self.videoModels.sort { $0.createDate > $1.createDate }
             let duration = CFAbsoluteTimeGetCurrent() - start
             print("视频转换总耗时: \(duration)秒")
             let videoTotalSize = Int64(self.videoModels.reduce(0){$0+$1.assetSize})
@@ -244,6 +245,7 @@ class PhotoManager{
             
             let start = CFAbsoluteTimeGetCurrent()
             self.otherModels = await convertAssetsToModel(for: self.otherAssets, mediaType: 1)
+            self.otherModels.sort { $0.createDate > $1.createDate }
             let duration = CFAbsoluteTimeGetCurrent() - start
             print("其他图片转换总耗时: \(duration)秒")
             let otherTotalSize = Int64(self.otherModels.reduce(0){$0+$1.assetSize})
@@ -269,11 +271,11 @@ class PhotoManager{
                     self.screenShotTotalSize = screenShotTotalSize
                     complectionHandler?(localModels, screenShotTotalSize)
                 }
-                return
             }
             
             let start = CFAbsoluteTimeGetCurrent()
             self.screenShotModels = await convertAssetsToModel(for: self.screenShotAssets, mediaType: 1)
+            self.screenShotModels.sort { $0.createDate > $1.createDate }
             let duration = CFAbsoluteTimeGetCurrent() - start
             print("截图转换总耗时: \(duration)秒")
             let screenShotTotalSize = Int64(self.screenShotModels.reduce(0){$0+$1.assetSize})
@@ -524,7 +526,7 @@ extension PhotoManager{
          options.version = .original
          options.deliveryMode = .highQualityFormat
          options.isNetworkAccessAllowed = true
-         
+        
          // 4. 请求视频资源
          PHImageManager.default().requestAVAsset(forVideo: asset, options: options) { (avAsset, _, _) in
              DispatchQueue.main.async {

PhoneManager/Class/Page/Home/View/HomeView.swift

@@ -51,7 +51,7 @@ class HomeView:UIView {
         
         sview.register(HomeTitleCollectionCell.self, forCellWithReuseIdentifier: HomeTitleCollectionCell.identifiers)
         sview.register(HomeOtherCollectionCell.self, forCellWithReuseIdentifier: HomeOtherCollectionCell.identifier)
-        
+        sview.register(HomeVideoCoverCell.classForCoder(), forCellWithReuseIdentifier: "HomeVideoCoverCell")
         sview.register(HomeCollectionViewHeader.self, forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader, withReuseIdentifier: "HomeCollectionViewHeader")
         sview.register(UICollectionReusableView.self,forSupplementaryViewOfKind: UICollectionView.elementKindSectionFooter,withReuseIdentifier: "HomeCollectionViewFooter")
         
@@ -278,11 +278,19 @@ extension HomeView:WaterfallMutiSectionDelegate,UICollectionViewDataSource,UICol
             
             return cell
         case 1:
-            let cell = collectionView.dequeueReusableCell(withReuseIdentifier: HomeOtherCollectionCell.identifier, for: indexPath) as! HomeOtherCollectionCell
-            cell.dealMediaType(indexPath.row)
-           let model = viewModel.cardGroup[indexPath.row]
-            cell.reloadUIWithModel(model: model)
-            return cell
+            if viewModel.cardGroup[indexPath.row].folderName == HomeUIEnum.SimilarVideos.title ||  viewModel.cardGroup[indexPath.row].folderName ==  HomeUIEnum.Videos.title{
+                let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "HomeVideoCoverCell", for: indexPath) as! HomeVideoCoverCell
+               let model = viewModel.cardGroup[indexPath.row]
+                cell.reloadUIWithModel(model: model)
+                return cell
+            }else{
+                let cell = collectionView.dequeueReusableCell(withReuseIdentifier: HomeOtherCollectionCell.identifier, for: indexPath) as! HomeOtherCollectionCell
+                cell.dealMediaType(indexPath.row)
+               let model = viewModel.cardGroup[indexPath.row]
+                cell.reloadUIWithModel(model: model)
+                return cell
+            }
+   
         default:
             return UICollectionViewCell()
         }
@@ -402,9 +410,9 @@ extension HomeView:WaterfallMutiSectionDelegate,UICollectionViewDataSource,UICol
     func referenceSizeForHeader(collectionView collection: UICollectionView, layout: WaterfallMutiSectionFlowLayout, section: Int) -> CGSize {
         if section == 0 {
             if PhotoManager.shared.permissionStatus == .authorized{
-                return CGSize(width: self.collectionView.width, height: 76 + (self.homeNavView?.height ?? 0))
+                return CGSize(width:ScreenW-(marginLR*2), height: 76 + (self.homeNavView?.height ?? 0))
             }else{
-                return CGSize(width: self.collectionView.width, height: 450)
+                return CGSize(width:ScreenW-(marginLR*2), height: 450)
             }
         }
         return CGSize.zero

PhoneManager/Class/Page/Home/View/cell/HomeTitleCollectionCell.swift

@@ -12,7 +12,7 @@ class HomeTitleCollectionCell:UICollectionViewCell {
     
     static let identifiers = "HomeTitleCollectionCellID"
     
-    private var titleLabel: UILabel?
+    private var titleLabel: UILabel!
     
     public var fileLabel:UILabel?
     
@@ -48,8 +48,8 @@ class HomeTitleCollectionCell:UICollectionViewCell {
         
         
         titleLabel = UILabel()
-        titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .bold)
-        titleLabel?.textColor = UIColor.colorWithHex(hexStr: black3Color)
+        titleLabel.font = UIFont.systemFont(ofSize: 16, weight: .bold)
+        titleLabel.textColor = UIColor.colorWithHex(hexStr: black3Color)
         
         fileLabel = UILabel()
         fileLabel?.font = UIFont.systemFont(ofSize: 14, weight: .bold)
@@ -118,8 +118,8 @@ class HomeTitleCollectionCell:UICollectionViewCell {
         guard let model = model else { return }
         self.model = model
         
-        titleLabel?.text = model.folderName
-        titleLabel?.sizeToFit()
+        titleLabel.text = model.folderName
+        titleLabel.sizeToFit()
         
         var count = 0
         
@@ -137,8 +137,8 @@ class HomeTitleCollectionCell:UICollectionViewCell {
             assetsModels = assets.compactMap({ model in
                 return ImageCollectionModel.init(asset: model)
             })
-            collectionView?.reloadData()
         }
+        collectionView?.reloadData()
         
     }
     
@@ -155,12 +155,12 @@ class HomeTitleCollectionCell:UICollectionViewCell {
         
         super.layoutSubviews()
         
-        titleLabel?.snp.makeConstraints({ make in
+        titleLabel.snp.makeConstraints({ make in
             
             make.top.left.equalTo(16)
         })
         
-        titleLabel?.sizeToFit()
+        titleLabel.sizeToFit()
         
         fileLabel?.snp.makeConstraints({ make in
             
@@ -172,9 +172,9 @@ class HomeTitleCollectionCell:UICollectionViewCell {
         
         collectionView?.snp.makeConstraints({ make in
             make.left.equalTo(16)
-            make.bottom.equalTo(-16)
+            make.bottom.equalTo(0)
             make.right.equalTo(-16)
-            make.top.equalTo(48)
+            make.top.equalTo(titleLabel.snp.bottom).offset(13)
         })
         
         nextImage?.snp.makeConstraints({ make in
@@ -205,7 +205,7 @@ extension HomeTitleCollectionCell:UICollectionViewDelegate,UICollectionViewDataS
     
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
          // 计算 cell 宽度
-        return CGSize(width:collectionView.height - 2.5, height: collectionView.height - 2.5)  // 宽高相等，形成网格
+        return CGSize(width:collectionView.height - 18, height: collectionView.height - 18)  // 宽高相等，形成网格
     }
     
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, minimumInteritemSpacingForSectionAt section: Int) -> CGFloat {

PhoneManager/Class/Page/Home/View/cell/HomeVideoCoverCell.swift

+//
+//  HomeVideoCoverCell.swift
+//  PhoneManager
+//
+//  Created by edy on 2025/5/20.
+//
+
+import UIKit
+import AVKit
+
+class HomeVideoCoverCell: UICollectionViewCell {
+    
+    var videoUrl:URL?
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private func setupUI() {
+        backgroundColor = .white
+        self.contentView.addSubview(self.titleLabel)
+        self.contentView.addSubview(self.imageView)
+
+        contentView.layer.addSublayer(playerLayer)
+        self.contentView.addSubview(self.infoBackView)
+        self.infoBackView.addSubview(self.countLabel)
+        self.infoBackView.addSubview(self.sizeLabel)
+        self.infoBackView.addSubview(self.moreImageView)
+    }
+    
+    func reloadUIWithModel(model:HomePhotosModel?){
+        // 1. 先重置状态
+        guard let model else {
+            playerLayer.isHidden = true
+            videoPlayer.pause()
+            return
+        }
+        
+        // 设置标题
+        self.titleLabel.text = model.folderName
+        // 获取数量
+        var count = 0
+        for item in model.assets {
+            count = count + item.count
+        }
+        // 设置数量文字
+        self.countLabel.text = "\(count) Videos"
+        // 设置文件大小文字
+        let sizeKB : Double = model.allFileSize/1000
+        if sizeKB < 1000{
+            self.sizeLabel.text = String(format: "(%.2lf) KB" ,sizeKB)
+        }else if sizeKB < (1000 * 1000) && sizeKB > 1000{
+            self.sizeLabel.text = String(format: "(%.2lf) MB" ,sizeKB/1000)
+        }else{
+            self.sizeLabel.text = String(format: "(%.2lf) GB" ,sizeKB/(1000 * 1000))
+        }
+        
+        // 2. 设置新数据
+        if let id = model.assets.first?.first?.localIdentifier{
+            // 保存当前的 identifier 用于验证
+            let currentID = id
+            imageView.asset.load(withLocalIdentifier:id,placeholder: UIImage(named: "videosmoren"))
+            PhotoManager.shared.getVideoURL(localIdentifier:id, completion: {[weak self] url in
+                guard let weakSelf = self else { return }
+                // 验证 ID 是否匹配，避免 cell 重用导致的错误
+                if currentID == id {
+                    weakSelf.configure(with: url)
+                }
+            })
+            
+        }else{
+            self.imageView.image = UIImage.init(named: "videosmoren")
+            playerLayer.isHidden = true
+            videoPlayer.pause()
+        }
+    }
+    
+    public let imageView: UIImageView = {
+        let iv = UIImageView()
+        iv.contentMode = .scaleAspectFill
+        iv.clipsToBounds = true
+        iv.layer.cornerRadius = 8
+        iv.backgroundColor = .clear
+        return iv
+    }()
+    
+    private let infoBackView: UIView = {
+        let iv = UIView()
+        iv.clipsToBounds = true
+        iv.layer.cornerRadius = 8
+        iv.backgroundColor = UIColor(red: 0, green: 0, blue: 0, alpha: 0.4)
+        return iv
+    }()
+    
+    
+    public var countLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = .white
+        label.font = .systemFont(ofSize: 14, weight: .medium)
+        label.textAlignment = .left
+        return label
+    }()
+    
+    let sizeLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = .white
+        label.font = .systemFont(ofSize: 10, weight: .medium)
+        label.textAlignment = .left
+        return label
+    }()
+    
+    private let moreImageView: UIImageView = {
+        let iv = UIImageView()
+        iv.contentMode = .scaleAspectFill
+        iv.image = UIImage(named: "icon_left_setting_grey")
+        iv.backgroundColor = .clear
+        return iv
+    }()
+    
+    private let titleLabel: UILabel = {
+        let label = UILabel()
+        label.font = .systemFont(ofSize: 16, weight: .bold)
+        label.textColor = UIColor.colorWithHex(hexStr: black3Color)
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        return label
+    }()
+    
+    override func layoutSubviews() {
+        
+        self.layer.cornerRadius = 12
+        self.layer.masksToBounds = true
+        
+        imageView.snp.makeConstraints { make in
+            make.top.equalTo(self.titleLabel.snp.bottom).offset(8)
+            make.left.equalToSuperview().offset(16)
+            make.width.equalToSuperview().offset(-32)
+            make.height.equalTo(self.width - 32)
+        }
+        
+        self.infoBackView.snp.makeConstraints { make in
+            make.left.right.bottom.equalTo(imageView)
+            make.height.equalTo(40)
+        }
+
+        
+        titleLabel.snp.makeConstraints { make in
+            
+            make.left.top.equalToSuperview().offset(16)
+            make.width.equalToSuperview().offset(-32)
+        }
+        
+        self.countLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(12)
+            make.top.equalToSuperview().offset(3)
+            make.height.equalTo(20)
+        }
+        self.sizeLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(12)
+            make.top.equalTo(countLabel.snp.bottom).offset(-2)
+            make.height.equalTo(14)
+        }
+        self.moreImageView.snp.makeConstraints { make in
+            make.width.height.equalTo(20)
+            make.right.equalToSuperview().offset(-12)
+            make.centerY.equalToSuperview()
+        }
+        
+        playerLayer.frame = imageView.frame
+        playerLayer.cornerRadius = 8
+        playerLayer.masksToBounds = true
+    }
+
+    
+    lazy var videoPlayer:AVPlayer = {
+        let palyer = AVPlayer.init()
+        palyer.volume = 0
+        // 设置音频会话，允许混音
+        try? AVAudioSession.sharedInstance().setCategory(.playback, options: .mixWithOthers)
+        try? AVAudioSession.sharedInstance().setActive(true)
+        return palyer
+    }()
+    
+    lazy var playerLayer:AVPlayerLayer = {
+        let playerLayer = AVPlayerLayer.init(player: videoPlayer)
+        playerLayer.backgroundColor = UIColor.black.cgColor
+        playerLayer.isHidden = true
+        return playerLayer
+    }()
+    
+    
+    deinit{
+        NotificationCenter.default.removeObserver(self)
+    }
+   
+}
+
+
+extension HomeVideoCoverCell{
+    
+    
+    func configure(with videoURL: URL?) {
+        
+        guard let videoURL = videoURL else{
+            playerLayer.isHidden = true
+            videoPlayer.pause()
+            return
+        }
+        playerLayer.isHidden = false
+        
+        if videoURL == videoUrl{
+            Print("地址相同，无需刷新")
+            return
+        }
+        videoUrl = videoURL
+        
+        Print("地址不同，需刷新")
+        
+        let item = AVPlayerItem.init(url: videoURL)
+        
+        videoPlayer.replaceCurrentItem(with: item)
+        
+        videoPlayer.play()
+
+        NotificationCenter.default.addObserver(self,
+                                             selector: #selector(playerDidFinishPlaying),
+                                             name: .AVPlayerItemDidPlayToEndTime,
+                                             object: item)
+    }
+
+    @objc private func playerDidFinishPlaying() {
+
+        videoPlayer.seek(to: .zero)
+        videoPlayer.play()
+    }
+
+    
+
+
+}

PhoneManager/Class/Page/Keep/Controller/MaintaiDetailViewController.swift

@@ -80,6 +80,7 @@ class MaintaiDetailViewController: BaseViewController {
         if isSelectAll{
             let ids = viewModel.souces.flatMap{$0}.compactMap{$0.localIdentifier}
             if GroupDatabase.shared.batchDelete(localIdentifiers: ids){
+                selectAsset.removeAll()
                 self.navigationController?.popViewController(animated: true)
             }
             isSelectAll = false
@@ -175,7 +176,7 @@ extension MaintaiDetailViewController:UITableViewDelegate,UITableViewDataSource{
             }
             
             // 拿到当前在选中数据的下标
-             let selectIndex = selectAsset.firstIndex(where: {
+             var selectIndex = selectAsset.firstIndex(where: {
                  $0 == cell.selectAsset
              })
             
@@ -191,11 +192,15 @@ extension MaintaiDetailViewController:UITableViewDelegate,UITableViewDataSource{
                         weakSelf.selectAsset[sIndex] = selects
                     }else{
                         weakSelf.selectAsset.remove(at: sIndex)
+                        selectIndex = nil
                     }
                     
                 }else{
                     Print("没有任何选中数据")
                     weakSelf.selectAsset.append(selects)
+                    selectIndex = weakSelf.selectAsset.firstIndex(where: {
+                        $0 == selects
+                    })
                 }
                 weakSelf.dealMutilImagePick()
             }
@@ -238,8 +243,10 @@ extension MaintaiDetailViewController:UITableViewDelegate,UITableViewDataSource{
         }else{
             maintaiBottomView.disMiss()
         }
-        
-        tableView.reloadData()
+       // tableView.reloadData()
+//        UIView.performWithoutAnimation {
+//            self.tableView.reloadData()
+//        }
     }
     
     func dealPickAssetModel(index:Int){

PhoneManager/Class/Page/Keep/View/MaintaiDetailImageCell.xib

@@ -21,10 +21,10 @@
                         <rect key="frame" x="0.0" y="0.0" width="269" height="253"/>
                     </imageView>
                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oJ5-js-pjw">
-                        <rect key="frame" x="234" y="213" width="30" height="30"/>
+                        <rect key="frame" x="235" y="219" width="34" height="34"/>
                         <constraints>
-                            <constraint firstAttribute="width" constant="30" id="gGs-ha-T24"/>
-                            <constraint firstAttribute="height" constant="30" id="mvi-bY-CFY"/>
+                            <constraint firstAttribute="width" constant="34" id="gGs-ha-T24"/>
+                            <constraint firstAttribute="height" constant="34" id="mvi-bY-CFY"/>
                         </constraints>
                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                         <state key="normal" image="icon_maintai_unselect_big"/>
@@ -38,8 +38,8 @@
             <viewLayoutGuide key="safeArea" id="ZTg-uK-7eu"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="T4a-zL-UKQ" secondAttribute="bottom" id="B7R-M8-dpU"/>
-                <constraint firstAttribute="bottom" secondItem="oJ5-js-pjw" secondAttribute="bottom" constant="10" id="BfF-Td-Tcc"/>
-                <constraint firstAttribute="trailing" secondItem="oJ5-js-pjw" secondAttribute="trailing" constant="5" id="Iw9-UA-zNe"/>
+                <constraint firstAttribute="bottom" secondItem="oJ5-js-pjw" secondAttribute="bottom" id="BfF-Td-Tcc"/>
+                <constraint firstAttribute="trailing" secondItem="oJ5-js-pjw" secondAttribute="trailing" id="Iw9-UA-zNe"/>
                 <constraint firstItem="T4a-zL-UKQ" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="MoV-lR-Hqz"/>
                 <constraint firstItem="T4a-zL-UKQ" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="dJs-Pa-MhO"/>
                 <constraint firstAttribute="trailing" secondItem="T4a-zL-UKQ" secondAttribute="trailing" id="gyj-E3-guF"/>

PhoneManager/Class/Page/Keep/View/MaintaiDetailImageSmallCell.swift

@@ -43,7 +43,7 @@ class MaintaiDetailImageSmallCell: UICollectionViewCell {
         selectBtn.addTarget(self, action: #selector(selectChange), for: .touchUpInside)
         selectBtn.snp.makeConstraints { make in
             make.right.bottom.equalTo(0)
-            make.size.equalTo(20)
+            make.size.equalTo(30)
         }
     }
     

PhoneManager/Class/Page/Keep/View/MaintaiDetailTableViewCell.swift

@@ -58,8 +58,8 @@ class MaintaiDetailTableViewCell: UITableViewCell {
     func configChild(){
         let layout = UICollectionViewFlowLayout()
         layout.itemSize = CGSize(width: smallW, height: smallW)
-        layout.minimumLineSpacing = 8
-        layout.minimumInteritemSpacing = 8
+        layout.minimumLineSpacing = 12
+        layout.minimumInteritemSpacing = 12
         layout.sectionInset = UIEdgeInsets(top: 0, left: 12, bottom: 0, right: 12)
         layout.scrollDirection = .horizontal
         
@@ -135,8 +135,9 @@ extension MaintaiDetailTableViewCell:UIScrollViewDelegate{
             Print("主图滑动距离",scrollView.contentOffset.x)
             let index = Int(scrollView.contentOffset.x/bigW)
             Print("小图滑动到下标\(index)")
+            let space:CGFloat = (self.smallW + 12) * CGFloat(index)
             UIView.animate(withDuration: 0.3) {
-                self.pageCollectionView.contentOffset = CGPoint(x: index * Int(self.smallW+8)+4, y: 0)
+                self.pageCollectionView.contentOffset = CGPoint(x:space, y: 0)
             }
         }
     }
@@ -183,8 +184,9 @@ extension MaintaiDetailTableViewCell:UIScrollViewDelegate{
         Print("小图滑动距离",offsetX)
         let index = Int((offsetX/(smallW+12)).rounded()) //Int(offsetX/(smallW+12).rounded()) //rounded(offsetX/smallW)
         Print("大图滑动到下标\(index)")
+        let space:CGFloat = (self.smallW + 12) * CGFloat(index)
         UIView.animate(withDuration: 0.3) {
-            self.pageCollectionView.contentOffset = CGPoint(x: index * Int(self.smallW+8)+4, y: 0)
+            self.pageCollectionView.contentOffset = CGPoint(x: space, y: 0)
         }
         self.mainCollectionView.contentOffset = CGPoint(x: index * Int(self.bigW), y: 0)
         draggView = .null

PhoneManager/Class/Page/Keep/View/MaintaiDetialVideoCell.swift

@@ -37,23 +37,20 @@ class MaintaiDetialVideoCell: UITableViewCell {
         contentView.bringSubviewToFront(selectBtn)
         selectBtn.addTarget(self, action: #selector(selectChange), for: .touchUpInside)
         selectBtn.snp.makeConstraints { make in
-            make.right.equalTo(-15)
-            make.bottom.equalTo(-10)
-            make.size.equalTo(30)
+            make.right.equalTo(-22)
+            make.bottom.equalTo(0)
+            make.size.equalTo(34)
         }
     }
     
     private func setupPlayer() {
-        // 创建播放器层
-//        playerLayer = AVPlayerLayer()
-//        playerLayer?.videoGravity = .resizeAspect
         contentView.layer.addSublayer(playerLayer)
     }
     
     override func layoutSubviews() {
         super.layoutSubviews()
         // 设置播放器层的frame
-        playerLayer.frame = CGRect(x: 15, y: 10, width: contentView.width-30, height: contentView.height-20)
+        playerLayer.frame = CGRect(x: 22, y: 10, width: contentView.width-44, height: contentView.height-10)
         playerLayer.cornerRadius = 15
         playerLayer.masksToBounds = true
     }
@@ -92,53 +89,34 @@ class MaintaiDetialVideoCell: UITableViewCell {
             return
         }
         
-
+        if videoPlayer.rate != 0{
+            return
+        }
         
         let item = AVPlayerItem.init(url: videoURL)
         
         videoPlayer.replaceCurrentItem(with: item)
         
         videoPlayer.play()
-        
-//        // 创建播放器项
-//        let playerItem = AVPlayerItem(url: videoURL)
-//        
-//        // 创建播放器
-//        player = AVPlayer(playerItem: playerItem)
-//        playerLayer?.player = player
-//        
-//        // 设置静音
-//        player?.volume = 0
-//        
-//        // 播放视频
-//        player?.play()
-//        
-        // 添加播放完成的观察者
+
         NotificationCenter.default.addObserver(self,
                                              selector: #selector(playerDidFinishPlaying),
                                              name: .AVPlayerItemDidPlayToEndTime,
                                              object: item)
     }
-//    
+
     @objc private func playerDidFinishPlaying() {
-//        // 播放结束后不做任何操作，因为只需要播放一次
-//        player?.pause()
-       // player?.seek(to: .zero)
-        //playerLayer.player?.seek(to: .zero)
+
         videoPlayer.seek(to: .zero)
         videoPlayer.play()
     }
-//    
-//    override func prepareForReuse() {
-//        super.prepareForReuse()
-//        // 清理播放器
-//        player?.pause()
-//        player = nil
-//        NotificationCenter.default.removeObserver(self)
-//    }
-//    
+
     
     @objc func selectChange(){
         selectChangeBlock?()
     }
+    
+    deinit{
+        NotificationCenter.default.removeObserver(self)
+    }
 }

PhoneManager/Class/Page/Pay/View/HomePayDueView.swift

@@ -46,8 +46,11 @@ class HomePayDueView: UIView {
     
     func reloadUI(_ type:Int,week:SKProduct?,life:SKProduct?){
         
-        guard let pord = week,let pord1 = life else {  return }
-        
+        guard let pord = week,let pord1 = life else {
+            self.isHidden = true
+            return
+        }
+        self.isHidden = false
         if type == 0{
             // 免费试用订阅
             dueDay.text = "Due today"

PhoneManager/Class/Page/Pay/View/HomePayView.swift

@@ -181,6 +181,7 @@ class HomePayView:UIView {
         payButton?.setTitleColor(UIColor.colorWithHex(hexStr: whiteColor), for: .normal)
         payButton?.titleLabel?.font = UIFont.scaledSystemFont(ofSize: 16, weight: .bold)
         payButton?.backgroundColor = UIColor.colorWithHex(hexStr: mColor)
+        payButton?.isEnabled = false
         payButton?.addTarget(self, action: #selector(payButtonClick), for: .touchUpInside)
         self.addSubview(payButton!)
         
@@ -314,6 +315,13 @@ class HomePayView:UIView {
        
         self.weekProduct = week
         self.lifeProduct = life
+        
+        if week != nil,life != nil{
+            payButton?.isEnabled = true
+        }else{
+            payButton?.isEnabled = false
+        }
+    
         payDueView.reloadUI(type, week: week, life: life)
         
         trailTitle.attributedText = nil
@@ -413,7 +421,7 @@ class HomePayView:UIView {
         }
         
         trailTitle = UILabel()
-        trailTitle.text = "Free for 7 days, then $6.99/week"
+        trailTitle.text = "" //"Free for 7 days, then $6.99/week"
         trailTitle.textColor = UIColor.colorWithHex(hexStr: black3Color)
         trailTitle.font = UIFont.scaledSystemFont(ofSize: 12, weight: .regular)
         tipsView.addSubview(trailTitle)

PhoneManager/Class/Page/Pay/ViewController/PayDistanceViewController.swift

@@ -21,6 +21,7 @@ class PayDistanceViewController: UIViewController {
     var payBtn:UIButton!
     
     var year:SKProduct?
+    var life:SKProduct?
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -70,14 +71,14 @@ class PayDistanceViewController: UIViewController {
         yearDistacePrice = UILabel()
         yearDistacePrice.font = UIFont.systemFont(ofSize: 14,weight: .semibold)
         yearDistacePrice.textColor = UIColor.colorWithHex(hexStr: "#111111")
-        yearDistacePrice.text = "$39.99 $19.99 / Year"
+        yearDistacePrice.text = ""//"$39.99 $19.99 / Year"
         scrollView.addSubview(yearDistacePrice)
         
-        let priceAtt = createRichPriceText(
-            originalPrice: "$39.99",
-            discountedPrice: "$19.99 / Year"
-        )
-        yearDistacePrice.attributedText = priceAtt
+//        let priceAtt = createRichPriceText(
+//            originalPrice: "$39.99",
+//            discountedPrice: "$19.99 / Year"
+//        )
+//        yearDistacePrice.attributedText = priceAtt
         
         let cancelLabel =  UILabel()
         cancelLabel.font = UIFont.systemFont(ofSize: 12,weight: .semibold)
@@ -90,13 +91,14 @@ class PayDistanceViewController: UIViewController {
         payBtn.setTitleColor(.white, for: .normal)
         payBtn.titleLabel?.font = UIFont.systemFont(ofSize: 18, weight: .semibold)
         payBtn.layer.cornerRadius = 30
+        payBtn.isEnabled = false
         payBtn.addTarget(self, action: #selector(iapPayAction), for: .touchUpInside)
         payBtn.backgroundColor = UIColor.colorWithHex(hexStr: "#0082FF")
         scrollView.addSubview(payBtn)
         
         let termsBtn = UIButton()
         termsBtn.setTitle("Terms", for: .normal)
-        termsBtn.titleLabel?.font = UIFont.systemFont(ofSize: 10,weight: .medium)
+        termsBtn.titleLabel?.font = UIFont.systemFont(ofSize: 11.RW(),weight: .medium)
         termsBtn.setTitleColor(UIColor.colorWithHex(hexStr: "#999999"), for: .normal)
         termsBtn.titleLabel?.addUnderline()
         termsBtn.addTarget(self, action: #selector(termsAction(btn:)), for: .touchUpInside)
@@ -106,9 +108,9 @@ class PayDistanceViewController: UIViewController {
         
         let recoveryBtn = UIButton()
         recoveryBtn.setTitle("Restore", for: .normal)
-        recoveryBtn.titleLabel?.font = UIFont.systemFont(ofSize: 10,weight: .medium)
+        recoveryBtn.titleLabel?.font = UIFont.systemFont(ofSize: 11.RW(),weight: .medium)
         recoveryBtn.setTitleColor(UIColor.colorWithHex(hexStr: "#999999"), for: .normal)
-        recoveryBtn.frame = CGRect(x: scrollView.bounds.width - 66, y: ScreenH - (20+kSafeAreaInsets.bottom), width: 50, height: 20)
+        recoveryBtn.frame = CGRect(x: scrollView.bounds.width - 66, y: ScreenH - (20+kSafeAreaInsets.bottom), width: CGFloat(50.RW()), height: 20)
         recoveryBtn.titleLabel?.addUnderline()
         recoveryBtn.addTarget(self, action: #selector(recoveryBtnAction), for: .touchUpInside)
         scrollView.addSubview(recoveryBtn)
@@ -256,8 +258,9 @@ class PayDistanceViewController: UIViewController {
         IAPManager.share.fetchProducts { [weak self] products in
             guard let weakSelf = self else { return }
             DispatchQueue.main.async {
-                if let (_, _,yearProduct) = products {
+                if let (_,lifetimeProduct,yearProduct) = products {
                     weakSelf.year = yearProduct
+                    weakSelf.life = lifetimeProduct
                     weakSelf.reloadSKUI()
                 }
             }
@@ -266,12 +269,13 @@ class PayDistanceViewController: UIViewController {
     
     func reloadSKUI(){
         
-        guard let year = year else{
+        guard let year = year,let life = life else{
+            payBtn.isEnabled = false
             return
         }
-
+        payBtn.isEnabled = true
         let priceAtt = createRichPriceText(
-            originalPrice: "$39.99",
+            originalPrice: "\(life.localizedPrice)",
             discountedPrice: "\(year.localizedPrice) / Year"
         )
         yearDistacePrice.attributedText = priceAtt