|
|
@@ -35,6 +35,7 @@ class TSPurchaseVC: TSBaseVC {
|
|
|
return purchaseManager
|
|
|
}()
|
|
|
|
|
|
+ private var isHandlePurchaseStateChanged = true //是否处理购买状态变化
|
|
|
|
|
|
func createImageScroll(imageName:String,direction:ImagesAnimateScrollView.`Direction`)->ImagesAnimateScrollView{
|
|
|
let imageScroll1: ImagesAnimateScrollView = ImagesAnimateScrollView()
|
|
|
@@ -98,6 +99,12 @@ class TSPurchaseVC: TSBaseVC {
|
|
|
}
|
|
|
|
|
|
override func dealThings() {
|
|
|
+
|
|
|
+ //周会员不自动处理变化,必须点击购买后才处理
|
|
|
+ if purchaseManager.vipType == .week {
|
|
|
+ isHandlePurchaseStateChanged = false
|
|
|
+ }
|
|
|
+
|
|
|
addNotifaction()
|
|
|
onPurchaseStateChanged()
|
|
|
NotificationCenter.default.addObserver(forName: .kPurchasePrepared, object: nil, queue: OperationQueue.main) { [weak self] _ in
|
|
|
@@ -113,6 +120,7 @@ class TSPurchaseVC: TSBaseVC {
|
|
|
guard let self = self else {
|
|
|
return
|
|
|
}
|
|
|
+ isHandlePurchaseStateChanged = true
|
|
|
PurchaseManager.default.pay(for: self.viewModel.selectedType)
|
|
|
}.store(in: &cancellabel)
|
|
|
|
|
|
@@ -138,7 +146,9 @@ class TSPurchaseVC: TSBaseVC {
|
|
|
|
|
|
}.store(in: &cancellabel)
|
|
|
|
|
|
- viewModel.restorePublisher.receive(on: DispatchQueue.main).sink { _ in
|
|
|
+ viewModel.restorePublisher.receive(on: DispatchQueue.main).sink { [weak self] _ in
|
|
|
+ guard let self = self else { return }
|
|
|
+ isHandlePurchaseStateChanged = true
|
|
|
PurchaseManager.default.restorePremium()
|
|
|
}.store(in: &cancellabel)
|
|
|
}
|
|
|
@@ -148,6 +158,11 @@ class TSPurchaseVC: TSBaseVC {
|
|
|
purchaseManager.onPurchaseStateChanged = { [weak self] manager,state,object in
|
|
|
guard let self = self else { return }
|
|
|
|
|
|
+ if isHandlePurchaseStateChanged == false {
|
|
|
+ debugPrint("purchaseManager.onPurchaseStateChanged 不处理")
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
DispatchQueue.main.async {
|
|
|
switch state {
|
|
|
case .none:
|
