From 65150ff832383e25f31d20837ad97f77d2338979 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 02 四月 2021 09:05:38 +0800
Subject: [PATCH] 2021-04-02 1.更新丰林最新SDK
---
On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnIntercomViewController.m | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnIntercomViewController.m b/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnIntercomViewController.m
index 4a07cfa..ce4c850 100644
--- a/On+/xamarin/ESVideoOnXamarin/ESVideoOnXamarin/ESOnIntercomViewController.m
+++ b/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 鍒濆鍖栧け璐�");
// }
// }
- //鍒濆鍖朅udioSession
- _sessionHelper = [[AudioSessionHelper alloc]init];
- [_sessionHelper setAudioSession];
+// //鍒濆鍖朅udioSession
+// _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鍒濆鍖朞K锛屽彲浠ヨ繛鎺�),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;
}
}
--
Gitblit v1.8.0