Commit 509cf0ac authored by CZ1004's avatar CZ1004

【优化】上线前修改

parent 5c70d6fe
...@@ -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()
} }
......
...@@ -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)
} }
} }
......
...@@ -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)
} }
} }
} }
......
...@@ -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)
} }
} }
} }
......
...@@ -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()
} }
......
...@@ -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()
} }
......
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