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
509cf0ac
Commit
509cf0ac
authored
May 23, 2025
by
CZ1004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
【优化】上线前修改
parent
5c70d6fe
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
50 additions
and
43 deletions
+50
-43
ChargeInfoViewController.swift
...ass/Page/Charge/Controller/ChargeInfoViewController.swift
+7
-6
PhotoRemoveViewController.swift
...lass/Page/Home/Controller/PhotoRemoveViewController.swift
+1
-0
TrashSubView.swift
PhoneManager/Class/Page/Home/View/TrashSubView.swift
+20
-0
TrashViewController.swift
...ger/Class/Page/Trash/Controller/TrashViewController.swift
+20
-0
EmailCleanListView.swift
...Manager/Class/Session/Email/View/EmailCleanListView.swift
+1
-21
EmailContentView.swift
PhoneManager/Class/Session/Email/View/EmailContentView.swift
+1
-16
No files found.
PhoneManager/Class/Page/Charge/Controller/ChargeInfoViewController.swift
View file @
509cf0ac
...
@@ -74,7 +74,7 @@ class ChargeInfoViewController:BaseViewController {
...
@@ -74,7 +74,7 @@ class ChargeInfoViewController:BaseViewController {
self
.
view
.
showBlur
()
self
.
view
.
showBlur
()
self
.
present
(
alertView
,
animated
:
true
)
self
.
present
(
alertView
,
animated
:
true
)
alertView
.
selectClickCallback
=
{
isSure
in
alertView
.
selectClickCallback
=
{
isSure
in
alertView
.
dismiss
(
animated
:
true
)
alertView
.
dismiss
(
animated
:
true
)
{
self
.
view
.
hideBlur
()
self
.
view
.
hideBlur
()
if
isSure
{
if
isSure
{
self
.
popAdverTisement
()
self
.
popAdverTisement
()
...
@@ -83,6 +83,7 @@ class ChargeInfoViewController:BaseViewController {
...
@@ -83,6 +83,7 @@ class ChargeInfoViewController:BaseViewController {
}
}
}
}
}
}
}
}
else
{
}
else
{
self
.
setAnimation
()
self
.
setAnimation
()
}
}
...
...
PhoneManager/Class/Page/Home/Controller/PhotoRemoveViewController.swift
View file @
509cf0ac
...
@@ -190,6 +190,7 @@ class PhotoRemoveViewController: BaseViewController {
...
@@ -190,6 +190,7 @@ class PhotoRemoveViewController: BaseViewController {
guard
let
self
else
{
return
}
guard
let
self
else
{
return
}
DispatchQueue
.
main
.
async
{
DispatchQueue
.
main
.
async
{
self
.
showCurrentPageUIWhenTashDataChanged
()
self
.
showCurrentPageUIWhenTashDataChanged
()
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
}
}
}
}
...
...
PhoneManager/Class/Page/Home/View/TrashSubView.swift
View file @
509cf0ac
...
@@ -214,12 +214,14 @@ extension TrashSubView {
...
@@ -214,12 +214,14 @@ extension TrashSubView {
let
tempArray
=
Array
(
data
.
prefix
(
deleteCount
))
let
tempArray
=
Array
(
data
.
prefix
(
deleteCount
))
TrashDataManager
.
clearTrashData
(
mediaType
:
self
.
type
,
data
:
tempArray
)
{
TrashDataManager
.
clearTrashData
(
mediaType
:
self
.
type
,
data
:
tempArray
)
{
self
.
clearTashDataCallBack
()
self
.
clearTashDataCallBack
()
self
.
showDeleteSuccess
(
array
:
tempArray
)
}
}
}
}
}
else
{
}
else
{
let
tempArray
=
Array
(
data
.
prefix
(
deleteCount
))
let
tempArray
=
Array
(
data
.
prefix
(
deleteCount
))
TrashDataManager
.
clearTrashData
(
mediaType
:
self
.
type
,
data
:
tempArray
)
{
TrashDataManager
.
clearTrashData
(
mediaType
:
self
.
type
,
data
:
tempArray
)
{
self
.
clearTashDataCallBack
()
self
.
clearTashDataCallBack
()
self
.
showDeleteSuccess
(
array
:
tempArray
)
}
}
}
}
...
@@ -227,6 +229,7 @@ extension TrashSubView {
...
@@ -227,6 +229,7 @@ extension TrashSubView {
let
tempArray
=
Array
(
data
.
prefix
(
deleteCount
))
let
tempArray
=
Array
(
data
.
prefix
(
deleteCount
))
TrashDataManager
.
clearTrashData
(
mediaType
:
self
.
type
,
data
:
tempArray
)
{
TrashDataManager
.
clearTrashData
(
mediaType
:
self
.
type
,
data
:
tempArray
)
{
self
.
clearTashDataCallBack
()
self
.
clearTashDataCallBack
()
self
.
showDeleteSuccess
(
array
:
tempArray
)
self
.
updateFreeTimes
()
self
.
updateFreeTimes
()
}
}
}
}
...
@@ -237,6 +240,22 @@ extension TrashSubView {
...
@@ -237,6 +240,22 @@ extension TrashSubView {
}
}
}
}
// 删除成功页面
func
showDeleteSuccess
(
array
:[
AssetModel
]){
var
tempSize
=
0.0
for
item
in
array
{
tempSize
=
tempSize
+
item
.
assetSize
}
DispatchQueue
.
main
.
async
{
let
vc
=
DelSuccessViewController
()
vc
.
delType
=
array
.
count
>
1
?
"photos"
:
"photo"
vc
.
fileSzie
=
Int64
(
tempSize
)
vc
.
fileCount
=
array
.
count
vc
.
modalPresentationStyle
=
.
fullScreen
self
.
responderViewController
()?
.
present
(
vc
,
animated
:
true
)
}
}
@objc
func
tapHandle
(){
@objc
func
tapHandle
(){
self
.
presentTashDetailViewClickCallBack
()
self
.
presentTashDetailViewClickCallBack
()
}
}
...
@@ -253,6 +272,7 @@ extension TrashSubView {
...
@@ -253,6 +272,7 @@ extension TrashSubView {
self
.
updateFreeTimes
()
self
.
updateFreeTimes
()
}
}
self
.
clearTashDataCallBack
()
self
.
clearTashDataCallBack
()
self
.
showDeleteSuccess
(
array
:
data
)
}
}
}
}
}
}
...
...
PhoneManager/Class/Page/Trash/Controller/TrashViewController.swift
View file @
509cf0ac
...
@@ -297,12 +297,14 @@ extension TrashViewController:UIScrollViewDelegate{
...
@@ -297,12 +297,14 @@ extension TrashViewController:UIScrollViewDelegate{
let
tempArray
=
Array
(
data
.
prefix
(
deleteCount
))
let
tempArray
=
Array
(
data
.
prefix
(
deleteCount
))
TrashDataManager
.
clearTrashData
(
mediaType
:
info
.
0
,
data
:
tempArray
)
{
TrashDataManager
.
clearTrashData
(
mediaType
:
info
.
0
,
data
:
tempArray
)
{
info
.
1
.
dataSource
.
removeAll
(
where
:
{
tempArray
.
map
({
$0
.
localIdentifier
})
.
contains
(
$0
.
localIdentifier
)})
info
.
1
.
dataSource
.
removeAll
(
where
:
{
tempArray
.
map
({
$0
.
localIdentifier
})
.
contains
(
$0
.
localIdentifier
)})
self
.
showDeleteSuccess
(
array
:
tempArray
)
}
}
}
}
}
else
{
}
else
{
let
tempArray
=
Array
(
data
.
prefix
(
deleteCount
))
let
tempArray
=
Array
(
data
.
prefix
(
deleteCount
))
TrashDataManager
.
clearTrashData
(
mediaType
:
info
.
0
,
data
:
tempArray
)
{
TrashDataManager
.
clearTrashData
(
mediaType
:
info
.
0
,
data
:
tempArray
)
{
info
.
1
.
dataSource
.
removeAll
(
where
:
{
tempArray
.
map
({
$0
.
localIdentifier
})
.
contains
(
$0
.
localIdentifier
)})
info
.
1
.
dataSource
.
removeAll
(
where
:
{
tempArray
.
map
({
$0
.
localIdentifier
})
.
contains
(
$0
.
localIdentifier
)})
self
.
showDeleteSuccess
(
array
:
tempArray
)
}
}
}
}
...
@@ -311,6 +313,7 @@ extension TrashViewController:UIScrollViewDelegate{
...
@@ -311,6 +313,7 @@ extension TrashViewController:UIScrollViewDelegate{
TrashDataManager
.
clearTrashData
(
mediaType
:
info
.
0
,
data
:
tempArray
)
{
TrashDataManager
.
clearTrashData
(
mediaType
:
info
.
0
,
data
:
tempArray
)
{
self
.
updateFreeTimes
()
self
.
updateFreeTimes
()
info
.
1
.
dataSource
.
removeAll
(
where
:
{
tempArray
.
map
({
$0
.
localIdentifier
})
.
contains
(
$0
.
localIdentifier
)})
info
.
1
.
dataSource
.
removeAll
(
where
:
{
tempArray
.
map
({
$0
.
localIdentifier
})
.
contains
(
$0
.
localIdentifier
)})
self
.
showDeleteSuccess
(
array
:
tempArray
)
}
}
}
}
}
}
...
@@ -340,6 +343,22 @@ extension TrashViewController:UIScrollViewDelegate{
...
@@ -340,6 +343,22 @@ extension TrashViewController:UIScrollViewDelegate{
}
}
}
}
func
showDeleteSuccess
(
array
:[
AssetModel
]){
var
tempSize
=
0.0
for
item
in
array
{
tempSize
=
tempSize
+
item
.
assetSize
}
DispatchQueue
.
main
.
async
{
let
vc
=
DelSuccessViewController
()
vc
.
delType
=
array
.
count
>
1
?
"photos"
:
"photo"
vc
.
fileSzie
=
Int64
(
tempSize
)
vc
.
fileCount
=
array
.
count
vc
.
modalPresentationStyle
=
.
fullScreen
self
.
present
(
vc
,
animated
:
true
)
}
}
func
delMethod
(
needUpdateFreeTimes
:
Bool
){
func
delMethod
(
needUpdateFreeTimes
:
Bool
){
let
info
=
self
.
getTypeByCurrentPage
(
pageIndex
:
currentPage
)
let
info
=
self
.
getTypeByCurrentPage
(
pageIndex
:
currentPage
)
let
data
=
TrashDataManager
.
getCurrentMediaTypeTrashData
(
mediaType
:
info
.
0
)
let
data
=
TrashDataManager
.
getCurrentMediaTypeTrashData
(
mediaType
:
info
.
0
)
...
@@ -349,6 +368,7 @@ extension TrashViewController:UIScrollViewDelegate{
...
@@ -349,6 +368,7 @@ extension TrashViewController:UIScrollViewDelegate{
self
.
updateFreeTimes
()
self
.
updateFreeTimes
()
}
}
info
.
1
.
dataSource
.
removeAll
()
info
.
1
.
dataSource
.
removeAll
()
self
.
showDeleteSuccess
(
array
:
data
)
}
}
}
}
}
}
...
...
PhoneManager/Class/Session/Email/View/EmailCleanListView.swift
View file @
509cf0ac
...
@@ -113,28 +113,8 @@ extension EmailCleanListView : UITableViewDataSource,UITableViewDelegate {
...
@@ -113,28 +113,8 @@ extension EmailCleanListView : UITableViewDataSource,UITableViewDelegate {
if
IAPManager
.
share
.
isSubscribed
==
false
{
if
IAPManager
.
share
.
isSubscribed
==
false
{
// 弹出内购页面
// 弹出内购页面
HomePayViewController
.
show
{
HomePayViewController
.
show
{
// 再次判断下
if
IAPManager
.
share
.
isSubscribed
==
false
{
// 弹出提示框
let
alertView
=
AdvTipSelectView
()
alertView
.
selectType
=
.
selectTypeSetAnimation
alertView
.
getOtherInfoByType
()
self
.
showBlur
()
self
.
responderViewController
()?
.
present
(
alertView
,
animated
:
true
)
alertView
.
selectClickCallback
=
{
isSure
in
alertView
.
dismiss
(
animated
:
true
)
self
.
hideBlur
()
if
isSure
{
self
.
popAdverTisement
()
AdvManager
.
shared
.
finisedCallBack
=
{
callblock
()
callblock
()
}
}
}
}
}
else
{
callblock
()
}
}
}
else
{
}
else
{
callblock
()
callblock
()
}
}
...
...
PhoneManager/Class/Session/Email/View/EmailContentView.swift
View file @
509cf0ac
...
@@ -162,23 +162,8 @@ extension EmailContentView :UITableViewDelegate,UITableViewDataSource{
...
@@ -162,23 +162,8 @@ extension EmailContentView :UITableViewDelegate,UITableViewDataSource{
if
IAPManager
.
share
.
isSubscribed
==
false
{
if
IAPManager
.
share
.
isSubscribed
==
false
{
// 弹出内购页面
// 弹出内购页面
HomePayViewController
.
show
{
HomePayViewController
.
show
{
// 弹出提示框
let
alertView
=
AdvTipSelectView
()
alertView
.
selectType
=
.
selectTypeSetAnimation
alertView
.
getOtherInfoByType
()
self
.
showBlur
()
self
.
responderViewController
()?
.
present
(
alertView
,
animated
:
true
)
alertView
.
selectClickCallback
=
{
isSure
in
alertView
.
dismiss
(
animated
:
true
)
self
.
hideBlur
()
if
isSure
{
self
.
popAdverTisement
()
AdvManager
.
shared
.
finisedCallBack
=
{
callblock
()
callblock
()
}
}
}
}
}
}
else
{
}
else
{
callblock
()
callblock
()
}
}
...
...
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