优化热区

PhoneManager/Assets.xcassets/img_bj_battery.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "img_bj_battery.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "img_bj_battery@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "img_bj_battery@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

PhoneManager/Class/Resource/Animation/DefaultChargeLight/DefaultChargeLight.json

+{"v":"5.6.3","fr":25,"ip":0,"op":51,"w":1122,"h":1122,"nm":"iOS电池动画","ddd":0,"assets":[{"id":"image_0","w":858,"h":189,"u":"images/","p":"____.png","e":0},{"id":"image_1","w":400,"h":661,"u":"images/","p":"Vector_104-1560.png","e":0},{"id":"image_2","w":73,"h":72,"u":"images/","p":"_____0104-1559.png","e":0},{"id":"image_3","w":45,"h":45,"u":"images/","p":"_____1104-1558.png","e":0},{"id":"image_4","w":91,"h":90,"u":"images/","p":"_____2104-1557.png","e":0},{"id":"image_5","w":64,"h":63,"u":"images/","p":"_____3104-1556.png","e":0},{"id":"image_6","w":568,"h":239,"u":"images/","p":"_____4104-1550.png","e":0},{"id":"image_7","w":1134,"h":441,"u":"images/","p":"___104-1545.png","e":0},{"id":"image_8","w":50,"h":1350,"u":"images/","p":"Rectangle_630_104-1544.png","e":0},{"id":"image_9","w":119,"h":1347,"u":"images/","p":"Rectangle_629_104-1543.png","e":0},{"id":"image_10","w":1134,"h":279,"u":"images/","p":"___104-1530.png","e":0},{"id":"image_11","w":1134,"h":1332,"u":"images/","p":"_____5104-1529.png","e":0},{"id":"image_12","w":1134,"h":279,"u":"images/","p":"_____6_104-1526.png","e":0},{"id":"image_13","w":1134,"h":279,"u":"images/","p":"_____7104-1525.png","e":0},{"id":"comp_0","layers":[{"ddd":0,"ind":1,"ty":2,"nm":"小气泡","refId":"image_2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[403.553,762,0],"ix":2},"a":{"a":0,"k":[36.5,36,0],"ix":1},"s":{"a":0,"k":[33.333,33.333,100],"ix":6}},"ao":0,"hasMask":true,"masksProperties":[{"inv":false,"mode":"n","pt":{"a":0,"k":{"i":[[102,57]],"o":[[-102,-57]],"v":[[208.84,-630]],"c":false},"ix":1},"o":{"a":0,"k":100,"ix":3},"x":{"a":0,"k":0,"ix":4},"nm":"蒙版 1"}],"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":2,"nm":"小气泡","refId":"image_3","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[511.501,781.5,0],"ix":2},"a":{"a":0,"k":[22.5,22.5,0],"ix":1},"s":{"a":0,"k":[33.333,33.333,100],"ix":6}},"ao":0,"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":2,"nm":"小气泡","refId":"image_4","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[698.535,777,0],"ix":2},"a":{"a":0,"k":[45.5,45,0],"ix":1},"s":{"a":0,"k":[33.333,33.333,100],"ix":6}},"ao":0,"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":2,"nm":"小气泡","refId":"image_5","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[594.311,808.5,0],"ix":2},"a":{"a":0,"k":[32,31.5,0],"ix":1},"s":{"a":0,"k":[33.333,33.333,100],"ix":6}},"ao":0,"ip":0,"op":75,"st":0,"bm":0}]}],"layers":[{"ddd":0,"ind":1,"ty":2,"nm":"_ 横条.png","cl":"png","refId":"image_0","sr":1,"ks":{"o":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":10,"s":[100],"e":[100]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":40,"s":[100],"e":[0]},{"t":50}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.37,"y":1},"o":{"x":0.63,"y":0},"t":0,"s":[561,881,0],"e":[561,297,0],"to":[0,0,0],"ti":[0,0,0]},{"t":50}],"ix":2},"a":{"a":0,"k":[429,94.5,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":2,"nm":"Vector","refId":"image_1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[561.523,590.006,0],"ix":2},"a":{"a":0,"k":[200,330.5,0],"ix":1},"s":{"a":0,"k":[33.261,33.261,100],"ix":6}},"ao":0,"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":0,"nm":"小气泡组","refId":"comp_0","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[561,561,0],"ix":2},"a":{"a":0,"k":[561,561,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"w":1122,"h":1122,"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":2,"nm":"小盖子","refId":"image_6","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[561,273.75,0],"ix":2},"a":{"a":0,"k":[284,119.5,0],"ix":1},"s":{"a":0,"k":[33.264,33.264,100],"ix":6}},"ao":0,"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":2,"nm":"盖子","refId":"image_7","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[561,316.5,0],"ix":2},"a":{"a":0,"k":[567,220.5,0],"ix":1},"s":{"a":0,"k":[33.333,33.333,100],"ix":6}},"ao":0,"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":6,"ty":2,"nm":"Rectangle 630","refId":"image_8","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[432.283,600,0],"ix":2},"a":{"a":0,"k":[25,675,0],"ix":1},"s":{"a":0,"k":[32.586,32.586,100],"ix":6}},"ao":0,"ef":[{"ty":29,"nm":"高斯模糊","np":5,"mn":"ADBE Gaussian Blur 2","ix":1,"en":1,"ef":[{"ty":0,"nm":"模糊度","mn":"ADBE Gaussian Blur 2-0001","ix":1,"v":{"a":0,"k":12,"ix":1}},{"ty":7,"nm":"模糊方向","mn":"ADBE Gaussian Blur 2-0002","ix":2,"v":{"a":0,"k":1,"ix":2}},{"ty":7,"nm":"重复边缘像素","mn":"ADBE Gaussian Blur 2-0003","ix":3,"v":{"a":0,"k":1,"ix":3}}]}],"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":7,"ty":2,"nm":"Rectangle 629","refId":"image_9","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[476.275,606.541,0],"ix":2},"a":{"a":0,"k":[59.5,673.5,0],"ix":1},"s":{"a":0,"k":[32.86,32.86,100],"ix":6}},"ao":0,"ef":[{"ty":29,"nm":"高斯模糊","np":5,"mn":"ADBE Gaussian Blur 2","ix":1,"en":1,"ef":[{"ty":0,"nm":"模糊度","mn":"ADBE Gaussian Blur 2-0001","ix":1,"v":{"a":0,"k":48,"ix":1}},{"ty":7,"nm":"模糊方向","mn":"ADBE Gaussian Blur 2-0002","ix":2,"v":{"a":0,"k":1,"ix":2}},{"ty":7,"nm":"重复边缘像素","mn":"ADBE Gaussian Blur 2-0003","ix":3,"v":{"a":0,"k":1,"ix":3}}]}],"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":8,"ty":2,"nm":"底部","refId":"image_10","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[561,787.5,0],"ix":2},"a":{"a":0,"k":[567,139.5,0],"ix":1},"s":{"a":0,"k":[33.333,33.333,100],"ix":6}},"ao":0,"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":9,"ty":2,"nm":"圆柱体","refId":"image_11","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[561,564,0],"ix":2},"a":{"a":0,"k":[567,666,0],"ix":1},"s":{"a":0,"k":[33.333,33.333,100],"ix":6}},"ao":0,"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":10,"ty":2,"nm":"底部银边","refId":"image_12","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[561,808.5,0],"ix":2},"a":{"a":0,"k":[567,139.5,0],"ix":1},"s":{"a":0,"k":[33.333,33.333,100],"ix":6}},"ao":0,"ip":0,"op":75,"st":0,"bm":0},{"ddd":0,"ind":11,"ty":2,"nm":"发散光","refId":"image_13","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[561,841.5,0],"ix":2},"a":{"a":0,"k":[567,139.5,0],"ix":1},"s":{"a":0,"k":[33.333,33.333,100],"ix":6}},"ao":0,"ip":0,"op":75,"st":0,"bm":0}],"markers":[]}
\ No newline at end of file

PhoneManager/Class/Session/Charge/Model/ChargeViewCollectionModel.swift

@@ -50,6 +50,10 @@ func loadVideoItems() -> [ChargeDataModel]{
             }
         }
     }
+    
+//    // 需要添加一张默认背景
+//    let model = ChargeDataModel(isFree: true, coverImage: UIImage(named: "img_bj_battery")!, url: URL("")!)
+//    dataArray.insert(model, at: 0)
     return dataArray
 }
 

PhoneManager/Class/Session/Charge/View/ChargeInfoBackView.swift

@@ -8,6 +8,7 @@
 import UIKit
 import SnapKit
 import AVKit
+import Lottie
 
 class ChargeInfoBackView:UIView {
     
@@ -20,6 +21,13 @@ class ChargeInfoBackView:UIView {
         return sview
     }()
     
+//    lazy var animationView:LottieAnimationView = {
+//        let animationView = LottieAnimationView(name: "DefaultChargeLight")
+//        animationView.frame = self.bounds
+//        animationView.loopMode = .loop
+//        return animationView
+//    }()
+    
     let timeLabel: UILabel = {
         let label = UILabel()
         label.font = UIFont.systemFont(ofSize: 72, weight: .bold)
@@ -57,6 +65,17 @@ class ChargeInfoBackView:UIView {
         setupUI()
         
         self.videoPlayView.playVideo(with: model.url)
+//        // 表示这个是一张图片
+//        if model.url == URL(""){
+//            self.videoPlayView.isHidden = true
+//            self.animationView.isHidden = false
+//            self.animationView.play()
+//        }else {
+//            // 这是视频
+//            self.videoPlayView.isHidden = false
+//            self.animationView.isHidden = true
+//            self.videoPlayView.playVideo(with: model.url)
+//        }
         
         setupTimeUpdates()
         
@@ -74,6 +93,8 @@ class ChargeInfoBackView:UIView {
         
         self.addSubview(videoPlayView)
         
+//        self.addSubview(animationView)
+        
         self.addSubview(timeLabel)
         
         self.addSubview(weekLabel)

PhoneManager/Class/Session/Compress/Cell/CompressSelectCell.swift

@@ -105,6 +105,14 @@ class CompressSelectCell : UICollectionViewCell {
         return view
     }()
     
+    lazy var extensionView: UIView = {
+        let view = UIView()
+        let tap = UITapGestureRecognizer()
+        tap.addTarget(self, action: #selector(selectClick))
+        view.addGestureRecognizer(tap)
+        return view
+    }()
+    
     lazy var selectImageView: UIImageView = {
         let view = UIImageView()
         view.image = UIImage(named: "ic_sel_com")
@@ -137,6 +145,8 @@ class CompressSelectCell : UICollectionViewCell {
         self.addSubview(self.saveSizeView)
         self.saveSizeView.addSubview(self.saveSizeLabel)
         self.saveSizeView.addSubview(self.moreImageView)
+        
+        self.addSubview(self.extensionView)
         self.addSubview(self.selectImageView)
         
         self.backImageView.snp.makeConstraints { make in
@@ -166,6 +176,11 @@ class CompressSelectCell : UICollectionViewCell {
             make.height.width.equalTo(24)
         }
         
+        self.extensionView.snp.makeConstraints { make in
+            make.center.equalTo(self.selectImageView.snp.center)
+            make.height.width.equalTo(80)
+        }
+        
         
        
     }

PhoneManager/Class/Session/Compress/Controller/CompressQualityController.swift

@@ -283,13 +283,7 @@ class CompressQualityController : BaseViewController{
         
         }
         
-        if HomePayModel.share.isNoAd == false {
-            HomeNoAdsViewController.show {
-                actionBlock()
-            }
-        }else{
-            actionBlock()
-        }
+        actionBlock()
         
     }
 }

PhoneManager/Class/Session/Home/View/cell/HomePhotosDetailCollectionCell.swift

@@ -32,6 +32,8 @@ class HomePhotosDetailCollectionCell : UICollectionViewCell {
     var currentOrder : Int = 0
     
     
+    
+    
     lazy var backImageView: UIImageView = {
         let view = UIImageView()
         view.clipsToBounds = true
@@ -48,6 +50,14 @@ class HomePhotosDetailCollectionCell : UICollectionViewCell {
         return view
     }()
     
+    lazy var extensionView: UIView = {
+        let view = UIView()
+        let tap = UITapGestureRecognizer()
+        tap.addTarget(self, action: #selector(selectClick))
+        view.addGestureRecognizer(tap)
+        return view
+    }()
+    
     lazy var selectImageView: UIImageView = {
         let view = UIImageView()
         view.image = UIImage(named: "ic_sel_com")
@@ -79,11 +89,17 @@ class HomePhotosDetailCollectionCell : UICollectionViewCell {
         
         self.addSubview(self.backImageView)
         self.addSubview(self.selectImageView)
+        self.addSubview(self.extensionView)
         
         self.backImageView.snp.makeConstraints { make in
             make.left.right.height.width.equalToSuperview()
         }
         
+        self.extensionView.snp.makeConstraints { make in
+            make.center.equalTo(self.selectImageView.snp.center)
+            make.height.width.equalTo(80)
+        }
+        
         self.selectImageView.snp.makeConstraints { make in
             make.bottom.right.equalToSuperview().offset(-12)
             make.height.width.equalTo(24)
@@ -96,7 +112,7 @@ class HomePhotosDetailCollectionCell : UICollectionViewCell {
     
     
     @objc func imageClick(){
-      
+        
     }
     
     @objc func selectClick(){

PhoneManager/Class/Session/Home/View/cell/HomeVideoDetailCell.swift

@@ -95,6 +95,14 @@ class HomeVideoDetailCell : UICollectionViewCell {
         return view
     }()
     
+    lazy var extensionView: UIView = {
+        let view = UIView()
+        let tap = UITapGestureRecognizer()
+        tap.addTarget(self, action: #selector(selectClick))
+        view.addGestureRecognizer(tap)
+        return view
+    }()
+    
     lazy var playImageView: UIImageView = {
         let view = UIImageView()
         view.backgroundColor = .clear
@@ -168,6 +176,7 @@ class HomeVideoDetailCell : UICollectionViewCell {
         self.saveSizeView.addSubview(self.saveSizeLabel)
         self.saveSizeView.addSubview(self.moreImageView)
         self.addSubview(self.selectImageView)
+        self.addSubview(self.extensionView)
         
         self.backImageView.snp.makeConstraints { make in
             make.left.right.height.width.equalToSuperview()
@@ -199,6 +208,10 @@ class HomeVideoDetailCell : UICollectionViewCell {
             make.bottom.right.equalToSuperview().offset(-12)
             make.height.width.equalTo(24)
         }
+        self.extensionView.snp.makeConstraints { make in
+            make.center.equalTo(self.selectImageView.snp.center)
+            make.height.width.equalTo(80)
+        }
         
        
     }

PhoneManager/Class/Session/Home/View/cell/ImageSeletedCollectionCell.swift

@@ -108,6 +108,14 @@ class ImageSeletedCollectionCell:UICollectionViewCell {
         }
     }
     
+    lazy var extensionView: UIView = {
+           let view = UIView()
+           let tap = UITapGestureRecognizer()
+           tap.addTarget(self, action: #selector(seletedBtnClick))
+           view.addGestureRecognizer(tap)
+           return view
+       }()
+    
     func setupUI() {
         
         backImageView = UIImageView()
@@ -123,12 +131,17 @@ class ImageSeletedCollectionCell:UICollectionViewCell {
         seletedBtn?.addTarget(self, action: #selector(seletedBtnClick), for: .touchUpInside)
         
         self.backgroundColor = .clear
+        
+        
+        
+        
     }
     
     func addViews() {
         
         self.addSubview(backImageView!)
         self.addSubview(seletedBtn!)
+        self.addSubview(self.extensionView)
     }
     
     @objc func seletedBtnClick() {
@@ -156,6 +169,11 @@ class ImageSeletedCollectionCell:UICollectionViewCell {
             make.right.equalToSuperview().offset(-20)
         })
         
+        self.extensionView.snp.makeConstraints { make in
+            make.center.equalTo((self.seletedBtn?.snp.center)!)
+            make.height.width.equalTo(80)
+        }
+        
     }
     
 }

PhoneManager/Class/Session/NoAds/HomeNoAdsViewController.swift

@@ -343,7 +343,8 @@ extension HomeNoAdsViewController : UIScrollViewDelegate {
     
     private func setUI() -> Void {
         topBackimg.snp.makeConstraints { make in
-            make.left.right.top.equalToSuperview()
+            make.left.right.equalToSuperview()
+            make.top.equalToSuperview().offset(-20)
         }
         
         closeBtn.snp.makeConstraints { make in
@@ -357,7 +358,7 @@ extension HomeNoAdsViewController : UIScrollViewDelegate {
         
         info.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
-            make.centerY.equalTo(topBackimg.snp.bottom).offset(-10)
+            make.centerY.equalTo(topBackimg.snp.bottom).offset(-30)
         }
         
         contentScroll.snp.makeConstraints { make in

PhoneManager/Class/Session/Secret/View/SecretFirstCell.swift

@@ -14,6 +14,8 @@ class SecretFirstCell: UICollectionViewCell {
     override init(frame: CGRect) {
         super.init(frame: frame)
         setUI()
+        
+        
     }
     
     var callback:(()->Void)?
@@ -37,6 +39,12 @@ class SecretFirstCell: UICollectionViewCell {
         timeLabe.snp.makeConstraints { make in
             make.left.bottom.equalToSuperview().inset(14)
         }
+        
+        self.addSubview(self.extensionView)
+        self.extensionView.snp.makeConstraints { make in
+            make.center.equalTo(self.selectInfo.snp.center)
+            make.height.width.equalTo(80)
+        }
     }
     
     var isSelect:Bool = false {
@@ -77,6 +85,15 @@ class SecretFirstCell: UICollectionViewCell {
         return info
     }()
     
+    lazy var extensionView: UIView = {
+        let view = UIView()
+        let tap = UITapGestureRecognizer()
+        tap.addTarget(self, action: #selector(SelectTouch))
+        view.addGestureRecognizer(tap)
+        return view
+    }()
+    
+    
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }