From 0add6304d59f710cafa5c4d2d40d2bd4a9ac6ffc Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 19 四月 2021 18:50:33 +0800
Subject: [PATCH] 1.更新SDKEZOpensdk_iOS_4.16.1_build20210330。
---
EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs | 5
EZSDK/EZSDK/SDK/include/modules/EZVideoTalkView.h | 18 +
EZSDK/EZSDK.xcodeproj/project.pbxproj | 204 +++++++++-----------
EZSDK/EZSDK/SDK/include/EZPlayer.h | 7
EZSDK/EZSDK/SDK/libEZOpenSDK.a | 0
EZSDK/EZSDK/SDK/include/EZConstants.h | 4
EZSDK/EZSDK/SDK/include/modules/EZVideoTalkSDK.h | 81 ++++---
EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceTableViewController.m | 8
/dev/null | 221 ----------------------
EZSDK/README.md | 3
EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a | 0
EZSDK/EZSDK/SDK/include/EZOpenSDK.h | 12 +
EZSDK/EZSDK/SDK/include/modules/EZVideoTalkParam.h | 13 +
EZSDK/EZSDK/SDK/include/modules/EZMediaSessionVideoParam.h | 18 +
14 files changed, 212 insertions(+), 382 deletions(-)
diff --git a/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a b/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
index b285509..1004a29 100644
--- a/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
+++ b/EZSDK.IOS/EZSDK.IOS/Library/libEZSDK.a
Binary files differ
diff --git a/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs b/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
index c1e8c77..4a9e2cc 100644
--- a/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
+++ b/EZSDK.IOS/EZSDK.IOS/Properties/AssemblyInfo.cs
@@ -25,10 +25,13 @@
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-[assembly: AssemblyVersion("1.2.0")]
+[assembly: AssemblyVersion("1.2.1")]
// The following attributes are used to specify the signing key for the assembly,
// if desired. See the Mono documentation for more information about signing.
//[assembly: AssemblyDelaySign(false)]
//[assembly: AssemblyKeyFile("")]
+
+//2021-04-19
+//鏇存柊SDKEZOpensdk_iOS_4.16.1_build20210330銆�
diff --git a/EZSDK/EZSDK.xcodeproj/project.pbxproj b/EZSDK/EZSDK.xcodeproj/project.pbxproj
index e8a7178..8711570 100644
--- a/EZSDK/EZSDK.xcodeproj/project.pbxproj
+++ b/EZSDK/EZSDK.xcodeproj/project.pbxproj
@@ -91,7 +91,6 @@
B9BC9A0425C0FFBD00C024FE /* MessageListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC991F25C0FFBA00C024FE /* MessageListCell.m */; };
B9BC9A0625C0FFBD00C024FE /* EZCameraTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC992625C0FFBA00C024FE /* EZCameraTableViewController.m */; };
B9BC9A0725C0FFBD00C024FE /* EZWifiConfigViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC992725C0FFBA00C024FE /* EZWifiConfigViewController.m */; };
- B9BC9A0825C0FFBD00C024FE /* EZVideoTalkViewcontroller.mm in Sources */ = {isa = PBXBuildFile; fileRef = B9BC992925C0FFBA00C024FE /* EZVideoTalkViewcontroller.mm */; };
B9BC9A0925C0FFBD00C024FE /* EZMessagePlaybackViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC992B25C0FFBA00C024FE /* EZMessagePlaybackViewController.m */; };
B9BC9A0A25C0FFBD00C024FE /* EZMultiChannelRealPlayVC.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC992C25C0FFBA00C024FE /* EZMultiChannelRealPlayVC.m */; };
B9BC9A0B25C0FFBD00C024FE /* EZDeviceUpgradeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC992D25C0FFBA00C024FE /* EZDeviceUpgradeViewController.m */; };
@@ -111,7 +110,6 @@
B9BC9A1925C0FFBD00C024FE /* EZAPWiFiConfigViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC994425C0FFBB00C024FE /* EZAPWiFiConfigViewController.m */; };
B9BC9A1A25C0FFBD00C024FE /* EZDeviceTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC994925C0FFBB00C024FE /* EZDeviceTableViewController.m */; };
B9BC9A1B25C0FFBD00C024FE /* EZWifiTipsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC994A25C0FFBB00C024FE /* EZWifiTipsViewController.m */; };
- B9BC9A1C25C0FFBD00C024FE /* EZSupportViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC995325C0FFBB00C024FE /* EZSupportViewController.m */; };
B9BC9A1D25C0FFBD00C024FE /* EZCalendarViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC995425C0FFBB00C024FE /* EZCalendarViewController.m */; };
B9BC9A1E25C0FFBD00C024FE /* EZWifiInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC995525C0FFBB00C024FE /* EZWifiInfoViewController.m */; };
B9BC9A1F25C0FFBD00C024FE /* EZSettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B9BC995825C0FFBB00C024FE /* EZSettingViewController.m */; };
@@ -165,6 +163,43 @@
B965BE0025EE0B0D00E58AFB /* ResponseData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ResponseData.m; sourceTree = "<group>"; };
B965BE0125EE0B0D00E58AFB /* EZHttpUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZHttpUtil.h; sourceTree = "<group>"; };
B965BE0225EE0B0D00E58AFB /* ResponseData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResponseData.h; sourceTree = "<group>"; };
+ B99F57BB262D85CF0049A308 /* EZConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZConstants.h; sourceTree = "<group>"; };
+ B99F57BC262D85CF0049A308 /* EZHCNetDeviceSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZHCNetDeviceSDK.h; sourceTree = "<group>"; };
+ B99F57BD262D85CF0049A308 /* EZStreamPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZStreamPlayer.h; sourceTree = "<group>"; };
+ B99F57BE262D85CF0049A308 /* EZOpenSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOpenSDK.h; sourceTree = "<group>"; };
+ B99F57BF262D85CF0049A308 /* EZPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlayer.h; sourceTree = "<group>"; };
+ B99F57C0262D85CF0049A308 /* EZGlobalSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZGlobalSDK.h; sourceTree = "<group>"; };
+ B99F57C2262D85CF0049A308 /* EZDeviceVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDeviceVersion.h; sourceTree = "<group>"; };
+ B99F57C3262D85CF0049A308 /* EZUserInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZUserInfo.h; sourceTree = "<group>"; };
+ B99F57C4262D85CF0049A308 /* EZDeviceUpgradeStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDeviceUpgradeStatus.h; sourceTree = "<group>"; };
+ B99F57C5262D85CF0049A308 /* EZAccessToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAccessToken.h; sourceTree = "<group>"; };
+ B99F57C6262D85CF0049A308 /* EZPlayerExParamInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlayerExParamInfo.h; sourceTree = "<group>"; };
+ B99F57C7262D85CF0049A308 /* EzvizWatchServerInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EzvizWatchServerInfo.h; sourceTree = "<group>"; };
+ B99F57C8262D85CF0049A308 /* EZDeviceRecordDownloadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDeviceRecordDownloadTask.h; sourceTree = "<group>"; };
+ B99F57C9262D85CF0049A308 /* EzvizRecordFileInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EzvizRecordFileInfo.h; sourceTree = "<group>"; };
+ B99F57CA262D85CF0049A308 /* EZDeviceRecordFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDeviceRecordFile.h; sourceTree = "<group>"; };
+ B99F57CB262D85CF0049A308 /* EZLeaveMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZLeaveMessage.h; sourceTree = "<group>"; };
+ B99F57CC262D85CF0049A308 /* EZHiddnsDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZHiddnsDeviceInfo.h; sourceTree = "<group>"; };
+ B99F57CD262D85CF0049A308 /* EZVideoTalkView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZVideoTalkView.h; sourceTree = "<group>"; };
+ B99F57CE262D85CF0049A308 /* EZDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDeviceInfo.h; sourceTree = "<group>"; };
+ B99F57CF262D85CF0049A308 /* EZRecordDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecordDownloader.h; sourceTree = "<group>"; };
+ B99F57D0262D85CF0049A308 /* EZRecordDownloadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecordDownloadTask.h; sourceTree = "<group>"; };
+ B99F57D1262D85CF0049A308 /* EZVideoTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZVideoTransformer.h; sourceTree = "<group>"; };
+ B99F57D2262D85CF0049A308 /* EZTokenKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZTokenKit.h; sourceTree = "<group>"; };
+ B99F57D3262D85CF0049A308 /* EZDetectorInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDetectorInfo.h; sourceTree = "<group>"; };
+ B99F57D4262D85CF0049A308 /* EZHCNetDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZHCNetDeviceInfo.h; sourceTree = "<group>"; };
+ B99F57D5262D85CF0049A308 /* EZCameraInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZCameraInfo.h; sourceTree = "<group>"; };
+ B99F57D6262D85CF0049A308 /* EZCloudRecordFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZCloudRecordFile.h; sourceTree = "<group>"; };
+ B99F57D7262D85CF0049A308 /* EZCloudRecordDownloadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZCloudRecordDownloadTask.h; sourceTree = "<group>"; };
+ B99F57D8262D85CF0049A308 /* EZAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAreaInfo.h; sourceTree = "<group>"; };
+ B99F57D9262D85CF0049A308 /* EZProbeDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZProbeDeviceInfo.h; sourceTree = "<group>"; };
+ B99F57DA262D85CF0049A308 /* EZVideoTalkSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZVideoTalkSDK.h; sourceTree = "<group>"; };
+ B99F57DB262D85CF0049A308 /* EZMediaSessionVideoParam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMediaSessionVideoParam.h; sourceTree = "<group>"; };
+ B99F57DC262D85CF0049A308 /* EZVideoQualityInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZVideoQualityInfo.h; sourceTree = "<group>"; };
+ B99F57DD262D85CF0049A308 /* EZAlarmInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAlarmInfo.h; sourceTree = "<group>"; };
+ B99F57DE262D85CF0049A308 /* EZVideoTalkParam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZVideoTalkParam.h; sourceTree = "<group>"; };
+ B99F57DF262D85CF0049A308 /* EZSADPDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZSADPDeviceInfo.h; sourceTree = "<group>"; };
+ B99F57E0262D85CF0049A308 /* EZStorageInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZStorageInfo.h; sourceTree = "<group>"; };
B9BC92FA25C0FC3500C024FE /* libEZSDK.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libEZSDK.a; sourceTree = BUILT_PRODUCTS_DIR; };
B9BC92FD25C0FC3500C024FE /* EZSDK.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = EZSDK.h; sourceTree = "<group>"; };
B9BC92FE25C0FC3500C024FE /* EZSDK.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = EZSDK.m; sourceTree = "<group>"; };
@@ -417,8 +452,6 @@
B9BC992525C0FFBA00C024FE /* EZCalendarViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZCalendarViewController.h; sourceTree = "<group>"; };
B9BC992625C0FFBA00C024FE /* EZCameraTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZCameraTableViewController.m; sourceTree = "<group>"; };
B9BC992725C0FFBA00C024FE /* EZWifiConfigViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZWifiConfigViewController.m; sourceTree = "<group>"; };
- B9BC992925C0FFBA00C024FE /* EZVideoTalkViewcontroller.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = EZVideoTalkViewcontroller.mm; sourceTree = "<group>"; };
- B9BC992A25C0FFBA00C024FE /* EZVideoTalkViewcontroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZVideoTalkViewcontroller.h; sourceTree = "<group>"; };
B9BC992B25C0FFBA00C024FE /* EZMessagePlaybackViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMessagePlaybackViewController.m; sourceTree = "<group>"; };
B9BC992C25C0FFBA00C024FE /* EZMultiChannelRealPlayVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZMultiChannelRealPlayVC.m; sourceTree = "<group>"; };
B9BC992D25C0FFBA00C024FE /* EZDeviceUpgradeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZDeviceUpgradeViewController.m; sourceTree = "<group>"; };
@@ -457,8 +490,6 @@
B9BC994E25C0FFBB00C024FE /* EZMessagePlaybackViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZMessagePlaybackViewController.h; sourceTree = "<group>"; };
B9BC994F25C0FFBB00C024FE /* EZWifiConfigViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZWifiConfigViewController.h; sourceTree = "<group>"; };
B9BC995025C0FFBB00C024FE /* EZCameraTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZCameraTableViewController.h; sourceTree = "<group>"; };
- B9BC995225C0FFBB00C024FE /* EZSupportViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZSupportViewController.h; sourceTree = "<group>"; };
- B9BC995325C0FFBB00C024FE /* EZSupportViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZSupportViewController.m; sourceTree = "<group>"; };
B9BC995425C0FFBB00C024FE /* EZCalendarViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZCalendarViewController.m; sourceTree = "<group>"; };
B9BC995525C0FFBB00C024FE /* EZWifiInfoViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EZWifiInfoViewController.m; sourceTree = "<group>"; };
B9BC995625C0FFBB00C024FE /* EZDeviceResultViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDeviceResultViewController.h; sourceTree = "<group>"; };
@@ -486,41 +517,6 @@
B9BC996E25C0FFBB00C024FE /* PrefixHeader.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
B9BC997025C0FFBB00C024FE /* GlobalKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GlobalKit.m; sourceTree = "<group>"; };
B9BC997125C0FFBB00C024FE /* GlobalKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlobalKit.h; sourceTree = "<group>"; };
- B9BC997625C0FFBC00C024FE /* EZConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZConstants.h; sourceTree = "<group>"; };
- B9BC997725C0FFBC00C024FE /* EZHCNetDeviceSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZHCNetDeviceSDK.h; sourceTree = "<group>"; };
- B9BC997825C0FFBC00C024FE /* EZStreamPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZStreamPlayer.h; sourceTree = "<group>"; };
- B9BC997925C0FFBC00C024FE /* EZOpenSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZOpenSDK.h; sourceTree = "<group>"; };
- B9BC997A25C0FFBC00C024FE /* EZPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlayer.h; sourceTree = "<group>"; };
- B9BC997B25C0FFBC00C024FE /* EZGlobalSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZGlobalSDK.h; sourceTree = "<group>"; };
- B9BC997D25C0FFBC00C024FE /* EZDeviceVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDeviceVersion.h; sourceTree = "<group>"; };
- B9BC997E25C0FFBC00C024FE /* EZUserInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZUserInfo.h; sourceTree = "<group>"; };
- B9BC997F25C0FFBC00C024FE /* EZDeviceUpgradeStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDeviceUpgradeStatus.h; sourceTree = "<group>"; };
- B9BC998025C0FFBC00C024FE /* EZAccessToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAccessToken.h; sourceTree = "<group>"; };
- B9BC998125C0FFBC00C024FE /* EZPlayerExParamInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZPlayerExParamInfo.h; sourceTree = "<group>"; };
- B9BC998225C0FFBC00C024FE /* EzvizWatchServerInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EzvizWatchServerInfo.h; sourceTree = "<group>"; };
- B9BC998325C0FFBC00C024FE /* EZDeviceRecordDownloadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDeviceRecordDownloadTask.h; sourceTree = "<group>"; };
- B9BC998425C0FFBC00C024FE /* EzvizRecordFileInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EzvizRecordFileInfo.h; sourceTree = "<group>"; };
- B9BC998525C0FFBC00C024FE /* EZDeviceRecordFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDeviceRecordFile.h; sourceTree = "<group>"; };
- B9BC998625C0FFBC00C024FE /* EZLeaveMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZLeaveMessage.h; sourceTree = "<group>"; };
- B9BC998725C0FFBC00C024FE /* EZHiddnsDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZHiddnsDeviceInfo.h; sourceTree = "<group>"; };
- B9BC998825C0FFBC00C024FE /* EZDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDeviceInfo.h; sourceTree = "<group>"; };
- B9BC998925C0FFBC00C024FE /* EZRecordDownloader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecordDownloader.h; sourceTree = "<group>"; };
- B9BC998A25C0FFBC00C024FE /* EZRecordDownloadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZRecordDownloadTask.h; sourceTree = "<group>"; };
- B9BC998B25C0FFBC00C024FE /* EZVideoTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZVideoTransformer.h; sourceTree = "<group>"; };
- B9BC998C25C0FFBC00C024FE /* EZTokenKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZTokenKit.h; sourceTree = "<group>"; };
- B9BC998D25C0FFBC00C024FE /* EZDetectorInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZDetectorInfo.h; sourceTree = "<group>"; };
- B9BC998E25C0FFBC00C024FE /* EZHCNetDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZHCNetDeviceInfo.h; sourceTree = "<group>"; };
- B9BC998F25C0FFBC00C024FE /* EZCameraInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZCameraInfo.h; sourceTree = "<group>"; };
- B9BC999025C0FFBC00C024FE /* EZCloudRecordFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZCloudRecordFile.h; sourceTree = "<group>"; };
- B9BC999125C0FFBC00C024FE /* EZCloudRecordDownloadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZCloudRecordDownloadTask.h; sourceTree = "<group>"; };
- B9BC999225C0FFBC00C024FE /* EZAreaInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAreaInfo.h; sourceTree = "<group>"; };
- B9BC999325C0FFBC00C024FE /* EZProbeDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZProbeDeviceInfo.h; sourceTree = "<group>"; };
- B9BC999425C0FFBD00C024FE /* EZVideoTalkSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZVideoTalkSDK.h; sourceTree = "<group>"; };
- B9BC999525C0FFBD00C024FE /* EZVideoQualityInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZVideoQualityInfo.h; sourceTree = "<group>"; };
- B9BC999625C0FFBD00C024FE /* EZAlarmInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZAlarmInfo.h; sourceTree = "<group>"; };
- B9BC999725C0FFBD00C024FE /* EZVideoTalkParam.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZVideoTalkParam.h; sourceTree = "<group>"; };
- B9BC999825C0FFBD00C024FE /* EZSADPDeviceInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZSADPDeviceInfo.h; sourceTree = "<group>"; };
- B9BC999925C0FFBD00C024FE /* EZStorageInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EZStorageInfo.h; sourceTree = "<group>"; };
B9BC999A25C0FFBD00C024FE /* libEZOpenSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libEZOpenSDK.a; sourceTree = "<group>"; };
B9EA4E5425C7E805000FFDA2 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
B9EA4E5625C7E805000FFDA2 /* UIScrollView+MJRefresh.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIScrollView+MJRefresh.m"; sourceTree = "<group>"; };
@@ -580,6 +576,58 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
+ B99F57BA262D85CF0049A308 /* include */ = {
+ isa = PBXGroup;
+ children = (
+ B99F57BB262D85CF0049A308 /* EZConstants.h */,
+ B99F57BC262D85CF0049A308 /* EZHCNetDeviceSDK.h */,
+ B99F57BD262D85CF0049A308 /* EZStreamPlayer.h */,
+ B99F57BE262D85CF0049A308 /* EZOpenSDK.h */,
+ B99F57BF262D85CF0049A308 /* EZPlayer.h */,
+ B99F57C0262D85CF0049A308 /* EZGlobalSDK.h */,
+ B99F57C1262D85CF0049A308 /* modules */,
+ );
+ path = include;
+ sourceTree = "<group>";
+ };
+ B99F57C1262D85CF0049A308 /* modules */ = {
+ isa = PBXGroup;
+ children = (
+ B99F57C2262D85CF0049A308 /* EZDeviceVersion.h */,
+ B99F57C3262D85CF0049A308 /* EZUserInfo.h */,
+ B99F57C4262D85CF0049A308 /* EZDeviceUpgradeStatus.h */,
+ B99F57C5262D85CF0049A308 /* EZAccessToken.h */,
+ B99F57C6262D85CF0049A308 /* EZPlayerExParamInfo.h */,
+ B99F57C7262D85CF0049A308 /* EzvizWatchServerInfo.h */,
+ B99F57C8262D85CF0049A308 /* EZDeviceRecordDownloadTask.h */,
+ B99F57C9262D85CF0049A308 /* EzvizRecordFileInfo.h */,
+ B99F57CA262D85CF0049A308 /* EZDeviceRecordFile.h */,
+ B99F57CB262D85CF0049A308 /* EZLeaveMessage.h */,
+ B99F57CC262D85CF0049A308 /* EZHiddnsDeviceInfo.h */,
+ B99F57CD262D85CF0049A308 /* EZVideoTalkView.h */,
+ B99F57CE262D85CF0049A308 /* EZDeviceInfo.h */,
+ B99F57CF262D85CF0049A308 /* EZRecordDownloader.h */,
+ B99F57D0262D85CF0049A308 /* EZRecordDownloadTask.h */,
+ B99F57D1262D85CF0049A308 /* EZVideoTransformer.h */,
+ B99F57D2262D85CF0049A308 /* EZTokenKit.h */,
+ B99F57D3262D85CF0049A308 /* EZDetectorInfo.h */,
+ B99F57D4262D85CF0049A308 /* EZHCNetDeviceInfo.h */,
+ B99F57D5262D85CF0049A308 /* EZCameraInfo.h */,
+ B99F57D6262D85CF0049A308 /* EZCloudRecordFile.h */,
+ B99F57D7262D85CF0049A308 /* EZCloudRecordDownloadTask.h */,
+ B99F57D8262D85CF0049A308 /* EZAreaInfo.h */,
+ B99F57D9262D85CF0049A308 /* EZProbeDeviceInfo.h */,
+ B99F57DA262D85CF0049A308 /* EZVideoTalkSDK.h */,
+ B99F57DB262D85CF0049A308 /* EZMediaSessionVideoParam.h */,
+ B99F57DC262D85CF0049A308 /* EZVideoQualityInfo.h */,
+ B99F57DD262D85CF0049A308 /* EZAlarmInfo.h */,
+ B99F57DE262D85CF0049A308 /* EZVideoTalkParam.h */,
+ B99F57DF262D85CF0049A308 /* EZSADPDeviceInfo.h */,
+ B99F57E0262D85CF0049A308 /* EZStorageInfo.h */,
+ );
+ path = modules;
+ sourceTree = "<group>";
+ };
B9BC92F125C0FC3500C024FE = {
isa = PBXGroup;
children = (
@@ -1050,7 +1098,6 @@
B9BC994A25C0FFBB00C024FE /* EZWifiTipsViewController.m */,
B9BC994F25C0FFBB00C024FE /* EZWifiConfigViewController.h */,
B9BC992725C0FFBA00C024FE /* EZWifiConfigViewController.m */,
- B9BC992825C0FFBA00C024FE /* VideoTalk */,
B9BC994E25C0FFBB00C024FE /* EZMessagePlaybackViewController.h */,
B9BC992B25C0FFBA00C024FE /* EZMessagePlaybackViewController.m */,
B9BC994D25C0FFBB00C024FE /* EZMultiChannelRealPlayVC.h */,
@@ -1093,27 +1140,8 @@
B9BC994425C0FFBB00C024FE /* EZAPWiFiConfigViewController.m */,
B9BC994525C0FFBB00C024FE /* EZAddByQRCodeViewController.h */,
B9BC996625C0FFBB00C024FE /* EZAddByQRCodeViewController.m */,
- B9BC995125C0FFBB00C024FE /* Support */,
);
path = UIViewControllers;
- sourceTree = "<group>";
- };
- B9BC992825C0FFBA00C024FE /* VideoTalk */ = {
- isa = PBXGroup;
- children = (
- B9BC992925C0FFBA00C024FE /* EZVideoTalkViewcontroller.mm */,
- B9BC992A25C0FFBA00C024FE /* EZVideoTalkViewcontroller.h */,
- );
- path = VideoTalk;
- sourceTree = "<group>";
- };
- B9BC995125C0FFBB00C024FE /* Support */ = {
- isa = PBXGroup;
- children = (
- B9BC995225C0FFBB00C024FE /* EZSupportViewController.h */,
- B9BC995325C0FFBB00C024FE /* EZSupportViewController.m */,
- );
- path = Support;
sourceTree = "<group>";
};
B9BC996F25C0FFBB00C024FE /* Global */ = {
@@ -1132,60 +1160,10 @@
B9BC997425C0FFBC00C024FE /* SDK */ = {
isa = PBXGroup;
children = (
- B9BC997525C0FFBC00C024FE /* include */,
+ B99F57BA262D85CF0049A308 /* include */,
B9BC999A25C0FFBD00C024FE /* libEZOpenSDK.a */,
);
path = SDK;
- sourceTree = "<group>";
- };
- B9BC997525C0FFBC00C024FE /* include */ = {
- isa = PBXGroup;
- children = (
- B9BC997625C0FFBC00C024FE /* EZConstants.h */,
- B9BC997725C0FFBC00C024FE /* EZHCNetDeviceSDK.h */,
- B9BC997825C0FFBC00C024FE /* EZStreamPlayer.h */,
- B9BC997925C0FFBC00C024FE /* EZOpenSDK.h */,
- B9BC997A25C0FFBC00C024FE /* EZPlayer.h */,
- B9BC997B25C0FFBC00C024FE /* EZGlobalSDK.h */,
- B9BC997C25C0FFBC00C024FE /* modules */,
- );
- path = include;
- sourceTree = "<group>";
- };
- B9BC997C25C0FFBC00C024FE /* modules */ = {
- isa = PBXGroup;
- children = (
- B9BC997D25C0FFBC00C024FE /* EZDeviceVersion.h */,
- B9BC997E25C0FFBC00C024FE /* EZUserInfo.h */,
- B9BC997F25C0FFBC00C024FE /* EZDeviceUpgradeStatus.h */,
- B9BC998025C0FFBC00C024FE /* EZAccessToken.h */,
- B9BC998125C0FFBC00C024FE /* EZPlayerExParamInfo.h */,
- B9BC998225C0FFBC00C024FE /* EzvizWatchServerInfo.h */,
- B9BC998325C0FFBC00C024FE /* EZDeviceRecordDownloadTask.h */,
- B9BC998425C0FFBC00C024FE /* EzvizRecordFileInfo.h */,
- B9BC998525C0FFBC00C024FE /* EZDeviceRecordFile.h */,
- B9BC998625C0FFBC00C024FE /* EZLeaveMessage.h */,
- B9BC998725C0FFBC00C024FE /* EZHiddnsDeviceInfo.h */,
- B9BC998825C0FFBC00C024FE /* EZDeviceInfo.h */,
- B9BC998925C0FFBC00C024FE /* EZRecordDownloader.h */,
- B9BC998A25C0FFBC00C024FE /* EZRecordDownloadTask.h */,
- B9BC998B25C0FFBC00C024FE /* EZVideoTransformer.h */,
- B9BC998C25C0FFBC00C024FE /* EZTokenKit.h */,
- B9BC998D25C0FFBC00C024FE /* EZDetectorInfo.h */,
- B9BC998E25C0FFBC00C024FE /* EZHCNetDeviceInfo.h */,
- B9BC998F25C0FFBC00C024FE /* EZCameraInfo.h */,
- B9BC999025C0FFBC00C024FE /* EZCloudRecordFile.h */,
- B9BC999125C0FFBC00C024FE /* EZCloudRecordDownloadTask.h */,
- B9BC999225C0FFBC00C024FE /* EZAreaInfo.h */,
- B9BC999325C0FFBC00C024FE /* EZProbeDeviceInfo.h */,
- B9BC999425C0FFBD00C024FE /* EZVideoTalkSDK.h */,
- B9BC999525C0FFBD00C024FE /* EZVideoQualityInfo.h */,
- B9BC999625C0FFBD00C024FE /* EZAlarmInfo.h */,
- B9BC999725C0FFBD00C024FE /* EZVideoTalkParam.h */,
- B9BC999825C0FFBD00C024FE /* EZSADPDeviceInfo.h */,
- B9BC999925C0FFBD00C024FE /* EZStorageInfo.h */,
- );
- path = modules;
sourceTree = "<group>";
};
B9EA4E5325C7E805000FFDA2 /* MJRefresh */ = {
@@ -1411,7 +1389,6 @@
B9BC99ED25C0FFBD00C024FE /* SDWebImagePrefetcher.m in Sources */,
B9BC99A025C0FFBD00C024FE /* DACircularProgressView.m in Sources */,
B9BC99CE25C0FFBD00C024FE /* NSString+DDKit.m in Sources */,
- B9BC9A0825C0FFBD00C024FE /* EZVideoTalkViewcontroller.mm in Sources */,
B9BC9A0925C0FFBD00C024FE /* EZMessagePlaybackViewController.m in Sources */,
B9BC956225C0FC6C00C024FE /* DeviceInfo.m in Sources */,
B9BC99D825C0FFBD00C024FE /* UIButton+AFNetworking.m in Sources */,
@@ -1431,7 +1408,6 @@
B9BC99CA25C0FFBD00C024FE /* UIImageView+DDKit.m in Sources */,
B965BE0325EE0B0D00E58AFB /* EZHttpUtil.m in Sources */,
B9BC9A2825C0FFBD00C024FE /* EZPlaybackViewController.m in Sources */,
- B9BC9A1C25C0FFBD00C024FE /* EZSupportViewController.m in Sources */,
B9BC92FF25C0FC3500C024FE /* EZSDK.m in Sources */,
B9BC99BA25C0FFBD00C024FE /* MWPhoto.m in Sources */,
B9BC9A1D25C0FFBD00C024FE /* EZCalendarViewController.m in Sources */,
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceTableViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceTableViewController.m
index a40c299..6c7fc55 100644
--- a/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceTableViewController.m
+++ b/EZSDK/EZSDK/EZ/UIViewControllers/EZDeviceTableViewController.m
@@ -20,7 +20,7 @@
#import "EZAreaInfo.h"
#import "EZUserInfo.h"
#import "Toast+UIView.h"
-#import "EZVideoTalkViewcontroller.h"
+//#import "EZVideoTalkViewcontroller.h"
#import "EZMultiChannelRealPlayVC.h"
#import "EZHubDebugViewController.h"
#import "GlobalKit.h"
@@ -390,9 +390,9 @@
}
- (void) go2VideoTalk:(EZDeviceInfo *)deviceInfo {
- EZVideoTalkViewcontroller *vc = [EZVideoTalkViewcontroller videoTalkVC];
- vc.deviceInfo = deviceInfo;
- [self.navigationController pushViewController:vc animated:YES];
+// EZVideoTalkViewcontroller *vc = [EZVideoTalkViewcontroller videoTalkVC];
+// vc.deviceInfo = deviceInfo;
+// [self.navigationController pushViewController:vc animated:YES];
}
- (IBAction)go2MultiPlay:(id)sender {
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/Support/EZSupportViewController.h b/EZSDK/EZSDK/EZ/UIViewControllers/Support/EZSupportViewController.h
deleted file mode 100644
index 49acc2d..0000000
--- a/EZSDK/EZSDK/EZ/UIViewControllers/Support/EZSupportViewController.h
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// EZSupportViewController.h
-// EZOpenSDKDemo
-//
-// Created by linyong on 2018/7/5.
-// Copyright 漏 2018骞� linyong. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface EZSupportViewController : UIViewController
-
-@end
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/Support/EZSupportViewController.m b/EZSDK/EZSDK/EZ/UIViewControllers/Support/EZSupportViewController.m
deleted file mode 100644
index d760119..0000000
--- a/EZSDK/EZSDK/EZ/UIViewControllers/Support/EZSupportViewController.m
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// EZSupportViewController.m
-// EZOpenSDKDemo
-//
-// Created by linyong on 2018/7/5.
-// Copyright 漏 2018骞� linyong. All rights reserved.
-//
-
-#import "EZSupportViewController.h"
-#import "Toast+UIView.h"
-#import "EZOpenSDK.h"
-#import "GlobalKit.h"
-
-#define test2AppKey @"a8bc553b576c430a9c4bcf96cc7de377"
-#define test2AppAPIUrl @"https://test2.ys7.com:9000"
-#define test2AppAuthUrl @"https://test2auth.ys7.com:8643"
-#define testAppKey @"ae1b9af9dcac4caeb88da6dbbf2dd8d5"
-#define testAppAPIUrl @"https://test.ys7.com:65"
-#define testAppAuthUrl @"https://testopenauth.ys7.com:8447"
-
-
-@interface EZSupportViewController ()
-
-@property (weak, nonatomic) IBOutlet UITextField *appKeyInput;
-@property (weak, nonatomic) IBOutlet UITextField *accessTokenInput;
-@property (weak, nonatomic) IBOutlet UITextField *apiUrlInput;
-@property (weak, nonatomic) IBOutlet UITextField *authUrlInput;
-@property (weak, nonatomic) IBOutlet UITextField *devSerialInput;
-
-@end
-
-@implementation EZSupportViewController
-
-- (void)viewDidLoad
-{
- [super viewDidLoad];
-
- [self initSubviews];
-
-// self.appKeyInput.text = @"26810f3acd794862b608b6cfbc32a6b8";
-// self.accessTokenInput.text = @"at.2nizmrxb0u30ixknd6qu3cv609qs7f50-2h6hy82vta-0gvc2c8-hrvpporto";
-// self.apiUrlInput.text = @"https://open.ys7.com";
-// self.authUrlInput.text = @"https://test12openauth.ys7.com";
-// self.devSerialInput.text = @"789393515";
-}
-
-- (void) initSubviews
-{
- self.title = @"鏀寔鐣岄潰";
- [self createBackBtn];
- [self createDoneBtn];
-}
-
-- (void) showToastWithText:(NSString *) text
-{
- if (!text)
- {
- return;
- }
-
- [self.view makeToast:text duration:2.0 position:@"center"];
-}
-
-- (void)createBackBtn
-{
- self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"閫�鍑�"
- style:UIBarButtonItemStylePlain
- target:self
- action:@selector(backClick:)];
-}
-
-- (void)backClick:(id) sender
-{
- [self.navigationController dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (void)createDoneBtn
-{
- self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"瀹屾垚"
- style:UIBarButtonItemStylePlain
- target:self
- action:@selector(doneClick:)];
-}
-
-- (void)doneClick:(id) sender
-{
- [GlobalKit shareKit].configDevSerial = self.devSerialInput.text.length > 0 ? self.devSerialInput.text : @"";
-
- if (self.appKeyInput.text.length == 0 )
- {
- [self showToastWithText:@"appKey涓嶆纭�."];
- return;
- }
-
- if (self.apiUrlInput.text.length > 0)
- {
- [EZOpenSDK initLibWithAppKey:self.appKeyInput.text
- url:self.apiUrlInput.text
- authUrl:self.authUrlInput.text.length>0?self.authUrlInput.text:nil];
- }
- else
- {
- [EZOpenSDK initLibWithAppKey:self.appKeyInput.text];
- }
-
- if (self.accessTokenInput.text.length > 0)
- {
- [EZOpenSDK setAccessToken:self.accessTokenInput.text];
- }
-
- [self.navigationController dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (IBAction)test2BtnClick:(id)sender
-{
- [EZOpenSDK logout:^(NSError *error) {
-
- }];
- [EZOpenSDK initLibWithAppKey:test2AppKey
- url:test2AppAPIUrl
- authUrl:test2AppAuthUrl];
- [self.navigationController dismissViewControllerAnimated:YES completion:nil];
-}
-
-- (IBAction)testBtnClick:(id)sender
-{
- [EZOpenSDK logout:^(NSError *error) {
-
- }];
- [EZOpenSDK initLibWithAppKey:testAppKey
- url:testAppAPIUrl
- authUrl:testAppAuthUrl];
- [self.navigationController dismissViewControllerAnimated:YES completion:nil];
-}
-
-
-
-@end
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/VideoTalk/EZVideoTalkViewcontroller.h b/EZSDK/EZSDK/EZ/UIViewControllers/VideoTalk/EZVideoTalkViewcontroller.h
deleted file mode 100644
index 8ee9987..0000000
--- a/EZSDK/EZSDK/EZ/UIViewControllers/VideoTalk/EZVideoTalkViewcontroller.h
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// EZVideoTalkViewcontroller.h
-// EZBAVDemo
-//
-// Created by kanhaiping on 2018/6/26.
-// Copyright 漏 2018骞� hikvision. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@class EZDeviceInfo;
-
-@interface EZVideoTalkViewcontroller : UIViewController
-
-@property(nonatomic, strong) EZDeviceInfo *deviceInfo;
-
-+ (EZVideoTalkViewcontroller *) videoTalkVC;
-
-@end
-
diff --git a/EZSDK/EZSDK/EZ/UIViewControllers/VideoTalk/EZVideoTalkViewcontroller.mm b/EZSDK/EZSDK/EZ/UIViewControllers/VideoTalk/EZVideoTalkViewcontroller.mm
deleted file mode 100644
index efe606a..0000000
--- a/EZSDK/EZSDK/EZ/UIViewControllers/VideoTalk/EZVideoTalkViewcontroller.mm
+++ /dev/null
@@ -1,221 +0,0 @@
-//
-// EZVideoTalkViewcontroller.m
-// EZBAVDemo
-//
-// Created by kanhaiping on 2018/6/26.
-// Copyright 漏 2018骞� hikvision. All rights reserved.
-//
-
-#import "EZVideoTalkViewcontroller.h"
-#import "EZVideoTalkSDK.h"
-#import "EZVideoTalkParam.h"
-#import "UIView+Toast.h"
-#import <AVFoundation/AVFoundation.h>
-#import "EZOpenSDK.h"
-#import "EZDeviceInfo.h"
-#import "GlobalKit.h"
-#import "EzvizWatchServerInfo.h"
-#import "EZTokenKit.h"
-
-@interface EZVideoTalkViewcontroller ()<EZVideoTalkSDKDelegate>
-@property (nonatomic, assign) BOOL bEverOpenSound;
-@property (nonatomic, strong) EZVideoTalkSDK *client;
-
-@property (weak, nonatomic) IBOutlet UIView *localView;
-@property (weak, nonatomic) IBOutlet UIView *remoteView;
-@property (weak, nonatomic) IBOutlet UITextField *roomIDTextField;
-
-@property (nonatomic, strong) EzvizWatchServerInfo *watchServerInfo;
-
-@end
-
-@implementation EZVideoTalkViewcontroller
-
-+ (EZVideoTalkViewcontroller *) videoTalkVC {
-
- EZVideoTalkViewcontroller *vc = [[NSBundle mainBundle] loadNibNamed:@"EZVideoTalkViewcontroller" owner:nil options:nil].firstObject;
- return vc;
-}
-
-- (void)viewDidLoad {
- [super viewDidLoad];
- // Do any additional setup after loading the view, typically from a nib.
- UITapGestureRecognizer *gesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapAction:)];
- if (self.view.gestureRecognizers.count <= 0) {
- [self.view addGestureRecognizer:gesture];
- }
-
- self.title = @"Video Talk";
-}
-
-- (void)viewWillAppear:(BOOL)animated {
- [super viewWillAppear:animated];
-
- [[NSNotificationCenter defaultCenter]addObserver:self selector:@selector(stopTalk) name:UIApplicationDidEnterBackgroundNotification object:nil];
- [self getWatchInfo];
-}
-
-- (void)viewWillDisappear:(BOOL)animated {
- [super viewWillDisappear:animated];
-
- [[NSNotificationCenter defaultCenter] removeObserver:self];
-
- if (self.client != nil) {
- [self stopTalk];
- }
-}
-
-- (void)didReceiveMemoryWarning {
- [super didReceiveMemoryWarning];
- // Dispose of any resources that can be recreated.
-}
-
-
-#pragma mark Actions
-
-- (IBAction)createRoomAction:(id)sender {
-
- [self startTalkWithRoomID:0];
-}
-
-- (IBAction)enterRoomAction:(id)sender {
-
- if (self.roomIDTextField.text.length <= 0 || [self.roomIDTextField.text integerValue] <= 0) {
- [self showMessage:@"璇疯緭鍏ユ纭殑鎴块棿鍙�"];
- return;
- }
-
- [self startTalkWithRoomID:(int32_t)[self.roomIDTextField.text integerValue]];
-
- [self showMessage:@"鍔犲叆鎴块棿"];
-}
-
-- (IBAction)leaveRoomAction:(id)sender {
-
- [self stopTalk];
-
- [self showMessage:@"宸茬寮�鎴块棿"];
-}
-
-- (void)tapAction:(id)sender {
-
- [self.roomIDTextField resignFirstResponder];
-}
-
-#pragma mark Helper
-
-- (void)showMessage:(NSString *)message
-{
- [self.view makeToast:message duration:2.0 position:CSToastPositionCenter];
-}
-
-#pragma mark BAV API
-
-- (void)getWatchInfo {
-
- __weak typeof(self) weakSelf = self;
- [EZOpenSDK requestGetWatchServerInfo:self.deviceInfo.deviceSerial completion:^(id watchServerInfo, NSError *error) {
-
- weakSelf.watchServerInfo = watchServerInfo;
- }];
-}
-
-- (void)startTalkWithRoomID:(int32_t)roomID
-{
- if (self.client != nil) {
- [self.client stop];
- self.client = nil;
- }
-
- EZVideoTalkParam *param = [EZVideoTalkParam new];
- param.iCltRole = roomID > 0 ? 1 : 0;
- param.iCltType = 1;
- param.iOtherCltType = 1;
-// param.iReason = 101;
- param.iStsPort = self.watchServerInfo.port;
- param.iRoomId = roomID > 0 ? roomID : 0;
- param.szOterId = self.deviceInfo.deviceSerial;
- param.szSelfId = @"1234567891";
- param.szAuthToken = [EZTokenKit sharedKit].token;
- param.szStsAddr = self.watchServerInfo.domain;
-
- [EZVideoTalkSDK setDebugVideoLog:YES];
- [EZVideoTalkSDK setDebugLogEnable:YES withLogCallback:^(NSString *logStr) {
- NSLog(@"%@", logStr);
- }];
-
- _client = [[EZVideoTalkSDK alloc] initWithParam:param localWindow:self.localView remoteWindow:self.remoteView];
- _client.delegate = self;
-
- // [_client startWithType:EZVideoTalkCaptureVideo | EZVideoTalkCaptureAudio];
- [_client startWithType:EZVideoTalkCaptureAudio];
-}
-
-- (void)stopTalk
-{
- [self.client stop];
- self.client = nil;
-}
-
-#pragma mark EZVideoTalkSDKDelegate
-
-- (void)videoTalk:(EZVideoTalkSDK *)client didReceivedError:(int32_t)errorCode
-{
- NSLog(@"%s recived errorcode:%d", __func__, errorCode);
-
- dispatch_async(dispatch_get_main_queue(), ^{
- [self showMessage:[NSString stringWithFormat:@"BAVClient Error:%d",errorCode]];
- });
-
- [self stopTalk];
-}
-
-- (void)videoTalk:(EZVideoTalkSDK *)client didReceivedMessage:(EZVideoTalkMessageType)messageCode msg:(NSString *)msg
-{
- NSLog(@"%s recived messagecode:%lu ,msg:%@", __func__, (unsigned long)messageCode, msg);
-
- dispatch_async(dispatch_get_main_queue(), ^{
-
- if (messageCode == EZVideoTalkMessageRoomCreated) {
-
- [self showMessage:[NSString stringWithFormat:@"宸插垱寤烘埧闂�:%d", self.client.roomID]];
- self.roomIDTextField.text = [NSString stringWithFormat:@"%d", self.client.roomID];
- }
- else if (messageCode == EZVideoTalkMessageStartInputData) {
-
- [self showMessage:[NSString stringWithFormat:@"寮�濮嬫帹娴�"]];
- }
- });
-}
-
-- (void)videoTalk:(EZVideoTalkSDK *)client didReceivedBavClientLogMsg:(NSString *)msg {
-
- NSLog(@"%s recived msg:%@", __func__, msg);
-}
-
-- (void)videoTalk:(EZVideoTalkSDK *)client playDelayTime:(int32_t)delayTime {
-
- NSLog(@"%s delayTime:%d", __func__, delayTime);
-
- dispatch_async(dispatch_get_main_queue(), ^{
- [self showMessage:[NSString stringWithFormat:@"鎾斁鍗￠】-delayTime:%d", delayTime]];
- });
-}
-
-- (void)videoTalk:(EZVideoTalkSDK *)client playDelayTimeStatistics:(double)delayTimeStat {
-
- NSLog(@"%s delayTimeStat:%f", __func__, delayTimeStat);
-}
-
-- (void)videoTalk:(EZVideoTalkSDK *)client didDisplayWidth:(int32_t)width height:(int32_t)height {
-
- NSLog(@"%s", __func__);
- if (!self.bEverOpenSound) {
- self.bEverOpenSound = YES;
- [self.client openSound:YES];
- }
-}
-
-
-
-@end
diff --git a/EZSDK/EZSDK/SDK/include/EZConstants.h b/EZSDK/EZSDK/SDK/include/EZConstants.h
index 464bb8d..1d6ea09 100644
--- a/EZSDK/EZSDK/SDK/include/EZConstants.h
+++ b/EZSDK/EZSDK/SDK/include/EZConstants.h
@@ -143,9 +143,9 @@
/* WiFi閰嶇疆璁惧鐘舵�� */
typedef NS_ENUM(NSInteger, EZWifiConfigStatus) {
DEVICE_WIFI_CONNECTING = 1, //璁惧姝ｅ湪杩炴帴WiFi
- DEVICE_WIFI_CONNECTED = 2, //璁惧杩炴帴WiFi鎴愬姛
+ DEVICE_WIFI_CONNECTED = 2, //璁惧杩炴帴WiFi鎴愬姛 (宸插簾寮� v4.16.0)
DEVICE_PLATFORM_REGISTED = 3, //璁惧娉ㄥ唽骞冲彴鎴愬姛
- DEVICE_ACCOUNT_BINDED = 4 //璁惧宸茬粡缁戝畾璐︽埛
+ DEVICE_ACCOUNT_BINDED = 4 //璁惧宸茬粡缁戝畾璐︽埛 (宸插簾寮� v4.16.0)
};
/* 璁惧ptz鍛戒护 */
diff --git a/EZSDK/EZSDK/SDK/include/EZOpenSDK.h b/EZSDK/EZSDK/SDK/include/EZOpenSDK.h
index 3d2bbf0..323d797 100644
--- a/EZSDK/EZSDK/SDK/include/EZOpenSDK.h
+++ b/EZSDK/EZSDK/SDK/include/EZOpenSDK.h
@@ -814,4 +814,16 @@
platFormId:(NSString *)platFormId
completion:(void (^)(id records, NSError *error))completion;
+#pragma mark - v4.16 澶氭柟闊宠棰�
+/// 鍒涘缓浼氳淇℃伅
+/// @param password 鑷畾涔夊瘑鐮�
+/// @param completion operation
++ (void)requestCallingMeetingInfo:(NSString *)password
+ completion:(void (^)(int32_t roomId, NSString *vtmAddress, NSError *error))completion;
+
+/// 鍔犲叆鏂硅幏鍙栦細璁俊鎭�
+/// @param roomId 鎴块棿鍙�
+/// @param completion operation
++ (void)requestCalledMeetingInfo:(NSString *)roomId
+ completion:(void (^)(int32_t roomId, NSString *vtmAddress, NSError *error))completion;
@end
diff --git a/EZSDK/EZSDK/SDK/include/EZPlayer.h b/EZSDK/EZSDK/SDK/include/EZPlayer.h
index 84c5dd7..a1dd6b7 100644
--- a/EZSDK/EZSDK/SDK/include/EZPlayer.h
+++ b/EZSDK/EZSDK/SDK/include/EZPlayer.h
@@ -241,6 +241,13 @@
- (BOOL)startVoiceTalk;
/**
+ * 寮�濮婽TS瀵硅锛屽紓姝ユ帴鍙ｏ紝杩斿洖鍊煎彧鏄〃绀烘搷浣滄垚鍔燂紝涓嶄唬琛ㄦ挱鏀炬垚鍔�
+ * 閽堝浜嶯VR瀵硅浣跨敤
+ * @return YES/NO
+ */
+- (BOOL)startVoiceTalkNeedVoiceChannel:(BOOL)needVoiceChannel;
+
+/**
* 寮�濮婹os瀵硅锛屽紓姝ユ帴鍙ｏ紝杩斿洖鍊煎彧鏄〃绀烘搷浣滄垚鍔燂紝涓嶄唬琛ㄦ挱鏀炬垚鍔�
*
* @return YES/NO
diff --git a/EZSDK/EZSDK/SDK/include/modules/EZMediaSessionVideoParam.h b/EZSDK/EZSDK/SDK/include/modules/EZMediaSessionVideoParam.h
new file mode 100644
index 0000000..317a8a0
--- /dev/null
+++ b/EZSDK/EZSDK/SDK/include/modules/EZMediaSessionVideoParam.h
@@ -0,0 +1,18 @@
+//
+// EZMediaSessionVideoParam.h
+// EZBAVClient
+//
+// Created by kanhaiping on 2018/7/13.
+// Copyright 漏 2018骞� hikvision. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface EZMediaSessionVideoParam : NSObject
+@property (nonatomic, strong, readonly) NSString *resolutionPreset;
+@property (nonatomic, assign) NSInteger pixelWidth;
+@property (nonatomic, assign) NSInteger pixelHeigth;
+@property (nonatomic, assign) NSInteger videoOrientation;//浼犲叆 AVCaptureVideoOrientation锛岄粯璁ょ珫灞�
+@property (nonatomic, assign) NSInteger encodeKeyFrameInterval;//I甯ч棿闅旓紝鍗曚綅绉�
+//@property (nonatomic, assign) BOOL isCrop;
+@end
diff --git a/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkParam.h b/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkParam.h
index 4d8155a..27ce0db 100644
--- a/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkParam.h
+++ b/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkParam.h
@@ -11,9 +11,10 @@
NS_ASSUME_NONNULL_BEGIN
@interface EZVideoTalkParam : NSObject
-
+
@property (nonatomic, assign) int32_t iCltRole; /**< 蹇呭～ 0 鍙戣捣 1 鎺ュ彈 鍙戣捣绔～鍐�0 鎺ュ彈绔～鍐�1 鎷掔粷涓�2 */
-@property (nonatomic, assign) int32_t iOtherCltType; /**< 閫夋嫨 鍙湁瀵圭鏄墜琛ㄧ闇�濉啓 */
+@property (nonatomic, assign) int32_t iStreamType;/**< 蹇呴�� 0 闊宠棰� 1 瀵硅 2 浼氳*/
+@property (nonatomic, assign) int32_t iOtherCltType; /**< 閫夋嫨 */
@property (nonatomic, assign) int32_t iCltType; /**< 蹇呭～ 瀹㈡埛绔被鍨� */
@property (nonatomic, strong) NSString *szStsAddr; /**< 蹇呭～ 鏈嶅姟鍦板潃 */
@property (nonatomic, assign) int32_t iStsPort; /**< 蹇呭～ 鏈嶅姟绔彛 */
@@ -22,9 +23,15 @@
@property (nonatomic, strong) NSString *szSelfId; /**< 蹇呭～ 鏍囪瘑Id */
@property (nonatomic, strong) NSString *szOterId; /**< 閫夋嫨 鎵嬭〃搴忓垪鍙� */
+@property (nonatomic, assign) int32_t iAuthType; /**< 閫夋嫨 璁よ瘉绫诲瀷 */
@property (nonatomic, strong) NSString *szAuthToken; /**< 蹇呭～ 璁よ瘉token */
-@property (nonatomic, strong) NSString *m_szExtensionParas; /**< 閫夋嫨 鎵╁睍瀛楁淇℃伅 */
+@property (nonatomic, strong) NSString *szExtensionParas; /**< 閫夋嫨 鎵╁睍瀛楁淇℃伅 */
+@property (nonatomic, assign) int32_t iChannel;//閫夊～ 涓夋柟闊宠棰戞椂锛孖PC璁惧闇�瑕佸～鍐�
+@property (nonatomic, assign) int32_t iDevStreamType;//閫夊～ 璁惧涓诲瓙鐮佹祦
+
+@property (nonatomic, assign) BOOL isMultiPartyCall; //鏄惁鏄鏂归�氳瘽
+@property (nonatomic, assign) BOOL isCallingWithDevice; //鏄惁鏄甫鏈夎澶囩殑涓诲彨鏂癸紙澶氭柟閫氳瘽锛�
@end
diff --git a/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkSDK.h b/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkSDK.h
index 9b02087..170a928 100644
--- a/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkSDK.h
+++ b/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkSDK.h
@@ -7,7 +7,6 @@
//
#import <UIKit/UIKit.h>
-#import "EZVideoTalkParam.h"
NS_ASSUME_NONNULL_BEGIN
@@ -16,8 +15,10 @@
EZVideoTalkMessageRoomCreated, //鍒涘缓鎴块棿鎴愬姛
EZVideoTalkMessagePeerEnteredRoom, //鐩墠鏈娇鐢紝鐢ㄤ簬澶氭柟
EZVideoTalkMessagePeerLeaveRoom, //鐩墠鏈娇鐢紝鐢ㄤ簬澶氭柟
- EZVideoTalkMessageStartInputData //閾炬帴寤虹珛鎴愬姛锛屽紑濮嬫帹娴�
+ EZVideoTalkMessageStartInputData, //閾炬帴寤虹珛鎴愬姛锛屽紑濮嬫帹娴�
+ EZVideoTalkMessageTransferData, //閫忎紶娑堟伅
} EZVideoTalkMessageType;
+
typedef NS_OPTIONS(NSUInteger, EZVideoTalkCaptureType) {
EZVideoTalkCaptureNone = 1 << 0,
@@ -26,7 +27,7 @@
};
-@class EZVideoTalkSDK;
+@class EZVideoTalkSDK, EZVideoTalkParam, EZMediaSessionVideoParam, EZVideoTalkView;
@protocol EZVideoTalkSDKDelegate<NSObject>
@@ -36,18 +37,20 @@
鍥炶皟娑堟伅
@param client client
- @param messageCode 娑堟伅鐮�
- @param msg 閫忎紶娑堟伅
+ @param messageCode 娑堟伅鐮� 鍙傝EZBAVMessage
+ @param msg 閫忎紶娑堟伅锛�
+ 濡傛灉鏄疎ZVideoTalkMessagePeerEnteredRoom鍜孍ZVideoTalkMessagePeerLeaveRoom娑堟伅锛宮sg鏄瘂@"clientID":@(9527),@"clientName":@"寮犱笁"}
+ 濡傛灉娑堟伅鏄� EZVideoTalkMessageTransferData msg鏄� msg鏄瘂@"content":@"瀹為檯鐨勯�忎紶娑堟伅"}
*/
-- (void)videoTalk:(EZVideoTalkSDK *)client didReceivedMessage:(EZVideoTalkMessageType)messageType msg:(NSString*)msg;
+- (void)videoTalk:(EZVideoTalkSDK *)client didReceivedMessage:(EZVideoTalkMessageType)messageCode msg:(NSDictionary *)msg;
-/**
- 鍥炶皟娑堟伅 bavclient log鍥炶皟
-
- @param client client
- @param msg 閫忎紶娑堟伅
- */
-- (void)videoTalk:(EZVideoTalkSDK *)client didReceivedBavClientLogMsg:(NSString*)msg;
+
+// 鍥炶皟娑堟伅 bavclient log鍥炶皟
+//
+// @param client client
+// @param msg 閫忎紶娑堟伅
+// */
+//- (void)bavClient:(EZVideoTalk *)client didReceivedBavClientLogMsg:(NSString*)msg;
/**
鏄剧ず鍥炶皟锛岄娆＄敾闈㈠嚭鏉ヤ互鍙婂悗缁敾闈㈠昂瀵稿彂鐢熷彉鍖栨椂鍥炶皟
@@ -56,23 +59,8 @@
@param width 鐢婚潰瀹藉害
@param height 鐢婚潰楂樺害
*/
-- (void)videoTalk:(EZVideoTalkSDK *)clientt didDisplayWidth:(int32_t)width height:(int32_t)height;
+- (void)videoTalk:(EZVideoTalkSDK *)client didDisplayWidth:(int32_t)width height:(int32_t)height ofRemoteClient:(int)clientID;
-/**
- 鎾斁鍗￠】
-
- @param client client
- @param delayTime 鍗￠】鏃堕棿
- */
-- (void)videoTalk:(EZVideoTalkSDK *)client playDelayTime:(int32_t)delayTime;
-
-/**
- 鎾斁鍗￠】缁熻
-
- @param client client
- @param delayTimeStat 鍗￠】鏃堕棿
- */
-- (void)videoTalk:(EZVideoTalkSDK *)client playDelayTimeStatistics:(double)delayTimeStat;
@end
@@ -87,32 +75,53 @@
@param param 蹇呭～ 閰嶇疆鍙傛暟
@param localWin 鏈湴绐楀彛
- @param remoteWin 杩滅绐楀彛
@return 杩斿洖鍊�
*/
-- (instancetype)initWithParam:(EZVideoTalkParam *)param
- localWindow:(UIView *)localWin
- remoteWindow:(UIView *)remoteWin;
+- (instancetype)initWithParam:(EZMediaSessionVideoParam *)param
+ localWindow:(EZVideoTalkView *)localWin;
+
+/// 璁剧疆杩滅▼绐楀彛
+/// 1.蹇呴』鍦ㄦ嬁鍒拌繙绔鎴风鍔犲叆鐨勬秷鎭悗璁剧疆锛�
+/// 2.蹇呴』鍦ㄤ富绾跨▼璋冪敤锛�
+/// 3.缁撴潫鍚庨渶瑕佸皢window鍙负nil锛�
+/// @param remoteWin 杩滅绐楀彛
+/// @param clientID 鍔犲叆鐨勫鎴风鐨処D
+- (int32_t)setRemoteWindow:(UIView * _Nullable)remoteWin ofClient:(int32_t)clientID;
/**
寮�濮嬪弻鍚戦煶瑙嗛瀵硅锛岃�楁椂鎺ュ彛锛岄粯璁� EZVideoTalkCaptureVideo | EZVideoTalkCaptureAudio 鍚屾椂寮�鍚�
*/
-- (void)start;
+- (void)startWithBAVParam:(EZVideoTalkParam *)param;
/**
寮�濮嬪弻鍚戦煶瑙嗛瀵硅锛岃�楁椂鎺ュ彛
+ @param param 蹇呭～ 閰嶇疆鍙傛暟
+ @param type 閲囬泦绫诲瀷
*/
-- (void)startWithType:(EZVideoTalkCaptureType)type;
+- (void)startWithBAVParam:(EZVideoTalkParam *)param type:(EZVideoTalkCaptureType)type;
/**
鍋滄鍙屽悜闊宠棰戝璁�
*/
- (void)stop;
+/// 鏈湴閲囬泦鐨勯煶棰戞垨鑰呮槸瑙嗛閰嶇疆锛屽彲浠ュ湪闊宠棰戦�氳瘽杩囩▼涓垏鎹�
+/// @param type EZMediaCaptureSessionType
+- (int32_t)configCaptureType:(EZVideoTalkCaptureType)type;
+
/// 寮�鍚０闊筹紝鎺ユ敹鍒癊ZVideoTalkMessageStartInputData娑堟伅鍚庤皟鐢�
/// @param open 寮�鍏崇姸鎬�
-- (int32_t) openSound:(BOOL)open;
+/// @param clientId clientId
+- (int32_t) openSound:(BOOL)open forClient:(int32_t)clientId;
+
+/**
+ 鍒囨崲瀵硅鏃朵娇鐢ㄧ殑鎽勫儚澶达紝榛樿閲囩敤鍓嶇疆 鍚屾鎺ュ彛
+
+ @param backCameraSelected YES:閫夋嫨鍚庣疆锛孨O:閫夋嫨鍓嶇疆
+ @return 鎴愬姛杩斿洖 noErr锛屽け璐ヨ繑鍥為敊璇爜
+ */
+- (int32_t)switchCamera:(BOOL)backCameraSelected;
#pragma mark - 鏃ュ織璋冭瘯
/**
diff --git a/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkView.h b/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkView.h
new file mode 100644
index 0000000..1ab4653
--- /dev/null
+++ b/EZSDK/EZSDK/SDK/include/modules/EZVideoTalkView.h
@@ -0,0 +1,18 @@
+//
+// EZVideoTalkView.h
+// EZVideoTalk
+//
+// Created by Harper Kan on 2020/12/5.
+// Copyright 漏 2020 hikvision. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import <AVFoundation/AVFoundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface EZVideoTalkView : UIView
+- (AVSampleBufferDisplayLayer *)videoLayer;
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/EZSDK/EZSDK/SDK/libEZOpenSDK.a b/EZSDK/EZSDK/SDK/libEZOpenSDK.a
index f09f777..3f9b2e0 100644
--- a/EZSDK/EZSDK/SDK/libEZOpenSDK.a
+++ b/EZSDK/EZSDK/SDK/libEZOpenSDK.a
Binary files differ
diff --git a/EZSDK/README.md b/EZSDK/README.md
index 524b9b8..f260c95 100644
--- a/EZSDK/README.md
+++ b/EZSDK/README.md
@@ -1,4 +1,5 @@
## 涓嶅甫 libsqlite3.0銆丆oreMedia銆丄udioToolbox銆乂ideoToolbox.framework銆丟LKit.framework銆丱penAL.framework銆丮obileCoreServices銆丼ystemConfiguration銆丆oreTelephony銆丄VFoundation.framework銆乴ibc++銆乴ibiconv.2.4.0銆乴ibbz2銆乴ibz 绛変緷璧栧簱
鍘熺敓app宸ョ▼椤圭洰锛岀紪璇戠殑鍐嶆坊鍔犱緷璧栧簱灏辫銆�
-
+### 聽2021-04-19
+1.鏇存柊SDKEZOpensdk_iOS_4.16.1_build20210330銆�
--
Gitblit v1.8.0