From d75285e647bdaea402198353d17f1dccbc8137f6 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 03 三月 2021 10:37:04 +0800
Subject: [PATCH] 2021-03-03 1.优化
---
EZSDK/EZSDK/EZ/Global/EZHttpUtil.m | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
index 8f37e15..3b79af6 100644
--- a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
+++ b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.m
@@ -11,6 +11,7 @@
#import <CommonCrypto/CommonDigest.h>
#import "AFNetworking.h"
+#define TestRequestHttpsHost @"https://test-gz.hdlcontrol.com"
#pragma mark API
#define API_POST_EZ_AddDevice @"/home-wisdom/platform/childAddDevice"
#define API_POST_EZ_GetChildToken @"/home-wisdom/platform/childToken"
@@ -63,7 +64,6 @@
* @param verifyCode 璁惧楠岃瘉鐮�
* @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
*
- * @return operation
*/
+ (void)addDeviceByHDL:(NSString *)deviceSerial
verifyCode:(NSString *)verifyCode
@@ -91,7 +91,6 @@
* @param deviceSerial 璁惧搴忓垪鍙�
* @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
*
- * @return operation
*/
+ (void)deleteDeviceByHDL:(NSString *)deviceSerial completion:(void (^)(ResponseData *responseData))completion{
//1.璁剧疆璇锋眰鍙傛暟
@@ -182,9 +181,9 @@
completion:(void (^)(ResponseData *responseData))completion{
//1,鍒涘缓浣犲緱璇锋眰url
- NSString *URL = @"";
- if([GlobalKit shareKit].GlobalRequestHttpsHost == NULL){
- URL = @"https://test-gz.hdlcontrol.com";
+ NSString *URL = [GlobalKit shareKit].GlobalRequestHttpsHost;
+ if([self stringIsNullOrEmpty:URL]){
+ URL = TestRequestHttpsHost;
}
URL = [NSString stringWithFormat:@"%@%@", URL, apiPath];
@@ -251,13 +250,26 @@
newString = [newString substringToIndex:[newString length] - 1];
newString = [newString stringByAppendingString: SECRET_KEY];
//2.4 MD5杞崲+杞皬鍐�
- if(newString == nil || newString == NULL){
+ if([self stringIsNullOrEmpty:newString]){
newString = @"";
}
NSString* signstr = [self signMD5Encrypt:newString];
[params setValue:signstr forKey:@"sign"];
return params;
+}
+
+
+/// 瀛楃涓插垽绌�
+/// @param valueStr 浼犲叆鍒ゆ柇瀛楃
++ (BOOL)stringIsNullOrEmpty:(NSString *)valueStr
+{
+ if((valueStr == nil || [valueStr isKindOfClass:[NSNull class]] || valueStr.length == 0)){
+ return YES;
+ }else{
+ return NO;
+ }
+
}
/**
@@ -284,7 +296,7 @@
/// <param name="valueStr"></param>
/// <returns></returns>
+(bool)IfValueNeedSign:(NSString *)valueStr{
- if (( (valueStr == nil || [valueStr isKindOfClass:[NSNull class]] || valueStr.length == 0))//鍒ょ┖瀛楃
+ if (( [self stringIsNullOrEmpty:valueStr])//鍒ょ┖瀛楃
|| ([[valueStr substringToIndex:1] isEqual:@"{"])//鍒ゆ柇鏄惁涓哄璞�
|| ([[valueStr substringToIndex:1] isEqual:@"["])//鍒ゆ柇鏄惁涓烘暟缁�
) {
--
Gitblit v1.8.0