From 54ada3b3c6c58da67dda2ecaea4b19b42ab5c257 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期三, 29 三月 2023 17:51:47 +0800
Subject: [PATCH] 1.改用萤石动态库，解决openssl版本冲突问题 2.设备回调成功增加返回设备序列号 3.优化部分功能
---
EZSDK/EZSDK/EZSDK.m | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/EZSDK/EZSDK/EZSDK.m b/EZSDK/EZSDK/EZSDK.m
index d7c2c54..91fa7ce 100644
--- a/EZSDK/EZSDK/EZSDK.m
+++ b/EZSDK/EZSDK/EZSDK.m
@@ -7,17 +7,17 @@
#import "EZSDK.h"
//#import "DeviceInfo.h"
-#import "EZDeviceInfo.h"
-#import "EZOpenSDK.h"
+#import <EZOpenSDKFramework/EZDeviceInfo.h>
+#import <EZOpenSDKFramework/EZOpenSDK.h>
#import "GlobalKit.h"
-#import "EZAccessToken.h"
+#import <EZOpenSDKFramework/EZAccessToken.h>
#import "NSArray+DDKit.h"
#import "EZAddByQRCodeViewController.h"
#import "EZLivePlayViewController.h"
#import "EZSettingViewController.h"
#import "EZPlaybackViewController.h"
#import "EZDeviceTableViewController.h"
-#import "EZHCNetDeviceSDK.h"
+#import <EZOpenSDKFramework/EZHCNetDeviceSDK.h>
#import "EZMessagePhotoViewController.h"
#import "HDLEZVisitorRecordViewController.h"
#import "HDLEZDeviceMsgListViewController.h"
@@ -146,6 +146,7 @@
instanceVC.filterTypes=filterTepes;
//push鎽勫儚澶村垪琛ㄧ殑viewController
[[self getCurrentVC] setNavigationBarHidden:NO];
+// [[self getCurrentVC].navigationBar setHidden:NO];
[[self getCurrentVC] pushViewController:instanceVC animated:YES];
}
@@ -179,6 +180,7 @@
EZAddByQRCodeViewController *rootViewController = [addDeviceStoryBoard instantiateViewControllerWithIdentifier:@"AddByQRCode"];
rootViewController.deviceType=type;
[[self getCurrentVC] setNavigationBarHidden:NO];
+ [[self getCurrentVC].navigationBar setHidden:NO];
[[self getCurrentVC] pushViewController:rootViewController animated:YES];
} else {
// [UIView dd_showMessage:@"iOS 7.0浠ヤ笅鎵爜鍔熻兘璇疯嚜琛屽疄鐜�"];
@@ -198,7 +200,7 @@
rootViewController.deviceInfo=(EZDeviceInfo *)deviceInfo;
NSLog(@"play--iphone--deviceName -%@",rootViewController.deviceInfo.deviceName);
// rootViewController.cameraIndex=0;
- [[self getCurrentVC] setNavigationBarHidden:NO];
+ [[self getCurrentVC].navigationBar setHidden:NO];
[[self getCurrentVC] pushViewController:rootViewController animated:YES];
@@ -233,6 +235,7 @@
vc.deviceId=deviceId;
vc.deviceSerial=deviceSerial;
[[self getCurrentVC] setNavigationBarHidden:NO];
+ [[self getCurrentVC].navigationBar setHidden:NO];
[[self getCurrentVC] pushViewController:vc animated:YES];
}
@@ -245,6 +248,7 @@
EZSettingViewController *settingVC=[settingStoryBoard instantiateViewControllerWithIdentifier:@"EZSettingViewController"];
settingVC.deviceInfo=(EZDeviceInfo *)deviceInfo;
[[self getCurrentVC] setNavigationBarHidden:NO];
+ [[self getCurrentVC].navigationBar setHidden:NO];
[[self getCurrentVC] pushViewController:settingVC animated:YES];
}
@@ -257,6 +261,7 @@
EZPlaybackViewController *playBackVC=[playBackStoryBoard instantiateViewControllerWithIdentifier:@"EZPlaybackViewController"];
playBackVC.deviceInfo=(EZDeviceInfo *)deviceInfo;
[[self getCurrentVC] setNavigationBarHidden:NO];
+ [[self getCurrentVC].navigationBar setHidden:NO];
[[self getCurrentVC] pushViewController:playBackVC animated:YES];
}
@@ -266,7 +271,8 @@
- (void)toTemPassView:(NSString*)deviceId{
HDLEZVisitorRecordViewController *vc=[[HDLEZVisitorRecordViewController alloc] init];
vc.deviceId=deviceId;
- [[self getCurrentVC] setNavigationBarHidden:YES];
+// [[self getCurrentVC] setNavigationBarHidden:YES];
+ [[self getCurrentVC].navigationBar setHidden:YES];
[[self getCurrentVC] pushViewController:vc animated:YES];
}
@@ -276,7 +282,8 @@
- (void)toDeviceMsgListView:(NSString*)deviceId{
HDLEZDeviceMsgListViewController *vc=[[HDLEZDeviceMsgListViewController alloc] init];
vc.deviceId=deviceId;
- [[self getCurrentVC] setNavigationBarHidden:YES];
+// [[self getCurrentVC] setNavigationBarHidden:YES];
+ [[self getCurrentVC].navigationBar setHidden:YES];
[[self getCurrentVC] pushViewController:vc animated:YES];
}
--
Gitblit v1.8.0