Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.h
@@ -30,7 +30,6 @@ * @param verifyCode 设备验证码 * @param completion 回调block，error为空时表示添加成功 * * @return operation */ + (void)addDeviceByHDL:(NSString *)deviceSerial verifyCode:(NSString *)verifyCode @@ -43,7 +42,6 @@ * @param deviceSerial 设备序列号 * @param completion 回调block，error为空时表示添加成功 * * @return operation */ + (void)deleteDeviceByHDL:(NSString *)deviceSerial completion:(void (^)(ResponseData *responseData))completion;
@@ -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，error为空时表示添加成功 * * @return operation */ + (void)addDeviceByHDL:(NSString *)deviceSerial verifyCode:(NSString *)verifyCode @@ -91,7 +91,6 @@ * @param deviceSerial 设备序列号 * @param completion 回调block，error为空时表示添加成功 * * @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:@"["])//判断是否为数组 ) { 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; 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]; } //获取当前屏幕显示的viewcontroller (这里面获取的相当于rootViewController) +(UINavigationController *)getCurrentVC 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 { 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", @"正在添加，请稍候..."); 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); } } Binary files differ
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. EZSDK/EZSDK/EZ/Global/EZHttpUtil.h
@@ -30,7 +30,6 @@ * @param verifyCode 设备验证码 * @param completion 回调block，error为空时表示添加成功 * * @return operation */ + (void)addDeviceByHDL:(NSString *)deviceSerial verifyCode:(NSString *)verifyCode @@ -43,7 +42,6 @@ * @param deviceSerial 设备序列号 * @param completion 回调block，error为空时表示添加成功 * * @return operation */ + (void)deleteDeviceByHDL:(NSString *)deviceSerial completion:(void (^)(ResponseData *responseData))completion;
@@ -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，error为空时表示添加成功 * * @return operation */ + (void)addDeviceByHDL:(NSString *)deviceSerial verifyCode:(NSString *)verifyCode @@ -91,7 +91,6 @@ * @param deviceSerial 设备序列号 * @param completion 回调block，error为空时表示添加成功 * * @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:@"["])//判断是否为数组 ) { 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 { EZSDK/EZSDK/EZSDK.h
@@ -23,6 +23,11 @@ */ +(void)setHDlAccessToken:(NSString *) accessToken refreshToken:(NSString *) refreshToken; /** 设置SDK的河东接口的requestHttpsHost */ +(void)setRequestHttpsHost:(NSString *) requestHttpsHost; /** 直接跳转到萤石摄像头列表 */ +(void)go2EZvizMonitor; 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]; } //获取当前屏幕显示的viewcontroller (这里面获取的相当于rootViewController) +(UINavigationController *)getCurrentVC
