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
---
EZSDK/EZSDK/EZSDK.m | 285 +++++++++++++++++++++++++++-----------------------------
1 files changed, 139 insertions(+), 146 deletions(-)
diff --git a/EZSDK/EZSDK/EZSDK.m b/EZSDK/EZSDK/EZSDK.m
index 02954b8..d283890 100644
--- a/EZSDK/EZSDK/EZSDK.m
+++ b/EZSDK/EZSDK/EZSDK.m
@@ -6,8 +6,7 @@
//
#import "EZSDK.h"
-#import "DeviceInfo.h"
-#import "EZDeviceInfo.h"
+//#import "DeviceInfo.h"
#import "EZDeviceInfo.h"
#import "EZOpenSDK.h"
#import "GlobalKit.h"
@@ -21,8 +20,7 @@
#import "EZHCNetDeviceSDK.h"
-#define CURR_LANG ([[NSLocale preferredLanguages] objectAtIndex:0])
-#define LanguageIsChinese ([CURR_LANG rangeOfString:@"zh-Hans"].location != NSNotFound)
+
@implementation EZSDK
@@ -35,8 +33,8 @@
{
static BOOL isHavelibInit=NO;
if (!isHavelibInit) {
-// isHavelibInit=YES;
- NSLog(@"绗竴娆″垵濮嬪寲钀ょ煶搴�");
+ // isHavelibInit=YES;
+ // NSLog(@"绗竴娆″垵濮嬪寲钀ょ煶搴�");
if (!LanguageIsChinese) {
//娴峰鐗�
isHavelibInit = [EZGlobalSDK initLibWithAppKey:globalAppKey];
@@ -53,6 +51,127 @@
}
return isHavelibInit;
}
+
+/**
+ 璁剧疆SDK鐨刟ccessToken
+ */
++(void)setEZAccessToken:(NSString *) accessToken
+{
+ [[GlobalKit shareKit] setAccessToken:accessToken];
+ [EZOPENSDK setAccessToken:accessToken];
+}
+
+/**
+ 璁剧疆HDLSDK鐨刟ccessToken
+ */
++(void)setHDlAccessToken:(NSString *) accessToken refreshToken:(NSString *) refreshToken
+{
+ [[GlobalKit shareKit] setHdlAccessToken:accessToken];
+ [[GlobalKit shareKit] setHdlRefreshToken:refreshToken];
+}
+/**
+ 璁剧疆SDK鐨勬渤涓滄帴鍙ｇ殑requestHttpsHost鍜屽钩鍙� 鏍囪瘑锛�1.on+(榛樿) 2.evoyo
+ */
++(void)setRequestHttpsHostAndPlatform:(NSString *) requestHttpsHost platform:(int) platform{
+ [[GlobalKit shareKit] setGlobalRequestHttpsHost:requestHttpsHost];
+ [[GlobalKit shareKit] setHdlPlatform:platform];
+}
+
+//鑾峰彇褰撳墠灞忓箷鏄剧ず鐨剉iewcontroller (杩欓噷闈㈣幏鍙栫殑鐩稿綋浜巖ootViewController)
++(UINavigationController *)getCurrentVC
+{
+ UIWindow * window = [[UIApplication sharedApplication] keyWindow];
+ if (window.windowLevel != UIWindowLevelNormal)
+ {
+ NSArray *windows = [[UIApplication sharedApplication] windows];
+ for(UIWindow * tmpWin in windows)
+ {
+ if (tmpWin.windowLevel == UIWindowLevelNormal)
+ {
+ window = tmpWin;
+ break;
+ }
+ }
+ }
+
+ return (UINavigationController *)window.rootViewController;
+}
+
+
+/**
+ 鐩存帴璺宠浆鍒拌悿鐭虫憚鍍忓ご鍒楄〃
+ */
++(void)go2EZvizMonitor
+{
+ // NSLog(@"go2EZvizMonitor");
+ //鑾峰彇EZMain鐨剆troyboard鏂囦欢
+ UIStoryboard *ezMainStoryboard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
+ //鑾峰彇EZMain.storyboard鐨勫疄渚媀iewController--鑾峰彇鎽勫儚澶村垪琛�
+ EZDeviceTableViewController *instanceVC = [ezMainStoryboard instantiateViewControllerWithIdentifier:@"EZCameraList"];
+ //push鎽勫儚澶村垪琛ㄧ殑viewController
+ [[self getCurrentVC] setNavigationBarHidden:NO];
+ // NSLog(@"willpush********");
+ [[self getCurrentVC] pushViewController:instanceVC animated:YES];
+ // NSLog(@"had pushed********");
+}
+
+/**
+ 璺宠浆娣诲姞娣诲姞璁惧
+ */
++(void)addEzvizMonitor
+{
+ // NSLog(@"娣诲姞鎽勫儚澶�");
+ if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0) {
+ UIStoryboard *addDeviceStoryBoard = [UIStoryboard storyboardWithName:@"AddDevice" bundle:nil];
+ EZAddByQRCodeViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"AddByQRCode"];
+ [[self getCurrentVC] setNavigationBarHidden:NO];
+ [[self getCurrentVC] pushViewController:rootViewController animated:YES];
+ } else {
+ // [UIView dd_showMessage:@"iOS 7.0浠ヤ笅鎵爜鍔熻兘璇疯嚜琛屽疄鐜�"];
+ NSLog(@"iOS 7.0浠ヤ笅鎵爜鍔熻兘璇疯嚜琛屽疄鐜�");
+ }
+
+}
+
+/**
+ 鏌ョ湅瑙嗛鐩戞帶鐩存挱
+ */
++(void)Play:(NSObject*)deviceInfo
+{
+ UIStoryboard *addDeviceStoryBoard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
+ EZLivePlayViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"EZLivePlayViewController"];
+ // NSLog(@"play--iphone--rootViewController");
+ rootViewController.deviceInfo=(EZDeviceInfo *)deviceInfo;
+ NSLog(@"play--iphone--deviceName -%@",rootViewController.deviceInfo.deviceName);
+ // rootViewController.cameraIndex=0;
+ [[self getCurrentVC] setNavigationBarHidden:NO];
+ [[self getCurrentVC] pushViewController:rootViewController animated:YES];
+}
+
+/**
+ 鎵撳紑鎽勫儚澶磋缃〉闈�
+ */
++(void)setting:(NSObject*)deviceInfo
+{
+ UIStoryboard *settingStoryBoard=[UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
+ EZSettingViewController *settingVC=[settingStoryBoard instantiateViewControllerWithIdentifier:@"EZSettingViewController"];
+ settingVC.deviceInfo=(EZDeviceInfo *)deviceInfo;
+ [[self getCurrentVC] setNavigationBarHidden:NO];
+ [[self getCurrentVC] pushViewController:settingVC animated:YES];
+}
+
+/**
+ 鍥炴斁鎾斁鍘嗗彶
+ */
++(void)playBackVideo:(NSObject*)deviceInfo
+{
+ UIStoryboard *playBackStoryBoard=[UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
+ EZPlaybackViewController *playBackVC=[playBackStoryBoard instantiateViewControllerWithIdentifier:@"EZPlaybackViewController"];
+ playBackVC.deviceInfo=(EZDeviceInfo *)deviceInfo;
+ [[self getCurrentVC] setNavigationBarHidden:NO];
+ [[self getCurrentVC] pushViewController:playBackVC animated:YES];
+}
+
//+(void)MonitorPushMessage:(NSString *)MonitorType ID:(NSString *)ID
//{
@@ -122,68 +241,6 @@
// return ICommons;
//}
-//鑾峰彇褰撳墠灞忓箷鏄剧ず鐨剉iewcontroller (杩欓噷闈㈣幏鍙栫殑鐩稿綋浜巖ootViewController)
-+(UINavigationController *)getCurrentVC
-{
- UIWindow * window = [[UIApplication sharedApplication] keyWindow];
- if (window.windowLevel != UIWindowLevelNormal)
- {
- NSArray *windows = [[UIApplication sharedApplication] windows];
- for(UIWindow * tmpWin in windows)
- {
- if (tmpWin.windowLevel == UIWindowLevelNormal)
- {
- window = tmpWin;
- break;
- }
- }
- }
-
- return (UINavigationController *)window.rootViewController;
-}
-
-//+(void)login
-//{
-// if ([GlobalKit shareKit].accessToken)
-// {
-// [EZOPENSDK setAccessToken:[GlobalKit shareKit].accessToken];
-// NSLog(@"login---1");
-// }
-// else
-// {
-// [EZOPENSDK openLoginPage:^(EZAccessToken *accessToken) {
-// [[GlobalKit shareKit] setAccessToken:accessToken.accessToken];
-// [EZOPENSDK setAccessToken:accessToken.accessToken];
-// NSLog(@"login---2");
-// }];
-// }
-//}
-
-+(void)go2EZvizMonitor
-{
- NSLog(@"go2EZvizMonitor");
-// if (isPad) {
-// //鑾峰彇EZMain鐨剆troyboard鏂囦欢
-// UIStoryboard *ezMainStoryboard = [UIStoryboard storyboardWithName:@"EZMainForIPad" bundle:nil];
-// //鑾峰彇EZMain.storyboard鐨勫疄渚媀iewController--鑾峰彇鎽勫儚澶村垪琛�
-// EZDeviceTableViewController *instanceVC = [ezMainStoryboard instantiateViewControllerWithIdentifier:@"EZCameraList"];
-// //push鎽勫儚澶村垪琛ㄧ殑viewController
-// [[self getCurrentVC] setNavigationBarHidden:NO];
-// [[self getCurrentVC] pushViewController:instanceVC animated:YES];
-// }else{
-
- //鑾峰彇EZMain鐨剆troyboard鏂囦欢
- UIStoryboard *ezMainStoryboard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
- //鑾峰彇EZMain.storyboard鐨勫疄渚媀iewController--鑾峰彇鎽勫儚澶村垪琛�
- EZDeviceTableViewController *instanceVC = [ezMainStoryboard instantiateViewControllerWithIdentifier:@"EZCameraList"];
- //push鎽勫儚澶村垪琛ㄧ殑viewController
- [[self getCurrentVC] setNavigationBarHidden:NO];
- NSLog(@"willpush********");
- [[self getCurrentVC] pushViewController:instanceVC animated:YES];
- NSLog(@"had pushed********");
-// }
-
-}
//+(NSArray *)getDeviceList:(int)pageIndex :(int)pageSize
//{
@@ -221,87 +278,23 @@
// return deviceListaArray ;
//}
-+(void)addEzvizMonitor
-{
- NSLog(@"娣诲姞鎽勫儚澶�");
- if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0) {
- UIStoryboard *addDeviceStoryBoard = [UIStoryboard storyboardWithName:@"AddDevice" bundle:nil];
- EZAddByQRCodeViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"AddByQRCode"];
- [[self getCurrentVC] setNavigationBarHidden:NO];
- [[self getCurrentVC] pushViewController:rootViewController animated:YES];
- } else {
-// [UIView dd_showMessage:@"iOS 7.0浠ヤ笅鎵爜鍔熻兘璇疯嚜琛屽疄鐜�"];
- NSLog(@"iOS 7.0浠ヤ笅鎵爜鍔熻兘璇疯嚜琛屽疄鐜�");
- }
-
-}
-
-+(void)Play:(NSObject*)deviceInfo
-{
-// if (isPad) {
-// NSLog(@"play--ipad--");
-// UIStoryboard *addDeviceStoryBoard = [UIStoryboard storyboardWithName:@"EZMainForIPad" bundle:nil];
-// EZLivePlayViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"EZLivePlayViewController"];
-// rootViewController.deviceInfo=(EZDeviceInfo *)deviceInfo;
-// rootViewController.cameraIndex=0;
-// [[self getCurrentVC] setNavigationBarHidden:NO];
-// [[self getCurrentVC] pushViewController:rootViewController animated:YES];
-// }else{
- NSLog(@"play--iphone--1225");
- UIStoryboard *addDeviceStoryBoard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
- EZLivePlayViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"EZLivePlayViewController"];
- NSLog(@"play--iphone--rootViewController");
- rootViewController.deviceInfo=(EZDeviceInfo *)deviceInfo;
- NSLog(@"play--iphone--deviceName -%@",rootViewController.deviceInfo.deviceName);
-// rootViewController.cameraIndex=0;
- [[self getCurrentVC] setNavigationBarHidden:NO];
- [[self getCurrentVC] pushViewController:rootViewController animated:YES];
+//+(void)login
+//{
+// if ([GlobalKit shareKit].accessToken)
+// {
+// [EZOPENSDK setAccessToken:[GlobalKit shareKit].accessToken];
+// NSLog(@"login---1");
// }
-
-
-}
-
-
-+(void)setting:(NSObject*)deviceInfo
-{
-// if (isPad) {
-// UIStoryboard *settingStoryBoard=[UIStoryboard storyboardWithName:@"EZMainForIPad" bundle:nil];
-// EZSettingViewController *settingVC=[settingStoryBoard instantiateViewControllerWithIdentifier:@"EZSettingViewController"];
-// settingVC.deviceInfo=(EZDeviceInfo *)deviceInfo;
-// [[self getCurrentVC] setNavigationBarHidden:NO];
-// [[self getCurrentVC] pushViewController:settingVC animated:YES];
-// }else{
-
- UIStoryboard *settingStoryBoard=[UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
- EZSettingViewController *settingVC=[settingStoryBoard instantiateViewControllerWithIdentifier:@"EZSettingViewController"];
- settingVC.deviceInfo=(EZDeviceInfo *)deviceInfo;
- [[self getCurrentVC] setNavigationBarHidden:NO];
- [[self getCurrentVC] pushViewController:settingVC animated:YES];
+// else
+// {
+// [EZOPENSDK openLoginPage:^(EZAccessToken *accessToken) {
+// [[GlobalKit shareKit] setAccessToken:accessToken.accessToken];
+// [EZOPENSDK setAccessToken:accessToken.accessToken];
+// NSLog(@"login---2");
+// }];
// }
+//}
-
-}
-
-+(void)playBackVideo:(NSObject*)deviceInfo
-{
-
-// if (isPad) {
-// UIStoryboard *playBackStoryBoard=[UIStoryboard storyboardWithName:@"EZMainForIPad" bundle:nil];
-// EZPlaybackViewController *playBackVC=[playBackStoryBoard instantiateViewControllerWithIdentifier:@"EZPlaybackViewController"];
-// playBackVC.deviceInfo=(EZDeviceInfo *)deviceInfo;
-// playBackVC.cameraIndex=0;
-// [[self getCurrentVC] setNavigationBarHidden:NO];
-// [[self getCurrentVC] pushViewController:playBackVC animated:YES];
-// }else{
- UIStoryboard *playBackStoryBoard=[UIStoryboard storyboardWithName:@"EZMain" bundle:nil];
- EZPlaybackViewController *playBackVC=[playBackStoryBoard instantiateViewControllerWithIdentifier:@"EZPlaybackViewController"];
- playBackVC.deviceInfo=(EZDeviceInfo *)deviceInfo;
-// playBackVC.cameraIndex=0;
- [[self getCurrentVC] setNavigationBarHidden:NO];
- [[self getCurrentVC] pushViewController:playBackVC animated:YES];
-// }
-
-}
@end
--
Gitblit v1.8.0