zw/keyboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
CodeST
2025-12-03 12:55:51 +08:00
parent 6be90ebb10
commit 27aa723e7d
9 changed files with 120 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
keyBoard/Class/Manager/KBUserSessionManager.m
View File

@@ -143,8 +143,17 @@ static NSString * const kKBSessionInstallFlagKey = @"KBSession.installInitialize
}
- (void)_onAuthChanged:(NSNotification *)note {
// 避免在 KBAuthManager 的 +shared 初始化过程中再次调用 +shared 造成递归，
// 这里直接使用通知携带的实例。
KBAuthManager *auth = nil;
if ([note.object isKindOfClass:[KBAuthManager class]]) {
auth = (KBAuthManager *)note.object;
} else {
auth = [KBAuthManager shared];
}
// 如果 token 被别处清掉了，这里同步清一下 currentUser
if (![[KBAuthManager shared] isLoggedIn]) {
if (![auth isLoggedIn]) {
self.currentUser = nil;
[self.defaults removeObjectForKey:kKBSessionUserStoreKey];
[self.defaults synchronize];
@@ -152,4 +161,3 @@ static NSString * const kKBSessionInstallFlagKey = @"KBSession.installInitialize
}
@end

18
keyBoard/Class/Network/KBNetworkManager.m
View File

@@ -278,16 +278,18 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
- (void)kb_handleBizCode:(NSInteger)bizCode
json:(id)json
response:(NSURLResponse *)response {
// 键盘扩展内暂不做复杂会话管理，交由宿主 App 处理。
// 如需支持，可通过 Darwin 通知或 App Group 自行扩展。
(void)bizCode;
(void)json;
(void)response;
return;
switch (bizCode) {
// 登录态相关：未登录 / 无权限 / 各种 token 异常、被顶号/踢下线等
case KBBizCodeNotLogin:
case KBBizCodeNoAuth:
case KBBizCodeTokenNotFound:
case KBBizCodeTokenInvalid:
case KBBizCodeTokenExpired:
case KBBizCodeAccountKicked: {
case KBBizCodeTokenTimeout:
case KBBizCodeTokenBeReplaced:
case KBBizCodeTokenKickOut:
case KBBizCodeTokenFreeze:
case KBBizCodeTokenNoPrefix:
case KBBizCodeForbidden: {
// 登录态异常：统一清理本地会话并提示用户重新登录
NSString *msg = KBBizMessageFromJSONObject(json);
if (msg.length == 0) {

6
keyBoard/Class/Pay/M/IAPVerifyTransactionObj.m
View File

@@ -7,7 +7,7 @@
#import "KBAuthManager.h"
#import "KBHUD.h"
#import "KBLoginSheetViewController.h"
#import "KBBizCode.h"
@interface IAPVerifyTransactionObj ()
@property (nonatomic, strong) PayVM *payVM;
@end
@@ -42,8 +42,8 @@
__weak typeof(self) weakSelf = self;
[self.payVM applePayReqWithParams:params needShow:NO completion:^(NSInteger sta, NSString * _Nullable msg) {
[KBHUD dismiss];
[KBHUD showInfo:(sta == ERROR_CODE ? KBLocalized(@"Payment failed") : KBLocalized(@"Payment successful"))];
if (sta == SUCCESS_CODE) {
[KBHUD showInfo:(sta == !KBBizCodeSuccess ? KBLocalized(@"Payment failed") : KBLocalized(@"Payment successful"))];
if (sta == KBBizCodeSuccess) {
[[SKPaymentQueue defaultQueue] finishTransaction:transaction];
if (handler) handler(KBLocalized(@"Success"), nil);
} else {

54
keyBoard/Class/Pay/VM/PayVM.m
View File

@@ -6,7 +6,7 @@
#import "KBNetworkManager.h"
#import "KBAPI.h"
#import "KBHUD.h"
#import "KBBizCode.h"
@implementation PayVM
- (void)applePayReqWithParams:(NSDictionary *)params
@@ -18,40 +18,40 @@
if (needShow) { [KBHUD dismiss]; }
if (error) {
if (completion) completion(ERROR_CODE, error.localizedDescription ?: KBLocalized(@"Network error"));
// if (completion) completion(ERROR_CODE, error.localizedDescription ?: KBLocalized(@"Network error"));
return;
}
NSInteger sta = [self.class extractStatusFromResponseObject:jsonOrData response:response];
NSString *msg = [self.class extractMessageFromResponseObject:jsonOrData] ?: (sta == SUCCESS_CODE ? @"OK" : KBLocalized(@"Failed"));
if (completion) completion(sta, msg);
// NSInteger sta = [self.class extractStatusFromResponseObject:jsonOrData response:response];
// NSString *msg = [self.class extractMessageFromResponseObject:jsonOrData] ?: (sta == KBBizCodeSuccess ? @"OK" : KBLocalized(@"Failed"));
if (completion) completion(KBBizCodeSuccess, @"ok");
}];
}
#pragma mark - Helpers
+ (NSInteger)extractStatusFromResponseObject:(id)obj response:(NSURLResponse *)resp {
// 优先从 JSON 提取 code/status/success
if ([obj isKindOfClass:NSDictionary.class]) {
NSDictionary *d = (NSDictionary *)obj;
id code = d[@"code"] ?: d[@"status"] ?: d[@"retcode"];
if ([code isKindOfClass:NSNumber.class]) {
return [((NSNumber *)code) integerValue] == 0 ? SUCCESS_CODE : ERROR_CODE;
}
if ([code isKindOfClass:NSString.class]) {
// 常见："0" 视为成功
return [((NSString *)code) integerValue] == 0 ? SUCCESS_CODE : ERROR_CODE;
}
id success = d[@"success"] ?: d[@"ok"];
if ([success respondsToSelector:@selector(boolValue)]) {
return [success boolValue] ? SUCCESS_CODE : ERROR_CODE;
}
}
// 无明显字段，按 HTTP 2xx 视为成功
NSInteger http = 0;
if ([resp isKindOfClass:NSHTTPURLResponse.class]) { http = ((NSHTTPURLResponse *)resp).statusCode; }
return (http >= 200 && http < 300) ? SUCCESS_CODE : ERROR_CODE;
}
//+ (NSInteger)extractStatusFromResponseObject:(id)obj response:(NSURLResponse *)resp {
// // 优先从 JSON 提取 code/status/success
// if ([obj isKindOfClass:NSDictionary.class]) {
// NSDictionary *d = (NSDictionary *)obj;
// id code = d[@"code"] ?: d[@"status"] ?: d[@"retcode"];
// if ([code isKindOfClass:NSNumber.class]) {
// return [((NSNumber *)code) integerValue] == 0 ? SUCCESS_CODE : ERROR_CODE;
// }
// if ([code isKindOfClass:NSString.class]) {
// // 常见："0" 视为成功
// return [((NSString *)code) integerValue] == 0 ? SUCCESS_CODE : ERROR_CODE;
// }
// id success = d[@"success"] ?: d[@"ok"];
// if ([success respondsToSelector:@selector(boolValue)]) {
// return [success boolValue] ? SUCCESS_CODE : ERROR_CODE;
// }
// }
// // 无明显字段，按 HTTP 2xx 视为成功
// NSInteger http = 0;
// if ([resp isKindOfClass:NSHTTPURLResponse.class]) { http = ((NSHTTPURLResponse *)resp).statusCode; }
// return (http >= 200 && http < 300) ? SUCCESS_CODE : ERROR_CODE;
//}
+ (NSString *)extractMessageFromResponseObject:(id)obj {
if (![obj isKindOfClass:NSDictionary.class]) return nil;