From b7fa25faef4decf509a998ae861f059896ea6093 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 19 四月 2021 16:35:22 +0800
Subject: [PATCH] 2021-04-19 1.配置说明截图，记录下来方便下次其他同事集成时候参考
---
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.m | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.m
index 3b79af6..29b7426 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.m
@@ -24,23 +24,33 @@
#define SECRET_KEY @"WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss"
+#define TIME_OUT 15.0f
+
@implementation EZHttpUtil
#pragma mark -鎺ュ彛璇锋眰閮ㄥ垎
-
-
+/// sharedManager
++ (id)sharedManager {
+ static dispatch_once_t once;
+ static id instance;
+ dispatch_once(&once, ^{
+ instance = [self new];
+ });
+ return instance;
+}
/**
* @since 娌充笢鑾峰彇瀛愯处鍙穞oken鐨勬帴鍙�
*
* @param block 鍥炶皟block
*/
-+ (void)getChildToken:(void (^)(NSString *accessToken))block{
+- (void)getChildToken:(void (^)(NSString *accessToken))block{
//2.璁剧疆璇锋眰鍙傛暟
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
+ [parameters setValue: [NSString stringWithFormat:@"%d", [GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
parameters = [self GetSignRequestDictionary:parameters];
[self requestHttpsPost:API_POST_EZ_GetChildToken parameters:parameters completion:^(ResponseData *responseData) {
@@ -65,7 +75,7 @@
* @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
*
*/
-+ (void)addDeviceByHDL:(NSString *)deviceSerial
+- (void)addDeviceByHDL:(NSString *)deviceSerial
verifyCode:(NSString *)verifyCode
completion:(void (^)(ResponseData *responseData))completion{
@@ -73,6 +83,7 @@
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
[parameters setValue:deviceSerial forKey:@"deviceSerial"];
[parameters setValue:verifyCode forKey:@"validateCode"];
+ [parameters setValue: [NSString stringWithFormat:@"%d",[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
parameters = [self GetSignRequestDictionary:parameters];
[self requestHttpsPost:API_POST_EZ_AddDevice parameters:parameters completion:^(ResponseData *responseData) {
@@ -92,10 +103,11 @@
* @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
*
*/
-+ (void)deleteDeviceByHDL:(NSString *)deviceSerial completion:(void (^)(ResponseData *responseData))completion{
+- (void)deleteDeviceByHDL:(NSString *)deviceSerial completion:(void (^)(ResponseData *responseData))completion{
//1.璁剧疆璇锋眰鍙傛暟
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
[parameters setValue:deviceSerial forKey:@"deviceSerial"];
+ [parameters setValue: [NSString stringWithFormat:@"%d",[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
parameters = [self GetSignRequestDictionary:parameters];
[self requestHttpsPost:API_POST_EZ_ChildDelDevice parameters:parameters completion:^(ResponseData *responseData) {
@@ -111,7 +123,7 @@
/// 鍒锋柊token
/// @param block 缁撴灉
-+ (void)refreshHDLToken:(void (^)(BOOL isSuccess))block{
+- (void)refreshHDLToken:(void (^)(BOOL isSuccess))block{
//1.璁剧疆璇锋眰鍙傛暟
NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
@@ -148,7 +160,7 @@
/// @param apiPath 鎺ュ彛鍦板潃
/// @param parameters 璇锋眰鍙傛暟
/// @param completion 璇锋眰鍝嶅簲鍙傛暟
-+ (void)requestHttpsPost:(NSString *)apiPath
+- (void)requestHttpsPost:(NSString *)apiPath
parameters:(NSMutableDictionary *)parameters
completion:(void (^)(ResponseData *responseData))completion{
@@ -176,7 +188,7 @@
/// @param apiPath 鎺ュ彛鍦板潃
/// @param parameters 璇锋眰鍙傛暟
/// @param completion 璇锋眰鍝嶅簲鍙傛暟
-+ (void)requestHttpsBase:(NSString *)apiPath
+- (void)requestHttpsBase:(NSString *)apiPath
parameters:(NSMutableDictionary *)parameters
completion:(void (^)(ResponseData *responseData))completion{
@@ -194,7 +206,7 @@
//3.request
NSMutableURLRequest * request = [[AFJSONRequestSerializer serializer] requestWithMethod:@"post" URLString:URL parameters:parameters error:nil];
- request.timeoutInterval = 10.0f;
+ request.timeoutInterval = TIME_OUT;
[request setValue:@"application/json" forHTTPHeaderField:@"Content-Type"];
[request setValue:@"application/json" forHTTPHeaderField:@"Accept"];
[request setValue:GlobalKit.shareKit.hdlAccessToken forHTTPHeaderField:@"Authorization"];
@@ -223,7 +235,7 @@
/**
* 鍩虹鏈嶅姟鐨勬帴鍙ｉ兘瑕佹牎楠宻ign
*/
-+(NSMutableDictionary *)GetSignRequestDictionary:(NSMutableDictionary *)params{
+-(NSMutableDictionary *)GetSignRequestDictionary:(NSMutableDictionary *)params{
if(params == NULL){
params =[NSMutableDictionary dictionary];
}
@@ -262,7 +274,7 @@
/// 瀛楃涓插垽绌�
/// @param valueStr 浼犲叆鍒ゆ柇瀛楃
-+ (BOOL)stringIsNullOrEmpty:(NSString *)valueStr
+- (BOOL)stringIsNullOrEmpty:(NSString *)valueStr
{
if((valueStr == nil || [valueStr isKindOfClass:[NSNull class]] || valueStr.length == 0)){
return YES;
@@ -275,7 +287,7 @@
/**
MD5杞崲+杞皬鍐�
*/
-+ (NSString*)signMD5Encrypt:(NSString *)str
+- (NSString*)signMD5Encrypt:(NSString *)str
{
const char *cStr = [str UTF8String];
unsigned char digest[CC_MD5_DIGEST_LENGTH];
@@ -295,7 +307,7 @@
/// </summary>
/// <param name="valueStr"></param>
/// <returns></returns>
-+(bool)IfValueNeedSign:(NSString *)valueStr{
+-(bool)IfValueNeedSign:(NSString *)valueStr{
if (( [self stringIsNullOrEmpty:valueStr])//鍒ょ┖瀛楃
|| ([[valueStr substringToIndex:1] isEqual:@"{"])//鍒ゆ柇鏄惁涓哄璞�
|| ([[valueStr substringToIndex:1] isEqual:@"["])//鍒ゆ柇鏄惁涓烘暟缁�
--
Gitblit v1.8.0