Skip to content

徐利超 / MutiFaceDemo

转到一个项目
Commit c5784b21 by 徐利超
Options

update 多人音视频demo 完成

parent b1ccf7e8
正在显示 包含 228 行增加 和 11 行删除
MutiFaceDemo.xcodeproj/project.pbxproj
......@@ -65,6 +65,9 @@
40F6FA6223D6CCCF00EC3737 /* NMCBasicModuleFramework.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40F6F9D723D6A08A00EC3737 /* NMCBasicModuleFramework.framework */; };
40F6FA6323D6CCCF00EC3737 /* NMCBasicModuleFramework.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 40F6F9D723D6A08A00EC3737 /* NMCBasicModuleFramework.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
40F6FA7623D6E58E00EC3737 /* MutiFaceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 40F6FA7523D6E58E00EC3737 /* MutiFaceViewController.m */; };
40F6FA7B23E8285300EC3737 /* nim_server .conf in Resources */ = {isa = PBXBuildFile; fileRef = 40F6FA7A23E8285300EC3737 /* nim_server .conf */; };
40F6FA7E23E973F500EC3737 /* MutiFaceContainerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 40F6FA7D23E973F500EC3737 /* MutiFaceContainerView.m */; };
40F6FA8023E97F0300EC3737 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 40F6FA7F23E97F0300EC3737 /* Settings.bundle */; };
901AFCC6973CC2B29B1AFF5C /* Pods_MutiFaceDemo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9E636B910955FD5DD32F0DCE /* Pods_MutiFaceDemo.framework */; };
/* End PBXBuildFile section */
......@@ -201,6 +204,10 @@
40F6FA3F23D6B36A00EC3737 /* ijksdl_timer.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ijksdl_timer.c; sourceTree = "<group>"; };
40F6FA7423D6E58E00EC3737 /* MutiFaceViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MutiFaceViewController.h; sourceTree = "<group>"; };
40F6FA7523D6E58E00EC3737 /* MutiFaceViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MutiFaceViewController.m; sourceTree = "<group>"; };
40F6FA7A23E8285300EC3737 /* nim_server .conf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "nim_server .conf"; sourceTree = "<group>"; };
40F6FA7C23E973F500EC3737 /* MutiFaceContainerView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MutiFaceContainerView.h; sourceTree = "<group>"; };
40F6FA7D23E973F500EC3737 /* MutiFaceContainerView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MutiFaceContainerView.m; sourceTree = "<group>"; };
40F6FA7F23E97F0300EC3737 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; };
9E636B910955FD5DD32F0DCE /* Pods_MutiFaceDemo.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_MutiFaceDemo.framework; sourceTree = BUILT_PRODUCTS_DIR; };
E8FDB7899269DB88599AB6D9 /* Pods-MutiFaceDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MutiFaceDemo.debug.xcconfig"; path = "Target Support Files/Pods-MutiFaceDemo/Pods-MutiFaceDemo.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
......@@ -271,6 +278,8 @@
40F6F99523D696CF00EC3737 /* MutiFaceDemo */ = {
isa = PBXGroup;
children = (
40F6FA7F23E97F0300EC3737 /* Settings.bundle */,
40F6FA7A23E8285300EC3737 /* nim_server .conf */,
40F6F9D123D6A08A00EC3737 /* ThirdPartLibs */,
40F6F9CB23D6987D00EC3737 /* Application */,
40F6F99623D696CF00EC3737 /* AppDelegate.h */,
......@@ -319,6 +328,8 @@
children = (
40F6FA7423D6E58E00EC3737 /* MutiFaceViewController.h */,
40F6FA7523D6E58E00EC3737 /* MutiFaceViewController.m */,
40F6FA7C23E973F500EC3737 /* MutiFaceContainerView.h */,
40F6FA7D23E973F500EC3737 /* MutiFaceContainerView.m */,
);
path = faceViewController;
sourceTree = "<group>";
......@@ -666,9 +677,11 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
40F6FA7B23E8285300EC3737 /* nim_server .conf in Resources */,
40F6F9DB23D6A08A00EC3737 /* NMCVideoFilter.bundle in Resources */,
40F6F9A623D696D600EC3737 /* LaunchScreen.storyboard in Resources */,
40F6F9A323D696D600EC3737 /* Assets.xcassets in Resources */,
40F6FA8023E97F0300EC3737 /* Settings.bundle in Resources */,
40F6F9A123D696CF00EC3737 /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -752,6 +765,7 @@
40F6FA4823D6B36A00EC3737 /* NTESPinyinConverter.m in Sources */,
40F6FA4023D6B36A00EC3737 /* MBProgressHUD.m in Sources */,
40F6FA5023D6B36A00EC3737 /* renderer_yuv420p.c in Sources */,
40F6FA7E23E973F500EC3737 /* MutiFaceContainerView.m in Sources */,
40F6FA5423D6B36A00EC3737 /* yuv444p10le.fsh.c in Sources */,
40F6FA4123D6B36A00EC3737 /* UIView+NTES.m in Sources */,
40F6FA4623D6B36A00EC3737 /* NTESBundleSetting.m in Sources */,
......
MutiFaceDemo/AppDelegate.m
......@@ -10,7 +10,10 @@
#import <NIMSDK/NIMSDK.h>
#import "LoginViewController.h"
#define NIMAppKey @"4ea930ab3d6fb1f3613e9877332c9dd9"
//本地化key
//#define NIMAppKey @"b6c92438c06f98a909ae45bf21bf2842"
@interface AppDelegate ()
......
MutiFaceDemo/Application/faceViewController/MutiFaceContainerView.h 0 → 100644
//
// MutiFaceContainerView.h
// MutiFaceDemo
//
// Created by Xu Lichao on 2020/2/4.
// Copyright © 2020 Yuwei. All rights reserved.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface MutiFaceContainerView : UIView
- (void)refreshWithRemoteView:(UIView *)remoteView;
@end
NS_ASSUME_NONNULL_END
MutiFaceDemo/Application/faceViewController/MutiFaceContainerView.m 0 → 100644
//
// MutiFaceContainerView.m
// MutiFaceDemo
//
// Created by Xu Lichao on 2020/2/4.
// Copyright © 2020 Yuwei. All rights reserved.
//
#import "MutiFaceContainerView.h"
@interface MutiFaceContainerView ()
@property (nonatomic, strong) UIView *remoteView;
@end
@implementation MutiFaceContainerView
- (instancetype)initWithFrame:(CGRect)frame
{
self = [super initWithFrame:frame];
if (self)
{
self.backgroundColor = [UIColor clearColor];
self.remoteView = [[UIView alloc] initWithFrame:self.bounds];
[self addSubview:self.remoteView];
}
return self;
}
- (void)refreshWithRemoteView:(UIView *)remoteView
{
if (_remoteView != remoteView) {
[_remoteView removeFromSuperview];
_remoteView = remoteView;
if (remoteView) {
remoteView.frame = self.bounds;
remoteView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
[self addSubview:remoteView];
}
}
}
@end
MutiFaceDemo/Application/faceViewController/MutiFaceViewController.m
......@@ -9,6 +9,7 @@
#import "MutiFaceViewController.h"
#import "NTESBundleSetting.h"
#import "UIAlertView+NTESBlock.h"
#import "MutiFaceContainerView.h"
//网易云相关
#define NTES_USE_CLEAR_BAR - (BOOL)useClearBar{return YES;}
......@@ -33,6 +34,9 @@ dispatch_async(dispatch_get_main_queue(), block);\
@property (nonatomic, strong) UIView *videoView;
@property (nonatomic, strong) UIButton *hangupBtn;
@property (nonatomic, strong) UIView *localView;
@property (nonatomic, strong) UIView *remoteView;
//会议
......@@ -50,6 +54,7 @@ dispatch_async(dispatch_get_main_queue(), block);\
[self setupUI];
self.meeting = [self makeMeeting];
_meeting.name = self.roomName;
[self baseStep];
}
- (void)setupUI
......@@ -58,16 +63,35 @@ dispatch_async(dispatch_get_main_queue(), block);\
[self.view addSubview:self.videoView];
[self.view addSubview:self.hangupBtn];
CGFloat size = SCREEN_WIDTH / 2;
// [self.view addSubview:self.remoteView];
// [self.view addSubview:self.localView];
for (NSInteger i = 0; i < 4; ++i) {
NSInteger x = i % 2;
NSInteger y = i / 2;
UIView *sizeView = [[UIView alloc] initWithFrame:CGRectMake(x * size, y *size, size, size)];
MutiFaceContainerView *sizeView = [[MutiFaceContainerView alloc] initWithFrame:CGRectMake(x * size, y *size, size, size)];
sizeView.tag = 100 + i;
[self.view addSubview:sizeView];
}
}
- (void)baseStep
{
[self checkServiceEnable:^(BOOL enable) {
if (enable) {
if (self.needCreate) {
[self reserveMeetting];
}else {
[self joinMeeting];
}
[self addListeners];
}else {
[self dismissViewControllerAnimated:YES completion:nil];
}
}];
}
#pragma mark - methods
- (void)leaveRoomWithInfo:(NSString *)info
{
......@@ -90,6 +114,22 @@ dispatch_async(dispatch_get_main_queue(), block);\
return isExist;
}
- (NSInteger)findUserIndex:(NSString *)uid
{
NSInteger index = 100;
for (NSString *existUid in self.userArray) {
if ([uid isEqualToString:existUid]) {
break;
}else {
index++;
}
}
if (index >= 100 + self.userArray.count) {
return -1;
}
return index;
}
#pragma mark - NIM相关
- (void)checkServiceEnable:(void(^)(BOOL))result{
......@@ -256,16 +296,29 @@ dispatch_async(dispatch_get_main_queue(), block);\
- (void)onLocalDisplayviewReady:(UIView *)displayView
{
MutiFaceContainerView *containerView = (MutiFaceContainerView *)[self.view viewWithTag:100];
[containerView refreshWithRemoteView:displayView];
// displayView.frame = self.localView.bounds;
// [self.localView addSubview:displayView];
}
- (void)onRemoteDisplayviewReady:(UIView *)displayView user:(NSString *)user
{
// displayView.frame = self.remoteView.bounds;
// [self.remoteView addSubview:displayView];
if (![self findUserExist:user]) {
[self.userArray addObject:user];
}
NSInteger tag = [self findUserIndex:user];
if (tag != -1) {
MutiFaceContainerView *containerView = (MutiFaceContainerView *)[self.view viewWithTag:tag];
[containerView refreshWithRemoteView:displayView];
}
}
#pragma mark - meeting set
- (NIMNetCallMeeting *)makeMeeting
{
......@@ -285,13 +338,12 @@ dispatch_async(dispatch_get_main_queue(), block);\
- (void)fillUserSetting:(NIMNetCallOption *)option
{
option.autoRotateRemoteVideo = [[NTESBundleSetting sharedConfig] videochatAutoRotateRemoteVideo];
option.remoteViewoShowType = NIMNetCallRemoteVideoShowTypeYuvData;
NIMNetCallServerRecord *serverRecord = [[NIMNetCallServerRecord alloc] init];
serverRecord.enableServerAudioRecording = [[NTESBundleSetting sharedConfig] serverRecordAudio];
serverRecord.enableServerVideoRecording = [[NTESBundleSetting sharedConfig] serverRecordVideo];
serverRecord.enableServerHostRecording = [[NTESBundleSetting sharedConfig] serverRecordHost];
serverRecord.serverRecordingMode = [[NTESBundleSetting sharedConfig] serverRecordMode];
serverRecord.enableServerAudioRecording = YES;
serverRecord.enableServerVideoRecording = YES;
serverRecord.enableServerHostRecording = YES;
serverRecord.serverRecordingMode = NIMNetCallServerRecordModeDefault;
option.serverRecord = serverRecord;
......@@ -313,6 +365,8 @@ dispatch_async(dispatch_get_main_queue(), block);\
option.scene = [[NTESBundleSetting sharedConfig] scene];
NIMNetCallVideoCaptureParam *param = [[NIMNetCallVideoCaptureParam alloc] init];
//设置视频方向
param.videoCaptureOrientation = NIMVideoOrientationPortrait;
[self fillVideoCaptureSetting:param];
option.videoCaptureParam = param;
......@@ -357,4 +411,20 @@ dispatch_async(dispatch_get_main_queue(), block);\
return _userArray;
}
- (UIView *)localView
{
if (!_localView) {
_localView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH / 2, SCREEN_WIDTH / 2)];
}
return _localView;
}
- (UIView *)remoteView
{
if (!_remoteView) {
_remoteView = [[UIView alloc] initWithFrame:CGRectMake(SCREEN_WIDTH / 2, 0, SCREEN_WIDTH / 2, SCREEN_WIDTH / 2)];
}
return _remoteView;
}
@end
MutiFaceDemo/Application/loginViewController/LoginViewController.m
......@@ -75,7 +75,7 @@
- (void)user1Login
{
CHWEAKSELF
[[[NIMSDK sharedSDK] loginManager] login:@"hzyw1564536238433" token:@"e66363a51c4e260558c45da570248e56" completion:^(NSError * _Nullable error) {
[[[NIMSDK sharedSDK] loginManager] login:@"hzyw1564536238433" token:@"d59bf5af61a25e19e0719f22d53f9728" completion:^(NSError * _Nullable error) {
CHSTRONGSELF
if (error) {
TraceS(@"======>>>>>%@",error);
......@@ -107,7 +107,7 @@
- (void)user3Login
{
CHWEAKSELF
[[[NIMSDK sharedSDK] loginManager] login:@"hzyw1564538246299" token:@"2862bbc024662c2b8f9db0527ff4c085" completion:^(NSError * _Nullable error) {
[[[NIMSDK sharedSDK] loginManager] login:@"hzyw1564538246299" token:@"a3fc7f2d62cc7790728e6c710e9c3b01" completion:^(NSError * _Nullable error) {
CHSTRONGSELF
if (error) {
TraceS(@"%@",error);
......@@ -252,7 +252,7 @@
{
if (!_textField) {
_textField = [[UITextField alloc] initWithFrame:CGRectMake(20, 10, 200, 30)];
_textField.text = @"YWTestRoomName_1";
_textField.text = @"YWTestRoomName_2";
_textField.font = kFont(14);
_textField.layer.borderWidth = 1;
_textField.layer.borderColor = [UIColor blackColor].CGColor;
......
MutiFaceDemo/Info.plist
......@@ -22,6 +22,18 @@
<true/>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>NSCameraUsageDescription</key>
<string>亲，我们需要访问您的相机来拍摄身份证信息并上传以便核实信息，可以吗？</string>
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
<string>亲，我们需要访问您的位置信息来获取当前您正在进行面签的地点，可以吗？</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>亲，我们需要访问您的位置信息来获取当前您正在进行面签的地点，可以吗？</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>亲，我们需要访问您的位置信息来获取当前您正在进行面签的地点，可以吗？</string>
<key>NSMicrophoneUsageDescription</key>
<string>亲，我们需要访问您的麦克风以便同业务员进行通话和录制实时面签，可以吗？</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>亲，我们需要访问您的相册选取身份证照片并上传以便核实信息，可以吗？</string>
<key>UIRequiredDeviceCapabilities</key>
<array>
<string>armv7</string>
......
MutiFaceDemo/Settings.bundle/private.plist 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>New item</key>
<string></string>
<key>StringsTable</key>
<string>Root</string>
<key>PreferenceSpecifiers</key>
<array>
<dict>
<key>Type</key>
<string>PSGroupSpecifier</string>
<key>Title</key>
<string></string>
<key>FooterText</key>
<string>私有化配置的修改将在app下次启动时生效，请注销登录并退出应用。</string>
</dict>
<dict>
<key>Type</key>
<string>PSTextFieldSpecifier</string>
<key>DefaultValue</key>
<string></string>
<key>Title</key>
<string>配置文件URL</string>
<key>Key</key>
<string>privatization_url</string>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>私有化开关</string>
<key>Key</key>
<string>privatization_enabled</string>
<key>DefaultValue</key>
<false/>
</dict>
<dict>
<key>Type</key>
<string>PSToggleSwitchSpecifier</string>
<key>Title</key>
<string>密码转MD5</string>
<key>Key</key>
<string>privatization_password_md5_enabled</string>
<key>DefaultValue</key>
<false/>
</dict>
</array>
</dict>
</plist>
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或 登录 后发表评论