Skip to content

P
PhoneManager
Commit c8293021 authored by CZ1004's avatar CZ1004
Browse files
Options

【修复】充电逻辑修复

parent b0e0d93b
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 53 deletions
PhoneManager/AppDelegate.swift
View file @ c8293021
......@@ -46,6 +46,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
return true
}
func applicationDidBecomeActive(_ application: UIApplication) {
NotificationCenter.default.post(name: Notification.Name("applicationDidBecomeActive"), object: nil)
}
......@@ -304,5 +307,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}
}
}
PhoneManager/Class/Session/Home/Controller/HomeInfoViewController.swift
View file @ c8293021
......@@ -111,6 +111,11 @@ class HomeInfoViewController:BaseViewController {
}
}
// 显示弹出框
func showPopView(popView: AdvTipDeleteView){
self.view.addSubview(popView)
}
sview.deleteCallBack = { [weak self] array in
guard let self = self else { return }
......@@ -129,7 +134,7 @@ class HomeInfoViewController:BaseViewController {
// 弹出单个删除类型
view.deleteType = .deletePhotoOne
view.getOtherInfoByType(type: self.type!)
self.view.addSubview(view)
showPopView(popView: view)
}
}else {
// 获取次数对应的删除照片数量
......@@ -143,7 +148,7 @@ class HomeInfoViewController:BaseViewController {
view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: self.type!)
self.view.addSubview(view)
showPopView(popView: view)
}
}else {
// 如果小于直接删除
......@@ -162,7 +167,7 @@ class HomeInfoViewController:BaseViewController {
view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: self.type!)
self.view.addSubview(view)
showPopView(popView: view)
}
}else if tempArray.count > 1 && tempArray.count <= 5 {
// 如果是1张到5张之间，那么免费的张数是当前张数减一
......@@ -172,7 +177,7 @@ class HomeInfoViewController:BaseViewController {
view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: self.type!)
self.view.addSubview(view)
showPopView(popView: view)
}
}else{
// 如果只是一张，直接删除
......
PhoneManager/Class/Session/Home/Controller/HomePhotosDetailViewController.swift
View file @ c8293021
......@@ -427,6 +427,12 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
}
}
// 显示弹出框
func showPopView(popView: AdvTipDeleteView){
self.view.addSubview(popView)
}
@objc func deleteButtonAction(){
......@@ -444,7 +450,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
// 弹出单个删除类型
view.deleteType = .deletePhotoOne
view.getOtherInfoByType(type: .Other)
self.view.addSubview(view)
self.showPopView(popView: view)
}
}else {
// 获取次数对应的删除照片数量
......@@ -458,7 +464,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .Other)
self.view.addSubview(view)
self.showPopView(popView: view)
}
}else {
// 如果小于直接删除
......@@ -477,7 +483,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .Other)
self.view.addSubview(view)
self.showPopView(popView: view)
}
}else if tempArray.count > 1 && tempArray.count <= 5 {
// 如果是1张到5张之间，那么免费的张数是当前张数减一
......@@ -487,7 +493,7 @@ extension HomePhotosDetailViewController:WaterfallMutiSectionDelegate,UICollecti
view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .Other)
self.view.addSubview(view)
self.showPopView(popView: view)
}
}else{
// 如果只是一张，直接删除
......
PhoneManager/Class/Session/Home/Controller/HomeVideoDetailController.swift
View file @ c8293021
......@@ -347,7 +347,11 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
}
// 显示弹出框
func showPopView(popView: AdvTipDeleteView){
self.view.addSubview(popView)
}
@objc func deleteButtonAction(){
......@@ -366,7 +370,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
// 弹出单个删除类型
view.deleteType = .deletePhotoOne
view.getOtherInfoByType(type: .videos)
self.view.addSubview(view)
self.showPopView(popView: view)
}
}else {
// 获取次数对应的删除照片数量
......@@ -380,7 +384,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .videos)
self.view.addSubview(view)
self.showPopView(popView: view)
}
}else {
// 如果小于直接删除
......@@ -399,7 +403,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .videos)
self.view.addSubview(view)
self.showPopView(popView: view)
}
}else if tempArray.count > 1 && tempArray.count <= 5 {
// 如果是1张到5张之间，那么免费的张数是当前张数减一
......@@ -409,7 +413,7 @@ extension HomeVideoDetailController:WaterfallMutiSectionDelegate,UICollectionVie
view.deleteType = .deletePhotosMore
view.freeDeleteCount = freeDeleteCount
view.getOtherInfoByType(type: .videos)
self.view.addSubview(view)
self.showPopView(popView: view)
}
}else{
// 如果只是一张，直接删除
......
PhoneManager/Class/Session/Home/Controller/HomeViewController.swift
View file @ c8293021
......@@ -12,6 +12,8 @@ class HomeViewController:BaseViewController {
private var isShowPay:Bool = false
private var isShowCharge:Bool = false
var homeView:HomeView?
fileprivate func junmToModule(_ cIndex: Int, _ self: HomeViewController) {
......@@ -49,9 +51,6 @@ class HomeViewController:BaseViewController {
let vc:SecretViewController = SecretViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
//
// let vc:SecretViewController = SecretViewController()
// self.navigationController?.pushViewController(vc, animated: true)
}
case 2 :
DispatchQueue.main.async {[weak self] in
......@@ -128,6 +127,11 @@ class HomeViewController:BaseViewController {
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?.titleCallBack = {[weak self] model,type in
......@@ -242,6 +246,19 @@ class HomeViewController:BaseViewController {
}
})
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
}
}
// 重新刷新下集合
......@@ -269,11 +286,19 @@ class HomeViewController:BaseViewController {
}
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
self.barHidden = false
// 开启定时器
Singleton.shared.startCountdown {}
if !isShowCharge {
return
}
if !isShowPay {
......@@ -282,25 +307,13 @@ class HomeViewController:BaseViewController {
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 {
HomePayViewController.show {}
}
if HomePayModel.share.isNoAd == false {
HomePayViewController.show {}
}
}
// 开启定时器
Singleton.shared.startCountdown {}
}
// 重复图片
......
PhoneManager/Class/Session/Secret/SecretViewController.swift
View file @ c8293021
......@@ -54,16 +54,6 @@ class SecretViewController: BaseViewController {
super.viewDidLoad()
_ = Resource.isDirect()
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()
}else{
let alert = SecretAlert()
......@@ -79,7 +69,6 @@ class SecretViewController: BaseViewController {
}
set.modalPresentationStyle = .fullScreen
self?.present(set, animated: true)
// self?.navigationController?.pushViewController(set, animated: true)
}else{
self?.ShowUI()
}
......@@ -91,6 +80,11 @@ class SecretViewController: BaseViewController {
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
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
......@@ -139,7 +133,6 @@ class SecretViewController: BaseViewController {
if pass.count > 2 {
let set = SecretSetViewController()
set.secretType = .del
// self.navigationController?.pushViewController(set, animated: true)
set.Callback = { cr in
set.dismiss(animated: true)
}
......@@ -152,7 +145,6 @@ class SecretViewController: BaseViewController {
set.Callback = { cr in
set.dismiss(animated: true)
}
// self.navigationController?.pushViewController(set, animated: true)
set.modalPresentationStyle = .fullScreen
self.present(set, animated: true)
}
......@@ -178,6 +170,7 @@ class SecretViewController: BaseViewController {
secretLock.snp.makeConstraints { make in
make.right.equalToSuperview().offset(-28)
make.centerY.equalTo(secretTL.snp.centerY)
make.width.height.equalTo(28)
}
bottomm.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
......@@ -234,8 +227,6 @@ class SecretViewController: BaseViewController {
private lazy var secretLock: UIButton = {
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)
view.addSubview(lock)
return lock
......@@ -246,18 +237,20 @@ class SecretViewController: BaseViewController {
view.addSubview(b)
b.callback = { [weak self] in
guard let self = self else { return }
// 先弹出广告
popAdverTisement()
AdvManager.shared.finisedCallBack = {
if b.state == .add {
if b.state == .add {
// 添加的时候需要先弹出广告
popAdverTisement()
AdvManager.shared.finisedCallBack = {
self.AddAction.show();
self.AddAction.callback = { idx in
self.AddImagePicker(idx)
}
}else{
self.deleteData()
}
}else{
// 删除图片的时候不弹广告和内购
self.deleteData()
}
func popAdverTisement(){
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