Skip to content

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

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

# Conflicts:
#	PhoneManager/Class/Session/Home/Controller/HomeInfoViewController.swift
parents aa8c57c4 c8293021
Show whitespace changes
Inline Side-by-side
Showing with 191 additions and 91 deletions
PhoneManager/AppDelegate.swift
View file @ d6da802c
...@@ -46,6 +46,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate { ...@@ -46,6 +46,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return true return true
} }
func applicationDidBecomeActive(_ application: UIApplication) {
NotificationCenter.default.post(name: Notification.Name("applicationDidBecomeActive"), object: nil)
}
...@@ -304,5 +307,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate { ...@@ -304,5 +307,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
} }
} }
} }
PhoneManager/Class/Session/Advertisement/View/AdvTipDeleteView.swift
View file @ d6da802c
...@@ -106,6 +106,16 @@ class AdvTipDeleteView : UIView { ...@@ -106,6 +106,16 @@ class AdvTipDeleteView : UIView {
view.layer.cornerRadius = 24 view.layer.cornerRadius = 24
view.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .bold) view.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .bold)
view.setImage(UIImage(named: "ic_ad_pop"), for: .normal) view.setImage(UIImage(named: "ic_ad_pop"), for: .normal)
// 设置间距为 8
let spacing: CGFloat = 8
// 获取图片和文字的大小
let imageSize = view.imageView?.image?.size ?? .zero
let titleSize = view.titleLabel?.intrinsicContentSize ?? .zero
// 计算 imageEdgeInsets 和 titleEdgeInsets
view.imageEdgeInsets = UIEdgeInsets(top: 0, left: -spacing / 2, bottom: 0, right: spacing / 2)
view.titleEdgeInsets = UIEdgeInsets(top: 0, left: spacing / 2, bottom: 0, right: -spacing / 2)
view.addTarget(self, action: #selector(deleteMoreButtonSelect), for: .touchUpInside) view.addTarget(self, action: #selector(deleteMoreButtonSelect), for: .touchUpInside)
return view return view
}() }()
......
PhoneManager/Class/Session/Advertisement/View/AdvTipSelectView.swift
View file @ d6da802c
...@@ -95,6 +95,14 @@ class AdvTipSelectView : UIView { ...@@ -95,6 +95,14 @@ class AdvTipSelectView : UIView {
view.layer.cornerRadius = 24 view.layer.cornerRadius = 24
view.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .bold) view.titleLabel?.font = UIFont.systemFont(ofSize: 16, weight: .bold)
view.setImage(UIImage(named: "ic_ad_pop"), for: .normal) view.setImage(UIImage(named: "ic_ad_pop"), for: .normal)
// 设置间距为 8
let spacing: CGFloat = 8
// 获取图片和文字的大小
let imageSize = view.imageView?.image?.size ?? .zero
let titleSize = view.titleLabel?.intrinsicContentSize ?? .zero
// 计算 imageEdgeInsets 和 titleEdgeInsets
view.imageEdgeInsets = UIEdgeInsets(top: 0, left: -spacing / 2, bottom: 0, right: spacing / 2)
view.titleEdgeInsets = UIEdgeInsets(top: 0, left: spacing / 2, bottom: 0, right: -spacing / 2)
view.addTarget(self, action: #selector(buttonSureSelectAction), for: .touchUpInside) view.addTarget(self, action: #selector(buttonSureSelectAction), for: .touchUpInside)
return view return view
}() }()
......
PhoneManager/Class/Session/Home/Controller/HomeInfoViewController.swift
View file @ d6da802c
...@@ -74,6 +74,7 @@ class HomeInfoViewController:BaseViewController { ...@@ -74,6 +74,7 @@ class HomeInfoViewController:BaseViewController {
} }
self.showDeleteSuccess(fileCount: tempStringArray.count, fileSize: fileSize) self.showDeleteSuccess(fileCount: tempStringArray.count, fileSize: fileSize)
// 删除缓存数据 // 删除缓存数据
PhotoDataManager.manager.removeDataWhenDeleteInPage(data: imgs) PhotoDataManager.manager.removeDataWhenDeleteInPage(data: imgs)
...@@ -93,9 +94,12 @@ class HomeInfoViewController:BaseViewController { ...@@ -93,9 +94,12 @@ class HomeInfoViewController:BaseViewController {
self?.ids = model.otherModelArray[1].assets self?.ids = model.otherModelArray[1].assets
} }
self?.tablewView.ids = self?.ids self?.tablewView.ids = self?.ids
self?.tablewView.deleteModel(array: imgs)
} }
}) })
self.tablewView.deleteModel(array: imgs) // 更新下首页数据以及缓存数据
let dataUpdated = Notification.Name("DataUpdatedNotification")
NotificationCenter.default.post(name: dataUpdated, object: nil, userInfo: nil)
func updateFreeTimes(){ func updateFreeTimes(){
...@@ -112,6 +116,11 @@ class HomeInfoViewController:BaseViewController { ...@@ -112,6 +116,11 @@ class HomeInfoViewController:BaseViewController {
} }
} }
// 显示弹出框
func showPopView(popView: AdvTipDeleteView){
self.view.addSubview(popView)
}
sview.deleteCallBack = { [weak self] array in sview.deleteCallBack = { [weak self] array in
guard let self = self else { return } guard let self = self else { return }
...@@ -130,7 +139,7 @@ class HomeInfoViewController:BaseViewController { ...@@ -130,7 +139,7 @@ class HomeInfoViewController:BaseViewController {
// 弹出单个删除类型 // 弹出单个删除类型
view.deleteType = .deletePhotoOne view.deleteType = .deletePhotoOne
view.getOtherInfoByType(type: self.type!) view.getOtherInfoByType(type: self.type!)
self.view.addSubview(view) showPopView(popView: view)
} }
}else { }else {
// 获取次数对应的删除照片数量 // 获取次数对应的删除照片数量
...@@ -144,7 +153,7 @@ class HomeInfoViewController:BaseViewController { ...@@ -144,7 +153,7 @@ class HomeInfoViewController:BaseViewController {
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: self.type!) view.getOtherInfoByType(type: self.type!)
self.view.addSubview(view) showPopView(popView: view)
} }
}else { }else {
// 如果小于直接删除 // 如果小于直接删除
...@@ -163,7 +172,7 @@ class HomeInfoViewController:BaseViewController { ...@@ -163,7 +172,7 @@ class HomeInfoViewController:BaseViewController {
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: self.type!) view.getOtherInfoByType(type: self.type!)
self.view.addSubview(view) showPopView(popView: view)
} }
}else if tempArray.count > 1 && tempArray.count <= 5 { }else if tempArray.count > 1 && tempArray.count <= 5 {
// 如果是1张到5张之间，那么免费的张数是当前张数减一 // 如果是1张到5张之间，那么免费的张数是当前张数减一
...@@ -173,7 +182,7 @@ class HomeInfoViewController:BaseViewController { ...@@ -173,7 +182,7 @@ class HomeInfoViewController:BaseViewController {
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: self.type!) view.getOtherInfoByType(type: self.type!)
self.view.addSubview(view) showPopView(popView: view)
} }
}else{ }else{
// 如果只是一张，直接删除 // 如果只是一张，直接删除
...@@ -224,6 +233,15 @@ class HomeInfoViewController:BaseViewController { ...@@ -224,6 +233,15 @@ class HomeInfoViewController:BaseViewController {
return defaultImageView return defaultImageView
}() }()
lazy var defaultTipLabel : UILabel = {
let label = UILabel()
label.text = "There are no new files to process"
label.textColor = UIColor(red: 0.2, green: 0.2, blue: 0.2, alpha: 1)
label.font = UIFont.systemFont(ofSize: 16, weight: .bold)
label.textAlignment = .center
return label
}()
var ids: [[AssetModel]]? var ids: [[AssetModel]]?
var titleText : String? var titleText : String?
...@@ -326,10 +344,16 @@ class HomeInfoViewController:BaseViewController { ...@@ -326,10 +344,16 @@ class HomeInfoViewController:BaseViewController {
view.addSubview(self.defaultImageView) view.addSubview(self.defaultImageView)
self.defaultImageView.snp.makeConstraints { make in self.defaultImageView.snp.makeConstraints { make in
make.width.height.equalTo(180) make.width.height.equalTo(180)
make.top.equalTo(292) make.top.equalTo(262)
make.centerX.equalToSuperview()
}
view.addSubview(self.defaultTipLabel)
self.defaultTipLabel.snp.makeConstraints { make in
make.width.equalToSuperview()
make.height.equalTo(28)
make.top.equalTo(self.defaultImageView.snp.bottom).offset(-30)
make.centerX.equalToSuperview() make.centerX.equalToSuperview()
} }
setDefaultPage() setDefaultPage()
} }
...@@ -343,9 +367,11 @@ class HomeInfoViewController:BaseViewController { ...@@ -343,9 +367,11 @@ class HomeInfoViewController:BaseViewController {
self.defaultImageView.image = UIImage(named: "img_photo__home_defpage") self.defaultImageView.image = UIImage(named: "img_photo__home_defpage")
} }
self.defaultImageView.isHidden = false self.defaultImageView.isHidden = false
self.defaultTipLabel.isHidden = false
self.seletedAllBtn.isHidden = true self.seletedAllBtn.isHidden = true
}else{ }else{
self.defaultImageView.isHidden = true self.defaultImageView.isHidden = true
self.defaultTipLabel.isHidden = true
self.seletedAllBtn.isHidden = false self.seletedAllBtn.isHidden = false
} }
} }
......
PhoneManager/Class/Session/Home/Controller/HomePhotosDetailViewController.swift
View file @ d6da802c
...@@ -73,6 +73,14 @@ class HomePhotosDetailViewController : BaseViewController { ...@@ -73,6 +73,14 @@ class HomePhotosDetailViewController : BaseViewController {
defaultImageView.isHidden = true defaultImageView.isHidden = true
return defaultImageView return defaultImageView
}() }()
lazy var defaultTipLabel : UILabel = {
let label = UILabel()
label.text = "There are no new files to process"
label.textColor = UIColor(red: 0.2, green: 0.2, blue: 0.2, alpha: 1)
label.font = UIFont.systemFont(ofSize: 16, weight: .bold)
label.textAlignment = .center
return label
}()
lazy var collectionView:UICollectionView = { lazy var collectionView:UICollectionView = {
...@@ -158,7 +166,14 @@ class HomePhotosDetailViewController : BaseViewController { ...@@ -158,7 +166,14 @@ class HomePhotosDetailViewController : BaseViewController {
self.view.addSubview(self.defaultImageView) self.view.addSubview(self.defaultImageView)
self.defaultImageView.snp.makeConstraints { make in self.defaultImageView.snp.makeConstraints { make in
make.width.height.equalTo(180) make.width.height.equalTo(180)
make.top.equalTo(292) make.top.equalTo(262)
make.centerX.equalToSuperview()
}
self.view.addSubview(self.defaultTipLabel)
self.defaultTipLabel.snp.makeConstraints { make in
make.width.equalToSuperview()
make.height.equalTo(28)
make.top.equalTo(self.defaultImageView.snp.bottom).offset(-30)
make.centerX.equalToSuperview() make.centerX.equalToSuperview()
} }
setDefaultPage() setDefaultPage()
...@@ -172,11 +187,13 @@ class HomePhotosDetailViewController : BaseViewController { ...@@ -172,11 +187,13 @@ class HomePhotosDetailViewController : BaseViewController {
DispatchQueue.main.async { DispatchQueue.main.async {
if self.resourceData.count == 0 { if self.resourceData.count == 0 {
self.defaultImageView.isHidden = false self.defaultImageView.isHidden = false
self.defaultTipLabel.isHidden = false
self.currentHeaderView?.btnView.isHidden = true self.currentHeaderView?.btnView.isHidden = true
self.videoDetailNavView?.seletedAllBtn.isHidden = true self.videoDetailNavView?.seletedAllBtn.isHidden = true
self.deleteButton.isHidden = true self.deleteButton.isHidden = true
}else{ }else{
self.defaultImageView.isHidden = true self.defaultImageView.isHidden = true
self.defaultTipLabel.isHidden = true
self.currentHeaderView?.btnView.isHidden = false self.currentHeaderView?.btnView.isHidden = false
self.videoDetailNavView?.seletedAllBtn.isHidden = false self.videoDetailNavView?.seletedAllBtn.isHidden = false
self.deleteButton.isHidden = false self.deleteButton.isHidden = false
...@@ -434,6 +451,12 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti ...@@ -434,6 +451,12 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
} }
} }
// 显示弹出框
func showPopView(popView: AdvTipDeleteView){
self.view.addSubview(popView)
}
@objc func deleteButtonAction(){ @objc func deleteButtonAction(){
...@@ -451,7 +474,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti ...@@ -451,7 +474,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
// 弹出单个删除类型 // 弹出单个删除类型
view.deleteType = .deletePhotoOne view.deleteType = .deletePhotoOne
view.getOtherInfoByType(type: .Other) view.getOtherInfoByType(type: .Other)
self.view.addSubview(view) self.showPopView(popView: view)
} }
}else { }else {
// 获取次数对应的删除照片数量 // 获取次数对应的删除照片数量
...@@ -465,7 +488,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti ...@@ -465,7 +488,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .Other) view.getOtherInfoByType(type: .Other)
self.view.addSubview(view) self.showPopView(popView: view)
} }
}else { }else {
// 如果小于直接删除 // 如果小于直接删除
...@@ -484,7 +507,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti ...@@ -484,7 +507,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .Other) view.getOtherInfoByType(type: .Other)
self.view.addSubview(view) self.showPopView(popView: view)
} }
}else if tempArray.count > 1 && tempArray.count <= 5 { }else if tempArray.count > 1 && tempArray.count <= 5 {
// 如果是1张到5张之间，那么免费的张数是当前张数减一 // 如果是1张到5张之间，那么免费的张数是当前张数减一
...@@ -494,7 +517,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti ...@@ -494,7 +517,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .Other) view.getOtherInfoByType(type: .Other)
self.view.addSubview(view) self.showPopView(popView: view)
} }
}else{ }else{
// 如果只是一张，直接删除 // 如果只是一张，直接删除
......
PhoneManager/Class/Session/Home/Controller/HomeVideoDetailController.swift
View file @ d6da802c
...@@ -102,6 +102,14 @@ class HomeVideoDetailController :BaseViewController { ...@@ -102,6 +102,14 @@ class HomeVideoDetailController :BaseViewController {
defaultImageView.isHidden = true defaultImageView.isHidden = true
return defaultImageView return defaultImageView
}() }()
lazy var defaultTipLabel : UILabel = {
let label = UILabel()
label.text = "There are no new files to process"
label.textColor = UIColor(red: 0.2, green: 0.2, blue: 0.2, alpha: 1)
label.font = UIFont.systemFont(ofSize: 16, weight: .bold)
label.textAlignment = .center
return label
}()
func setUI(){ func setUI(){
...@@ -149,7 +157,14 @@ class HomeVideoDetailController :BaseViewController { ...@@ -149,7 +157,14 @@ class HomeVideoDetailController :BaseViewController {
self.view.addSubview(self.defaultImageView) self.view.addSubview(self.defaultImageView)
self.defaultImageView.snp.makeConstraints { make in self.defaultImageView.snp.makeConstraints { make in
make.width.height.equalTo(180) make.width.height.equalTo(180)
make.top.equalTo(292) make.top.equalTo(262)
make.centerX.equalToSuperview()
}
view.addSubview(self.defaultTipLabel)
self.defaultTipLabel.snp.makeConstraints { make in
make.width.equalToSuperview()
make.height.equalTo(28)
make.top.equalTo(self.defaultImageView.snp.bottom).offset(-30)
make.centerX.equalToSuperview() make.centerX.equalToSuperview()
} }
setDefaultPage() setDefaultPage()
...@@ -345,7 +360,11 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie ...@@ -345,7 +360,11 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
} }
// 显示弹出框
func showPopView(popView: AdvTipDeleteView){
self.view.addSubview(popView)
}
@objc func deleteButtonAction(){ @objc func deleteButtonAction(){
...@@ -364,7 +383,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie ...@@ -364,7 +383,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
// 弹出单个删除类型 // 弹出单个删除类型
view.deleteType = .deletePhotoOne view.deleteType = .deletePhotoOne
view.getOtherInfoByType(type: .videos) view.getOtherInfoByType(type: .videos)
self.view.addSubview(view) self.showPopView(popView: view)
} }
}else { }else {
// 获取次数对应的删除照片数量 // 获取次数对应的删除照片数量
...@@ -378,7 +397,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie ...@@ -378,7 +397,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .videos) view.getOtherInfoByType(type: .videos)
self.view.addSubview(view) self.showPopView(popView: view)
} }
}else { }else {
// 如果小于直接删除 // 如果小于直接删除
...@@ -397,7 +416,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie ...@@ -397,7 +416,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .videos) view.getOtherInfoByType(type: .videos)
self.view.addSubview(view) self.showPopView(popView: view)
} }
}else if tempArray.count > 1 && tempArray.count <= 5 { }else if tempArray.count > 1 && tempArray.count <= 5 {
// 如果是1张到5张之间，那么免费的张数是当前张数减一 // 如果是1张到5张之间，那么免费的张数是当前张数减一
...@@ -407,7 +426,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie ...@@ -407,7 +426,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
view.deleteType = .deletePhotosMore view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .videos) view.getOtherInfoByType(type: .videos)
self.view.addSubview(view) self.showPopView(popView: view)
} }
}else{ }else{
// 如果只是一张，直接删除 // 如果只是一张，直接删除
...@@ -492,11 +511,13 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie ...@@ -492,11 +511,13 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
DispatchQueue.main.async { DispatchQueue.main.async {
if self.resourceData.count == 0 { if self.resourceData.count == 0 {
self.defaultImageView.isHidden = false self.defaultImageView.isHidden = false
self.defaultTipLabel.isHidden = false
self.currentHeaderView?.btnView.isHidden = true self.currentHeaderView?.btnView.isHidden = true
self.videoDetailNavView?.seletedAllBtn.isHidden = true self.videoDetailNavView?.seletedAllBtn.isHidden = true
self.deleteButton.isHidden = true self.deleteButton.isHidden = true
}else{ }else{
self.defaultImageView.isHidden = true self.defaultImageView.isHidden = true
self.defaultTipLabel.isHidden = true
self.currentHeaderView?.btnView.isHidden = false self.currentHeaderView?.btnView.isHidden = false
self.videoDetailNavView?.seletedAllBtn.isHidden = false self.videoDetailNavView?.seletedAllBtn.isHidden = false
self.deleteButton.isHidden = false self.deleteButton.isHidden = false
......
PhoneManager/Class/Session/Home/Controller/HomeViewController.swift
View file @ d6da802c
...@@ -12,6 +12,8 @@ class HomeViewController:BaseViewController { ...@@ -12,6 +12,8 @@ class HomeViewController:BaseViewController {
private var isShowPay:Bool = false private var isShowPay:Bool = false
private var isShowCharge:Bool = false
var homeView:HomeView? var homeView:HomeView?
fileprivate func junmToModule(_ cIndex: Int, _ self: HomeViewController) { fileprivate func junmToModule(_ cIndex: Int, _ self: HomeViewController) {
...@@ -49,9 +51,6 @@ class HomeViewController:BaseViewController { ...@@ -49,9 +51,6 @@ class HomeViewController:BaseViewController {
let vc:SecretViewController = SecretViewController() let vc:SecretViewController = SecretViewController()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
} }
//
// let vc:SecretViewController = SecretViewController()
// self.navigationController?.pushViewController(vc, animated: true)
} }
case 2 : case 2 :
DispatchQueue.main.async {[weak self] in DispatchQueue.main.async {[weak self] in
...@@ -130,6 +129,11 @@ class HomeViewController:BaseViewController { ...@@ -130,6 +129,11 @@ class HomeViewController:BaseViewController {
NotificationCenter.default.addObserver(self, selector: #selector(handleHomeSimilarImageResourceUpdate(_:)), name: homeSimilarImageResourceUpdate, object: nil) NotificationCenter.default.addObserver(self, selector: #selector(handleHomeSimilarImageResourceUpdate(_:)), name: homeSimilarImageResourceUpdate, object: nil)
// // 充电通知
// let applicationDidBecomeActive = Notification.Name("applicationDidBecomeActive")
// NotificationCenter.default.addObserver(self, selector: #selector(handleApplicationDidBecomeActive(_:)), name: applicationDidBecomeActive, object: nil)
//
homeView = HomeView(frame: view.bounds) homeView = HomeView(frame: view.bounds)
homeView?.titleCallBack = {[weak self] model,type in homeView?.titleCallBack = {[weak self] model,type in
...@@ -240,7 +244,29 @@ class HomeViewController:BaseViewController { ...@@ -240,7 +244,29 @@ class HomeViewController:BaseViewController {
PhotoDataManager.manager.loadFromFileSystem(resultModel: {[weak self] model in PhotoDataManager.manager.loadFromFileSystem(resultModel: {[weak self] model in
DispatchQueue.main.async { DispatchQueue.main.async {
self?.homeView?.model = model self?.homeView?.model = model
if let collectionView = self?.homeView?.collectionView { self?.reloadCollectionView()
}
})
if !isShowCharge {
if BatteryMonitorManager.shared.getBatteryIsCharging() {
// 从字典里面取 如果有
var tempModel : ChargeDataModel?
if UserDefaults.standard.object(forKey: "chargePicInfo") != nil {
let flag : String = UserDefaults.standard.object(forKey: "chargePicInfo") as! String
tempModel = loadVideoItems()[Int(flag)!]
let vc:ChargeInfoViewController = ChargeInfoViewController(model:tempModel, type: ChargeInfoViewController.ChargeInfoType.charge)
self.navigationController?.pushViewController(vc, animated: false)
}
}
isShowCharge = true
}
}
// 重新刷新下集合
func reloadCollectionView(){
DispatchQueue.main.async {
if let collectionView = self.homeView?.collectionView {
for section in 0..<collectionView.numberOfSections { for section in 0..<collectionView.numberOfSections {
for item in 0..<collectionView.numberOfItems(inSection: section) { for item in 0..<collectionView.numberOfItems(inSection: section) {
...@@ -252,22 +278,29 @@ class HomeViewController:BaseViewController { ...@@ -252,22 +278,29 @@ class HomeViewController:BaseViewController {
} }
}else{ }else{
UIView.transition(with:collectionView, duration: 0.3, options: .transitionCrossDissolve, animations: { UIView.transition(with:collectionView, duration: 0.3, options: .transitionCrossDissolve, animations: {
self?.homeView?.collectionView.reloadItems(at: [IndexPath(row: item, section: section)]) self.homeView?.collectionView.reloadItems(at: [IndexPath(row: item, section: section)])
}, completion: nil) }, completion: nil)
} }
} }
} }
} }
} }
})
} }
override func viewDidAppear(_ animated: Bool) { override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated) super.viewDidAppear(animated)
self.barHidden = false self.barHidden = false
// 开启定时器
Singleton.shared.startCountdown {}
if !isShowCharge {
return
}
if !isShowPay { if !isShowPay {
...@@ -276,25 +309,13 @@ class HomeViewController:BaseViewController { ...@@ -276,25 +309,13 @@ class HomeViewController:BaseViewController {
isShowPay = true isShowPay = true
if BatteryMonitorManager.shared.getBatteryIsCharging() {
// 从字典里面取 如果有
var tempModel : ChargeDataModel?
if UserDefaults.standard.object(forKey: "chargePicInfo") != nil {
let flag : String = UserDefaults.standard.object(forKey: "chargePicInfo") as! String
tempModel = loadVideoItems()[Int(flag)!]
let vc:ChargeInfoViewController = ChargeInfoViewController(model:tempModel, type: ChargeInfoViewController.ChargeInfoType.charge)
self.navigationController?.pushViewController(vc, animated: false)
}
}else {
if HomePayModel.share.isNoAd == false { if HomePayModel.share.isNoAd == false {
HomePayViewController.show {} HomePayViewController.show {}
} }
} }
}
// 开启定时器
Singleton.shared.startCountdown {}
} }
// 重复图片 // 重复图片
......
PhoneManager/Class/Session/Home/View/HomeCollectionViewHeader.swift
View file @ d6da802c
...@@ -43,7 +43,6 @@ class HomeCollectionViewHeader : UICollectionReusableView { ...@@ -43,7 +43,6 @@ class HomeCollectionViewHeader : UICollectionReusableView {
private lazy var tipLabel:UILabel = { private lazy var tipLabel:UILabel = {
let label = UILabel() let label = UILabel()
label.numberOfLines = 0 // 支持多行 label.numberOfLines = 0 // 支持多行
label.translatesAutoresizingMaskIntoConstraints = false
return label return label
}() }()
...@@ -57,8 +56,6 @@ class HomeCollectionViewHeader : UICollectionReusableView { ...@@ -57,8 +56,6 @@ class HomeCollectionViewHeader : UICollectionReusableView {
return label return label
}() }()
private func setupUI() { private func setupUI() {
// logo图片 // logo图片
...@@ -71,11 +68,11 @@ class HomeCollectionViewHeader : UICollectionReusableView { ...@@ -71,11 +68,11 @@ class HomeCollectionViewHeader : UICollectionReusableView {
// 文本 // 文本
self.addSubview(self.tipLabel) self.addSubview(self.tipLabel)
self.setFileAndCount(count: 0, fileSize: 0)
self.tipLabel.snp.makeConstraints { make in self.tipLabel.snp.makeConstraints { make in
make.left.equalToSuperview() make.left.equalToSuperview()
make.top.equalToSuperview().offset(32) make.top.equalToSuperview().offset(32)
make.height.equalTo(31) make.height.equalTo(31)
make.width.equalTo(300)
} }
self.addSubview(self.subTiplabel) self.addSubview(self.subTiplabel)
......
PhoneManager/Class/Session/Home/View/HomeInfoView.swift
View file @ d6da802c
...@@ -205,7 +205,7 @@ class HomeInfoView :UIView{ ...@@ -205,7 +205,7 @@ class HomeInfoView :UIView{
temModel.type = models[i].type temModel.type = models[i].type
temModel.smodels = updateSelectToDesSelect(data: arrayT) temModel.smodels = updateSelectToDesSelect(data: arrayT)
temModel.titleText = models[i].titleText temModel.titleText = models[i].titleText
newModel.append(models[i]) newModel.append(temModel)
} }
} }
// 将新的数据全部改成未被选中状态 // 将新的数据全部改成未被选中状态
...@@ -218,10 +218,6 @@ class HomeInfoView :UIView{ ...@@ -218,10 +218,6 @@ class HomeInfoView :UIView{
return dataArray return dataArray
} }
self.models = newModel self.models = newModel
// 更新下首页数据以及缓存数据
let dataUpdated = Notification.Name("DataUpdatedNotification")
NotificationCenter.default.post(name: dataUpdated, object: nil, userInfo: nil)
DispatchQueue.main.async {[weak self] in DispatchQueue.main.async {[weak self] in
......
PhoneManager/Class/Session/Home/View/HomeView.swift
View file @ d6da802c
...@@ -74,8 +74,9 @@ class HomeView:UIView { ...@@ -74,8 +74,9 @@ class HomeView:UIView {
guard let self else {return} guard let self else {return}
self.homeHeader?.setFileAndCount(count: model?.allFileNumber ?? 0, fileSize: model?.allFileSize ?? 0) self.homeHeader?.setFileAndCount(count: model?.allFileNumber ?? 0, fileSize: model?.allFileSize ?? 0)
self.homeHeader?.setNeedsLayout()
self.homeHeader?.layoutIfNeeded()
} }
} }
private func setupUI() { private func setupUI() {
...@@ -288,7 +289,11 @@ extension HomeView:WaterfallMutiSectionDelegate,UICollectionViewDataSource,UICol ...@@ -288,7 +289,11 @@ extension HomeView:WaterfallMutiSectionDelegate,UICollectionViewDataSource,UICol
func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView { func collectionView(_ collectionView: UICollectionView, viewForSupplementaryElementOfKind kind: String, at indexPath: IndexPath) -> UICollectionReusableView {
if kind == UICollectionView.elementKindSectionHeader { if kind == UICollectionView.elementKindSectionHeader {
let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "HomeCollectionViewHeader", for: indexPath) as! HomeCollectionViewHeader let header = collectionView.dequeueReusableSupplementaryView(ofKind: kind, withReuseIdentifier: "HomeCollectionViewHeader", for: indexPath) as! HomeCollectionViewHeader
if indexPath.section == 0{
// 取第 0 个header
self.homeHeader = header self.homeHeader = header
print("Header view cached: \(self.homeHeader != nil)")
}
header.cleanNowButtonCallback = {[weak self] in header.cleanNowButtonCallback = {[weak self] in
guard let self = self else {return} guard let self = self else {return}
let smodel = self.model?.titleModelArray[0] let smodel = self.model?.titleModelArray[0]
...@@ -316,6 +321,4 @@ extension HomeView:WaterfallMutiSectionDelegate,UICollectionViewDataSource,UICol ...@@ -316,6 +321,4 @@ extension HomeView:WaterfallMutiSectionDelegate,UICollectionViewDataSource,UICol
} }
return CGSize.zero return CGSize.zero
} }
} }
PhoneManager/Class/Session/Home/View/Model/HomePhotosModel .swift
View file @ d6da802c
...@@ -55,8 +55,6 @@ class PhotoDataManager { ...@@ -55,8 +55,6 @@ class PhotoDataManager {
size = size + Double(assModel.assetSize) size = size + Double(assModel.assetSize)
} }
model.otherModelArray[index].assets = finalyVideoData model.otherModelArray[index].assets = finalyVideoData
// 处理完成保存下当前数据
self.saveToFileSystem(model: model)
} }
}else{ }else{
...@@ -82,10 +80,7 @@ class PhotoDataManager { ...@@ -82,10 +80,7 @@ class PhotoDataManager {
} }
model.otherModelArray[index].assets = finalyVideoData model.otherModelArray[index].assets = finalyVideoData
model.otherModelArray[index].allFileSize = size model.otherModelArray[index].allFileSize = size
// 处理完成保存下
self.saveToFileSystem(model: model)
} }
} }
for index in 0..<model.titleModelArray.count { for index in 0..<model.titleModelArray.count {
// 删除相似截图和相似视频的缓存 // 删除相似截图和相似视频的缓存
...@@ -108,8 +103,9 @@ class PhotoDataManager { ...@@ -108,8 +103,9 @@ class PhotoDataManager {
} }
model.titleModelArray[index].assets = finalyVideoData model.titleModelArray[index].assets = finalyVideoData
model.titleModelArray[index].allFileSize = size model.titleModelArray[index].allFileSize = size
self.saveToFileSystem(model: model)
} }
// 处理完成保存下当前数据
self.saveToFileSystem(model: model)
}) })
// 将单利中的数据也删除 // 将单利中的数据也删除
for item in data { for item in data {
......
PhoneManager/Class/Session/Secret/SecretViewController.swift
View file @ d6da802c
...@@ -54,16 +54,6 @@ class SecretViewController: BaseViewController { ...@@ -54,16 +54,6 @@ class SecretViewController: BaseViewController {
super.viewDidLoad() super.viewDidLoad()
_ = Resource.isDirect() _ = Resource.isDirect()
if isShow { if isShow {
// if pass.count > 2 {
// let set = SecretSetViewController()
// set.secretType = .verify
// set.Callback = {[weak self] su in
// self?.ShowUI()
// }
// self.navigationController?.pushViewController(set, animated: true)
// }else{
// self.ShowUI()
// }
self.ShowUI() self.ShowUI()
}else{ }else{
let alert = SecretAlert() let alert = SecretAlert()
...@@ -79,7 +69,6 @@ class SecretViewController: BaseViewController { ...@@ -79,7 +69,6 @@ class SecretViewController: BaseViewController {
} }
set.modalPresentationStyle = .fullScreen set.modalPresentationStyle = .fullScreen
self?.present(set, animated: true) self?.present(set, animated: true)
// self?.navigationController?.pushViewController(set, animated: true)
}else{ }else{
self?.ShowUI() self?.ShowUI()
} }
...@@ -91,6 +80,11 @@ class SecretViewController: BaseViewController { ...@@ -91,6 +80,11 @@ class SecretViewController: BaseViewController {
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
secretLock.isSelected = !(pass.count > 1) secretLock.isSelected = !(pass.count > 1)
if secretLock.isSelected {
secretLock.setImage(UIImage(named: "ic_unlock_secret"), for: .normal)
}else{
secretLock.setImage(UIImage(named: "ic_lock_secret"), for: .normal)
}
} }
@discardableResult @discardableResult
...@@ -139,7 +133,6 @@ class SecretViewController: BaseViewController { ...@@ -139,7 +133,6 @@ class SecretViewController: BaseViewController {
if pass.count > 2 { if pass.count > 2 {
let set = SecretSetViewController() let set = SecretSetViewController()
set.secretType = .del set.secretType = .del
// self.navigationController?.pushViewController(set, animated: true)
set.Callback = { cr in set.Callback = { cr in
set.dismiss(animated: true) set.dismiss(animated: true)
} }
...@@ -152,7 +145,6 @@ class SecretViewController: BaseViewController { ...@@ -152,7 +145,6 @@ class SecretViewController: BaseViewController {
set.Callback = { cr in set.Callback = { cr in
set.dismiss(animated: true) set.dismiss(animated: true)
} }
// self.navigationController?.pushViewController(set, animated: true)
set.modalPresentationStyle = .fullScreen set.modalPresentationStyle = .fullScreen
self.present(set, animated: true) self.present(set, animated: true)
} }
...@@ -178,6 +170,7 @@ class SecretViewController: BaseViewController { ...@@ -178,6 +170,7 @@ class SecretViewController: BaseViewController {
secretLock.snp.makeConstraints { make in secretLock.snp.makeConstraints { make in
make.right.equalToSuperview().offset(-28) make.right.equalToSuperview().offset(-28)
make.centerY.equalTo(secretTL.snp.centerY) make.centerY.equalTo(secretTL.snp.centerY)
make.width.height.equalTo(28)
} }
bottomm.snp.makeConstraints { make in bottomm.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview() make.left.right.bottom.equalToSuperview()
...@@ -234,8 +227,6 @@ class SecretViewController: BaseViewController { ...@@ -234,8 +227,6 @@ class SecretViewController: BaseViewController {
private lazy var secretLock: UIButton = { private lazy var secretLock: UIButton = {
let lock = UIButton(type: .custom) let lock = UIButton(type: .custom)
lock.setImage(UIImage(named: "ic_lock_secret"), for: .normal)
lock.setImage(UIImage(named: "ic_unlock_secret"), for: .selected)
lock.addTarget(self, action: #selector(lockTouch(_:)), for: .touchUpInside) lock.addTarget(self, action: #selector(lockTouch(_:)), for: .touchUpInside)
view.addSubview(lock) view.addSubview(lock)
return lock return lock
...@@ -246,18 +237,20 @@ class SecretViewController: BaseViewController { ...@@ -246,18 +237,20 @@ class SecretViewController: BaseViewController {
view.addSubview(b) view.addSubview(b)
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 {
// 添加的时候需要先弹出广告
popAdverTisement() popAdverTisement()
AdvManager.shared.finisedCallBack = { AdvManager.shared.finisedCallBack = {
if b.state == .add {
self.AddAction.show(); self.AddAction.show();
self.AddAction.callback = { idx in self.AddAction.callback = { idx in
self.AddImagePicker(idx) self.AddImagePicker(idx)
} }
}
}else{ }else{
// 删除图片的时候不弹广告和内购
self.deleteData() self.deleteData()
} }
}
func popAdverTisement(){ func popAdverTisement(){
AdvManager.shared.showInterstitialAd(vc: self) AdvManager.shared.showInterstitialAd(vc: self)
} }
......
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