Merge branch 'develop_0409' into homeUpdate

* develop_0409:
  4 -  10

PhoneManager/Class/Session/NoAds/HomeNoAdsViewController.swift

@@ -440,3 +440,23 @@ extension HomeNoAdsViewController : UIScrollViewDelegate {
         root.present(nav, animated: true)
     }
 }
+
+
+class BackgroundTaskManager {
+    
+    static let share = BackgroundTaskManager()
+    
+    private var backgroundTaskID: UIBackgroundTaskIdentifier = .invalid
+    
+    func startTask() {
+        backgroundTaskID = UIApplication.shared.beginBackgroundTask { [weak self] in
+            self?.endTask() // 超时强制终止
+        }
+    }
+    
+    func endTask() {
+        guard backgroundTaskID != .invalid else { return }
+        UIApplication.shared.endBackgroundTask(backgroundTaskID)
+        backgroundTaskID = .invalid
+    }
+}

PhoneManager/Class/Session/Pay/Model/HomePayModel.swift

@@ -83,10 +83,15 @@ class HomePayModel: NSObject ,SKProductsRequestDelegate ,SKPaymentTransactionObs
     }
     
     func fetchProducts()  {
+        BackgroundTaskManager.share.startTask()
         let request = SKProductsRequest(productIdentifiers: Set(productIdentifiers))
         request.delegate = self
         request.start()
         Print("获取商品信息")
+        DispatchQueue.global().asyncAfter(deadline: .now() + 15) {
+            request.cancel()
+            BackgroundTaskManager.share.endTask()
+        }
     }
     
     private var product:[SKProduct?]?
@@ -109,10 +114,15 @@ class HomePayModel: NSObject ,SKProductsRequestDelegate ,SKPaymentTransactionObs
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.2, execute: {
             self.product = ps
             Print("获取商品信息成功")
+            BackgroundTaskManager.share.endTask()
             self.storeCall(ps)
         })
     }
 
+    func request(_ request: SKRequest, didFailWithError error: Error) {
+        BackgroundTaskManager.share.endTask()
+    }
+    
     /** 购买 */
     func purchase(_ states:PayState = .Subscribe) -> Void {
         guard let p1 = product?.first,

PhoneManager/Class/Session/Secret/SecretSetViewController.swift

@@ -15,7 +15,7 @@ class SecretSetViewController: BaseViewController, UITextFieldDelegate {
     case del     // 删除
     }
     
-    var Callback:((_ suc:Bool)->Void)?
+    var Callback:((_ suc:Bool)->Void) = { suc in }
     
     var secretType:SecretType = .create {
         didSet{
@@ -43,9 +43,7 @@ class SecretSetViewController: BaseViewController, UITextFieldDelegate {
             self.navigationController?.popToRootViewController(animated: true)
             return
         }
-        if Callback != nil {
-            Callback!(false)
-        }
+        Callback(false)
         super.close(animation: animation)
     }
     
@@ -79,10 +77,7 @@ class SecretSetViewController: BaseViewController, UITextFieldDelegate {
                             self.present(alert, animated: true)
                             DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) {
                                 alert.dismiss(animated: true) {
-                                    guard self.Callback != nil else {
-                                        return
-                                    }
-                                    self.Callback!(true)
+                                    self.Callback(true)
                                     self.navigationController?.popViewController(animated: true)
                                 }
                             }
@@ -95,10 +90,7 @@ class SecretSetViewController: BaseViewController, UITextFieldDelegate {
                     }
                     return
                 }
-                guard Callback != nil else {
-                    return
-                }
-                Callback!(true)
+                Callback(true)
                 self.navigationController?.popViewController(animated: true)
             }
         }