Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
P
PhoneManager
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Yang
PhoneManager
Commits
0a099741
Commit
0a099741
authored
May 22, 2025
by
yqz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_main' into yQz0507
* dev_main: 【新增】压缩播放视频 【优化】修复部分bug
parents
5fc9b779
6fff8e28
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
20 additions
and
22 deletions
+20
-22
CompressCompletedViewController.swift
...Compress/Controller/CompressCompletedViewController.swift
+7
-0
CompressCustomHeaderView.swift
...r/Class/Page/Compress/View/CompressCustomHeaderView.swift
+3
-19
HomePhotosDetailViewController.swift
...Page/Home/Controller/HomePhotosDetailViewController.swift
+1
-0
HomeVideoDetailController.swift
...lass/Page/Home/Controller/HomeVideoDetailController.swift
+1
-0
PhotoRemoveViewController.swift
...lass/Page/Home/Controller/PhotoRemoveViewController.swift
+6
-1
TrashSubView.swift
PhoneManager/Class/Page/Home/View/TrashSubView.swift
+0
-1
PMShowVideoCell.swift
PhoneManager/Class/Page/Secret/Cell/PMShowVideoCell.swift
+1
-0
SecretVideoPlayer.swift
PhoneManager/Class/Page/Secret/View/SecretVideoPlayer.swift
+1
-1
No files found.
PhoneManager/Class/Page/Compress/Controller/CompressCompletedViewController.swift
View file @
0a099741
...
@@ -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
...
...
PhoneManager/Class/Page/Compress/View/CompressCustomHeaderView.swift
View file @
0a099741
...
@@ -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
))
}
}
}
}
}
...
...
PhoneManager/Class/Page/Home/Controller/HomePhotosDetailViewController.swift
View file @
0a099741
...
@@ -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
)
}
}
...
...
PhoneManager/Class/Page/Home/Controller/HomeVideoDetailController.swift
View file @
0a099741
...
@@ -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
)
}
}
...
...
PhoneManager/Class/Page/Home/Controller/PhotoRemoveViewController.swift
View file @
0a099741
...
@@ -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
}
}
...
...
PhoneManager/Class/Page/Home/View/TrashSubView.swift
View file @
0a099741
...
@@ -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
)
...
...
PhoneManager/Class/Page/Secret/Cell/PMShowVideoCell.swift
View file @
0a099741
...
@@ -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
()
}
}
...
...
PhoneManager/Class/Page/Secret/View/SecretVideoPlayer.swift
View file @
0a099741
...
@@ -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
)
)
"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment