Merge branch 'dev_main' into yQz0507

* dev_main:
  【新增】压缩播放视频
  【优化】修复部分bug

PhoneManager/Class/Page/Compress/Controller/CompressCompletedViewController.swift

@@ -28,6 +28,13 @@ class CompressCompletedViewController : BaseViewController{
     var comVideoDataSource : [URL] = []{
         didSet{
             if let url = comVideoDataSource.first{
+                let vc = VideoViewController()
+                vc.url = url
+                self.addChild(vc)
+                vc.view.frame = self.infoView.bounds
+                self.infoView.addSubview(vc.view)
+                vc.didMove(toParent: self)
+            
                 DispatchQueue.main.async {
                     self.infoView.playVideo(from: url)
                     self.preImageView.isHidden = true

PhoneManager/Class/Page/Compress/View/CompressCustomHeaderView.swift

@@ -21,26 +21,10 @@ class CompressCustomHeaderView: UICollectionReusableView{
             var saveSum = 0.0
             for model in self.modeData{
                 sum = sum + model.assetSize
-                saveSum = saveSum + model.assetSize * 0.8
+                saveSum = saveSum + model.assetSize * 0.5
             }
-            sum = sum / 1000
-            saveSum = saveSum / 1000
-            if sum < 1000 {
-                self.siezLabel.text = String(format: "%.2f KB" ,(sum))
-            }else if sum < (1000 * 1000) && sum > 1024{
-                self.siezLabel.text = String(format: "%.2f MB" ,(sum/1000))
-            }else{
-                self.siezLabel.text = String(format: "%.2f GB" ,sum/(1000*1000))
-            }
-            
-            if saveSum < 1000 {
-                self.saveSizeLabel.text = String(format: "%.2f KB" ,(saveSum))
-            }else if saveSum < (1000 * 1000) && saveSum > 1024{
-                self.saveSizeLabel.text = String(format: "%.2f MB" ,(saveSum/1000))
-            }else{
-                self.saveSizeLabel.text = String(format: "%.2f GB" ,saveSum/(1000*1000))
-            }
-            
+            self.siezLabel.text = formatFileSize(sum)
+            self.saveSizeLabel.text = formatFileSize(saveSum)
         }
     }
     

PhoneManager/Class/Page/Home/Controller/HomePhotosDetailViewController.swift

@@ -296,6 +296,7 @@ class HomePhotosDetailViewController : BaseViewController {
                         self.collectionView.reloadData()
                     }
                     self.addTrashView()
+                    self.setDefaultPage()
                 }
                 self.present(vc, animated: true)
             }

PhoneManager/Class/Page/Home/Controller/HomeVideoDetailController.swift

@@ -277,6 +277,7 @@ class HomeVideoDetailController :BaseViewController {
                         self.collectionView.reloadData()
                     }
                     self.addTrashView()
+                    self.setDefaultPage()
                 }
                 self.present(vc, animated: true)
             }

PhoneManager/Class/Page/Home/Controller/PhotoRemoveViewController.swift

@@ -604,7 +604,12 @@ class PhotoRemoveViewController: BaseViewController {
         removedView.removeFromSuperview()
         
         // 当划到最后一张的时候就不再滑动了
-        if currentIndex == dataModel.count{
+        let tempIndex = dataModel.count - 1
+        // 表示滑动结束了
+        if currentIndex == tempIndex {
+            DispatchQueue.main.async {
+                self.navigationController?.popViewController(animated: true)
+            }
             return
         }
         

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

@@ -66,7 +66,6 @@ class TrashSubView: UIView {
             make.left.equalToSuperview().offset(16)
             make.top.equalToSuperview().offset(28)
             make.height.equalTo(22)
-            make.width.equalTo(30)
         }
         self.tipLabel.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(17)

PhoneManager/Class/Page/Secret/Cell/PMShowVideoCell.swift

@@ -32,6 +32,7 @@ class PMShowVideoCell: UICollectionViewCell {
                 vc.url = url
                 self.contentView.addSubview(vc.view)
                 self.contentView.bringSubviewToFront(self.selectBtn)
+                self.contentView.bringSubviewToFront(self.bestResultButton)
                 vc.view.snp.makeConstraints { make in
                     make.left.top.bottom.right.equalToSuperview()
                 }

PhoneManager/Class/Page/Secret/View/SecretVideoPlayer.swift

@@ -116,7 +116,7 @@ class SecretVideoPlayer: UIView {
             guard let self = self, let currentItem = self.player?.currentItem else { return }
             
             let currentTime = time.seconds
-            let totalDuration = currentItem.duration.seconds
+            _ = currentItem.duration.seconds
             
             // 更新进度标签
             self.callBackCurrtntTimeString("\(self.formatTime(seconds: currentTime))")