From cbd317b95cc92fecc860732af56f51de6aa157ff Mon Sep 17 00:00:00 2001 From: tonychan Date: Fri, 14 Apr 2023 16:44:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0openCamera=E6=8F=90=E5=89=8D?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I67771017a153628b8b9b99aa8191cf948e66ce95 --- .../Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m | 5 ++++- Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h | 4 ++++ Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm | 10 ++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m index 0ea54cf2..081d4deb 100644 --- a/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m +++ b/Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m @@ -130,13 +130,16 @@ - (void)viewDidLoad { NSString *productId = [TIoTCoreAppEnvironment shareEnvironment].cloudProductId?:@""; NSString *deviceName= self.deviceName?:@""; - [self callDevice:productId devicename:deviceName]; +// dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ + [self callDevice:productId devicename:deviceName]; +// }); UIBarButtonItem *right = [[UIBarButtonItem alloc] initWithTitle:@"静音" style:UIBarButtonItemStylePlain target:self action:@selector(showHudView:)]; self.navigationItem.rightBarButtonItem = right; //设置代理,接受设备消息 [TIoTCoreXP2PBridge sharedInstance].delegate = self; +// [[TIoTCoreXP2PBridge sharedInstance] openCamera:AVCaptureDevicePositionFront view:self.imageView]; } - (void)requestDiffDeviceDataWithXp2pInfo:(TRTCParams *)xp2pInfo { diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h index 062d0926..8f5bc543 100644 --- a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h +++ b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.h @@ -160,6 +160,10 @@ extern NSNotificationName const TIoTCoreXP2PBridgeNotificationStreamEnd; */ + (int)getStreamLinkMode:(NSString *)dev_name; +/* + * 打开本地预览 + */ +- (void)openCamera:(AVCaptureDevicePosition)videoPosition view:(UIView *)previewView; @end NS_ASSUME_NONNULL_END diff --git a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm index cef7e178..2a4c1eb1 100644 --- a/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm +++ b/Source/SDK/LinkVideo/TIoTCoreXP2PBridge.mm @@ -237,6 +237,8 @@ - (XP2PErrCode)startAppWith:(NSString *)pro_id dev_name:(NSString *)dev_name { [TRTCCloud sharedInstance].delegate = self; [[TRTCCloud sharedInstance] enterRoom:self.params appScene:TRTCAppSceneVideoCall]; + + [[TRTCCloud sharedInstance] muteLocalVideo:TRTCVideoStreamTypeBig mute:YES]; return XP2P_ERR_NONE; @@ -371,7 +373,10 @@ - (void)sendVoiceToServer:(NSString *)dev_name channel:(NSString *)channel_numbe // fileHandle = [NSFileHandle fileHandleForWritingAtPath:audioFile]; self.audioConfig = audio_config; self.videoConfig = video_config; + [[TRTCCloud sharedInstance] muteLocalVideo:TRTCVideoStreamTypeBig mute:NO]; + [[TRTCCloud sharedInstance] stopLocalPreview]; [[TRTCCloud sharedInstance] startLocalPreview:(video_config.videoPosition == AVCaptureDevicePositionFront)?YES:NO view:video_config.localView]; + [[TRTCCloud sharedInstance] startLocalAudio:TRTCAudioQualitySpeech]; return; @@ -529,8 +534,9 @@ + (int)getStreamLinkMode:(NSString *)dev_name { } - - +- (void)openCamera:(AVCaptureDevicePosition)videoPosition view:(UIView *)previewView { + [[TRTCCloud sharedInstance] startLocalPreview:(videoPosition == AVCaptureDevicePositionFront)?YES:NO view:previewView]; +} #pragma mark -TRTCCloudDelegate - (void)onEnterRoom:(NSInteger)result {