Skip to content

pidan / FuSiLive

Go to a project
Commit e3b71d54 by ludi
Options

接完连麦

parent 7c3bba79
Expand all
Inline Side-by-side
Showing with 80 additions and 82 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/FUSAPPConfigs/FUSFuSiConfigs.m
...@@ -77,12 +77,12 @@ static const NSString *FUSCidUDKey = @"FUSCidUDKey"; ...@@ -77,12 +77,12 @@ static const NSString *FUSCidUDKey = @"FUSCidUDKey";
/// App Version /// App Version
- (NSString *)appVersion { - (NSString *)appVersion {
return @"7742"; return @"7830";
} }
/// App Dot Version /// App Dot Version
- (NSString *)appDotVersion { - (NSString *)appDotVersion {
return @"7.7.4.2"; return @"7.8.3.0";
} }
/// App Id /// App Id
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
...@@ -605,8 +605,8 @@ ...@@ -605,8 +605,8 @@
00E6CD912F52FA3900B63797 /* FUSLiveChatTableClickTypeRangeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E6CD902F52FA3900B63797 /* FUSLiveChatTableClickTypeRangeModel.m */; }; 00E6CD912F52FA3900B63797 /* FUSLiveChatTableClickTypeRangeModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E6CD902F52FA3900B63797 /* FUSLiveChatTableClickTypeRangeModel.m */; };
00E6CD922F52FA3900B63797 /* FUSLiveChatTableClickTypeRangeModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E6CD8F2F52FA3900B63797 /* FUSLiveChatTableClickTypeRangeModel.h */; }; 00E6CD922F52FA3900B63797 /* FUSLiveChatTableClickTypeRangeModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E6CD8F2F52FA3900B63797 /* FUSLiveChatTableClickTypeRangeModel.h */; };
00E6CD9F2F556B0B00B63797 /* FUSVSGiftBombModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E6CD9E2F556B0B00B63797 /* FUSVSGiftBombModel.swift */; }; 00E6CD9F2F556B0B00B63797 /* FUSVSGiftBombModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E6CD9E2F556B0B00B63797 /* FUSVSGiftBombModel.swift */; };
00E6CDB82F5584BA00B63797 /* FFLinkMicDataHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E6CDB72F5584BA00B63797 /* FFLinkMicDataHelper.m */; }; 00E6CDB82F5584BA00B63797 /* FUSLinkMicDataHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E6CDB72F5584BA00B63797 /* FUSLinkMicDataHelper.m */; };
00E6CDB92F5584BA00B63797 /* FFLinkMicDataHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E6CDB62F5584BA00B63797 /* FFLinkMicDataHelper.h */; }; 00E6CDB92F5584BA00B63797 /* FUSLinkMicDataHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 00E6CDB62F5584BA00B63797 /* FUSLinkMicDataHelper.h */; };
00E6CDC02F5586AB00B63797 /* FUSLiveRoomSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E6CDBF2F5586AB00B63797 /* FUSLiveRoomSocket.swift */; }; 00E6CDC02F5586AB00B63797 /* FUSLiveRoomSocket.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E6CDBF2F5586AB00B63797 /* FUSLiveRoomSocket.swift */; };
3E261EA32F2C5F680008C0C0 /* FUSByteHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E261EA12F2C5F680008C0C0 /* FUSByteHelper.h */; }; 3E261EA32F2C5F680008C0C0 /* FUSByteHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E261EA12F2C5F680008C0C0 /* FUSByteHelper.h */; };
3E261EA42F2C5F680008C0C0 /* FUSByteHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E261EA22F2C5F680008C0C0 /* FUSByteHelper.m */; }; 3E261EA42F2C5F680008C0C0 /* FUSByteHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E261EA22F2C5F680008C0C0 /* FUSByteHelper.m */; };
...@@ -2477,8 +2477,8 @@ ...@@ -2477,8 +2477,8 @@
00E6CD8F2F52FA3900B63797 /* FUSLiveChatTableClickTypeRangeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSLiveChatTableClickTypeRangeModel.h; sourceTree = "<group>"; }; 00E6CD8F2F52FA3900B63797 /* FUSLiveChatTableClickTypeRangeModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSLiveChatTableClickTypeRangeModel.h; sourceTree = "<group>"; };
00E6CD902F52FA3900B63797 /* FUSLiveChatTableClickTypeRangeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSLiveChatTableClickTypeRangeModel.m; sourceTree = "<group>"; }; 00E6CD902F52FA3900B63797 /* FUSLiveChatTableClickTypeRangeModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSLiveChatTableClickTypeRangeModel.m; sourceTree = "<group>"; };
00E6CD9E2F556B0B00B63797 /* FUSVSGiftBombModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSVSGiftBombModel.swift; sourceTree = "<group>"; }; 00E6CD9E2F556B0B00B63797 /* FUSVSGiftBombModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSVSGiftBombModel.swift; sourceTree = "<group>"; };
00E6CDB62F5584BA00B63797 /* FFLinkMicDataHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FFLinkMicDataHelper.h; sourceTree = "<group>"; }; 00E6CDB62F5584BA00B63797 /* FUSLinkMicDataHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSLinkMicDataHelper.h; sourceTree = "<group>"; };
00E6CDB72F5584BA00B63797 /* FFLinkMicDataHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FFLinkMicDataHelper.m; sourceTree = "<group>"; }; 00E6CDB72F5584BA00B63797 /* FUSLinkMicDataHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSLinkMicDataHelper.m; sourceTree = "<group>"; };
00E6CDBF2F5586AB00B63797 /* FUSLiveRoomSocket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveRoomSocket.swift; sourceTree = "<group>"; }; 00E6CDBF2F5586AB00B63797 /* FUSLiveRoomSocket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveRoomSocket.swift; sourceTree = "<group>"; };
3E261EA12F2C5F680008C0C0 /* FUSByteHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSByteHelper.h; sourceTree = "<group>"; }; 3E261EA12F2C5F680008C0C0 /* FUSByteHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSByteHelper.h; sourceTree = "<group>"; };
3E261EA22F2C5F680008C0C0 /* FUSByteHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSByteHelper.m; sourceTree = "<group>"; }; 3E261EA22F2C5F680008C0C0 /* FUSByteHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSByteHelper.m; sourceTree = "<group>"; };
...@@ -5344,8 +5344,8 @@ ...@@ -5344,8 +5344,8 @@
BED656A62C5B745D00668116 /* FUSLinkMicroHttpHelper.m */, BED656A62C5B745D00668116 /* FUSLinkMicroHttpHelper.m */,
3E261EA52F2C5FAB0008C0C0 /* FUSLinkMicMediator.h */, 3E261EA52F2C5FAB0008C0C0 /* FUSLinkMicMediator.h */,
3E261EA62F2C5FAB0008C0C0 /* FUSLinkMicMediator.m */, 3E261EA62F2C5FAB0008C0C0 /* FUSLinkMicMediator.m */,
00E6CDB62F5584BA00B63797 /* FFLinkMicDataHelper.h */, 00E6CDB62F5584BA00B63797 /* FUSLinkMicDataHelper.h */,
00E6CDB72F5584BA00B63797 /* FFLinkMicDataHelper.m */, 00E6CDB72F5584BA00B63797 /* FUSLinkMicDataHelper.m */,
); );
path = Other; path = Other;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -7224,7 +7224,7 @@ ...@@ -7224,7 +7224,7 @@
BED659F62C5B745F00668116 /* FUSPKMainProgressBarView.h in Headers */, BED659F62C5B745F00668116 /* FUSPKMainProgressBarView.h in Headers */,
BE189E3D2C733B460008418B /* FSRRoommanagerdictPKView.h in Headers */, BE189E3D2C733B460008418B /* FSRRoommanagerdictPKView.h in Headers */,
BED65AA22C5B745F00668116 /* FUSAnchorListAutoPlayTableView.h in Headers */, BED65AA22C5B745F00668116 /* FUSAnchorListAutoPlayTableView.h in Headers */,
00E6CDB92F5584BA00B63797 /* FFLinkMicDataHelper.h in Headers */, 00E6CDB92F5584BA00B63797 /* FUSLinkMicDataHelper.h in Headers */,
BE189E0D2C733B460008418B /* FSRBulletdictEffectView.h in Headers */, BE189E0D2C733B460008418B /* FSRBulletdictEffectView.h in Headers */,
00B28C972D2FBF290008476B /* FUSFansMemberModel.h in Headers */, 00B28C972D2FBF290008476B /* FUSFansMemberModel.h in Headers */,
BE189DF12C733B460008418B /* FSRGiftShowRoomRoomGuarderTableViewCell.h in Headers */, BE189DF12C733B460008418B /* FSRGiftShowRoomRoomGuarderTableViewCell.h in Headers */,
...@@ -8516,10 +8516,14 @@ ...@@ -8516,10 +8516,14 @@
inputFileListPaths = ( inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule-resources-${CONFIGURATION}-input-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule-resources-${CONFIGURATION}-input-files.xcfilelist",
); );
inputPaths = (
);
name = "[CP] Copy Pods Resources"; name = "[CP] Copy Pods Resources";
outputFileListPaths = ( outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule-resources-${CONFIGURATION}-output-files.xcfilelist", "${PODS_ROOT}/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule-resources-${CONFIGURATION}-output-files.xcfilelist",
); );
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule-resources.sh\"\n"; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FUSShowRoomModule/Pods-FUSShowRoomModule-resources.sh\"\n";
...@@ -8968,7 +8972,7 @@ ...@@ -8968,7 +8972,7 @@
00E2A4542F1E1614003B779E /* FFPKScoreProgressView.swift in Sources */, 00E2A4542F1E1614003B779E /* FFPKScoreProgressView.swift in Sources */,
00E2A4552F1E1614003B779E /* FFPKControlSubBaseView.swift in Sources */, 00E2A4552F1E1614003B779E /* FFPKControlSubBaseView.swift in Sources */,
00E2A4562F1E1614003B779E /* FFPushRTMStreamChangeDataCell.swift in Sources */, 00E2A4562F1E1614003B779E /* FFPushRTMStreamChangeDataCell.swift in Sources */,
00E6CDB82F5584BA00B63797 /* FFLinkMicDataHelper.m in Sources */, 00E6CDB82F5584BA00B63797 /* FUSLinkMicDataHelper.m in Sources */,
00E2A4572F1E1614003B779E /* FFPKControlContributionBannerCell.swift in Sources */, 00E2A4572F1E1614003B779E /* FFPKControlContributionBannerCell.swift in Sources */,
00E2A4582F1E1614003B779E /* FFPushRTMStreamChangeDataAlertView.swift in Sources */, 00E2A4582F1E1614003B779E /* FFPushRTMStreamChangeDataAlertView.swift in Sources */,
00E2A4592F1E1614003B779E /* FFPKResultAnimation.swift in Sources */, 00E2A4592F1E1614003B779E /* FFPKResultAnimation.swift in Sources */,
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.h
...@@ -391,6 +391,9 @@ typedef NS_ENUM(NSInteger,FUSLiveRoomScopeType) { ...@@ -391,6 +391,9 @@ typedef NS_ENUM(NSInteger,FUSLiveRoomScopeType) {
- (void)fus_quitRoom; - (void)fus_quitRoom;
/// 请求rtc数据
-(void)fus_getRTCData;
#warning debugInfo #warning debugInfo
+ (void)fus_showDebugInfoViewWithString:(NSString *)string; + (void)fus_showDebugInfoViewWithString:(NSString *)string;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.m
...@@ -96,16 +96,15 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor ...@@ -96,16 +96,15 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor
} }
[self registerNotification]; [self registerNotification];
[self getRTCData];
} }
return self; return self;
} }
#pragma mark - 获取rtcData #pragma mark - 获取rtcData
- (void)getRTCData - (void)fus_getRTCData
{ {
[FUSLiveHttpHelper fus_requestliveGetRTCData:[FUSLiveHelper shareInstance].roomInfoModel.roomId Success:^(NSDictionary * _Nonnull dataDict) { [FUSLiveHttpHelper fus_requestliveGetRTCData:[FUSCacheDataShare shareStore].userDetailInfo.uid Success:^(NSDictionary * _Nonnull dataDict) {
if (FUSLiveHelper.shareInstance.liveRTCData == nil) { if (FUSLiveHelper.shareInstance.liveRTCData == nil) {
FUSLiveHelper.shareInstance.liveRTCData = [FUSLiveRTCData createFromArchieveWithKey:KLiveDataCenter_store_liveRTCData]; FUSLiveHelper.shareInstance.liveRTCData = [FUSLiveRTCData createFromArchieveWithKey:KLiveDataCenter_store_liveRTCData];
...@@ -279,7 +278,7 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor ...@@ -279,7 +278,7 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor
if (FUSLiveHelper.shareInstance.livePushConfig == nil) { if (FUSLiveHelper.shareInstance.livePushConfig == nil) {
return; return;
} }
//TODO: 索隆 - V57
NSString *bytedanceResource = BYTE_DANCE_FILTER_RESOURCE_PATH; NSString *bytedanceResource = BYTE_DANCE_FILTER_RESOURCE_PATH;
if ([FUSFileHelper fus_isExistFileAtPath:bytedanceResource]) { if ([FUSFileHelper fus_isExistFileAtPath:bytedanceResource]) {
[[NSFileManager defaultManager] removeItemAtPath:bytedanceResource error:nil]; [[NSFileManager defaultManager] removeItemAtPath:bytedanceResource error:nil];
...@@ -287,6 +286,8 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor ...@@ -287,6 +286,8 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor
dispatch_async(dispatch_get_global_queue(0, 0), ^{ dispatch_async(dispatch_get_global_queue(0, 0), ^{
//TODO: ludy: 这里修改了，注意一下bdurlmd5这些有没有
NSString *bdurl = FUSLiveHelper.shareInstance.livePushConfig.bdurl; NSString *bdurl = FUSLiveHelper.shareInstance.livePushConfig.bdurl;
NSString *bdurlmd5 = FUSLiveHelper.shareInstance.livePushConfig.bdurlmd5; NSString *bdurlmd5 = FUSLiveHelper.shareInstance.livePushConfig.bdurlmd5;
[FUSResourceDownloader.shareInstance fus_removeTaskKeyWithDownloadUrl:bdurl md5:bdurlmd5]; [FUSResourceDownloader.shareInstance fus_removeTaskKeyWithDownloadUrl:bdurl md5:bdurlmd5];
...@@ -1800,20 +1801,20 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor ...@@ -1800,20 +1801,20 @@ static NSString *const KLiveDataCenter_store_liveRTCData = @"LiveDataCenter_stor
if (bytedance) { if (bytedance) {
self.livePushConfig = [FUSStreamPushConfigModel fus_modelWithDict:bytedance]; self.livePushConfig = [FUSStreamPushConfigModel fus_modelWithDict:bytedance];
self.livePushConfig.captureType = FUSStreamCaptureTypeSingleStream; self.livePushConfig.captureType = FUSStreamCaptureTypeSingleStream;
//TODO: 索隆 - V57 //TODO: ludy: 这里修改了，注意一下bdurlmd5这些有没有
// FUSDownloadResourceModel *downloadModel = [[FUSDownloadResourceModel alloc] init]; FUSDownloadResourceModel *downloadModel = [[FUSDownloadResourceModel alloc] init];
// downloadModel.resourceUrl = self.livePushConfig.bdurl; downloadModel.resourceUrl = self.livePushConfig.bdurl;
// downloadModel.md5 = self.livePushConfig.bdurlmd5; downloadModel.md5 = self.livePushConfig.bdurlmd5;
// downloadModel.downloadPriority = NSOperationQueuePriorityVeryHigh; downloadModel.downloadPriority = NSOperationQueuePriorityVeryHigh;
// downloadModel.unzipPath = FUSBeautyHelper.shareInstance.beautyConfig.beautyResourcePath; downloadModel.unzipPath = FUSBeautyHelper.shareInstance.beautyConfig.beautyResourcePath;
// [FUSResourceDownloader.shareInstance fus_addDownloadResource:downloadModel]; [FUSResourceDownloader.shareInstance fus_addDownloadResource:downloadModel];
//
// FUSDownloadResourceModel *licbagDownloadModel = [[FUSDownloadResourceModel alloc] init]; FUSDownloadResourceModel *licbagDownloadModel = [[FUSDownloadResourceModel alloc] init];
// licbagDownloadModel.resourceUrl = self.livePushConfig.licbag; licbagDownloadModel.resourceUrl = self.livePushConfig.licbag;
// licbagDownloadModel.md5 = self.livePushConfig.licbagmd5; licbagDownloadModel.md5 = self.livePushConfig.licbagmd5;
// licbagDownloadModel.downloadPriority = NSOperationQueuePriorityVeryHigh; licbagDownloadModel.downloadPriority = NSOperationQueuePriorityVeryHigh;
// licbagDownloadModel.unzipPath = FUSBeautyHelper.shareInstance.beautyConfig.beautyResourceLicBagPath; licbagDownloadModel.unzipPath = FUSBeautyHelper.shareInstance.beautyConfig.beautyResourceLicBagPath;
// [FUSResourceDownloader.shareInstance fus_addDownloadResource:licbagDownloadModel]; [FUSResourceDownloader.shareInstance fus_addDownloadResource:licbagDownloadModel];
FUSLiveBitrateModel *model = FUSLiveBitrateModel.fus_currentBitrateModel; FUSLiveBitrateModel *model = FUSLiveBitrateModel.fus_currentBitrateModel;
if (model) { if (model) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
...@@ -2601,7 +2601,7 @@ BDAlphaPlayerMetalViewDelegate ...@@ -2601,7 +2601,7 @@ BDAlphaPlayerMetalViewDelegate
NSString *userId = [[dict objectForKey:@"userId"] description]; NSString *userId = [[dict objectForKey:@"userId"] description];
if (userOffer.integerValue > 0) { if (userOffer.integerValue > 0) {
[self.linkMicroView.linkMicDataHelper ff_updateUserOffer:userOffer forUid:userId]; [self.linkMicroView.linkMicDataHelper fus_updateUserOffer:userOffer forUid:userId];
} }
if (chipNum.doubleValue != 0) { if (chipNum.doubleValue != 0) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/Other/FFLinkMicDataHelper.h → Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/Other/FUSLinkMicDataHelper.h
// //
// FFLinkMicDataHelper.h // FUSLinkMicDataHelper.h
// LiveRoom // LiveRoom
// //
// Created by pierce on 2024/12/12. // Created by pierce on 2024/12/12.
...@@ -10,47 +10,47 @@ ...@@ -10,47 +10,47 @@
#import "FUSAgoraHelper.h" #import "FUSAgoraHelper.h"
#import "FUSLinkMicroModel.h" #import "FUSLinkMicroModel.h"
@class FFLinkMicDataHelper; @class FUSLinkMicDataHelper;
typedef NS_ENUM(NSInteger, FFLiveRoomLinkMicMode) { typedef NS_ENUM(NSInteger, FUSLiveRoomLinkMicMode) {
/// 申请上麦 /// 申请上麦
FFLiveRoomLinkMicModeApply = 0, FUSLiveRoomLinkMicModeApply = 0,
/// 自由上麦 /// 自由上麦
FFLiveRoomLinkMicModeAutoAccept = 1, FUSLiveRoomLinkMicModeAutoAccept = 1,
}; };
typedef NS_ENUM(NSInteger, FFLiveRoomLinkMicState) { typedef NS_ENUM(NSInteger, FUSLiveRoomLinkMicState) {
/// 当前无人上麦 /// 当前无人上麦
FFLiveRoomLinkMicStateNormal = 0, FUSLiveRoomLinkMicStateNormal = 0,
/// 观众、主播或者场控，有人申请上麦 /// 观众、主播或者场控，有人申请上麦
FFLiveRoomLinkMicStateSomeoneApplying = 1, FUSLiveRoomLinkMicStateSomeoneApplying = 1,
/// 当前正在连麦 /// 当前正在连麦
FFLiveRoomLinkMicStateSelfOnmic = 2, FUSLiveRoomLinkMicStateSelfOnmic = 2,
}; };
@protocol FFLinkMicDataHelperDelegate <NSObject> @protocol FUSLinkMicDataHelperDelegate <NSObject>
/// 当前麦上人说话的情况 /// 当前麦上人说话的情况
- (void)fflinkMicDataHelper:(FFLinkMicDataHelper *)linkMicDataHelper reportAudioVolumeIndicationOfSpeakers:(NSArray *)speakers; - (void)fus_linkMicDataHelper:(FUSLinkMicDataHelper *)linkMicDataHelper reportAudioVolumeIndicationOfSpeakers:(NSArray *)speakers;
/// 有人进入直播间 /// 有人进入直播间
- (void)fflinkMicDataHelper:(FFLinkMicDataHelper *)linkMicDataHelper didJoinedOfUid:(NSUInteger)uid; - (void)fus_linkMicDataHelper:(FUSLinkMicDataHelper *)linkMicDataHelper didJoinedOfUid:(NSUInteger)uid;
/// 回调当前获取到的 （2s回调一次） /// 回调当前获取到的 （2s回调一次）
/// @param bite 统计周期内，实际接收到的远端视频码率 /// @param bite 统计周期内，实际接收到的远端视频码率
/// @param uid 对应人的uid /// @param uid 对应人的uid
- (void)fflinkMicDataHelper:(FFLinkMicDataHelper *)linkMicDataHelper receivedBitrate:(NSInteger)bite uid:(NSInteger)uid; - (void)fus_linkMicDataHelper:(FUSLinkMicDataHelper *)linkMicDataHelper receivedBitrate:(NSInteger)bite uid:(NSInteger)uid;
/// 有人离线 /// 有人离线
/// @param reason 离线原因 /// @param reason 离线原因
- (void)fflinkMicDataHelper:(FFLinkMicDataHelper *)linkMicDataHelper didOfflineOfUid:(NSUInteger)uid reason:(AgoraUserOfflineReason)reason; - (void)fus_linkMicDataHelper:(FUSLinkMicDataHelper *)linkMicDataHelper didOfflineOfUid:(NSUInteger)uid reason:(AgoraUserOfflineReason)reason;
@end @end
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface FFLinkMicDataHelper : NSObject @interface FUSLinkMicDataHelper : NSObject
@property (nonatomic, strong, readonly) NSString *channelId; @property (nonatomic, strong, readonly) NSString *channelId;
...@@ -63,7 +63,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -63,7 +63,7 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, strong) NSMutableDictionary<NSString *, FUSLinkMicroModel *> *modelsDict; @property (nonatomic, strong) NSMutableDictionary<NSString *, FUSLinkMicroModel *> *modelsDict;
/// 连麦外部回调 /// 连麦外部回调
@property (nonatomic, weak) id<FFLinkMicDataHelperDelegate> agoraEventDelegate; @property (nonatomic, weak) id<FUSLinkMicDataHelperDelegate> agoraEventDelegate;
// 自己是否上麦用户 // 自己是否上麦用户
@property (nonatomic, assign, readonly) BOOL selfOnMicList; @property (nonatomic, assign, readonly) BOOL selfOnMicList;
...@@ -75,60 +75,60 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -75,60 +75,60 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, assign, readonly) BOOL selfRequestMic; @property (nonatomic, assign, readonly) BOOL selfRequestMic;
/// 连麦状态 /// 连麦状态
@property (nonatomic, assign, readonly) FFLiveRoomLinkMicState linkMicState; @property (nonatomic, assign, readonly) FUSLiveRoomLinkMicState linkMicState;
/// 连麦状态改变 /// 连麦状态改变
@property (nonatomic, copy) void(^linkMicStateDidChangedHandler)(FFLiveRoomLinkMicState linkMicState); @property (nonatomic, copy) void(^linkMicStateDidChangedHandler)(FUSLiveRoomLinkMicState linkMicState);
/// 连麦数据改变 /// 连麦数据改变
@property (nonatomic, copy) void(^linkMicDatasDidChangedHandler)(NSArray<FUSLinkMicroModel *> *models); @property (nonatomic, copy) void(^linkMicDatasDidChangedHandler)(NSArray<FUSLinkMicroModel *> *models);
/// 当前直播间的连麦配置 /// 当前直播间的连麦配置
@property (nonatomic, assign, readonly) FFLiveRoomLinkMicMode linkMicMode; @property (nonatomic, assign, readonly) FUSLiveRoomLinkMicMode linkMicMode;
- (instancetype)initWithRoomId:(NSString *)roomId channelId:(NSString *)channelId; - (instancetype)initWithRoomId:(NSString *)roomId channelId:(NSString *)channelId;
- (void)ff_updateRoomId:(NSString *)roomId channelId:(NSString *)channelId; - (void)fus_updateRoomId:(NSString *)roomId channelId:(NSString *)channelId;
- (void)ffjoinChannelSuccess:(void(^)(void))success - (void)fus_joinChannelSuccess:(void(^)(void))success
failure:(void(^)(void))failure; failure:(void(^)(void))failure;
/// 邀请用户上麦 /// 邀请用户上麦
/// @param uid 用户uid /// @param uid 用户uid
- (void)ffinvitUserLinkMicroWitUid:(NSString *)uid; - (void)fus_invitUserLinkMicroWitUid:(NSString *)uid;
// 改变自己的麦位状态 // 改变自己的麦位状态
- (void)ffswitchMicStatus:(BOOL)onMic; - (void)fus_switchMicStatus:(BOOL)onMic;
/// 根据uid改变自己的麦位状态 /// 根据uid改变自己的麦位状态
- (void)ffswitchMicStatus:(BOOL)onMic uid:(NSString *)uid; - (void)fus_switchMicStatus:(BOOL)onMic uid:(NSString *)uid;
- (void)ffsetUserInfos:(NSArray<FUSLinkMicroModel *> *)userModels; - (void)fus_setUserInfos:(NSArray<FUSLinkMicroModel *> *)userModels;
- (void)ff_offMicUser:(NSString *)uid; - (void)fus_offMicUser:(NSString *)uid;
/// 本地音频静音 /// 本地音频静音
- (void)ff_switchLocalAudio:(BOOL)mute; - (void)fus_switchLocalAudio:(BOOL)mute;
/// 停止连麦, 退出直播间, 上报服务器 /// 停止连麦, 退出直播间, 上报服务器
- (void)ffstopLinkMic; - (void)fus_stopLinkMic;
/// 停止连麦, 专门负责byre RTC /// 停止连麦, 专门负责byre RTC
- (void)ffstopRTCLinkMic; - (void)fus_stopRTCLinkMic;
/// 退出频道，不上报服务器 /// 退出频道，不上报服务器
- (void)ffexitLinkMicChannel; - (void)fus_exitLinkMicChannel;
/// 退出声网，销毁声网，不通知后台 /// 退出声网，销毁声网，不通知后台
- (void)ffdestroyLinkMic; - (void)fus_destroyLinkMic;
- (void)ff_resetHelper; - (void)fus_resetHelper;
/// 拉取用户列表 /// 拉取用户列表
- (void)requestOnlineData; - (void)requestOnlineData;
/// 根据当前状态改变申请申请连麦的状态 /// 根据当前状态改变申请申请连麦的状态
- (void)ff_changedAudienceSelfRequestMic; - (void)fus_changedAudienceSelfRequestMic;
- (void)ff_updateUserOffer:(NSString *)userOffer forUid:(NSString *)uid; - (void)fus_updateUserOffer:(NSString *)userOffer forUid:(NSString *)uid;
@end @end
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/View/FUSLinkMicroUserListView.h
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#import "FUSLinkMicroModel.h" #import "FUSLinkMicroModel.h"
#import "FUSLinkMicItemView.h" #import "FUSLinkMicItemView.h"
#import "FUSAgoraHelper.h" #import "FUSAgoraHelper.h"
#import "FFLinkMicDataHelper.h" #import "FUSLinkMicDataHelper.h"
@class FUSLinkMicroUserListView; @class FUSLinkMicroUserListView;
...@@ -59,13 +59,8 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -59,13 +59,8 @@ NS_ASSUME_NONNULL_BEGIN
@property (nonatomic, weak) id<FUSLinkMicUserListDelegate> micListDelegate; @property (nonatomic, weak) id<FUSLinkMicUserListDelegate> micListDelegate;
@property (nonatomic, strong, readonly) FFLinkMicDataHelper *linkMicDataHelper; @property (nonatomic, strong, readonly) FUSLinkMicDataHelper *linkMicDataHelper;
// 是否自己闭的麦
@property (nonatomic, assign) BOOL selfCloseMic;
/// 自己是否在麦上
@property (nonatomic, assign, readonly) BOOL selfOnMicList;
//view的数量 //view的数量
@property (nonatomic, assign) NSInteger viewAmount; @property (nonatomic, assign) NSInteger viewAmount;
...@@ -107,14 +102,6 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -107,14 +102,6 @@ NS_ASSUME_NONNULL_BEGIN
/// 重新把自己设置为声网的代理对象。 声网是引擎是个单例，代理回调只能回调到一个对象上，但是直播间里有两个这个view，所以在显示时要更换对应代理 /// 重新把自己设置为声网的代理对象。 声网是引擎是个单例，代理回调只能回调到一个对象上，但是直播间里有两个这个view，所以在显示时要更换对应代理
- (void)fus_resetDelegate; - (void)fus_resetDelegate;
/// 改变view的size
/// @param index 具体哪个下标的view
- (void)fus_updateHeaderViewSizeWithIndex:(NSInteger)index;
/// 改变view的size
/// @param userModels 传入数据源
- (void)fus_updateHeaderViewSizeWithModels:(NSArray<FUSLinkMicroModel *> *)userModels;
/// 邀请用户上麦 /// 邀请用户上麦
/// @param uid 用户uid /// @param uid 用户uid
...@@ -123,17 +110,17 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -123,17 +110,17 @@ NS_ASSUME_NONNULL_BEGIN
/// 删除用户 /// 删除用户
/// @param index /// @param index
- (void)fus_removeUserWithIndex:(NSInteger)index; //- (void)fus_removeUserWithIndex:(NSInteger)index;
/// 删除用户 /// 删除用户
/// @param index /// @param index
- (void)fus_removeUserWithModel:(FUSLinkMicroModel *)model; //- (void)fus_removeUserWithModel:(FUSLinkMicroModel *)model;
/// 调加用户 /// 调加用户
/// @param model /// @param model
- (void)fus_addUserWithModel:(FUSLinkMicroModel *)model; //- (void)fus_addUserWithModel:(FUSLinkMicroModel *)model;
// 改变自己的麦位状态 // 改变自己的麦位状态
- (void)fus_switchMicStatus:(BOOL)onMic; - (void)fus_switchMicStatus:(BOOL)onMic;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Router/FUSShowRoomRouter.m
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
} }
- (BOOL)selfOnMicList{ - (BOOL)selfOnMicList{
return [FUSLiveHelper shareInstance].currentFunctionView.linkMicroView.selfOnMicList; return [FUSLiveHelper shareInstance].currentFunctionView.linkMicroView.linkMicDataHelper.selfOnMicList;
} }
- (BOOL)isRoomVisable { - (BOOL)isRoomVisable {
...@@ -239,6 +239,9 @@ ...@@ -239,6 +239,9 @@
// 更新红包资源 // 更新红包资源
[FUSTreasureBoxHttpHelper fus_updateRedPackageResources]; [FUSTreasureBoxHttpHelper fus_updateRedPackageResources];
/// 拉取rtc信息
[[FUSLiveHelper shareInstance] fus_getRTCData];
[FUSLiveHttpHelper fus_requestLiveGameListSuccess:^(NSArray<FUSLiveGameModel *> *gameList) { [FUSLiveHttpHelper fus_requestLiveGameListSuccess:^(NSArray<FUSLiveGameModel *> *gameList) {
[FUSLiveConfigsDataCenter shareInstance].gameList = gameList; [FUSLiveConfigsDataCenter shareInstance].gameList = gameList;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment