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.优化
---
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZSDK.h | 5 +
EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs | 2
EZSDK/EZSDK/EZ/Global/EZHttpUtil.h | 2
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/GlobalKit.m | 5 +
EZSDK/EZSDK/EZSDK.h | 5 +
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZSDK.m | 6 ++
EZSDK.IOS/EZSDK.IOS/ApiDefinition.cs | 39 +++++++-----
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m | 8 +-
EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a | 0
EZSDK/EZSDK/EZ/Global/GlobalKit.m | 5 +
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.h | 2
Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.m | 26 ++++++--
EZSDK/EZSDK/EZ/Global/EZHttpUtil.m | 26 ++++++--
EZSDK/EZSDK/EZSDK.m | 6 ++
14 files changed, 97 insertions(+), 40 deletions(-)
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.h b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.h
index ef9f9e2..b87180f 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.h
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.h
@@ -30,7 +30,6 @@
* @param verifyCode 璁惧楠岃瘉鐮�
* @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
*
- * @return operation
*/
+ (void)addDeviceByHDL:(NSString *)deviceSerial
verifyCode:(NSString *)verifyCode
@@ -43,7 +42,6 @@
* @param deviceSerial 璁惧搴忓垪鍙�
* @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
*
- * @return operation
*/
+ (void)deleteDeviceByHDL:(NSString *)deviceSerial completion:(void (^)(ResponseData *responseData))completion;
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 8f37e15..3b79af6 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
@@ -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:@"["])//鍒ゆ柇鏄惁涓烘暟缁�
) {
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZSDK.h b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZSDK.h
index 2872116..d0f7827 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZSDK.h
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZSDK.h
@@ -23,6 +23,11 @@
*/
+(void)setHDlAccessToken:(NSString *) accessToken refreshToken:(NSString *) refreshToken;
/**
+ 璁剧疆SDK鐨勬渤涓滄帴鍙ｇ殑requestHttpsHost
+ */
++(void)setRequestHttpsHost:(NSString *) requestHttpsHost;
+
+/**
鐩存帴璺宠浆鍒拌悿鐭虫憚鍍忓ご鍒楄〃
*/
+(void)go2EZvizMonitor;
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZSDK.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZSDK.m
index c813e1e..8fdf0ec 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZSDK.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZSDK.m
@@ -69,6 +69,12 @@
[[GlobalKit shareKit] setHdlAccessToken:accessToken];
[[GlobalKit shareKit] setHdlRefreshToken:refreshToken];
}
+/**
+ 璁剧疆SDK鐨勬渤涓滄帴鍙ｇ殑requestHttpsHost
+ */
++(void)setRequestHttpsHost:(NSString *) requestHttpsHost{
+ [[GlobalKit shareKit] setGlobalRequestHttpsHost:requestHttpsHost];
+}
//鑾峰彇褰撳墠灞忓箷鏄剧ず鐨剉iewcontroller (杩欓噷闈㈣幏鍙栫殑鐩稿綋浜巖ootViewController)
+(UINavigationController *)getCurrentVC
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/GlobalKit.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/GlobalKit.m
index 00c5894..21efca0 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/GlobalKit.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/GlobalKit.m
@@ -11,6 +11,7 @@
#define EZOpenSDKAccessToken @"EZOpenSDKAccessToken"
#define EZhdlAccessToken @"EZhdlAccessToken"
#define EZhdlRefreshToken @"EZhdlRefreshToken"
+#define EZHDLRequestHttpsHost @"EZHDLRequestHttpsHost"
@implementation GlobalKit
@@ -60,6 +61,10 @@
[[NSUserDefaults standardUserDefaults] synchronize];
}
+- (void)setGlobalRequestHttpsHost:(NSString *)GlobalRequestHttpsHost
+{
+ _GlobalRequestHttpsHost = GlobalRequestHttpsHost;
+}
- (void)clearSession
{
diff --git a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
index 20f4877..800b2d2 100644
--- a/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
+++ b/Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m
@@ -55,11 +55,11 @@
// */
// [self performSegueWithIdentifier:@"go2CameraList" sender:nil];
+ [EZSDK setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJmZDgyMDY0ZmJmMGE0YTdmOWFhMmVhOTA0Y2FmNDY3MyIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiIxODgyNDg2NDE0MyIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoiTEUwMDAiLCJhcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzMjg4ODYyNzMwMDM4NTU4NzQiLCJleHAiOjE2MTQ1OTc5MzQsIm5iZiI6MTYxNDU5MDczNH0.e-ghYGplCF5lrMDwNd38RcbCjC79G729-iOMn3ozaEfmuZA_f5ElMvoyUf0Vm64IJMdwScuXPnSzJa2UQPyXNyZJRhpJDR4GKXI7X9VHqWJyrkc-_CJO0puLfB64K3SvKASD-PSHwzRggrmfn5G7GZ1gf-piK1grYurUIT-KaaE" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJlYzRiOTg4MTgxNWI0ZWJjYTEyNTU0ODNmNjg3NjgyMyIsImhlYWRlclByZWZpeCI6IkJlYXJlciAiLCJ0ZW5hbnRJZCI6IjIwIiwidG9rZW5UeXBlIjoicmVmcmVzaF90b2tlbiIsImFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTMyODg4NjI3MzAwMzg1NTg3NCIsImV4cCI6MTYxNTI1NjMxMCwibmJmIjoxNjE0NjUxNTEwfQ.CgpIhgGb4U-NB3EvveBg6mBgLKi0H_zdA_RgPhDREmMeVyAH58H4guzutIi2EO7Dw8bkR2PB9n6jP4MQQNaHclN1EaahNQtZ4rHipLrBY0oT35Uz4vw5yXaWAyLG6_FW2Ky4wpqLbSjv9x24yc5cuKNaknruf73V6bNIDnGaEr0"];
- GlobalKit.shareKit.hdlRefreshToken = @"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJlYzRiOTg4MTgxNWI0ZWJjYTEyNTU0ODNmNjg3NjgyMyIsImhlYWRlclByZWZpeCI6IkJlYXJlciAiLCJ0ZW5hbnRJZCI6IjIwIiwidG9rZW5UeXBlIjoicmVmcmVzaF90b2tlbiIsImFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTMyODg4NjI3MzAwMzg1NTg3NCIsImV4cCI6MTYxNTI1NjMxMCwibmJmIjoxNjE0NjUxNTEwfQ.CgpIhgGb4U-NB3EvveBg6mBgLKi0H_zdA_RgPhDREmMeVyAH58H4guzutIi2EO7Dw8bkR2PB9n6jP4MQQNaHclN1EaahNQtZ4rHipLrBY0oT35Uz4vw5yXaWAyLG6_FW2Ky4wpqLbSjv9x24yc5cuKNaknruf73V6bNIDnGaEr0";
-
-
- GlobalKit.shareKit.hdlAccessToken = @"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJmZDgyMDY0ZmJmMGE0YTdmOWFhMmVhOTA0Y2FmNDY3MyIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiIxODgyNDg2NDE0MyIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoiTEUwMDAiLCJhcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzMjg4ODYyNzMwMDM4NTU4NzQiLCJleHAiOjE2MTQ1OTc5MzQsIm5iZiI6MTYxNDU5MDczNH0.e-ghYGplCF5lrMDwNd38RcbCjC79G729-iOMn3ozaEfmuZA_f5ElMvoyUf0Vm64IJMdwScuXPnSzJa2UQPyXNyZJRhpJDR4GKXI7X9VHqWJyrkc-_CJO0puLfB64K3SvKASD-PSHwzRggrmfn5G7GZ1gf-piK1grYurUIT-KaaE";
+ [EZSDK setRequestHttpsHost:@"https://nearest.hdlcontrol.com"];
+
+
__weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
hud.labelText = NSLocalizedString(@"ad_adding_msg", @"姝ｅ湪娣诲姞锛岃绋嶅��...");
diff --git a/EZSDK.IOS/EZSDK.IOS/ApiDefinition.cs b/EZSDK.IOS/EZSDK.IOS/ApiDefinition.cs
index 2d0efaa..2c7b7c5 100644
--- a/EZSDK.IOS/EZSDK.IOS/ApiDefinition.cs
+++ b/EZSDK.IOS/EZSDK.IOS/ApiDefinition.cs
@@ -7,48 +7,53 @@
namespace EZSDK.IOS
{
// @interface EZSDK : NSObject
- [BaseType(typeof(NSObject))]
+ [BaseType (typeof(NSObject))]
interface EZSDK
{
// +(BOOL)initLibWithAppKey:(NSString *)appKey globalAppKey:(NSString *)globalAppKey;
[Static]
- [Export("initLibWithAppKey:globalAppKey:")]
- bool InitLibWithAppKey(string appKey, string globalAppKey);
+ [Export ("initLibWithAppKey:globalAppKey:")]
+ bool InitLibWithAppKey (string appKey, string globalAppKey);
// +(void)setEZAccessToken:(NSString *)accessToken;
[Static]
- [Export("setEZAccessToken:")]
- void SetEZAccessToken(string accessToken);
+ [Export ("setEZAccessToken:")]
+ void SetEZAccessToken (string accessToken);
// +(void)setHDlAccessToken:(NSString *)accessToken refreshToken:(NSString *)refreshToken;
[Static]
- [Export("setHDlAccessToken:refreshToken:")]
- void SetHDlAccessToken(string accessToken, string refreshToken);
+ [Export ("setHDlAccessToken:refreshToken:")]
+ void SetHDlAccessToken (string accessToken, string refreshToken);
+
+ // +(void)setRequestHttpsHost:(NSString *)requestHttpsHost;
+ [Static]
+ [Export ("setRequestHttpsHost:")]
+ void SetRequestHttpsHost (string requestHttpsHost);
// +(void)go2EZvizMonitor;
[Static]
- [Export("go2EZvizMonitor")]
- void Go2EZvizMonitor();
+ [Export ("go2EZvizMonitor")]
+ void Go2EZvizMonitor ();
// +(void)addEzvizMonitor;
[Static]
- [Export("addEzvizMonitor")]
- void AddEzvizMonitor();
+ [Export ("addEzvizMonitor")]
+ void AddEzvizMonitor ();
// +(void)Play:(NSObject *)deviceInfo;
[Static]
- [Export("Play:")]
- void Play(NSObject deviceInfo);
+ [Export ("Play:")]
+ void Play (NSObject deviceInfo);
// +(void)setting:(NSObject *)deviceInfo;
[Static]
- [Export("setting:")]
- void Setting(NSObject deviceInfo);
+ [Export ("setting:")]
+ void Setting (NSObject deviceInfo);
// +(void)playBackVideo:(NSObject *)deviceInfo;
[Static]
- [Export("playBackVideo:")]
- void PlayBackVideo(NSObject deviceInfo);
+ [Export ("playBackVideo:")]
+ void PlayBackVideo (NSObject deviceInfo);
}
}
diff --git a/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a b/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
index f913fc6..9a53587 100644
--- a/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
+++ b/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
Binary files differ
diff --git a/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs b/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
index fd0a691..46670ba 100644
--- a/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
+++ b/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("1.0.7")]
+[assembly: AssemblyVersion("1.0.8")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
diff --git a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.h b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.h
index ef9f9e2..b87180f 100644
--- a/EZSDK/EZSDK/EZ/Global/EZHttpUtil.h
+++ b/EZSDK/EZSDK/EZ/Global/EZHttpUtil.h
@@ -30,7 +30,6 @@
* @param verifyCode 璁惧楠岃瘉鐮�
* @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
*
- * @return operation
*/
+ (void)addDeviceByHDL:(NSString *)deviceSerial
verifyCode:(NSString *)verifyCode
@@ -43,7 +42,6 @@
* @param deviceSerial 璁惧搴忓垪鍙�
* @param completion 鍥炶皟block锛宔rror涓虹┖鏃惰〃绀烘坊鍔犳垚鍔�
*
- * @return operation
*/
+ (void)deleteDeviceByHDL:(NSString *)deviceSerial completion:(void (^)(ResponseData *responseData))completion;
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:@"["])//鍒ゆ柇鏄惁涓烘暟缁�
) {
diff --git a/EZSDK/EZSDK/EZ/Global/GlobalKit.m b/EZSDK/EZSDK/EZ/Global/GlobalKit.m
index 00c5894..21efca0 100644
--- a/EZSDK/EZSDK/EZ/Global/GlobalKit.m
+++ b/EZSDK/EZSDK/EZ/Global/GlobalKit.m
@@ -11,6 +11,7 @@
#define EZOpenSDKAccessToken @"EZOpenSDKAccessToken"
#define EZhdlAccessToken @"EZhdlAccessToken"
#define EZhdlRefreshToken @"EZhdlRefreshToken"
+#define EZHDLRequestHttpsHost @"EZHDLRequestHttpsHost"
@implementation GlobalKit
@@ -60,6 +61,10 @@
[[NSUserDefaults standardUserDefaults] synchronize];
}
+- (void)setGlobalRequestHttpsHost:(NSString *)GlobalRequestHttpsHost
+{
+ _GlobalRequestHttpsHost = GlobalRequestHttpsHost;
+}
- (void)clearSession
{
diff --git a/EZSDK/EZSDK/EZSDK.h b/EZSDK/EZSDK/EZSDK.h
index 2872116..d0f7827 100644
--- a/EZSDK/EZSDK/EZSDK.h
+++ b/EZSDK/EZSDK/EZSDK.h
@@ -23,6 +23,11 @@
*/
+(void)setHDlAccessToken:(NSString *) accessToken refreshToken:(NSString *) refreshToken;
/**
+ 璁剧疆SDK鐨勬渤涓滄帴鍙ｇ殑requestHttpsHost
+ */
++(void)setRequestHttpsHost:(NSString *) requestHttpsHost;
+
+/**
鐩存帴璺宠浆鍒拌悿鐭虫憚鍍忓ご鍒楄〃
*/
+(void)go2EZvizMonitor;
diff --git a/EZSDK/EZSDK/EZSDK.m b/EZSDK/EZSDK/EZSDK.m
index c813e1e..8fdf0ec 100644
--- a/EZSDK/EZSDK/EZSDK.m
+++ b/EZSDK/EZSDK/EZSDK.m
@@ -69,6 +69,12 @@
[[GlobalKit shareKit] setHdlAccessToken:accessToken];
[[GlobalKit shareKit] setHdlRefreshToken:refreshToken];
}
+/**
+ 璁剧疆SDK鐨勬渤涓滄帴鍙ｇ殑requestHttpsHost
+ */
++(void)setRequestHttpsHost:(NSString *) requestHttpsHost{
+ [[GlobalKit shareKit] setGlobalRequestHttpsHost:requestHttpsHost];
+}
//鑾峰彇褰撳墠灞忓箷鏄剧ず鐨剉iewcontroller (杩欓噷闈㈣幏鍙栫殑鐩稿綋浜巖ootViewController)
+(UINavigationController *)getCurrentVC
--
Gitblit v1.8.0