From 1a27ef122fb0a2b9f1c19dd609897728b795df5d Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期五, 09 七月 2021 18:27:41 +0800 Subject: [PATCH] 2021-07-09 1.告警消息相关接口替换,改为河东管理 --- EZSDK/EZSDK/EZSDK.m | 48 +++++++++++++++++++++++++++++++++++------------- 1 files changed, 35 insertions(+), 13 deletions(-) diff --git a/EZSDK/EZSDK/EZSDK.m b/EZSDK/EZSDK/EZSDK.m index cfb414f..f8d0607 100644 --- a/EZSDK/EZSDK/EZSDK.m +++ b/EZSDK/EZSDK/EZSDK.m @@ -18,12 +18,24 @@ #import "EZPlaybackViewController.h" #import "EZDeviceTableViewController.h" #import "EZHCNetDeviceSDK.h" - +#import "EZMessagePhotoViewController.h" @implementation EZSDK + +/// ++ (instancetype)sharedInstance{ + static EZSDK *instance = nil; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + if (!instance) { + instance = [[EZSDK alloc] init]; + } + }); + return instance; +} static BOOL isHavelibInit=NO; @@ -31,7 +43,7 @@ 鍒濆鍖朣DK 浼犲叆鍥藉唴鐗坘ey 鍜屾捣澶栫増globalAppKey */ -+ (BOOL)initLibWithAppKey:(NSString *)appKey globalAppKey:(NSString *)globalAppKey +- (BOOL)initLibWithAppKey:(NSString *)appKey globalAppKey:(NSString *)globalAppKey { if (!isHavelibInit) { @@ -57,7 +69,7 @@ /** 璁剧疆SDK鐨刟ccessToken */ -+(void)setEZAccessToken:(NSString *) accessToken +-(void)setEZAccessToken:(NSString *) accessToken { [[GlobalKit shareKit] setAccessToken:accessToken]; [EZOPENSDK setAccessToken:accessToken]; @@ -66,7 +78,7 @@ /** 璁剧疆HDLSDK鐨刟ccessToken */ -+(void)setHDlAccessToken:(NSString *) accessToken refreshToken:(NSString *) refreshToken +-(void)setHDlAccessToken:(NSString *) accessToken refreshToken:(NSString *) refreshToken { [[GlobalKit shareKit] setHdlAccessToken:accessToken]; [[GlobalKit shareKit] setHdlRefreshToken:refreshToken]; @@ -74,14 +86,14 @@ /** 璁剧疆SDK鐨勬渤涓滄帴鍙g殑requestHttpsHost鍜屽钩鍙� 鏍囪瘑锛�1.on+(榛樿) 2.evoyo */ -+(void)setRequestHttpsHostAndPlatform:(NSString *) requestHttpsHost platform:(int)platform homeId:(NSString *)homeId{ +-(void)setRequestHttpsHostAndPlatform:(NSString *) requestHttpsHost platform:(int)platform homeId:(NSString *)homeId{ [[GlobalKit shareKit] setGlobalRequestHttpsHost:requestHttpsHost]; [[GlobalKit shareKit] setHdlPlatform:platform]; [[GlobalKit shareKit] setHdlHomeId:homeId]; } //鑾峰彇褰撳墠灞忓箷鏄剧ず鐨剉iewcontroller (杩欓噷闈㈣幏鍙栫殑鐩稿綋浜巖ootViewController) -+(UINavigationController *)getCurrentVC +-(UINavigationController *)getCurrentVC { UIWindow * window = [[UIApplication sharedApplication] keyWindow]; if (window.windowLevel != UIWindowLevelNormal) @@ -104,7 +116,7 @@ /** 鐩存帴璺宠浆鍒拌悿鐭虫憚鍍忓ご鍒楄〃 */ -+(void)go2EZvizMonitor +-(void)go2EZvizMonitor { // NSLog(@"go2EZvizMonitor"); //鑾峰彇EZMain鐨剆troyboard鏂囦欢 @@ -121,7 +133,7 @@ /** 璺宠浆娣诲姞娣诲姞璁惧 */ -+(void)addEzvizMonitor +-(void)addEzvizMonitor { // NSLog(@"娣诲姞鎽勫儚澶�"); if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 7.0) { @@ -139,7 +151,7 @@ /** 鏌ョ湅瑙嗛鐩戞帶鐩存挱 */ -+(void)Play:(EZDeviceInfo*)deviceInfo +-(void)Play:(EZDeviceInfo*)deviceInfo { UIStoryboard *addDeviceStoryBoard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil]; EZLivePlayViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"EZLivePlayViewController"]; @@ -155,7 +167,7 @@ /// 鎸囧畾搴忓垪鍙锋挱鏀� /// @param deviceSerial 搴忓垪鍙� -+(void)PlayWithDeviceSerial:(NSString *)deviceSerial{ +-(void)PlayWithDeviceSerial:(NSString *)deviceSerial{ //鑾峰彇璁惧鍒楄〃鎺ュ彛 [EZOpenSDK getDeviceInfo:deviceSerial completion:^(EZDeviceInfo *deviceInfo, NSError *error) { if(error) @@ -172,7 +184,7 @@ /** 鎵撳紑鎽勫儚澶磋缃〉闈� */ -+(void)setting:(EZDeviceInfo*)deviceInfo +-(void)setting:(EZDeviceInfo*)deviceInfo { UIStoryboard *settingStoryBoard=[UIStoryboard storyboardWithName:@"EZMain" bundle:nil]; EZSettingViewController *settingVC=[settingStoryBoard instantiateViewControllerWithIdentifier:@"EZSettingViewController"]; @@ -184,7 +196,7 @@ /** 鍥炴斁鎾斁鍘嗗彶 */ -+(void)playBackVideo:(EZDeviceInfo*)deviceInfo +-(void)playBackVideo:(EZDeviceInfo*)deviceInfo { UIStoryboard *playBackStoryBoard=[UIStoryboard storyboardWithName:@"EZMain" bundle:nil]; EZPlaybackViewController *playBackVC=[playBackStoryBoard instantiateViewControllerWithIdentifier:@"EZPlaybackViewController"]; @@ -193,7 +205,17 @@ [[self getCurrentVC] pushViewController:playBackVC animated:YES]; } - +//// +//-(void)goToEZMessagePhotoVC:(EZAlarmInfo*)alarmInfo{ +// UIStoryboard *addDeviceStoryBoard = [UIStoryboard storyboardWithName:@"EZMain" bundle:nil]; +// EZMessagePhotoViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"EZMessagePhotoViewController"]; +// // NSLog(@"play--iphone--rootViewController"); +// rootViewController.info = alarmInfo; +//// NSLog(@"play--iphone--deviceName -%@",rootViewController.deviceInfo.deviceName); +//// rootViewController.cameraIndex=0; +// [[self getCurrentVC] setNavigationBarHidden:NO]; +// [[self getCurrentVC] pushViewController:rootViewController animated:YES]; +//} //+(void)MonitorPushMessage:(NSString *)MonitorType ID:(NSString *)ID //{ // [CommonList login]; -- Gitblit v1.8.0