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-04 21:53:47 +08:00
parent f7d11c5f8b
commit d2258883df
5 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CustomKeyboard/Network/KBNetworkManager.m
View File

@@ -6,7 +6,7 @@
#import "KBNetworkManager.h" #import "KBNetworkManager.h"
#import "AFNetworking.h" #import "AFNetworking.h"
#import "KBAuthManager.h" #import "KBAuthManager.h"
#import "KBUserSessionManager.h" //#import "KBUserSessionManager.h"
#import "KBSignUtils.h" #import "KBSignUtils.h"
NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network"; NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
@@ -29,11 +29,11 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
_timeout = 10.0; _timeout = 10.0;
// 默认请求头：Accept 任意类型 + 使用项目多语言管理器设置 Accept-Language // 默认请求头：Accept 任意类型 + 使用项目多语言管理器设置 Accept-Language
NSString *lang = [KBLocalizationManager shared].currentLanguageCode ?: KBLanguageCodeEnglish; NSString *lang = [KBLocalizationManager shared].currentLanguageCode ?: KBLanguageCodeEnglish;
NSString *token = [KBUserSessionManager shared].accessToken ? [KBUserSessionManager shared].accessToken : @""; // NSString *token = [KBUserSessionManager shared].accessToken ? [KBUserSessionManager shared].accessToken : @"";
_defaultHeaders = @{ _defaultHeaders = @{
@"Accept": @"*/*", @"Accept": @"*/*",
@"auth-token" : token, // @"auth-token" : token,
@"Accept-Language": lang @"Accept-Language": lang
}; };
// 设置基础域名，路径可相对该地址拼接 // 设置基础域名，路径可相对该地址拼接

5
Shared/KBUserSessionManager.m
View File

@@ -165,7 +165,10 @@ static NSString * const kKBSessionInstallFlagKey = @"KBSession.installInitialize
- (void)goLoginVC{ - (void)goLoginVC{
KBLoginVC *vc = [[KBLoginVC alloc] init]; 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 @end

4
keyBoard.xcodeproj/project.pbxproj
View File

@@ -110,7 +110,7 @@
0498BD7E2EE04F9C006CC1D5 /* KBTag.m in Sources */ = {isa = PBXBuildFile; fileRef = 0498BD7D2EE04F9C006CC1D5 /* KBTag.m */; }; 0498BD7E2EE04F9C006CC1D5 /* KBTag.m in Sources */ = {isa = PBXBuildFile; fileRef = 0498BD7D2EE04F9C006CC1D5 /* KBTag.m */; };
0498BD852EE1B255006CC1D5 /* KBSignUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 0498BD842EE1B255006CC1D5 /* KBSignUtils.m */; }; 0498BD852EE1B255006CC1D5 /* KBSignUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 0498BD842EE1B255006CC1D5 /* KBSignUtils.m */; };
0498BD862EE1BEC9006CC1D5 /* 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 */; }; 049FB20B2EC1C13800FAB05D /* KBSkinBottomActionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 049FB20A2EC1C13800FAB05D /* KBSkinBottomActionView.m */; };
049FB20E2EC1CD2800FAB05D /* KBAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 049FB20D2EC1CD2800FAB05D /* KBAlert.m */; }; 049FB20E2EC1CD2800FAB05D /* KBAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 049FB20D2EC1CD2800FAB05D /* KBAlert.m */; };
049FB2112EC1F72F00FAB05D /* KBMyListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 049FB2102EC1F72F00FAB05D /* KBMyListCell.m */; }; 049FB2112EC1F72F00FAB05D /* KBMyListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 049FB2102EC1F72F00FAB05D /* KBMyListCell.m */; };
@@ -1684,7 +1684,6 @@
isa = PBXSourcesBuildPhase; isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
0498BD872EE1BF1D006CC1D5 /* KBUserSessionManager.m in Sources */,
0498BD862EE1BEC9006CC1D5 /* KBSignUtils.m in Sources */, 0498BD862EE1BEC9006CC1D5 /* KBSignUtils.m in Sources */,
04791FFC2ED71D17004E8522 /* UIColor+Extension.m in Sources */, 04791FFC2ED71D17004E8522 /* UIColor+Extension.m in Sources */,
049FB2322EC45A0000FAB05D /* KBStreamFetcher.m in Sources */, 049FB2322EC45A0000FAB05D /* KBStreamFetcher.m in Sources */,
@@ -1694,6 +1693,7 @@
046131142ECF454500A6FADF /* KBKeyPreviewView.m in Sources */, 046131142ECF454500A6FADF /* KBKeyPreviewView.m in Sources */,
04FC95732EB09570007BD342 /* KBFunctionBarView.m in Sources */, 04FC95732EB09570007BD342 /* KBFunctionBarView.m in Sources */,
04C6EAD82EAF870B0089C901 /* KeyboardViewController.m in Sources */, 04C6EAD82EAF870B0089C901 /* KeyboardViewController.m in Sources */,
0498BD882EE1C166006CC1D5 /* KBUser.m in Sources */,
0459D1B82EBA287900F2D189 /* KBSkinManager.m in Sources */, 0459D1B82EBA287900F2D189 /* KBSkinManager.m in Sources */,
04FC95762EB095DE007BD342 /* KBFunctionPasteView.m in Sources */, 04FC95762EB095DE007BD342 /* KBFunctionPasteView.m in Sources */,
A1B2C3D42EB0A0A100000001 /* KBFunctionTagCell.m in Sources */, A1B2C3D42EB0A0A100000001 /* KBFunctionTagCell.m in Sources */,

2
keyBoard/Class/Login/M/KBUser.m
View File

@@ -22,7 +22,7 @@
return @(intValue); return @(intValue);
} else { } else {
// 如果收到非法值，可以返回默认值 // 如果收到非法值，可以返回默认值
KBLOG(@"⚠️ 收到非法的userStatus值: %ld", (long)intValue); // KBLOG(@"⚠️ 收到非法的userStatus值: %ld", (long)intValue);
return @(UserSexMan); return @(UserSexMan);
} }
} }

13
keyBoard/Class/Pay/VC/KBJfPay.m
View File

@@ -5,6 +5,7 @@
#import "KBJfPay.h" #import "KBJfPay.h"
#import "KBJfPayCell.h" #import "KBJfPayCell.h"
#import "FGIAPProductsFilter.h" #import "FGIAPProductsFilter.h"
#import "FGIAPManager.h"
static NSString * const kKBJfPayCellId = @"kKBJfPayCellId"; static NSString * const kKBJfPayCellId = @"kKBJfPayCellId";
@interface KBJfPay () <UICollectionViewDataSource, UICollectionViewDelegateFlowLayout> @interface KBJfPay () <UICollectionViewDataSource, UICollectionViewDelegateFlowLayout>
@@ -61,7 +62,7 @@ static NSString * const kKBJfPayCellId = @"kKBJfPayCellId";
@{ @"coins": @9990, @"price": @"$99.90" ,@"product_id" : @"100_coin" }, @{ @"coins": @9990, @"price": @"$99.90" ,@"product_id" : @"100_coin" },
@{ @"coins": @19990,@"price": @"$199.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]; [self.view addSubview:self.myPointsTitleLabel];
@@ -244,12 +245,18 @@ static NSString * const kKBJfPayCellId = @"kKBJfPayCellId";
// } // }
NSString *productId = @"com.yolo.vip.1month"; NSString *productId = @"com.yolo.vip.1month";
/// 2.获取商品信息 /// 2.获取商品信息
[KBHUD show];
[self.filter requestProductsWith:[NSSet setWithObject:productId] completion:^(NSArray<SKProduct *> * _Nonnull products) { [self.filter requestProductsWith:[NSSet setWithObject:productId] completion:^(NSArray<SKProduct *> * _Nonnull products) {
NSLog(@"====="); NSLog(@"=====");
// if (products.count > 0) {
// SKProduct *pro = productsp[0];
// }
// [[FGIAPManager shared].iap buyProduct:product onCompletion:^(NSString * _Nonnull message, FGIAPManagerPurchaseRusult result) { }];
/// 3.支付购买 /// 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]; // [self.view makeToast:message];
// }]; }];
}]; }];
} }