Skip to content

P
PhoneManager
Commit 7a003868 authored by shenyong's avatar shenyong
Browse files
Options

Merge branch 'Advertisement' of gitlab.huolea.com:ShuMing/phonemanager into Advertisement

parents 5d0ddc50 44d736ef
Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 97 deletions
PhoneManager/Class/Session/Charge/Controller/ChargeInfoViewController.swift
View file @ 7a003868
...@@ -64,6 +64,8 @@ class ChargeInfoViewController:BaseViewController { ...@@ -64,6 +64,8 @@ class ChargeInfoViewController:BaseViewController {
// 弹出内购页面 // 弹出内购页面
HomePayViewController.show { HomePayViewController.show {
// 再次判断下
if HomePayModel.share.isNoAd == false {
// 弹出提示框 // 弹出提示框
let alertView = AdvTipSelectView(frame: self.view.bounds) let alertView = AdvTipSelectView(frame: self.view.bounds)
alertView.selectType = .selectTypeSetAnimation alertView.selectType = .selectTypeSetAnimation
...@@ -76,6 +78,9 @@ class ChargeInfoViewController:BaseViewController { ...@@ -76,6 +78,9 @@ class ChargeInfoViewController:BaseViewController {
self.setAnimation() self.setAnimation()
} }
} }
}else{
self.setAnimation()
}
} }
}else { }else {
self.setAnimation() self.setAnimation()
......
PhoneManager/Class/Session/Compress/Controller/CompressCompletedViewController.swift
View file @ 7a003868
...@@ -303,7 +303,6 @@ class CompressCompletedViewController : BaseViewController{ ...@@ -303,7 +303,6 @@ class CompressCompletedViewController : BaseViewController{
let fetchResult = PHAsset.fetchAssets(withLocalIdentifiers: idents, options: nil) let fetchResult = PHAsset.fetchAssets(withLocalIdentifiers: idents, options: nil)
let fileSize = FileTool().calculateTotalAssetSize(fetchResult: fetchResult) let fileSize = FileTool().calculateTotalAssetSize(fetchResult: fetchResult)
let assetToDelete = fetchResult.firstObject let assetToDelete = fetchResult.firstObject
// PMLoadingHUD.share.show()
PHPhotoLibrary.shared().performChanges ({ PHPhotoLibrary.shared().performChanges ({
PHAssetChangeRequest.deleteAssets([assetToDelete] as NSFastEnumeration) PHAssetChangeRequest.deleteAssets([assetToDelete] as NSFastEnumeration)
}){ success, error in }){ success, error in
...@@ -319,13 +318,13 @@ class CompressCompletedViewController : BaseViewController{ ...@@ -319,13 +318,13 @@ class CompressCompletedViewController : BaseViewController{
PhotoDataManager.manager.removeDataWhenDeleteInPage(data: models) PhotoDataManager.manager.removeDataWhenDeleteInPage(data: models)
print("删除文件成功") print("删除文件成功")
self.showDeleteSuccess(fileCount:count, fileSize: fileSize) self.showDeleteSuccess(fileCount:count, fileSize: fileSize)
// self.jumpToCompressVC()
}else { }else {
PMLoadingHUD.share.disMiss()
if let error = error { if let error = error {
print("删除文件时出错: \(error.localizedDescription)") print("删除文件时出错: \(error.localizedDescription)")
} }
self.jumpToCompressVC()
} }
} }
} }
......
PhoneManager/Class/Session/Compress/Controller/CompressController.swift
View file @ 7a003868
...@@ -329,6 +329,7 @@ extension CompressController:WaterfallMutiSectionDelegate,UICollectionViewDataSo ...@@ -329,6 +329,7 @@ extension CompressController:WaterfallMutiSectionDelegate,UICollectionViewDataSo
if HomePayModel.share.isNoAd == false { if HomePayModel.share.isNoAd == false {
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
// 弹出提示框 // 弹出提示框
let alertView = AdvTipSelectView(frame: self.view.bounds) let alertView = AdvTipSelectView(frame: self.view.bounds)
alertView.selectType = .selectTypeCompressPhoto alertView.selectType = .selectTypeCompressPhoto
...@@ -341,6 +342,10 @@ extension CompressController:WaterfallMutiSectionDelegate,UICollectionViewDataSo ...@@ -341,6 +342,10 @@ extension CompressController:WaterfallMutiSectionDelegate,UICollectionViewDataSo
self.jumpToNextPage() self.jumpToNextPage()
} }
} }
}else {
self.jumpToNextPage()
}
} }
}else { }else {
self.jumpToNextPage() self.jumpToNextPage()
......
PhoneManager/Class/Session/Home/Controller/HomeInfoViewController.swift
View file @ 7a003868
...@@ -65,7 +65,6 @@ class HomeInfoViewController:BaseViewController { ...@@ -65,7 +65,6 @@ class HomeInfoViewController:BaseViewController {
let fetchs = PHAsset.fetchAssets(withLocalIdentifiers: tempStringArray, options: nil) let fetchs = PHAsset.fetchAssets(withLocalIdentifiers: tempStringArray, options: nil)
let fileSize = FileTool().calculateTotalAssetSize(fetchResult: fetchs) let fileSize = FileTool().calculateTotalAssetSize(fetchResult: fetchs)
//
PhotoAndVideoMananger.deleteAssets(localIdentifiers: tempStringArray) {[weak self] in PhotoAndVideoMananger.deleteAssets(localIdentifiers: tempStringArray) {[weak self] in
guard let self else {return} guard let self else {return}
...@@ -144,10 +143,14 @@ class HomeInfoViewController:BaseViewController { ...@@ -144,10 +143,14 @@ class HomeInfoViewController:BaseViewController {
// 当免费次数用完以后，无论删除多少都需要弹出广告 // 当免费次数用完以后，无论删除多少都需要弹出广告
if freeCount <= 0 { if freeCount <= 0 {
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
// 弹出单个删除类型 // 弹出单个删除类型
view.deleteType = .deletePhotoOne view.deleteType = .deletePhotoOne
view.getOtherInfoByType(type: self.type!) view.getOtherInfoByType(type: self.type!)
showPopView(popView: view) showPopView(popView: view)
}else{
deleteOp(imgs: array ,isAfterAdv: false)
}
} }
}else { }else {
// 获取次数对应的删除照片数量 // 获取次数对应的删除照片数量
...@@ -158,10 +161,14 @@ class HomeInfoViewController:BaseViewController { ...@@ -158,10 +161,14 @@ class HomeInfoViewController:BaseViewController {
if tempArray.count > freeDeleteCount { if tempArray.count > freeDeleteCount {
// 弹出多个删除类型 // 弹出多个删除类型
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: self.type!) view.getOtherInfoByType(type: self.type!)
showPopView(popView: view) showPopView(popView: view)
}else {
deleteOp(imgs: array,isAfterAdv: false)
}
} }
}else { }else {
// 如果小于直接删除 // 如果小于直接删除
...@@ -177,25 +184,33 @@ class HomeInfoViewController:BaseViewController { ...@@ -177,25 +184,33 @@ class HomeInfoViewController:BaseViewController {
freeDeleteCount = 5 freeDeleteCount = 5
// 弹出多个删除类型 // 弹出多个删除类型
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: self.type!) view.getOtherInfoByType(type: self.type!)
showPopView(popView: view) showPopView(popView: view)
}else {
deleteOp(imgs: array,isAfterAdv: false)
}
} }
}else if tempArray.count > 1 && tempArray.count <= 5 { }else if tempArray.count > 1 && tempArray.count <= 5 {
// 如果是1张到5张之间，那么免费的张数是当前张数减一 // 如果是1张到5张之间，那么免费的张数是当前张数减一
freeDeleteCount = tempArray.count - 1 freeDeleteCount = tempArray.count - 1
// 弹出多个删除类型 // 弹出多个删除类型
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: self.type!) view.getOtherInfoByType(type: self.type!)
showPopView(popView: view) showPopView(popView: view)
}else {
deleteOp(imgs: array ,isAfterAdv: false)
}
} }
}else{ }else{
// 如果只是一张，直接删除 // 如果只是一张，直接删除
HomePayViewController.show { HomePayViewController.show {
deleteOp(imgs: array as! [AssetModel],isAfterAdv: false) deleteOp(imgs: array ,isAfterAdv: false)
} }
} }
} }
...@@ -204,14 +219,15 @@ class HomeInfoViewController:BaseViewController { ...@@ -204,14 +219,15 @@ class HomeInfoViewController:BaseViewController {
view.deleteButtonClickCallback = {[weak self] isMore,deleteCount in view.deleteButtonClickCallback = {[weak self] isMore,deleteCount in
guard let self else {return} guard let self else {return}
let finalyDeleteArray = array as! [AssetModel] let finalyDeleteArray = array
var tempArr : [AssetModel] = [] var tempArr : [AssetModel] = []
for item in finalyDeleteArray { for item in finalyDeleteArray {
if tempArr.count < deleteCount { if tempArr.count < deleteCount {
tempArr.append(item) tempArr.append(item)
} }
} }
if isMore == true { if isMore == true{
if HomePayModel.share.isNoAd == false {
self.popAdverTisement() self.popAdverTisement()
// 广告看完再结束 // 广告看完再结束
AdvManager.shared.finisedCallBack = { AdvManager.shared.finisedCallBack = {
...@@ -219,6 +235,9 @@ class HomeInfoViewController:BaseViewController { ...@@ -219,6 +235,9 @@ class HomeInfoViewController:BaseViewController {
deleteOp(imgs: tempArr,isAfterAdv: true) deleteOp(imgs: tempArr,isAfterAdv: true)
} }
} }
}else{
deleteOp(imgs: tempArr,isAfterAdv: true)
}
} else { } else {
DispatchQueue.main.async { DispatchQueue.main.async {
deleteOp(imgs: tempArr,isAfterAdv: false) deleteOp(imgs: tempArr,isAfterAdv: false)
......
PhoneManager/Class/Session/Home/Controller/HomePhotosDetailViewController.swift
View file @ 7a003868
...@@ -482,10 +482,14 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti ...@@ -482,10 +482,14 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
// 当免费次数用完以后，无论删除多少都需要弹出广告 // 当免费次数用完以后，无论删除多少都需要弹出广告
if freeCount <= 0 { if freeCount <= 0 {
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
// 弹出单个删除类型 // 弹出单个删除类型
view.deleteType = .deletePhotoOne view.deleteType = .deletePhotoOne
view.getOtherInfoByType(type: .Other) view.getOtherInfoByType(type: .Other)
self.showPopView(popView: view) self.showPopView(popView: view)
}else {
self.deleteAction(count: self.selectedModel.count,isAfterAdv: false)
}
} }
}else { }else {
// 获取次数对应的删除照片数量 // 获取次数对应的删除照片数量
...@@ -496,10 +500,14 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti ...@@ -496,10 +500,14 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
if tempArray.count > freeDeleteCount { if tempArray.count > freeDeleteCount {
// 弹出多个删除类型 // 弹出多个删除类型
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .Other) view.getOtherInfoByType(type: .Other)
self.showPopView(popView: view) self.showPopView(popView: view)
}else {
self.deleteAction(count: self.selectedModel.count,isAfterAdv: false)
}
} }
}else { }else {
// 如果小于直接删除 // 如果小于直接删除
...@@ -515,20 +523,28 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti ...@@ -515,20 +523,28 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
freeDeleteCount = 5 freeDeleteCount = 5
// 弹出多个删除类型 // 弹出多个删除类型
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .Other) view.getOtherInfoByType(type: .Other)
self.showPopView(popView: view) self.showPopView(popView: view)
}else{
self.deleteAction(count: self.selectedModel.count,isAfterAdv: false)
}
} }
}else if tempArray.count > 1 && tempArray.count <= 5 { }else if tempArray.count > 1 && tempArray.count <= 5 {
// 如果是1张到5张之间，那么免费的张数是当前张数减一 // 如果是1张到5张之间，那么免费的张数是当前张数减一
freeDeleteCount = tempArray.count - 1 freeDeleteCount = tempArray.count - 1
// 弹出多个删除类型 // 弹出多个删除类型
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .Other) view.getOtherInfoByType(type: .Other)
self.showPopView(popView: view) self.showPopView(popView: view)
}else{
self.deleteAction(count: self.selectedModel.count,isAfterAdv: false)
}
} }
}else{ }else{
// 如果只是一张，直接删除 // 如果只是一张，直接删除
...@@ -540,11 +556,15 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti ...@@ -540,11 +556,15 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
} }
view.deleteButtonClickCallback = {isMore,deleteCount in view.deleteButtonClickCallback = {isMore,deleteCount in
if isMore == true { if isMore == true {
if HomePayModel.share.isNoAd == false {
self.popAdverTisement() self.popAdverTisement()
// 广告看完再结束 // 广告看完再结束
AdvManager.shared.finisedCallBack = { AdvManager.shared.finisedCallBack = {
self.deleteAction(count: deleteCount,isAfterAdv: true) self.deleteAction(count: deleteCount,isAfterAdv: true)
} }
}else{
self.deleteAction(count: deleteCount,isAfterAdv: true)
}
} else { } else {
self.deleteAction(count: deleteCount,isAfterAdv: false) self.deleteAction(count: deleteCount,isAfterAdv: false)
} }
......
PhoneManager/Class/Session/Home/Controller/HomeVideoDetailController.swift
View file @ 7a003868
...@@ -385,10 +385,14 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie ...@@ -385,10 +385,14 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
// 当免费次数用完以后，无论删除多少都需要弹出广告 // 当免费次数用完以后，无论删除多少都需要弹出广告
if freeCount <= 0 { if freeCount <= 0 {
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
// 弹出单个删除类型 // 弹出单个删除类型
view.deleteType = .deletePhotoOne view.deleteType = .deletePhotoOne
view.getOtherInfoByType(type: .videos) view.getOtherInfoByType(type: .videos)
self.showPopView(popView: view) self.showPopView(popView: view)
}else{
self.deleteAction(count: self.selectedModel.count,isAfterAdv: false)
}
} }
}else { }else {
// 获取次数对应的删除照片数量 // 获取次数对应的删除照片数量
...@@ -399,10 +403,14 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie ...@@ -399,10 +403,14 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
if tempArray.count > freeDeleteCount { if tempArray.count > freeDeleteCount {
// 弹出多个删除类型 // 弹出多个删除类型
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .videos) view.getOtherInfoByType(type: .videos)
self.showPopView(popView: view) self.showPopView(popView: view)
}else {
self.deleteAction(count: self.selectedModel.count,isAfterAdv: false)
}
} }
}else { }else {
// 如果小于直接删除 // 如果小于直接删除
...@@ -418,20 +426,29 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie ...@@ -418,20 +426,29 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
freeDeleteCount = 5 freeDeleteCount = 5
// 弹出多个删除类型 // 弹出多个删除类型
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .videos) view.getOtherInfoByType(type: .videos)
self.showPopView(popView: view) self.showPopView(popView: view)
}else{
self.deleteAction(count: self.selectedModel.count,isAfterAdv: false)
}
} }
}else if tempArray.count > 1 && tempArray.count <= 5 { }else if tempArray.count > 1 && tempArray.count <= 5 {
// 如果是1张到5张之间，那么免费的张数是当前张数减一 // 如果是1张到5张之间，那么免费的张数是当前张数减一
freeDeleteCount = tempArray.count - 1 freeDeleteCount = tempArray.count - 1
// 弹出多个删除类型 // 弹出多个删除类型
HomePayViewController.show { HomePayViewController.show {
if HomePayModel.share.isNoAd == false{
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .videos) view.getOtherInfoByType(type: .videos)
self.showPopView(popView: view) self.showPopView(popView: view)
}else{
self.deleteAction(count: self.selectedModel.count,isAfterAdv: false)
}
} }
}else{ }else{
// 如果只是一张，直接删除 // 如果只是一张，直接删除
...@@ -442,12 +459,16 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie ...@@ -442,12 +459,16 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
} }
} }
view.deleteButtonClickCallback = {isMore,deleteCount in view.deleteButtonClickCallback = {isMore,deleteCount in
if isMore == true { if isMore == true{
if HomePayModel.share.isNoAd == false {
self.popAdverTisement() self.popAdverTisement()
// 广告看完再结束 // 广告看完再结束
AdvManager.shared.finisedCallBack = { AdvManager.shared.finisedCallBack = {
self.deleteAction(count: deleteCount,isAfterAdv: true) self.deleteAction(count: deleteCount,isAfterAdv: true)
} }
}else{
self.deleteAction(count: deleteCount,isAfterAdv: true)
}
} else { } else {
self.deleteAction(count: deleteCount,isAfterAdv: false) self.deleteAction(count: deleteCount,isAfterAdv: false)
} }
......
PhoneManager/Class/Session/Home/Controller/HomeViewController.swift
View file @ 7a003868
...@@ -188,7 +188,7 @@ class HomeViewController:BaseViewController { ...@@ -188,7 +188,7 @@ class HomeViewController:BaseViewController {
if let cIndex = index as? Int { if let cIndex = index as? Int {
// 先走广告策略 // 先走广告策略
if AdvManager.shared.advTimeAfterInAPP <= 0 { if AdvManager.shared.advTimeAfterInAPP <= 0 && HomePayModel.share.isNoAd == false {
AdvManager.shared.showInterstitialAd(vc: self) AdvManager.shared.showInterstitialAd(vc: self)
}else { }else {
junmToModule(cIndex, self) junmToModule(cIndex, self)
......
PhoneManager/Class/Session/Public/Rate/CustomRateView.swift
View file @ 7a003868
...@@ -32,7 +32,7 @@ class CustomRateView: UIView { ...@@ -32,7 +32,7 @@ class CustomRateView: UIView {
} }
@IBAction func okClick(_ sender: Any) { @IBAction func okClick(_ sender: Any) {
viewRemoveAction()
guard let url = URL(string: "https://apps.apple.com/us/app/id\(APPConfig.APPID)?action=write-review") else { guard let url = URL(string: "https://apps.apple.com/us/app/id\(APPConfig.APPID)?action=write-review") else {
return return
} }
...@@ -42,6 +42,11 @@ class CustomRateView: UIView { ...@@ -42,6 +42,11 @@ class CustomRateView: UIView {
} }
@IBAction func noClick(_ sender: Any) { @IBAction func noClick(_ sender: Any) {
viewRemoveAction()
}
private func viewRemoveAction(){
DispatchQueue.main.async {
self.alpha = 1 self.alpha = 1
UIView.animate(withDuration: 0.2) { UIView.animate(withDuration: 0.2) {
self.alpha = 0 self.alpha = 0
...@@ -49,6 +54,7 @@ class CustomRateView: UIView { ...@@ -49,6 +54,7 @@ class CustomRateView: UIView {
self.removeFromSuperview() self.removeFromSuperview()
} }
} }
}
func show(){ func show(){
KEYWINDOW()?.addSubview(self) KEYWINDOW()?.addSubview(self)
......
PhoneManager/Class/Session/Secret/SecretViewController.swift
View file @ 7a003868
...@@ -238,6 +238,7 @@ class SecretViewController: BaseViewController { ...@@ -238,6 +238,7 @@ class SecretViewController: BaseViewController {
b.callback = { [weak self] in b.callback = { [weak self] in
guard let self = self else { return } guard let self = self else { return }
if b.state == .add { if b.state == .add {
if HomePayModel.share.isNoAd == false {
// 添加的时候需要先弹出广告 // 添加的时候需要先弹出广告
popAdverTisement() popAdverTisement()
AdvManager.shared.finisedCallBack = { AdvManager.shared.finisedCallBack = {
...@@ -246,6 +247,12 @@ class SecretViewController: BaseViewController { ...@@ -246,6 +247,12 @@ class SecretViewController: BaseViewController {
self.AddImagePicker(idx) self.AddImagePicker(idx)
} }
} }
}else {
self.AddAction.show();
self.AddAction.callback = { idx in
self.AddImagePicker(idx)
}
}
}else{ }else{
// 删除图片的时候不弹广告和内购 // 删除图片的时候不弹广告和内购
self.deleteData() self.deleteData()
......
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