2021-04-19 1.1.HDL云萤石摄像头对接接口，增加platform参数， 代表平台 1.on+(默认) 2.evoyo

JLChen

2021-04-19 de3b01d60322bfd86a123327689ea7451f0f410e

2021-04-19 1.1.HDL云萤石摄像头对接接口，增加platform参数， 代表平台  1.on+(默认) 2.evoyo

 Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZHttpUtil.m

@@ -50,6 +50,7 @@
    
    //2.设置请求参数
    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
    [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    parameters = [self GetSignRequestDictionary:parameters];
    
    [self requestHttpsPost:API_POST_EZ_GetChildToken parameters:parameters completion:^(ResponseData *responseData) {
@@ -82,6 +83,7 @@
    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
    [parameters setValue:deviceSerial forKey:@"deviceSerial"];
    [parameters setValue:verifyCode forKey:@"validateCode"];
    [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    parameters = [self GetSignRequestDictionary:parameters];
    
   [self requestHttpsPost:API_POST_EZ_AddDevice parameters:parameters completion:^(ResponseData *responseData) {
@@ -105,6 +107,7 @@
    //1.设置请求参数
    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
    [parameters setValue:deviceSerial forKey:@"deviceSerial"];
    [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    parameters = [self GetSignRequestDictionary:parameters];
    
    [self requestHttpsPost:API_POST_EZ_ChildDelDevice parameters:parameters completion:^(ResponseData *responseData) {

 Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZSDK.h

@@ -23,9 +23,9 @@
 */
+(void)setHDlAccessToken:(NSString *) accessToken refreshToken:(NSString *) refreshToken;
/**
 设置SDK的河东接口的requestHttpsHost
 设置SDK的河东接口的requestHttpsHost和平台 标识，1.on+(默认) 2.evoyo
 */
+(void)setRequestHttpsHost:(NSString *) requestHttpsHost;
+(void)setRequestHttpsHostAndPlatform:(NSString *) requestHttpsHost platform:(int) platform;

/**
 直接跳转到萤石摄像头列表

 Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/EZSDK.m

@@ -70,10 +70,11 @@
    [[GlobalKit shareKit] setHdlRefreshToken:refreshToken];
}
/**
 设置SDK的河东接口的requestHttpsHost
 设置SDK的河东接口的requestHttpsHost和平台 标识，1.on+(默认) 2.evoyo
 */
+(void)setRequestHttpsHost:(NSString *) requestHttpsHost{
+(void)setRequestHttpsHostAndPlatform:(NSString *) requestHttpsHost platform:(int) platform{
    [[GlobalKit shareKit] setGlobalRequestHttpsHost:requestHttpsHost];
    [[GlobalKit shareKit] setHdlPlatform:platform];
}

//获取当前屏幕显示的viewcontroller   (这里面获取的相当于rootViewController)

 Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/GlobalKit.h

@@ -18,6 +18,7 @@

@interface GlobalKit : NSObject

@property (nonatomic) int hdlPlatform;//平台 1.on+(默认) 2.evoyo
@property (nonatomic, copy) NSString *GlobalRequestHttpsHost;
@property (nonatomic, copy) NSString *hdlAccessToken;
@property (nonatomic, copy) NSString *hdlRefreshToken;

 Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/Global/GlobalKit.m

@@ -66,6 +66,11 @@
    _GlobalRequestHttpsHost = GlobalRequestHttpsHost;
}

- (void)sethdlPlatform:(int )hdlPlatform
{
    _hdlPlatform = hdlPlatform;
}

- (void)clearSession
{
    _accessToken = nil;

 Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m

@@ -55,9 +55,9 @@
//     */
//    [self performSegueWithIdentifier:@"go2CameraList" sender:nil];
    
    [EZSDK setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI4ZmIxNDBlYzMzYTM0OGU2YjgyYjg5MmJhNDc4NzljMiIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiIxODgyNDg2NDE0MyIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoiTEUwMDAiLCJhcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzMjg4ODYyNzMwMDM4NTU4NzQiLCJleHAiOjE2MTQ5MTc0NzYsIm5iZiI6MTYxNDkxMDI3Nn0.RUKrm2BARWbdwmhj6KKlqalYCXUQ7hIRJBT-5LbPM2EUs2eLNFnwSxx3CGTgN94l3-5WW00srhzvcx6la4IAMfR1kh8-vzr4bXcXOs-wXifxIyt36Y3j9wodzEUWnR0w-42XlQb3jjlz9LiaFKWAHoXaOsmb3Uf6UsoWdqFlnSc" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiJhZTU1NjBmOTRlNzY0Mzk5ODFlY2MzZDZkZGQ3NDNhYiIsImhlYWRlclByZWZpeCI6IkJlYXJlciAiLCJ0ZW5hbnRJZCI6IjIwIiwidG9rZW5UeXBlIjoicmVmcmVzaF90b2tlbiIsImFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTMyODg4NjI3MzAwMzg1NTg3NCIsImV4cCI6MTYxNTUxNTA3NiwibmJmIjoxNjE0OTEwMjc2fQ.YTb0I1t9SKJpoQmdGDyzOIB6mVNQ94AteekAgs15bFsx_LVsj9xOoiURGVfHpthqpCcvL4MxYAYqLjDQHqsf_FbT0KKujqCOjTfnVB-EkqKm5yCmq827NEbq3ZukBcGs0fxGxRQJPzkDyd0AerzkwERYZqryoooNGsOeMN6vC_k"];
    [EZSDK setHDlAccessToken:@"Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI5MDdhMzhkOTcyZjg0YmQ4YmY0NGM2OTczZGU2ZDU0OCIsInJvbGUiOiIiLCJoZWFkZXJQcmVmaXgiOiJCZWFyZXIgIiwidXNlckFjY291bnQiOiIxODgyNDg2NDE0MyIsInRlbmFudElkIjoiMjAiLCJ1c2VyVHlwZSI6IlVTRVJfQyIsInRva2VuVHlwZSI6ImFjY2Vzc190b2tlbiIsInVzZXJOYW1lIjoiTEUwMDAiLCJhcHBsaWNhdGlvbklkIjoiMCIsInVzZXJJZCI6IjEzMjg4ODYyNzMwMDM4NTU4NzQiLCJleHAiOjE2MTUyODgyMjEsIm5iZiI6MTYxNTI4MTAyMX0.HsVLWNUozTxFcXuQ1ljT_7P4wCzmbV3i4elbQzpWgi6hGWyrgvFi7yiD5sedSwygE8wwvujD342VunG_nDcttLtBijdcKfbiteOgttk-1HlWkny4xAhiRgFeJ3hQnLuH9QDnF1qiznFe_pwy8l41P-gM-WkxKGv7TlX3TPfzC5g" refreshToken:@"eyJ0eXAiOiJKV1QiLCJhbGciOiJSUzI1NiJ9.eyJqdGkiOiI5MjRhOWMzNGIwNDA0MGE4OGQ2OGNkNGI5NzllZGUxMiIsImhlYWRlclByZWZpeCI6IkJlYXJlciAiLCJ0ZW5hbnRJZCI6IjIwIiwidG9rZW5UeXBlIjoicmVmcmVzaF90b2tlbiIsImFwcGxpY2F0aW9uSWQiOiIwIiwidXNlcklkIjoiMTMyODg4NjI3MzAwMzg1NTg3NCIsImV4cCI6MTYxNTg4NTgyMSwibmJmIjoxNjE1MjgxMDIxfQ.VCwNcWPG5e--3JxLwoO6__vwZEcR_nAP_jTZKYYa2uhruHMhKUat2WYabiU6hofAp9KYKayqI7A24fbl2OrejVoJa_2s5zHkK7vVayo44u8J4aiw0m7YcfH_bzaz45pHhxAG2hKHm-3e95FqBTuKu3eP5m7YO-0HqQA9crRtELU"];
    
//    [EZSDK setRequestHttpsHost:@"https://nearest.hdlcontrol.com"];
    [EZSDK setRequestHttpsHost:@"https://test-gz.hdlcontrol.com"];
    
    
    

 EZSDK.IOS/EZSDK.IOS/ApiDefinition.cs

@@ -25,10 +25,10 @@
        [Export ("setHDlAccessToken:refreshToken:")]
        void SetHDlAccessToken (string accessToken, string refreshToken);

        // +(void)setRequestHttpsHost:(NSString *)requestHttpsHost;
        // +(void)setRequestHttpsHostAndPlatform:(NSString *)requestHttpsHost platform:(int)platform;
        [Static]
        [Export ("setRequestHttpsHost:")]
        void SetRequestHttpsHost (string requestHttpsHost);
        [Export("setRequestHttpsHostAndPlatform:platform:")]
        void SetRequestHttpsHostAndPlatform(string requestHttpsHost, int platform);

        // +(void)go2EZvizMonitor;
        [Static]

 EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a

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.1.0")]
[assembly: AssemblyVersion("1.2.0")]

// 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.m

@@ -50,6 +50,7 @@
    
    //2.设置请求参数
    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
    [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    parameters = [self GetSignRequestDictionary:parameters];
    
    [self requestHttpsPost:API_POST_EZ_GetChildToken parameters:parameters completion:^(ResponseData *responseData) {
@@ -82,6 +83,7 @@
    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
    [parameters setValue:deviceSerial forKey:@"deviceSerial"];
    [parameters setValue:verifyCode forKey:@"validateCode"];
    [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    parameters = [self GetSignRequestDictionary:parameters];
    
   [self requestHttpsPost:API_POST_EZ_AddDevice parameters:parameters completion:^(ResponseData *responseData) {
@@ -105,6 +107,7 @@
    //1.设置请求参数
    NSMutableDictionary *parameters = [NSMutableDictionary dictionary];
    [parameters setValue:deviceSerial forKey:@"deviceSerial"];
    [parameters setValue:[NSNumber numberWithInteger:[GlobalKit shareKit].hdlPlatform] forKey:@"platform"];
    parameters = [self GetSignRequestDictionary:parameters];
    
    [self requestHttpsPost:API_POST_EZ_ChildDelDevice parameters:parameters completion:^(ResponseData *responseData) {

 EZSDK/EZSDK/EZ/Global/GlobalKit.h

@@ -18,6 +18,7 @@

@interface GlobalKit : NSObject

@property (nonatomic) int hdlPlatform;//平台 1.on+(默认) 2.evoyo
@property (nonatomic, copy) NSString *GlobalRequestHttpsHost;
@property (nonatomic, copy) NSString *hdlAccessToken;
@property (nonatomic, copy) NSString *hdlRefreshToken;

 EZSDK/EZSDK/EZ/Global/GlobalKit.m

@@ -66,6 +66,11 @@
    _GlobalRequestHttpsHost = GlobalRequestHttpsHost;
}

- (void)sethdlPlatform:(int )hdlPlatform
{
    _hdlPlatform = hdlPlatform;
}

- (void)clearSession
{
    _accessToken = nil;

 EZSDK/EZSDK/EZSDK.h

@@ -23,9 +23,9 @@
 */
+(void)setHDlAccessToken:(NSString *) accessToken refreshToken:(NSString *) refreshToken;
/**
 设置SDK的河东接口的requestHttpsHost
 设置SDK的河东接口的requestHttpsHost和平台 标识，1.on+(默认) 2.evoyo
 */
+(void)setRequestHttpsHost:(NSString *) requestHttpsHost;
+(void)setRequestHttpsHostAndPlatform:(NSString *) requestHttpsHost platform:(int) platform;

/**
 直接跳转到萤石摄像头列表

 EZSDK/EZSDK/EZSDK.m

@@ -70,10 +70,11 @@
    [[GlobalKit shareKit] setHdlRefreshToken:refreshToken];
}
/**
 设置SDK的河东接口的requestHttpsHost
 设置SDK的河东接口的requestHttpsHost和平台 标识，1.on+(默认) 2.evoyo
 */
+(void)setRequestHttpsHost:(NSString *) requestHttpsHost{
+(void)setRequestHttpsHostAndPlatform:(NSString *) requestHttpsHost platform:(int) platform{
    [[GlobalKit shareKit] setGlobalRequestHttpsHost:requestHttpsHost];
    [[GlobalKit shareKit] setHdlPlatform:platform];
}

//获取当前屏幕显示的viewcontroller   (这里面获取的相当于rootViewController)

 README.md

@@ -2,3 +2,7 @@

萤石云 iOSSDK，移植跨平台相关工程


2021-04-19
1.HDL云萤石摄像头对接接口，增加platform参数， 代表平台  1.on+(默认) 2.evoyo