1
This commit is contained in:
@@ -26,8 +26,12 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
|
|||||||
if (self = [super init]) {
|
if (self = [super init]) {
|
||||||
_enabled = NO; // 键盘扩展默认无网络能力,需外部显式开启
|
_enabled = NO; // 键盘扩展默认无网络能力,需外部显式开启
|
||||||
_timeout = 10.0;
|
_timeout = 10.0;
|
||||||
// 默认接受任意类型,避免下载图片/二进制被服务端基于 Accept 拒绝
|
// 默认请求头:Accept 任意类型 + 使用项目多语言管理器设置 Accept-Language
|
||||||
_defaultHeaders = @{ @"Accept": @"*/*" };
|
NSString *lang = [KBLocalizationManager shared].currentLanguageCode ?: @"en";
|
||||||
|
_defaultHeaders = @{
|
||||||
|
@"Accept": @"*/*",
|
||||||
|
@"Accept-Language": lang
|
||||||
|
};
|
||||||
// 设置基础域名,路径可相对该地址拼接
|
// 设置基础域名,路径可相对该地址拼接
|
||||||
_baseURL = [NSURL URLWithString:KB_BASE_URL];
|
_baseURL = [NSURL URLWithString:KB_BASE_URL];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@
|
|||||||
NSString *authorizationCode = cred.authorizationCode ? [[NSString alloc] initWithData:cred.authorizationCode encoding:NSUTF8StringEncoding] : nil;
|
NSString *authorizationCode = cred.authorizationCode ? [[NSString alloc] initWithData:cred.authorizationCode encoding:NSUTF8StringEncoding] : nil;
|
||||||
|
|
||||||
NSMutableDictionary *params = [NSMutableDictionary dictionary];
|
NSMutableDictionary *params = [NSMutableDictionary dictionary];
|
||||||
if (identityToken.length) params[@"code"] = identityToken;
|
if (identityToken.length) params[@"identityToken"] = identityToken;
|
||||||
if (authorizationCode.length) params[@"accessCode"] = authorizationCode; // 仅供后端需要时使用
|
if (authorizationCode.length) params[@"accessCode"] = authorizationCode; // 仅供后端需要时使用
|
||||||
if (cred.user.length) params[@"userID"] = cred.user; // 可选
|
if (cred.user.length) params[@"userID"] = cred.user; // 可选
|
||||||
|
|
||||||
|
|||||||
@@ -36,8 +36,12 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
|
|||||||
if (self = [super init]) {
|
if (self = [super init]) {
|
||||||
_enabled = NO; // 键盘扩展默认无网络能力,需外部显式开启
|
_enabled = NO; // 键盘扩展默认无网络能力,需外部显式开启
|
||||||
_timeout = 10.0;
|
_timeout = 10.0;
|
||||||
// 默认接受任意类型,避免下载图片/二进制被服务端基于 Accept 拒绝
|
// 默认请求头:Accept 任意类型 + 使用项目多语言管理器设置 Accept-Language
|
||||||
_defaultHeaders = @{ @"Accept": @"*/*" };
|
NSString *lang = [KBLocalizationManager shared].currentLanguageCode ?: @"en";
|
||||||
|
_defaultHeaders = @{
|
||||||
|
@"Accept": @"*/*",
|
||||||
|
@"Accept-Language": lang
|
||||||
|
};
|
||||||
// 设置基础域名,路径可相对该地址拼接
|
// 设置基础域名,路径可相对该地址拼接
|
||||||
_baseURL = [NSURL URLWithString:KB_BASE_URL];
|
_baseURL = [NSURL URLWithString:KB_BASE_URL];
|
||||||
}
|
}
|
||||||
@@ -82,6 +86,7 @@ NSErrorDomain const KBNetworkErrorDomain = @"com.company.keyboard.network";
|
|||||||
jsonBody:(id)jsonBody
|
jsonBody:(id)jsonBody
|
||||||
headers:(NSDictionary<NSString *,NSString *> *)headers
|
headers:(NSDictionary<NSString *,NSString *> *)headers
|
||||||
completion:(KBNetworkCompletion)completion {
|
completion:(KBNetworkCompletion)completion {
|
||||||
|
NSLog(@"=====");
|
||||||
if (![self ensureEnabled:completion]) return nil;
|
if (![self ensureEnabled:completion]) return nil;
|
||||||
NSString *urlString = [self buildURLStringWithPath:path];
|
NSString *urlString = [self buildURLStringWithPath:path];
|
||||||
if (!urlString) { [self fail:KBNetworkErrorInvalidURL completion:completion]; return nil; }
|
if (!urlString) { [self fail:KBNetworkErrorInvalidURL completion:completion]; return nil; }
|
||||||
|
|||||||
Reference in New Issue
Block a user