Commit 0a099741 authored by yqz's avatar yqz

Merge branch 'dev_main' into yQz0507

* dev_main:
  【新增】压缩播放视频
  【优化】修复部分bug
parents 5fc9b779 6fff8e28
...@@ -28,6 +28,13 @@ class CompressCompletedViewController : BaseViewController{ ...@@ -28,6 +28,13 @@ class CompressCompletedViewController : BaseViewController{
var comVideoDataSource : [URL] = []{ var comVideoDataSource : [URL] = []{
didSet{ didSet{
if let url = comVideoDataSource.first{ 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 { DispatchQueue.main.async {
self.infoView.playVideo(from: url) self.infoView.playVideo(from: url)
self.preImageView.isHidden = true self.preImageView.isHidden = true
......
...@@ -21,26 +21,10 @@ class CompressCustomHeaderView: UICollectionReusableView{ ...@@ -21,26 +21,10 @@ class CompressCustomHeaderView: UICollectionReusableView{
var saveSum = 0.0 var saveSum = 0.0
for model in self.modeData{ for model in self.modeData{
sum = sum + model.assetSize sum = sum + model.assetSize
saveSum = saveSum + model.assetSize * 0.8 saveSum = saveSum + model.assetSize * 0.5
} }
sum = sum / 1000 self.siezLabel.text = formatFileSize(sum)
saveSum = saveSum / 1000 self.saveSizeLabel.text = formatFileSize(saveSum)
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))
}
} }
} }
......
...@@ -296,6 +296,7 @@ class HomePhotosDetailViewController : BaseViewController { ...@@ -296,6 +296,7 @@ class HomePhotosDetailViewController : BaseViewController {
self.collectionView.reloadData() self.collectionView.reloadData()
} }
self.addTrashView() self.addTrashView()
self.setDefaultPage()
} }
self.present(vc, animated: true) self.present(vc, animated: true)
} }
......
...@@ -277,6 +277,7 @@ class HomeVideoDetailController :BaseViewController { ...@@ -277,6 +277,7 @@ class HomeVideoDetailController :BaseViewController {
self.collectionView.reloadData() self.collectionView.reloadData()
} }
self.addTrashView() self.addTrashView()
self.setDefaultPage()
} }
self.present(vc, animated: true) self.present(vc, animated: true)
} }
......
...@@ -604,7 +604,12 @@ class PhotoRemoveViewController: BaseViewController { ...@@ -604,7 +604,12 @@ class PhotoRemoveViewController: BaseViewController {
removedView.removeFromSuperview() removedView.removeFromSuperview()
// 当划到最后一张的时候就不再滑动了 // 当划到最后一张的时候就不再滑动了
if currentIndex == dataModel.count{ let tempIndex = dataModel.count - 1
// 表示滑动结束了
if currentIndex == tempIndex {
DispatchQueue.main.async {
self.navigationController?.popViewController(animated: true)
}
return return
} }
......
...@@ -66,7 +66,6 @@ class TrashSubView: UIView { ...@@ -66,7 +66,6 @@ class TrashSubView: UIView {
make.left.equalToSuperview().offset(16) make.left.equalToSuperview().offset(16)
make.top.equalToSuperview().offset(28) make.top.equalToSuperview().offset(28)
make.height.equalTo(22) make.height.equalTo(22)
make.width.equalTo(30)
} }
self.tipLabel.snp.makeConstraints { make in self.tipLabel.snp.makeConstraints { make in
make.top.equalToSuperview().offset(17) make.top.equalToSuperview().offset(17)
......
...@@ -32,6 +32,7 @@ class PMShowVideoCell: UICollectionViewCell { ...@@ -32,6 +32,7 @@ class PMShowVideoCell: UICollectionViewCell {
vc.url = url vc.url = url
self.contentView.addSubview(vc.view) self.contentView.addSubview(vc.view)
self.contentView.bringSubviewToFront(self.selectBtn) self.contentView.bringSubviewToFront(self.selectBtn)
self.contentView.bringSubviewToFront(self.bestResultButton)
vc.view.snp.makeConstraints { make in vc.view.snp.makeConstraints { make in
make.left.top.bottom.right.equalToSuperview() make.left.top.bottom.right.equalToSuperview()
} }
......
...@@ -116,7 +116,7 @@ class SecretVideoPlayer: UIView { ...@@ -116,7 +116,7 @@ class SecretVideoPlayer: UIView {
guard let self = self, let currentItem = self.player?.currentItem else { return } guard let self = self, let currentItem = self.player?.currentItem else { return }
let currentTime = time.seconds let currentTime = time.seconds
let totalDuration = currentItem.duration.seconds _ = currentItem.duration.seconds
// 更新进度标签 // 更新进度标签
self.callBackCurrtntTimeString("\(self.formatTime(seconds: currentTime))") self.callBackCurrtntTimeString("\(self.formatTime(seconds: currentTime))")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment