optimize mine logic

ZhiJi/Classes/Goods/Controller/ZTPurchaseManager.swift

@@ -158,34 +158,33 @@ class ZTPurchaseManager: NSObject {
                 print("Restore Success: \(results.restoredPurchases)")
                 
                 if let product = results.restoredPurchases.last {
-                    let receiptData = SwiftyStoreKit.localReceiptData
-                    let receiptString = receiptData?.base64EncodedString(options: []) ?? ""
-                    print("receiptString: \(receiptString)")
-                    let dict = ["productId": product.productId, "transactionId" : (product.transaction.transactionIdentifier ?? ""), "receiptData" : receiptString]
-                    print("productId transactionId receiptData: \(dict)")
-                    // TODO: 服务器验证
-                    let innerHud = MBProgressHUD.showAdded(to:view, animated: true)
-                    TQNetworkTools.shared().post(withBodyAction: iosIPAVerifyReceipt, parameters: [:], body: dict, success: { (data) in
-                        innerHud.hide(animated: true)
-                        print("success----iosIPAVerifyReceipt-----------------\(data)------")
-                        guard let dict = data as? [String:Any], let result = dict["result"] as? [String:Any], let data = result["data"] as? [String:Any] else {
-                            return
-                        }
-                        
-                        guard let status = data["status"] as? Bool, status == true else {
-                            return
-                        }
-                        if product.needsFinishTransaction {
+                    if product.needsFinishTransaction {
+                        let receiptData = SwiftyStoreKit.localReceiptData
+                        let receiptString = receiptData?.base64EncodedString(options: []) ?? ""
+                        print("receiptString: \(receiptString)")
+                        let dict = ["productId": product.productId, "transactionId" : (product.transaction.transactionIdentifier ?? ""), "receiptData" : receiptString]
+                        print("productId transactionId receiptData: \(dict)")
+                        // TODO: 服务器验证
+                        let innerHud = MBProgressHUD.showAdded(to:view, animated: true)
+                        TQNetworkTools.shared().post(withBodyAction: iosIPAVerifyReceipt, parameters: [:], body: dict, success: { (data) in
+                            innerHud.hide(animated: true)
+                            print("success----iosIPAVerifyReceipt-----------------\(data)------")
+                            guard let dict = data as? [String:Any], let result = dict["result"] as? [String:Any], let data = result["data"] as? [String:Any] else {
+                                return
+                            }
+                            
+                            guard let status = data["status"] as? Bool, status == true else {
+                                return
+                            }
+                            
+                            print("Purchase Success: \(product.productId)")
                             SwiftyStoreKit.finishTransaction(product.transaction)
+                            success()
+                        }) { (error) in
+                            innerHud.hide(animated: true)
                         }
-                        print("Purchase Success: \(product.productId)")
-                        success()
-                    }) { (error) in
-                        innerHud.hide(animated: true)
                     }
-                    
                 }
-                
             } else {
                 MBProgressHUD.showError("没有商品可恢复")
                 print("Nothing to Restore")

ZhiJi/Classes/Mine/View/ZJMineHeaderView.m

@@ -185,7 +185,7 @@
         if (Member) {
             _gongNengLabel.text = kLocalizedString(@"mine_unlocked");
             _timeLabel.text = kLocalizedString(@"mine_free_used");
-//            _xuFeiButton.hidden = YES;
+            _xuFeiButton.hidden = YES;
         }else{
             _gongNengLabel.text = kLocalizedString(@"mine_premium_services_locked");
             _timeLabel.text = kLocalizedString(@"mine_unlock_more_services");
@@ -197,10 +197,20 @@
             _nicknameLabel.text = userInfo.nickname;
         }
     }else{
-        _nicknameLabel.text = kLocalizedString(@"mine_sign"); // [[data Read] objectForKey:@"NickName"];
-        _gongNengLabel.text = kLocalizedString(@"mine_premium_services_locked");
-        _timeLabel.text = kLocalizedString(@"mine_unlock_more_services");
-        [_xuFeiButton setTitle:kLocalizedString(@"mine_unlock") forState:(UIControlStateNormal)];
+        if (Member) {
+            _gongNengLabel.text = kLocalizedString(@"mine_unlocked");
+            _timeLabel.text = kLocalizedString(@"mine_free_used");
+            _nicknameLabel.text = kLocalizedString(@"mine_sign"); // [[data Read] objectForKey:@"NickName"];
+            _xuFeiButton.hidden = true;
+        }else{
+            _gongNengLabel.text = kLocalizedString(@"mine_premium_services_locked");
+            _timeLabel.text = kLocalizedString(@"mine_unlock_more_services");
+            [_xuFeiButton setTitle:kLocalizedString(@"mine_unlock") forState:(UIControlStateNormal)];
+            _xuFeiButton.hidden = false;
+        }
+//        _gongNengLabel.text = kLocalizedString(@"mine_premium_services_locked");
+//        _timeLabel.text = kLocalizedString(@"mine_unlock_more_services");
+//        [_xuFeiButton setTitle:kLocalizedString(@"mine_unlock") forState:(UIControlStateNormal)];
     }
     
     if ([userInfo.uid isEqual: @""]) {

ZhiJi/en.lproj/Localizable.strings

@@ -156,7 +156,7 @@ appName = "Family Mapp";
 "mine_sign"="Sign in";
 "mine_click_nickname"="Click name to edit";
 "mine_unlock_more_services"="Unlock to access Premium services";
-"mine_unlock"="Unlocked";
+"mine_unlock"="Unlock";
 "mine_userID"="User ID";
 "mine_track"="My track";
 "mine_emergenry_contacts"="Emergency contacts";