From 3d1f75f7dc2599755795c3a7f3998b9bdf47e9aa Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 02 四月 2021 14:43:02 +0800
Subject: [PATCH] 2021-04-02 1.ZigBee 丰林同样更新SDK。

---
 ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeSignature                      |    0 
 xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESVideoMonitorViewController.m              |   18 +++--
 xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Info.plist                        |    0 
 xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Headers/ESVideoPhone.h            |   15 ++++-
 xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/ESVideoPhoneSDk                   |    0 
 ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeResources                      |   14 ++--
 xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/project.pbxproj                   |    4 +
 xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m        |   19 +++--
 ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/ESVideoPhoneSDk                                   |    0 
 ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeDirectory                      |    0 
 ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESVideoMonitorViewController.m                   |   18 +++--
 ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeRequirements-1                 |    0 
 xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Headers/ESError.h                 |    6 +
 ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESvideoVideoIntercomViewController.m             |   19 +++--
 xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeDirectory      |    0 
 ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Headers/ESError.h                                 |    6 +
 ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Headers/ESVideoPhone.h                            |   15 ++++-
 xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeSignature      |    0 
 ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Info.plist                                        |    0 
 xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeRequirements-1 |    0 
 xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeResources      |   14 ++--
 21 files changed, 93 insertions(+), 55 deletions(-)

diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESVideoMonitorViewController.m b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESVideoMonitorViewController.m
index f384f71..ea34833 100644
--- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESVideoMonitorViewController.m
+++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESVideoMonitorViewController.m
@@ -13,13 +13,13 @@
 #import <ESVideoPhoneSDk/ESError.h>
 #import "ESvideoVideoIntercomViewController.h"
 #import <Photos/Photos.h>
-#import "AudioSessionHelper.h"
+//#import "AudioSessionHelper.h"
 #import "CBToast.h"
 #import "ESVideo.h"
 
 @interface ESVideoMonitorViewController ()<ESVideoPhoneDelegate>
 
-@property (nonatomic,strong) AudioSessionHelper    *sessionHelper;
+//@property (nonatomic,strong) AudioSessionHelper    *sessionHelper;
 @property (nonatomic,strong) ESVideoPhone          *es;
 @property (nonatomic,assign) BOOL                  playing;
 @property (nonatomic,assign) BOOL                  isInterrupt;
@@ -451,9 +451,9 @@
 //            NSLog(@"VideoCaptureSession 鍒濆鍖栧け璐�");
 //        }
 //    }
-    //鍒濆鍖朅udioSession
-    _sessionHelper = [[AudioSessionHelper alloc]init];
-    [_sessionHelper setAudioSession];
+//    //鍒濆鍖朅udioSession
+//    _sessionHelper = [[AudioSessionHelper alloc]init];
+//    [_sessionHelper setAudioSession];
     //娣诲姞杩涘叆鍚庡彴锛屼腑鏂瓑閫氱煡
     [self addObservers];
     
@@ -653,7 +653,7 @@
     // If media services were reset, and the last start succeeded, restart the session.
     if (error.code == AVErrorMediaServicesWereReset) {
         [_es onStopCapture];
-        [_es startTalk];
+        [_es stopTalk];
     }
 }
 
@@ -784,10 +784,12 @@
     //    }
     
     if(!_isSpeaking){
-        result = [_sessionHelper speaker:YES];
+//        result = [_sessionHelper speaker:YES];
+        [_es resetAudioCaptureIsSpeak:YES];
         _isSpeaking = YES;
     }else{
-        result = [_sessionHelper speaker:NO];
+//        result = [_sessionHelper speaker:NO];
+        [_es resetAudioCaptureIsSpeak:NO];
         _isSpeaking = NO;
     }
     if (result) {
diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESvideoVideoIntercomViewController.m b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESvideoVideoIntercomViewController.m
index 3ddb126..80e5020 100644
--- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESvideoVideoIntercomViewController.m
+++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDKDemo/ZigBee/ESvideoVideoIntercomViewController.m
@@ -11,7 +11,7 @@
 #import <AVFoundation/AVFoundation.h>
 #import <ESVideoPhoneSDk/ESVideoPhone.h>
 #import <ESVideoPhoneSDk/ESError.h>
-#import "AudioSessionHelper.h"
+//#import "AudioSessionHelper.h"
 #import <Photos/Photos.h>
 #import <AudioToolbox/AudioToolbox.h>
 #import "ESVideo.h"
@@ -20,7 +20,7 @@
 
 @interface ESvideoVideoIntercomViewController ()<ESVideoPhoneDelegate>
 
-@property (nonatomic,strong) AudioSessionHelper    *sessionHelper;
+//@property (nonatomic,strong) AudioSessionHelper    *sessionHelper;
 @property (nonatomic,strong) ESVideoPhone          *es;
 @property (nonatomic,assign) BOOL                  playing;
 @property (nonatomic,assign) BOOL                  isInterrupt;
@@ -638,9 +638,9 @@
 //            NSLog(@"VideoCaptureSession 鍒濆鍖栧け璐�");
 //        }
 //    }
-    //鍒濆鍖朅udioSession
-    _sessionHelper = [[AudioSessionHelper alloc]init];
-    [_sessionHelper setAudioSession];
+//    //鍒濆鍖朅udioSession
+//    _sessionHelper = [[AudioSessionHelper alloc]init];
+//    [_sessionHelper setAudioSession];
     //娣诲姞杩涘叆鍚庡彴锛屼腑鏂瓑閫氱煡
     [self addObservers];
     
@@ -964,13 +964,16 @@
     NSString *result = nil;
     //鍚瓛鐘舵�� 鎻掕�冲鍚庢嫈鎺夊悗鎭㈠鍒伴粯璁よ缃�
     if (sender == nil) {
-        result = [_sessionHelper speaker:NO];
+//        result = [_sessionHelper speaker:NO];
+        [_es resetAudioCaptureIsSpeak:NO];
     }else{
         if(!_isSpeaking){
-            result = [_sessionHelper speaker:YES];
+//            result = [_sessionHelper speaker:YES];
+            [_es resetAudioCaptureIsSpeak:YES];
             _isSpeaking = YES;
         }else{
-            result = [_sessionHelper speaker:NO];
+//            result = [_sessionHelper speaker:NO];
+            [_es resetAudioCaptureIsSpeak:NO];
             _isSpeaking = NO;
         }
     }
diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/ESVideoPhoneSDk b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/ESVideoPhoneSDk
index 6867847..d1587ef 100644
--- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/ESVideoPhoneSDk
+++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/ESVideoPhoneSDk
Binary files differ
diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Headers/ESError.h b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Headers/ESError.h
index 1cda4f1..0d5fe9d 100644
--- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Headers/ESError.h
+++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Headers/ESError.h
@@ -68,9 +68,13 @@
     LMPAudioPlayErrorBypassVoiceProcessing          = 6,//AudioPlay_鎵撳紑鍥炲０娑堥櫎鍔熻兘澶辫触
     LMPAudioPlayErrorAudioUnitInitialize            = 7,//AudioPlay_AudioUnitInitialize澶辫触
 };
+//闊抽閲嶉噰鏍凤紝浼氬鑷翠笉鑳藉彂閫佹挱鏀鹃煶棰戙��
+typedef NS_ENUM (NSUInteger, LMPAudioConverterError){
+    LMPAudioConverterErrorGetNew                   = 0,//GetNew澶辫触
+    LMPAudioConverterErrorRecord                   = 1,//Record澶辫触
+};
 
 @interface ESError : NSObject
 
 @end
-
 
diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Headers/ESVideoPhone.h b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Headers/ESVideoPhone.h
index 11f1d89..d3ed23c 100644
--- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Headers/ESVideoPhone.h
+++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Headers/ESVideoPhone.h
@@ -26,21 +26,26 @@
 @property(nonatomic,strong,readonly) UIView* showView;
 //涓柇璁剧疆
 @property (nonatomic,assign,readwrite) BOOL isInterrupt;
-
 /**
 * ESVideoPhone 鍒濆鍖栨柟娉�
-*
+* 鍒濆鍖朠2P锛孫penGL锛孉udioUnit鎾斁銆�
 * @param frame 鐢熸垚鏄剧ず瑙嗛鐨凜GRect
 * @param delegate ESVideoPhoneDelegate浠ｇ悊
 * @paramimagecallBack 鑾峰彇瑙嗛鎴浘鐨刡lock
 *
-*  @return ESVideoPhone 瀹炰緥,杩斿洖nil琛ㄧず鍒濆鍖栧け璐ャ��
+*  @return ESVideoPhone 瀹炰緥,杩斿洖nil琛ㄧずP2P鍒濆鍖栧け璐ャ��
 */
 - (instancetype)initESVideoPhoneWithFrame:(CGRect)frame delegate: (id<ESVideoPhoneDelegate>)del imagecallBack:(ImageCallback)callBack;
 //鎺堟潈鍚庢墦寮�闊抽閲囬泦锛岃棰戞病鏈夋潈闄愪篃鍙互鍙煶棰戦�氳瘽
 -(BOOL)initAudioCaptureSession;
 //鈿狅笍鎺堟潈鍚庢墦寮�瑙嗛閲囬泦锛岄煶棰戞病鏈夋潈闄愬缓璁笉瑕佸彂璧烽�氳瘽
 -(BOOL)initVideoCaptureSession;
+/**
+* 鍛煎彨
+*
+* @param deviceId 闂ㄥ彛鏈鸿澶嘔D锛岃繖涓弬鏁颁細浠庡悗鍙版媺鍙栵紙涓�鑸槸涓暟缁勫叾涓寘鍚鐢ㄦ埛鏉冮檺鎷ユ湁鐨勬墍鏈夐棬鍙ｆ満锛�
+*/
+- (void)onCall:(NSString *)deviceId;
 /**
 * 鐩戞帶
 *
@@ -75,6 +80,10 @@
 -(void)openTheDoorWithRoomid: (int)roomId;
 //閲婃斁璧勬簮锛坉elegate閲婃斁绛夛級
 -(void)freeSubClass;
+
+//鍏嶆彁鎾斁 鍚瓛鎾斁 浜掔浉鍒囨崲  buffer閲嶅埗涓�0锛屽惁鍒欐湁浜涚郴缁燂紝鍦ㄥ惉绛掓ā寮忎笅涓嶈兘閲囬泦 error-50
+-(BOOL)resetAudioCaptureIsSpeak:(BOOL)isSpeak;
+
 @end
 
 
diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Info.plist b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Info.plist
index 6a58dbc..396d13b 100644
--- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Info.plist
+++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/Info.plist
Binary files differ
diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeDirectory b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeDirectory
index 22986fc..ba66cf3 100644
--- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeDirectory
+++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeDirectory
Binary files differ
diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeRequirements-1 b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeRequirements-1
index f31b403..84caed2 100644
--- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeRequirements-1
+++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeRequirements-1
Binary files differ
diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeResources b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeResources
index 71cc318..f977b4c 100644
--- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeResources
+++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeResources
@@ -6,15 +6,15 @@
 	<dict>
 		<key>Headers/ESError.h</key>
 		<data>
-		6x23lohs1gRaX2F7raZcezxZt4A=
+		pvjBtkhm2U/Y83vkOrTjVeFC1rc=
 		</data>
 		<key>Headers/ESVideoPhone.h</key>
 		<data>
-		PXntC+GjEn5A+q23YZHDZYIGj3k=
+		kGvbOvS6cBnVsmUHmyi2E6VgP+8=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		pac6jrrTIT3Ur/3XHh3CoCOUlnE=
+		Zp/dsh9RYNjl/knrzPgFdMIaTIU=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -23,22 +23,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			6x23lohs1gRaX2F7raZcezxZt4A=
+			pvjBtkhm2U/Y83vkOrTjVeFC1rc=
 			</data>
 			<key>hash2</key>
 			<data>
-			y8ReVa9YaZ6fyPjy8EeTl3jbaUadZUYVC0IdLJ/HrgM=
+			18Khpfz8wF7kpRYfu0Hu9nXX8ojPhCddZq9AC5/W4P0=
 			</data>
 		</dict>
 		<key>Headers/ESVideoPhone.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			PXntC+GjEn5A+q23YZHDZYIGj3k=
+			kGvbOvS6cBnVsmUHmyi2E6VgP+8=
 			</data>
 			<key>hash2</key>
 			<data>
-			MboPVH5djlpgR//Z7UcRBMEeaakW6FWQbZxlkx4KzaM=
+			0nI6AIHD+V13SkVwTcbXE/eDC2SJLVTIcX2hiIoRtJg=
 			</data>
 		</dict>
 	</dict>
diff --git a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeSignature b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeSignature
index 8bda88d..f2b78a0 100644
--- a/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeSignature
+++ b/ESVideoPhoneSDKZigbee/ESVideoPhoneSDk.framework/_CodeSignature/CodeSignature
Binary files differ
diff --git a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/project.pbxproj b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/project.pbxproj
index a5b880d..9ea7459 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/project.pbxproj
+++ b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin.xcodeproj/project.pbxproj
@@ -136,7 +136,7 @@
 		B956B462248D28B70093C489 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1120;
+				LastUpgradeCheck = 1220;
 				ORGANIZATIONNAME = "闄堝槈涔�";
 				TargetAttributes = {
 					B956B469248D28B70093C489 = {
@@ -204,6 +204,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -262,6 +263,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
diff --git a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESVideoMonitorViewController.m b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESVideoMonitorViewController.m
index f384f71..ea34833 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESVideoMonitorViewController.m
+++ b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESVideoMonitorViewController.m
@@ -13,13 +13,13 @@
 #import <ESVideoPhoneSDk/ESError.h>
 #import "ESvideoVideoIntercomViewController.h"
 #import <Photos/Photos.h>
-#import "AudioSessionHelper.h"
+//#import "AudioSessionHelper.h"
 #import "CBToast.h"
 #import "ESVideo.h"
 
 @interface ESVideoMonitorViewController ()<ESVideoPhoneDelegate>
 
-@property (nonatomic,strong) AudioSessionHelper    *sessionHelper;
+//@property (nonatomic,strong) AudioSessionHelper    *sessionHelper;
 @property (nonatomic,strong) ESVideoPhone          *es;
 @property (nonatomic,assign) BOOL                  playing;
 @property (nonatomic,assign) BOOL                  isInterrupt;
@@ -451,9 +451,9 @@
 //            NSLog(@"VideoCaptureSession 鍒濆鍖栧け璐�");
 //        }
 //    }
-    //鍒濆鍖朅udioSession
-    _sessionHelper = [[AudioSessionHelper alloc]init];
-    [_sessionHelper setAudioSession];
+//    //鍒濆鍖朅udioSession
+//    _sessionHelper = [[AudioSessionHelper alloc]init];
+//    [_sessionHelper setAudioSession];
     //娣诲姞杩涘叆鍚庡彴锛屼腑鏂瓑閫氱煡
     [self addObservers];
     
@@ -653,7 +653,7 @@
     // If media services were reset, and the last start succeeded, restart the session.
     if (error.code == AVErrorMediaServicesWereReset) {
         [_es onStopCapture];
-        [_es startTalk];
+        [_es stopTalk];
     }
 }
 
@@ -784,10 +784,12 @@
     //    }
     
     if(!_isSpeaking){
-        result = [_sessionHelper speaker:YES];
+//        result = [_sessionHelper speaker:YES];
+        [_es resetAudioCaptureIsSpeak:YES];
         _isSpeaking = YES;
     }else{
-        result = [_sessionHelper speaker:NO];
+//        result = [_sessionHelper speaker:NO];
+        [_es resetAudioCaptureIsSpeak:NO];
         _isSpeaking = NO;
     }
     if (result) {
diff --git a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m
index 3ddb126..80e5020 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m
+++ b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m
@@ -11,7 +11,7 @@
 #import <AVFoundation/AVFoundation.h>
 #import <ESVideoPhoneSDk/ESVideoPhone.h>
 #import <ESVideoPhoneSDk/ESError.h>
-#import "AudioSessionHelper.h"
+//#import "AudioSessionHelper.h"
 #import <Photos/Photos.h>
 #import <AudioToolbox/AudioToolbox.h>
 #import "ESVideo.h"
@@ -20,7 +20,7 @@
 
 @interface ESvideoVideoIntercomViewController ()<ESVideoPhoneDelegate>
 
-@property (nonatomic,strong) AudioSessionHelper    *sessionHelper;
+//@property (nonatomic,strong) AudioSessionHelper    *sessionHelper;
 @property (nonatomic,strong) ESVideoPhone          *es;
 @property (nonatomic,assign) BOOL                  playing;
 @property (nonatomic,assign) BOOL                  isInterrupt;
@@ -638,9 +638,9 @@
 //            NSLog(@"VideoCaptureSession 鍒濆鍖栧け璐�");
 //        }
 //    }
-    //鍒濆鍖朅udioSession
-    _sessionHelper = [[AudioSessionHelper alloc]init];
-    [_sessionHelper setAudioSession];
+//    //鍒濆鍖朅udioSession
+//    _sessionHelper = [[AudioSessionHelper alloc]init];
+//    [_sessionHelper setAudioSession];
     //娣诲姞杩涘叆鍚庡彴锛屼腑鏂瓑閫氱煡
     [self addObservers];
     
@@ -964,13 +964,16 @@
     NSString *result = nil;
     //鍚瓛鐘舵�� 鎻掕�冲鍚庢嫈鎺夊悗鎭㈠鍒伴粯璁よ缃�
     if (sender == nil) {
-        result = [_sessionHelper speaker:NO];
+//        result = [_sessionHelper speaker:NO];
+        [_es resetAudioCaptureIsSpeak:NO];
     }else{
         if(!_isSpeaking){
-            result = [_sessionHelper speaker:YES];
+//            result = [_sessionHelper speaker:YES];
+            [_es resetAudioCaptureIsSpeak:YES];
             _isSpeaking = YES;
         }else{
-            result = [_sessionHelper speaker:NO];
+//            result = [_sessionHelper speaker:NO];
+            [_es resetAudioCaptureIsSpeak:NO];
             _isSpeaking = NO;
         }
     }
diff --git a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/ESVideoPhoneSDk b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/ESVideoPhoneSDk
index 6867847..d1587ef 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/ESVideoPhoneSDk
+++ b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/ESVideoPhoneSDk
Binary files differ
diff --git a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Headers/ESError.h b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Headers/ESError.h
index 1cda4f1..0d5fe9d 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Headers/ESError.h
+++ b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Headers/ESError.h
@@ -68,9 +68,13 @@
     LMPAudioPlayErrorBypassVoiceProcessing          = 6,//AudioPlay_鎵撳紑鍥炲０娑堥櫎鍔熻兘澶辫触
     LMPAudioPlayErrorAudioUnitInitialize            = 7,//AudioPlay_AudioUnitInitialize澶辫触
 };
+//闊抽閲嶉噰鏍凤紝浼氬鑷翠笉鑳藉彂閫佹挱鏀鹃煶棰戙��
+typedef NS_ENUM (NSUInteger, LMPAudioConverterError){
+    LMPAudioConverterErrorGetNew                   = 0,//GetNew澶辫触
+    LMPAudioConverterErrorRecord                   = 1,//Record澶辫触
+};
 
 @interface ESError : NSObject
 
 @end
-
 
diff --git a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Headers/ESVideoPhone.h b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Headers/ESVideoPhone.h
index 11f1d89..d3ed23c 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Headers/ESVideoPhone.h
+++ b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Headers/ESVideoPhone.h
@@ -26,21 +26,26 @@
 @property(nonatomic,strong,readonly) UIView* showView;
 //涓柇璁剧疆
 @property (nonatomic,assign,readwrite) BOOL isInterrupt;
-
 /**
 * ESVideoPhone 鍒濆鍖栨柟娉�
-*
+* 鍒濆鍖朠2P锛孫penGL锛孉udioUnit鎾斁銆�
 * @param frame 鐢熸垚鏄剧ず瑙嗛鐨凜GRect
 * @param delegate ESVideoPhoneDelegate浠ｇ悊
 * @paramimagecallBack 鑾峰彇瑙嗛鎴浘鐨刡lock
 *
-*  @return ESVideoPhone 瀹炰緥,杩斿洖nil琛ㄧず鍒濆鍖栧け璐ャ��
+*  @return ESVideoPhone 瀹炰緥,杩斿洖nil琛ㄧずP2P鍒濆鍖栧け璐ャ��
 */
 - (instancetype)initESVideoPhoneWithFrame:(CGRect)frame delegate: (id<ESVideoPhoneDelegate>)del imagecallBack:(ImageCallback)callBack;
 //鎺堟潈鍚庢墦寮�闊抽閲囬泦锛岃棰戞病鏈夋潈闄愪篃鍙互鍙煶棰戦�氳瘽
 -(BOOL)initAudioCaptureSession;
 //鈿狅笍鎺堟潈鍚庢墦寮�瑙嗛閲囬泦锛岄煶棰戞病鏈夋潈闄愬缓璁笉瑕佸彂璧烽�氳瘽
 -(BOOL)initVideoCaptureSession;
+/**
+* 鍛煎彨
+*
+* @param deviceId 闂ㄥ彛鏈鸿澶嘔D锛岃繖涓弬鏁颁細浠庡悗鍙版媺鍙栵紙涓�鑸槸涓暟缁勫叾涓寘鍚鐢ㄦ埛鏉冮檺鎷ユ湁鐨勬墍鏈夐棬鍙ｆ満锛�
+*/
+- (void)onCall:(NSString *)deviceId;
 /**
 * 鐩戞帶
 *
@@ -75,6 +80,10 @@
 -(void)openTheDoorWithRoomid: (int)roomId;
 //閲婃斁璧勬簮锛坉elegate閲婃斁绛夛級
 -(void)freeSubClass;
+
+//鍏嶆彁鎾斁 鍚瓛鎾斁 浜掔浉鍒囨崲  buffer閲嶅埗涓�0锛屽惁鍒欐湁浜涚郴缁燂紝鍦ㄥ惉绛掓ā寮忎笅涓嶈兘閲囬泦 error-50
+-(BOOL)resetAudioCaptureIsSpeak:(BOOL)isSpeak;
+
 @end
 
 
diff --git a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Info.plist b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Info.plist
index 6a58dbc..396d13b 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Info.plist
+++ b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/Info.plist
Binary files differ
diff --git a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeDirectory b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeDirectory
index 22986fc..ba66cf3 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeDirectory
+++ b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeDirectory
Binary files differ
diff --git a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeRequirements-1 b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeRequirements-1
index f31b403..84caed2 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeRequirements-1
+++ b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeRequirements-1
Binary files differ
diff --git a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeResources b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeResources
index 71cc318..f977b4c 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeResources
+++ b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeResources
@@ -6,15 +6,15 @@
 	<dict>
 		<key>Headers/ESError.h</key>
 		<data>
-		6x23lohs1gRaX2F7raZcezxZt4A=
+		pvjBtkhm2U/Y83vkOrTjVeFC1rc=
 		</data>
 		<key>Headers/ESVideoPhone.h</key>
 		<data>
-		PXntC+GjEn5A+q23YZHDZYIGj3k=
+		kGvbOvS6cBnVsmUHmyi2E6VgP+8=
 		</data>
 		<key>Info.plist</key>
 		<data>
-		pac6jrrTIT3Ur/3XHh3CoCOUlnE=
+		Zp/dsh9RYNjl/knrzPgFdMIaTIU=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -23,22 +23,22 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			6x23lohs1gRaX2F7raZcezxZt4A=
+			pvjBtkhm2U/Y83vkOrTjVeFC1rc=
 			</data>
 			<key>hash2</key>
 			<data>
-			y8ReVa9YaZ6fyPjy8EeTl3jbaUadZUYVC0IdLJ/HrgM=
+			18Khpfz8wF7kpRYfu0Hu9nXX8ojPhCddZq9AC5/W4P0=
 			</data>
 		</dict>
 		<key>Headers/ESVideoPhone.h</key>
 		<dict>
 			<key>hash</key>
 			<data>
-			PXntC+GjEn5A+q23YZHDZYIGj3k=
+			kGvbOvS6cBnVsmUHmyi2E6VgP+8=
 			</data>
 			<key>hash2</key>
 			<data>
-			MboPVH5djlpgR//Z7UcRBMEeaakW6FWQbZxlkx4KzaM=
+			0nI6AIHD+V13SkVwTcbXE/eDC2SJLVTIcX2hiIoRtJg=
 			</data>
 		</dict>
 	</dict>
diff --git a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeSignature b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeSignature
index 8bda88d..f2b78a0 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeSignature
+++ b/xamarin/ESVideoPhoneSDKXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeSignature
Binary files differ

--
Gitblit v1.8.0