From de3b01d60322bfd86a123327689ea7451f0f410e Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期一, 19 四月 2021 11:43:33 +0800 Subject: [PATCH] 2021-04-19 1.1.HDL云萤石摄像头对接接口,增加platform参数, 代表平台 1.on+(默认) 2.evoyo --- Demo/EZOpensdk_iOS_4.15.1_build20201104/Demo/EZOpenSDKDemo/ViewController.m | 45 ++++++++++++++++++++++++++------------------- 1 files changed, 26 insertions(+), 19 deletions(-) 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 75f59e1..b59e962 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 @@ -49,11 +49,31 @@ // //push鎽勫儚澶村垪琛ㄧ殑viewController // [self.navigationController pushViewController:instanceVC animated:YES]; - [[GlobalKit shareKit] setAccessToken:@"ra.b48ex6o495x0etj76a0a3huh1x91ymvw-8oi8f811ry-15pqyvo-dyuk9nyz4"]; - /** - * 涓嬮潰浠g爜鍔熻兘涓庝互涓婄殑娉ㄩ噴鏂规硶鐩稿悓 - */ - [self performSegueWithIdentifier:@"go2CameraList" sender:nil]; +// [[GlobalKit shareKit] setAccessToken:@"ra.b48ex6o495x0etj76a0a3huh1x91ymvw-8oi8f811ry-15pqyvo-dyuk9nyz4"]; +// /** +// * 涓嬮潰浠g爜鍔熻兘涓庝互涓婄殑娉ㄩ噴鏂规硶鐩稿悓 +// */ +// [self performSegueWithIdentifier:@"go2CameraList" sender:nil]; + + [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://test-gz.hdlcontrol.com"]; + + + + __weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; + hud.labelText = NSLocalizedString(@"ad_adding_msg", @"姝e湪娣诲姞锛岃绋嶅��..."); + [EZHttpUtil.sharedManager getChildToken:^(NSString *accessToken) { + [hud hide:YES]; + if(accessToken != NULL && ![accessToken isEqual:@""]){ + [[GlobalKit shareKit] setAccessToken:accessToken]; + /** + * 涓嬮潰浠g爜鍔熻兘涓庝互涓婄殑娉ㄩ噴鏂规硶鐩稿悓 + */ + [self performSegueWithIdentifier:@"go2CameraList" sender:nil]; + + } + }]; } - (IBAction)logout:(id)sender @@ -62,20 +82,7 @@ // [EZOPENSDK logout:^(NSError *error) { // }]; - __weak MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view animated:YES]; - [EZSDK addDeviceByHDL:@"" verifyCode:@"" completion:^(NSError *error) { - - [hud hide:YES]; - - if(!error){ - NSLog(@"璇锋眰鎴愬姛"); - }else{ - NSLog(@"璇锋眰澶辫触"); - -// NSLog(@"璇锋眰澶辫触%@",error.description); - } - [self handleTheError:error]; - }]; + } - (void)handleTheError:(NSError *)error -- Gitblit v1.8.0