From 54ada3b3c6c58da67dda2ecaea4b19b42ab5c257 Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期三, 29 三月 2023 17:51:47 +0800 Subject: [PATCH] 1.改用萤石动态库,解决openssl版本冲突问题 2.设备回调成功增加返回设备序列号 3.优化部分功能 --- EZSDK/EZSDK/EZ/Global/EZHttpUtil.m | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m index 3fc0474..71d32d8 100644 --- a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m +++ b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m @@ -131,8 +131,9 @@ [self requestHttpsPost:API_POST_EZ_AddDevice parameters:parameters completion:^(ResponseData *responseData) { if (responseData.success){//娣诲姞鎴愬姛锛岃Е鍙戜唬鐞� - if ([EZSDK sharedInstance].delegate&&[[EZSDK sharedInstance].delegate respondsToSelector:@selector(addDeviceSuccessed)]) { - [[EZSDK sharedInstance].delegate addDeviceSuccessed]; + if ([EZSDK sharedInstance].delegate&&[[EZSDK sharedInstance].delegate respondsToSelector:@selector(addDeviceSuccessed:)]) { +// HDLEZLog(@"娣诲姞璁惧璁惧鎴愬姛鍥炶皟:%@",parameters[@"deviceSerial"]); + [[EZSDK sharedInstance].delegate addDeviceSuccessed:parameters[@"deviceSerial"]]; } } @@ -497,6 +498,9 @@ [request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"]; [request setValue:@"application/json" forHTTPHeaderField:@"Accept"]; [request setValue:GlobalKit.shareKit.hdlAccessToken forHTTPHeaderField:@"Authorization"]; + //璇█绫诲瀷 + [manager.requestSerializer setValue:[self getCurrentLanguage] forHTTPHeaderField:@"language"]; + //4.dataTaskWithRequest [[manager dataTaskWithRequest:request completionHandler:^(NSURLResponse * _Nonnull response, id _Nullable responseObject, NSError * _Nullable error) { if (completion) { @@ -608,6 +612,23 @@ return true; } +/*鑾峰彇褰撳墠绯荤粺璇█ + */ +-(NSString *)getCurrentLanguage{ + NSArray *languages = [NSLocale preferredLanguages]; + NSString *currentLocaleLanguageCode=@"en"; + if (languages.count>0) { + currentLocaleLanguageCode = languages.firstObject; + if ([currentLocaleLanguageCode hasPrefix:@"zh"]) {//涓枃 + currentLocaleLanguageCode = @"cn"; + }else {//鍏跺畠璇█ + currentLocaleLanguageCode = @"en"; + } + } + return currentLocaleLanguageCode; +} + + @end -- Gitblit v1.8.0