From d2258883df55570b655981079bbed499edc2a91f Mon Sep 17 00:00:00 2001 From: CodeST <694468528@qq.com> Date: Thu, 4 Dec 2025 21:53:47 +0800 Subject: [PATCH] 1 --- CustomKeyboard/Network/KBNetworkManager.m | 6 +++--- Shared/KBUserSessionManager.m | 5 ++++- keyBoard.xcodeproj/project.pbxproj | 4 ++-- keyBoard/Class/Login/M/KBUser.m | 2 +- keyBoard/Class/Pay/VC/KBJfPay.m | 13 ++++++++++--- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/CustomKeyboard/Network/KBNetworkManager.m b/CustomKeyboard/Network/KBNetworkManager.m index 26903ee..a8e466c 100644 --- a/CustomKeyboard/Network/KBNetworkManager.m +++ b/CustomKeyboard/Network/KBNetworkManager.m @@ -6,7 +6,7 @@ #import "KBNetworkManager.h" #import "AFNetworking.h" #import "KBAuthManager.h" -#import "KBUserSessionManager.h" +//#import "KBUserSessionManager.h" #import "KBSignUtils.h" NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network"; @@ -29,11 +29,11 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network"; _timeout = 10.0; // 默认请求头：Accept 任意类型 + 使用项目多语言管理器设置 Accept-Language NSString *lang = [KBLocalizationManager shared].currentLanguageCode ?: KBLanguageCodeEnglish; - NSString *token = [KBUserSessionManager shared].accessToken ? [KBUserSessionManager shared].accessToken : @""; +// NSString *token = [KBUserSessionManager shared].accessToken ? [KBUserSessionManager shared].accessToken : @""; _defaultHeaders = @{ @"Accept": @"*/*", - @"auth-token" : token, +// @"auth-token" : token, @"Accept-Language": lang }; // 设置基础域名，路径可相对该地址拼接 diff --git a/Shared/KBUserSessionManager.m b/Shared/KBUserSessionManager.m index 2d447a4..2780d4a 100644 --- a/Shared/KBUserSessionManager.m +++ b/Shared/KBUserSessionManager.m @@ -165,7 +165,10 @@ static NSString * const kKBSessionInstallFlagKey = @"KBSession.installInitialize - (void)goLoginVC{ KBLoginVC *vc = [[KBLoginVC alloc] init]; - [KB_CURRENT_NAV pushViewController:vc animated:true]; + UINavigationController *nav = KB_CURRENT_NAV; + if (nav) { + [nav pushViewController:vc animated:YES]; + } } @end diff --git a/keyBoard.xcodeproj/project.pbxproj b/keyBoard.xcodeproj/project.pbxproj index a7840c5..2139e8e 100644 --- a/keyBoard.xcodeproj/project.pbxproj +++ b/keyBoard.xcodeproj/project.pbxproj @@ -110,7 +110,7 @@ 0498BD7E2EE04F9C006CC1D5 /* KBTag.m in Sources */ = {isa = PBXBuildFile; fileRef = 0498BD7D2EE04F9C006CC1D5 /* KBTag.m */; }; 0498BD852EE1B255006CC1D5 /* KBSignUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 0498BD842EE1B255006CC1D5 /* KBSignUtils.m */; }; 0498BD862EE1BEC9006CC1D5 /* KBSignUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 0498BD842EE1B255006CC1D5 /* KBSignUtils.m */; }; - 0498BD872EE1BF1D006CC1D5 /* KBUserSessionManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 047920492EDDCE25004E8522 /* KBUserSessionManager.m */; }; + 0498BD882EE1C166006CC1D5 /* KBUser.m in Sources */ = {isa = PBXBuildFile; fileRef = 04122F612EC5F41D00EF7AB3 /* KBUser.m */; }; 049FB20B2EC1C13800FAB05D /* KBSkinBottomActionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 049FB20A2EC1C13800FAB05D /* KBSkinBottomActionView.m */; }; 049FB20E2EC1CD2800FAB05D /* KBAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 049FB20D2EC1CD2800FAB05D /* KBAlert.m */; }; 049FB2112EC1F72F00FAB05D /* KBMyListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 049FB2102EC1F72F00FAB05D /* KBMyListCell.m */; }; @@ -1684,7 +1684,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 0498BD872EE1BF1D006CC1D5 /* KBUserSessionManager.m in Sources */, 0498BD862EE1BEC9006CC1D5 /* KBSignUtils.m in Sources */, 04791FFC2ED71D17004E8522 /* UIColor+Extension.m in Sources */, 049FB2322EC45A0000FAB05D /* KBStreamFetcher.m in Sources */, @@ -1694,6 +1693,7 @@ 046131142ECF454500A6FADF /* KBKeyPreviewView.m in Sources */, 04FC95732EB09570007BD342 /* KBFunctionBarView.m in Sources */, 04C6EAD82EAF870B0089C901 /* KeyboardViewController.m in Sources */, + 0498BD882EE1C166006CC1D5 /* KBUser.m in Sources */, 0459D1B82EBA287900F2D189 /* KBSkinManager.m in Sources */, 04FC95762EB095DE007BD342 /* KBFunctionPasteView.m in Sources */, A1B2C3D42EB0A0A100000001 /* KBFunctionTagCell.m in Sources */, diff --git a/keyBoard/Class/Login/M/KBUser.m b/keyBoard/Class/Login/M/KBUser.m index 18450e4..db41abd 100644 --- a/keyBoard/Class/Login/M/KBUser.m +++ b/keyBoard/Class/Login/M/KBUser.m @@ -22,7 +22,7 @@ return @(intValue); } else { // 如果收到非法值，可以返回默认值 - KBLOG(@"⚠️ 收到非法的userStatus值: %ld", (long)intValue); +// KBLOG(@"⚠️ 收到非法的userStatus值: %ld", (long)intValue); return @(UserSexMan); } } diff --git a/keyBoard/Class/Pay/VC/KBJfPay.m b/keyBoard/Class/Pay/VC/KBJfPay.m index 85def2c..a758662 100644 --- a/keyBoard/Class/Pay/VC/KBJfPay.m +++ b/keyBoard/Class/Pay/VC/KBJfPay.m @@ -5,6 +5,7 @@ #import "KBJfPay.h" #import "KBJfPayCell.h" #import "FGIAPProductsFilter.h" +#import "FGIAPManager.h" static NSString * const kKBJfPayCellId = @"kKBJfPayCellId"; @interface KBJfPay () @@ -61,7 +62,7 @@ static NSString * const kKBJfPayCellId = @"kKBJfPayCellId"; @{ @"coins": @9990, @"price": @"$99.90" ,@"product_id" : @"100_coin" }, @{ @"coins": @19990,@"price": @"$199.90" ,@"product_id" : @"100_coin" }, ]; - self.selectedIndex = 1; // 默认选中第二个，贴近截图 + self.selectedIndex = 0; // 视图组装 [self.view addSubview:self.myPointsTitleLabel]; @@ -244,12 +245,18 @@ static NSString * const kKBJfPayCellId = @"kKBJfPayCellId"; // } NSString *productId = @"com.yolo.vip.1month"; /// 2.获取商品信息 + [KBHUD show]; [self.filter requestProductsWith:[NSSet setWithObject:productId] completion:^(NSArray * _Nonnull products) { NSLog(@"====="); +// if (products.count > 0) { +// SKProduct *pro = productsp[0]; +// } +// [[FGIAPManager shared].iap buyProduct:product onCompletion:^(NSString * _Nonnull message, FGIAPManagerPurchaseRusult result) { }]; + /// 3.支付购买 -// [[FGIAPManager shared].iap buyProduct:products.firstObject onCompletion:^(NSString * _Nonnull message, FGIAPManagerPurchaseRusult result) { + [[FGIAPManager shared].iap buyProduct:products.firstObject onCompletion:^(NSString * _Nonnull message, FGIAPManagerPurchaseRusult result) { // [self.view makeToast:message]; -// }]; + }]; }]; }