On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnIntercomViewController.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 ESOnIntercomViewController ()<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; @@ -609,9 +609,9 @@ // NSLog(@"VideoCaptureSession 初始化失败"); // } // } //初始化AudioSession _sessionHelper = [[AudioSessionHelper alloc]init]; [_sessionHelper setAudioSession]; // //初始化AudioSession // _sessionHelper = [[AudioSessionHelper alloc]init]; // [_sessionHelper setAudioSession]; //添加进入后台，中断等通知 [self addObservers]; @@ -819,7 +819,7 @@ // If media services were reset, and the last start succeeded, restart the session. if (error.code == AVErrorMediaServicesWereReset) { [_es onStopCapture]; [_es startTalk]; [_es stopTalk]; } } @@ -933,13 +933,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]; [_es resetAudioCaptureIsSpeak:YES]; // result = [_sessionHelper speaker:YES]; _isSpeaking = YES; }else{ result = [_sessionHelper speaker:NO]; // result = [_sessionHelper speaker:NO]; [_es resetAudioCaptureIsSpeak:NO]; _isSpeaking = NO; } } On+/ESVideoOn/ESVideoPhoneSDKDemo/On/ESOnMonitorViewController.m
@@ -12,13 +12,13 @@ #import <ESVideoPhoneSDk/ESVideoPhone.h> #import <ESVideoPhoneSDk/ESError.h> #import <Photos/Photos.h> #import "AudioSessionHelper.h" //#import "AudioSessionHelper.h" //#import "CBToast.h" #import "ESVideo.h" @interface ESOnMonitorViewController ()<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; @@ -399,9 +399,9 @@ // NSLog(@"VideoCaptureSession 初始化失败"); // } // } //初始化AudioSession _sessionHelper = [[AudioSessionHelper alloc]init]; [_sessionHelper setAudioSession]; // //初始化AudioSession // _sessionHelper = [[AudioSessionHelper alloc]init]; // [_sessionHelper setAudioSession]; //添加进入后台，中断等通知 [self addObservers]; @@ -602,7 +602,7 @@ // If media services were reset, and the last start succeeded, restart the session. if (error.code == AVErrorMediaServicesWereReset) { [_es onStopCapture]; [_es startTalk]; [_es stopTalk]; } } @@ -733,10 +733,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) { On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnIntercomViewController.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 ESOnIntercomViewController ()<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; @@ -72,7 +72,6 @@ NSString * unlockSuccessfullyStr; NSString * callingStr; NSString * hangUpStr; NSString * hasBeenHungUpStr; // int openDoorTimeout; //全局变量 SystemSoundID sound; @@ -112,7 +111,6 @@ hangUpStr = @"挂断"; unlockSuccessfullyStr = @"开锁成功"; callingStr = @"来电中..."; hasBeenHungUpStr = @"已挂断"; }else{ tipStr = @"Prompt"; okStr = @"OK"; @@ -123,7 +121,6 @@ hangUpStr = @"Hang up"; unlockSuccessfullyStr = @"Unlock successfully"; callingStr = @"Incoming call"; hasBeenHungUpStr = @"Has been hung up"; } } @@ -612,9 +609,9 @@ // NSLog(@"VideoCaptureSession 初始化失败"); // } // } //初始化AudioSession _sessionHelper = [[AudioSessionHelper alloc]init]; [_sessionHelper setAudioSession]; // //初始化AudioSession // _sessionHelper = [[AudioSessionHelper alloc]init]; // [_sessionHelper setAudioSession]; //添加进入后台，中断等通知 [self addObservers]; @@ -761,7 +758,7 @@ // [_mCallOrAccept setTitle:@"通话中..." forState:UIControlStateNormal]; }else if([phoneEventStr isEqual:@"EVT_HangUp"]){ [self showUIAlertViewWithBack:hasBeenHungUpStr]; [self showUIAlertViewWithBack:@"已挂断"]; // [_mCallOrAccept setTitle:@"反呼" forState:UIControlStateNormal]; }else if([phoneEventStr isEqual:@"EVT_P2POnlineStatusChanged"]){ //EVT_P2PStarted(p2p初始化OK，可以连接),EVT_P2POnlineStatusChangedonline=1 @@ -775,7 +772,7 @@ NSDictionary *dic = [NSJSONSerialization JSONObjectWithData:data options:kNilOptions error:nil]; NSInteger status = [[dic valueForKey:@"status"]integerValue]; if(status && status == 1){ // NSLog(@"开门成功"); NSLog(@"开门成功"); [self setOpenDoorSuccess]; }else{ NSLog(@"开门失败"); @@ -822,7 +819,7 @@ // If media services were reset, and the last start succeeded, restart the session. if (error.code == AVErrorMediaServicesWereReset) { [_es onStopCapture]; [_es startTalk]; [_es stopTalk]; } } @@ -936,13 +933,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]; [_es resetAudioCaptureIsSpeak:YES]; // result = [_sessionHelper speaker:YES]; _isSpeaking = YES; }else{ result = [_sessionHelper speaker:NO]; // result = [_sessionHelper speaker:NO]; [_es resetAudioCaptureIsSpeak:NO]; _isSpeaking = NO; } } On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnMonitorViewController.m
@@ -12,13 +12,13 @@ #import <ESVideoPhoneSDk/ESVideoPhone.h> #import <ESVideoPhoneSDk/ESError.h> #import <Photos/Photos.h> #import "AudioSessionHelper.h" //#import "AudioSessionHelper.h" //#import "CBToast.h" #import "ESVideo.h" @interface ESOnMonitorViewController ()<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; @@ -57,7 +57,7 @@ NSString * unlockStr; NSString * endOfMonitoringStr; NSString * unlockSuccessfullyStr; CGFloat Height66; // int _openDoorTimeout; @@ -399,9 +399,9 @@ // NSLog(@"VideoCaptureSession 初始化失败"); // } // } //初始化AudioSession _sessionHelper = [[AudioSessionHelper alloc]init]; [_sessionHelper setAudioSession]; // //初始化AudioSession // _sessionHelper = [[AudioSessionHelper alloc]init]; // [_sessionHelper setAudioSession]; //添加进入后台，中断等通知 [self addObservers]; @@ -602,7 +602,7 @@ // If media services were reset, and the last start succeeded, restart the session. if (error.code == AVErrorMediaServicesWereReset) { [_es onStopCapture]; [_es startTalk]; [_es stopTalk]; } } @@ -733,10 +733,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) { On+/xamarin/ESVideoOnXamarin/Extern/ESVideoPhoneSDk.framework/ESVideoPhoneSDkBinary files differ
On+/xamarin/ESVideoOnXamarin/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
@@ -26,21 +26,26 @@ @property(nonatomic,strong,readonly) UIView* showView; //中断设置 @property (nonatomic,assign,readwrite) BOOL isInterrupt; /** * ESVideoPhone 初始化方法 * * 初始化P2P，OpenGL，AudioUnit播放。 * @param frame 生成显示视频的CGRect * @param delegate ESVideoPhoneDelegate代理 * @paramimagecallBack 获取视频截图的block * * @return ESVideoPhone 实例,返回nil表示初始化失败。 * @return ESVideoPhone 实例,返回nil表示P2P初始化失败。 */ - (instancetype)initESVideoPhoneWithFrame:(CGRect)frame delegate: (id<ESVideoPhoneDelegate>)del imagecallBack:(ImageCallback)callBack; //授权后打开音频采集，视频没有权限也可以只音频通话 -(BOOL)initAudioCaptureSession; //⚠️授权后打开视频采集，音频没有权限建议不要发起通话 -(BOOL)initVideoCaptureSession; /** * 呼叫 * * @param deviceId 门口机设备ID，这个参数会从后台拉取（一般是个数组其中包含该用户权限拥有的所有门口机） */ - (void)onCall:(NSString *)deviceId; /** * 监控 * @@ -75,6 +80,10 @@ -(void)openTheDoorWithRoomid: (int)roomId; //释放资源（delegate释放等） -(void)freeSubClass; //免提播放 听筒播放 互相切换 buffer重制为0，否则有些系统，在听筒模式下不能采集 error-50 -(BOOL)resetAudioCaptureIsSpeak:(BOOL)isSpeak; @end Binary files differ
On+/xamarin/ESVideoOnXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeDirectoryBinary files differ
On+/xamarin/ESVideoOnXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeRequirements-1Binary files differ
On+/xamarin/ESVideoOnXamarin/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> On+/xamarin/ESVideoOnXamarin/Extern/ESVideoPhoneSDk.framework/_CodeSignature/CodeSignatureBinary files differ
On+/xamarin/Shared.IOS.ESVideoOnSDK/Shared.IOS.ESVideoOnSDK/Library/ESVideoPhoneSDk.aBinary files differ
On+/xamarin/Shared.IOS.ESVideoOnSDK/Shared.IOS.ESVideoOnSDK/Library/libESVideoOnXamarin.aBinary files differ
On+/xamarin/Shared.IOS.ESVideoOnSDK/Shared.IOS.ESVideoOnSDK/Properties/AssemblyInfo.cs
@@ -25,7 +25,7 @@ // The form "{Major}.{Minor}.*" will automatically update the build and revision, // and "{Major}.{Minor}.{Build}.*" will update just the revision. [assembly: AssemblyVersion("1.0.2")] [assembly: AssemblyVersion("1.0.3")] // The following attributes are used to specify the signing key for the assembly, // if desired. See the Mono documentation for more information about signing.
