diff --git a/Shared/KBAPI.h b/Shared/KBAPI.h index e7fd8cf..380ceaf 100644 --- a/Shared/KBAPI.h +++ b/Shared/KBAPI.h @@ -40,6 +40,10 @@ #define API_CHARACTER_DEL_USER_CHARACTER @"/character/delUserCharacter" // 删除用户人设 #define API_CHARACTER_ADD_USER_CHARACTER @"/character/addUserCharacter" // 添加用户人设(假定路径,如有不同请按后端实际修改) +/// pay +#define API_VALIDATE_RECEIPT @"/api/apple/validate-receipt" // 排行榜标签列表 + + @@ -48,8 +52,5 @@ #define KB_API_APP_CONFIG @"app/config" // 获取 App 配置 #endif -#ifndef KB_API_IAP_VERIFY -#define KB_API_IAP_VERIFY @"/payment/apple/verify" // Apple IAP 验签(示例路径,请按后端实际修改) -#endif #endif /* KBAPI_h */ diff --git a/keyBoard/Class/Pay/M/IAPVerifyTransactionObj.m b/keyBoard/Class/Pay/M/IAPVerifyTransactionObj.m index b49a5bb..c66268e 100644 --- a/keyBoard/Class/Pay/M/IAPVerifyTransactionObj.m +++ b/keyBoard/Class/Pay/M/IAPVerifyTransactionObj.m @@ -36,9 +36,9 @@ #else type = 1; #endif - - NSDictionary *params = @{ @"payment": @{ @"receipt": receipt ?: @"", @"type": @(type) } }; - + + // , @"type": @(type) + NSDictionary *params = @{ @"receipt": receipt ?: @""}; __weak typeof(self) weakSelf = self; [self.payVM applePayReqWithParams:params needShow:NO completion:^(NSInteger sta, NSString * _Nullable msg) { [KBHUD dismiss]; @@ -56,13 +56,9 @@ #pragma mark - Helpers - (BOOL)checkLogin { - BOOL loggedIn = [[KBAuthManager shared] isLoggedIn]; + BOOL loggedIn = [[KBUserSessionManager shared] isLoggedIn]; if (!loggedIn) { - dispatch_async(dispatch_get_main_queue(), ^{ - UIViewController *top = [UIViewController kb_topMostViewController]; - if (top) { [KBLoginSheetViewController presentIfNeededFrom:top]; } - }); - return NO; + [[KBUserSessionManager shared] goLoginVC]; } return YES; } diff --git a/keyBoard/Class/Pay/VC/KBJfPay.m b/keyBoard/Class/Pay/VC/KBJfPay.m index a758662..07f5ac4 100644 --- a/keyBoard/Class/Pay/VC/KBJfPay.m +++ b/keyBoard/Class/Pay/VC/KBJfPay.m @@ -243,19 +243,21 @@ static NSString * const kKBJfPayCellId = @"kKBJfPayCellId"; // NSString *msg = [NSString stringWithFormat:@"购买:%@ Coins %@", item[@"coins"], item[@"price"]]; // [KBHUD showInfo:msg]; // } - NSString *productId = @"com.yolo.vip.1month"; + NSString *productId = @"com.loveKey.nyx.1day"; /// 2.获取商品信息 [KBHUD show]; [self.filter requestProductsWith:[NSSet setWithObject:productId] completion:^(NSArray * _Nonnull products) { - NSLog(@"====="); +// NSLog(@"====="); // if (products.count > 0) { // SKProduct *pro = productsp[0]; // } // [[FGIAPManager shared].iap buyProduct:product onCompletion:^(NSString * _Nonnull message, FGIAPManagerPurchaseRusult result) { }]; /// 3.支付购买 + SKProduct *product = products.firstObject; [[FGIAPManager shared].iap buyProduct:products.firstObject onCompletion:^(NSString * _Nonnull message, FGIAPManagerPurchaseRusult result) { // [self.view makeToast:message]; + [KBHUD dismiss]; }]; }]; } diff --git a/keyBoard/Class/Pay/VM/PayVM.m b/keyBoard/Class/Pay/VM/PayVM.m index 717d68e..ecbd9bc 100644 --- a/keyBoard/Class/Pay/VM/PayVM.m +++ b/keyBoard/Class/Pay/VM/PayVM.m @@ -14,7 +14,7 @@ completion:(KBPayCompletion)completion { if (needShow) { [KBHUD show]; } - [[KBNetworkManager shared] POST:KB_API_IAP_VERIFY jsonBody:params headers:nil completion:^(NSDictionary * _Nullable json, NSURLResponse * _Nullable response, NSError * _Nullable error) { + [[KBNetworkManager shared] POST:API_VALIDATE_RECEIPT jsonBody:params headers:nil completion:^(NSDictionary * _Nullable json, NSURLResponse * _Nullable response, NSError * _Nullable error) { if (needShow) { [KBHUD dismiss]; } if (error) {