合并ipc双向音视频需求

Change-Id: Ib6dc9a9d0b24dd6d93875770c6504934920c3f43

Author: tonychanchen

Source/LinkSDKDemo/Video/DeviceHomeList/Controller/TIoTDemoHomeViewController.m

@@ -24,6 +24,8 @@
 #import "TIoTDemoNVRSubDeviceVC.h"
 #import "TIoTDemoPlaybackVC.h"
 #import "TIoTDemoPreviewMJPEGVC.h"
+#import "TIoTDemoVideoCallVC.h"
+#import "TIoTDemoVideoPushVC.h"
 
 static NSInteger const maxLimitDeviceNumber = 4;
 static NSString *const kVideoDeviceListCellID = @"kVideoDeviceListCellID";
@@ -230,7 +232,7 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection
 
     TIoTDemoCustomSheetView *customActionSheet = [[TIoTDemoCustomSheetView alloc]init];
     cell.moreActionBlock = ^{
-        NSArray *actionTitleArray = @[@"预览",@"回放",@"图片流（mjpeg）",@"取消"];
+        NSArray *actionTitleArray = @[@"预览", @"IPC双向通话", @"IPC双向通话-只推流", @"回放",@"图片流（mjpeg）",@"取消"];
 
         ChooseFunctionBlock previewVideoBlock = ^(TIoTDemoCustomSheetView *view){
             DDLogVerbose(@"预览");
@@ -243,6 +245,29 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection
             [customActionSheet removeFromSuperview];
         };
 
+        ChooseFunctionBlock videoCallBlock = ^(TIoTDemoCustomSheetView *view){
+            DDLogVerbose(@"IPC双向通话");
+            
+            TIoTDemoVideoCallVC *previewDeviceVC = [[TIoTDemoVideoCallVC alloc]init];
+            previewDeviceVC.selectedModel = model;
+            previewDeviceVC.isNVR = NO;
+            [weakSelf.navigationController pushViewController:previewDeviceVC animated:YES];
+            [weakSelf resetDeviceListStatus];
+            [customActionSheet removeFromSuperview];
+        };
+        
+        ChooseFunctionBlock videoPushBlock = ^(TIoTDemoCustomSheetView *view){
+            DDLogVerbose(@"IPC双向通话");
+            
+            TIoTDemoVideoPushVC *previewDeviceVC = [[TIoTDemoVideoPushVC alloc]init];
+            previewDeviceVC.selectedModel = model;
+            previewDeviceVC.isNVR = NO;
+            [weakSelf.navigationController pushViewController:previewDeviceVC animated:YES];
+            [weakSelf resetDeviceListStatus];
+            [customActionSheet removeFromSuperview];
+        };
+        
+        
         ChooseFunctionBlock playbackVideoBlock = ^(TIoTDemoCustomSheetView *view){
             DDLogVerbose(@"回放");
             TIoTExploreOrVideoDeviceModel *model = weakSelf.dataArray[indexPath.row];
@@ -278,7 +303,7 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection
             DDLogVerbose(@"取消");
             [view removeFromSuperview];
         };
-        NSArray *actionBlockArray = @[previewVideoBlock,playbackVideoBlock,mjpegVideoBlock,cancelBlock];
+        NSArray *actionBlockArray = @[previewVideoBlock, videoCallBlock, videoPushBlock, playbackVideoBlock,mjpegVideoBlock,cancelBlock];
 
 
         [customActionSheet sheetViewTopTitleArray:actionTitleArray withMatchBlocks:actionBlockArray];

Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoPreviewDeviceVC.m

@@ -1137,13 +1137,13 @@ -(void)installMovieNotificationObservers
     if (self.isNVR == NO) {
         [[NSNotificationCenter defaultCenter] addObserver:self
                                                  selector:@selector(refushVideo:)
-                                                     name:@"xp2preconnect"
+                                                     name:TIoTCoreXP2PBridgeNotificationReady
                                                    object:nil];
 
     }
     [[NSNotificationCenter defaultCenter] addObserver:self
                                              selector:@selector(responseP2PdisConnect:)
-                                                 name:@"xp2disconnect"
+                                                 name:TIoTCoreXP2PBridgeNotificationDisconnect
                                                object:nil];
 }
 
@@ -1170,7 +1170,7 @@ - (void)refushVideo:(NSNotification *)notify {
             return;
         }
 
-        [MBProgressHUD show:[NSString stringWithFormat:@"%@ 通道建立成功",selectedName] icon:@"" view:self.view];
+        [MBProgressHUD show:[NSString stringWithFormat:@"%@ 本地服务已ready，可发起拉流或推流",selectedName] icon:@"" view:self.view];
 
         //计算IPC打洞时间
         self.endIpcP2P = CACurrentMediaTime();

Source/LinkSDKDemo/Video/P2P/Controller/TIoTDemoVideoCallVC.h

@@ -0,0 +1,20 @@
+//
+//  TIoTDemoVideoCallVC.h
+//  LinkSDKDemo
+//
+//  Created by eagleychen on 2023/4/7.
+//  Copyright © 2023 Tencent. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "TIoTExploreOrVideoDeviceModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface TIoTDemoVideoCallVC : UIViewController
+@property (nonatomic, strong) TIoTExploreOrVideoDeviceModel *selectedModel;   //选择设备的model
+@property (nonatomic, assign) BOOL isNVR; //区分是NVR、IPC
+@property (nonatomic, strong) NSString *deviceNameNVR;
+@end
+
+NS_ASSUME_NONNULL_END