Skip to content

pidan / FuSiLive

Go to a project
Commit c4be54a1 by suolong
Options

添加限时表演弹窗

parent 7f1f2d50
Expand all
Inline Side-by-side
Showing with 94 additions and 2 deletions
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
...@@ -1433,6 +1433,8 @@ ...@@ -1433,6 +1433,8 @@
BED658F22C5B745E00668116 /* FUSLiveBottomToolManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BED655EF2C5B745D00668116 /* FUSLiveBottomToolManager.m */; }; BED658F22C5B745E00668116 /* FUSLiveBottomToolManager.m in Sources */ = {isa = PBXBuildFile; fileRef = BED655EF2C5B745D00668116 /* FUSLiveBottomToolManager.m */; };
BED658F32C5B745E00668116 /* FUSLiveBottomToolSubView.h in Headers */ = {isa = PBXBuildFile; fileRef = BED655F02C5B745D00668116 /* FUSLiveBottomToolSubView.h */; }; BED658F32C5B745E00668116 /* FUSLiveBottomToolSubView.h in Headers */ = {isa = PBXBuildFile; fileRef = BED655F02C5B745D00668116 /* FUSLiveBottomToolSubView.h */; };
BED658F42C5B745E00668116 /* FUSLiveBottomToolSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = BED655F12C5B745D00668116 /* FUSLiveBottomToolSubView.m */; }; BED658F42C5B745E00668116 /* FUSLiveBottomToolSubView.m in Sources */ = {isa = PBXBuildFile; fileRef = BED655F12C5B745D00668116 /* FUSLiveBottomToolSubView.m */; };
BEF6C0A72F0A1B2C0033D4E5 /* FUSLiveShowTimePopView.h in Headers */ = {isa = PBXBuildFile; fileRef = BEF6C0A52F0A1B2C0033D4E5 /* FUSLiveShowTimePopView.h */; };
BEF6C0A82F0A1B2C0033D4E5 /* FUSLiveShowTimePopView.m in Sources */ = {isa = PBXBuildFile; fileRef = BEF6C0A62F0A1B2C0033D4E5 /* FUSLiveShowTimePopView.m */; };
BED658F52C5B745E00668116 /* FUSLiveBottomToolView.h in Headers */ = {isa = PBXBuildFile; fileRef = BED655F22C5B745D00668116 /* FUSLiveBottomToolView.h */; }; BED658F52C5B745E00668116 /* FUSLiveBottomToolView.h in Headers */ = {isa = PBXBuildFile; fileRef = BED655F22C5B745D00668116 /* FUSLiveBottomToolView.h */; };
BED658F62C5B745E00668116 /* FUSLiveBottomToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = BED655F32C5B745D00668116 /* FUSLiveBottomToolView.m */; }; BED658F62C5B745E00668116 /* FUSLiveBottomToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = BED655F32C5B745D00668116 /* FUSLiveBottomToolView.m */; };
BED658F72C5B745E00668116 /* FUSLiveChatFastInputCell.h in Headers */ = {isa = PBXBuildFile; fileRef = BED655F42C5B745D00668116 /* FUSLiveChatFastInputCell.h */; }; BED658F72C5B745E00668116 /* FUSLiveChatFastInputCell.h in Headers */ = {isa = PBXBuildFile; fileRef = BED655F42C5B745D00668116 /* FUSLiveChatFastInputCell.h */; };
...@@ -3814,6 +3816,8 @@ ...@@ -3814,6 +3816,8 @@
BED655EF2C5B745D00668116 /* FUSLiveBottomToolManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSLiveBottomToolManager.m; sourceTree = "<group>"; }; BED655EF2C5B745D00668116 /* FUSLiveBottomToolManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSLiveBottomToolManager.m; sourceTree = "<group>"; };
BED655F02C5B745D00668116 /* FUSLiveBottomToolSubView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSLiveBottomToolSubView.h; sourceTree = "<group>"; }; BED655F02C5B745D00668116 /* FUSLiveBottomToolSubView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSLiveBottomToolSubView.h; sourceTree = "<group>"; };
BED655F12C5B745D00668116 /* FUSLiveBottomToolSubView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSLiveBottomToolSubView.m; sourceTree = "<group>"; }; BED655F12C5B745D00668116 /* FUSLiveBottomToolSubView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSLiveBottomToolSubView.m; sourceTree = "<group>"; };
BEF6C0A52F0A1B2C0033D4E5 /* FUSLiveShowTimePopView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSLiveShowTimePopView.h; sourceTree = "<group>"; };
BEF6C0A62F0A1B2C0033D4E5 /* FUSLiveShowTimePopView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSLiveShowTimePopView.m; sourceTree = "<group>"; };
BED655F22C5B745D00668116 /* FUSLiveBottomToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSLiveBottomToolView.h; sourceTree = "<group>"; }; BED655F22C5B745D00668116 /* FUSLiveBottomToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSLiveBottomToolView.h; sourceTree = "<group>"; };
BED655F32C5B745D00668116 /* FUSLiveBottomToolView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSLiveBottomToolView.m; sourceTree = "<group>"; }; BED655F32C5B745D00668116 /* FUSLiveBottomToolView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSLiveBottomToolView.m; sourceTree = "<group>"; };
BED655F42C5B745D00668116 /* FUSLiveChatFastInputCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSLiveChatFastInputCell.h; sourceTree = "<group>"; }; BED655F42C5B745D00668116 /* FUSLiveChatFastInputCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSLiveChatFastInputCell.h; sourceTree = "<group>"; };
...@@ -6762,6 +6766,8 @@ ...@@ -6762,6 +6766,8 @@
BED655EF2C5B745D00668116 /* FUSLiveBottomToolManager.m */, BED655EF2C5B745D00668116 /* FUSLiveBottomToolManager.m */,
BED655F02C5B745D00668116 /* FUSLiveBottomToolSubView.h */, BED655F02C5B745D00668116 /* FUSLiveBottomToolSubView.h */,
BED655F12C5B745D00668116 /* FUSLiveBottomToolSubView.m */, BED655F12C5B745D00668116 /* FUSLiveBottomToolSubView.m */,
BEF6C0A52F0A1B2C0033D4E5 /* FUSLiveShowTimePopView.h */,
BEF6C0A62F0A1B2C0033D4E5 /* FUSLiveShowTimePopView.m */,
BED655F22C5B745D00668116 /* FUSLiveBottomToolView.h */, BED655F22C5B745D00668116 /* FUSLiveBottomToolView.h */,
BED655F32C5B745D00668116 /* FUSLiveBottomToolView.m */, BED655F32C5B745D00668116 /* FUSLiveBottomToolView.m */,
BED655F42C5B745D00668116 /* FUSLiveChatFastInputCell.h */, BED655F42C5B745D00668116 /* FUSLiveChatFastInputCell.h */,
...@@ -8606,6 +8612,7 @@ ...@@ -8606,6 +8612,7 @@
files = ( files = (
BED65B0A2C5B746000668116 /* FUSOpenScreenPushHelp.h in Headers */, BED65B0A2C5B746000668116 /* FUSOpenScreenPushHelp.h in Headers */,
BED658F32C5B745E00668116 /* FUSLiveBottomToolSubView.h in Headers */, BED658F32C5B745E00668116 /* FUSLiveBottomToolSubView.h in Headers */,
BEF6C0A72F0A1B2C0033D4E5 /* FUSLiveShowTimePopView.h in Headers */,
00B28CBA2D2FC4E10008476B /* FUSLiveEndLiveAssesModel.h in Headers */, 00B28CBA2D2FC4E10008476B /* FUSLiveEndLiveAssesModel.h in Headers */,
BE189DDF2C733B460008418B /* FSRRoomManagerViewController.h in Headers */, BE189DDF2C733B460008418B /* FSRRoomManagerViewController.h in Headers */,
BED65A442C5B745F00668116 /* FUSLiveBoxDetailSettingView.h in Headers */, BED65A442C5B745F00668116 /* FUSLiveBoxDetailSettingView.h in Headers */,
...@@ -10673,6 +10680,7 @@ ...@@ -10673,6 +10680,7 @@
BED659C02C5B745F00668116 /* FUSEmitterView.m in Sources */, BED659C02C5B745F00668116 /* FUSEmitterView.m in Sources */,
BE189DBC2C733B460008418B /* FSRSettingRoomGuarderOnlineModel.m in Sources */, BE189DBC2C733B460008418B /* FSRSettingRoomGuarderOnlineModel.m in Sources */,
BED658F42C5B745E00668116 /* FUSLiveBottomToolSubView.m in Sources */, BED658F42C5B745E00668116 /* FUSLiveBottomToolSubView.m in Sources */,
BEF6C0A82F0A1B2C0033D4E5 /* FUSLiveShowTimePopView.m in Sources */,
BED6599E2C5B745F00668116 /* FUSLinkMicItemView.m in Sources */, BED6599E2C5B745F00668116 /* FUSLinkMicItemView.m in Sources */,
BED658802C5B745E00668116 /* FUSLivePropsModel.m in Sources */, BED658802C5B745E00668116 /* FUSLivePropsModel.m in Sources */,
BE189DB82C733B460008418B /* FSRRoomManagerShowRoomModel.m in Sources */, BE189DB82C733B460008418B /* FSRRoomManagerShowRoomModel.m in Sources */,
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/PK/Live_bottom_add.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "Live_bottom_add.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Live_bottom_add@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Live_bottom_add@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/PK/Live_bottom_sub.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "Live_bottom_sub.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Live_bottom_sub@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Live_bottom_sub@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolManager.h
...@@ -40,6 +40,8 @@ typedef enum : NSInteger { ...@@ -40,6 +40,8 @@ typedef enum : NSInteger {
// FUSLiveBottomToolTypeNovaBuild, // FUSLiveBottomToolTypeNovaBuild,
/// 直播管理 /// 直播管理
FUSLiveBottomToolTypeLiveManage, FUSLiveBottomToolTypeLiveManage,
/// 限时表演：仅公开房在「房间设置」弹窗展示（第 3 个），图标 Live_bottom_showTime
FUSLiveBottomToolTypeShowTime,
} FUSLiveBottomToolType; } FUSLiveBottomToolType;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolManager.m
...@@ -186,6 +186,11 @@ ...@@ -186,6 +186,11 @@
image = [FUSShowRoomCenterBunble imageNamed:@"live_chat_icon_live_setting"]; image = [FUSShowRoomCenterBunble imageNamed:@"live_chat_icon_live_setting"];
break; break;
} }
case FUSLiveBottomToolTypeShowTime:
{
image = [FUSShowRoomCenterBunble imageNamed:@"Live_bottom_showTime"];
break;
}
// case FUSLiveBottomToolTypeNovaBuild: // case FUSLiveBottomToolTypeNovaBuild:
// if (isSelect) { // if (isSelect) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolSubView.m
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
#import "FUSShowRoomModule/FUSShowRoomModule-Swift.h" #import "FUSShowRoomModule/FUSShowRoomModule-Swift.h"
#import "FUSLiveShowTimePopView.h"
//#import "UIImageView+FUSTestImgeView.h" //#import "UIImageView+FUSTestImgeView.h"
@interface FUSLiveBottomToolSubView () <FUSLiveChatInputTextViewDelegate> @interface FUSLiveBottomToolSubView () <FUSLiveChatInputTextViewDelegate>
...@@ -168,6 +170,11 @@ ...@@ -168,6 +170,11 @@
[self onClickCameraBtn]; [self onClickCameraBtn];
} }
break; break;
case FUSLiveBottomToolTypeShowTime:
{
[FUSLiveShowTimePopView fus_showOnView:bgView];
}
break;
case FUSLiveBottomToolTypeExchange: case FUSLiveBottomToolTypeExchange:
{ {
[self onClickExchangeBtn]; [self onClickExchangeBtn];
...@@ -583,7 +590,11 @@ ...@@ -583,7 +590,11 @@
[toolTypesList appendObjects:@[@(FUSLiveBottomToolTypeLiveSetting),@(FUSLiveBottomToolTypeRoomSetting), /*@(FUSLiveBottomToolTypeRoomScope),@(FUSLiveBottomToolTypePK), @(FUSLiveBottomToolTypeNovaBuild)*/]]; [toolTypesList appendObjects:@[@(FUSLiveBottomToolTypeLiveSetting),@(FUSLiveBottomToolTypeRoomSetting), /*@(FUSLiveBottomToolTypeRoomScope),@(FUSLiveBottomToolTypePK), @(FUSLiveBottomToolTypeNovaBuild)*/]];
} }
else { else {
[toolTypesList appendObjects:@[@(FUSLiveBottomToolTypeLiveSetting),@(FUSLiveBottomToolTypeRoomSetting), /*@(FUSLiveBottomToolTypeRoomScope),*/@(FUSLiveBottomToolTypePK)/*, @(FUSLiveBottomToolTypeNovaBuild)*/]]; if (FUSLiveHelper.shareInstance.roomScopeType == FUSLiveRoomScopeTypeOpen) {
[toolTypesList appendObjects:@[@(FUSLiveBottomToolTypeLiveSetting),@(FUSLiveBottomToolTypeRoomSetting),@(FUSLiveBottomToolTypeShowTime), /*@(FUSLiveBottomToolTypeRoomScope),*/@(FUSLiveBottomToolTypePK)/*, @(FUSLiveBottomToolTypeNovaBuild)*/]];
} else {
[toolTypesList appendObjects:@[@(FUSLiveBottomToolTypeLiveSetting),@(FUSLiveBottomToolTypeRoomSetting), /*@(FUSLiveBottomToolTypeRoomScope),*/@(FUSLiveBottomToolTypePK)/*, @(FUSLiveBottomToolTypeNovaBuild)*/]];
}
} }
// [toolTypesList appendObjects:@[@(FFLiveBottomToolTypeLiveSetting),@(FFLiveBottomToolTypeRoomSetting), @(FFLiveBottomToolTypeRoomScope),@(FFLiveBottomToolTypeBeautySticker), @(FFLiveBottomToolTypeNovaBuild)]]; // [toolTypesList appendObjects:@[@(FFLiveBottomToolTypeLiveSetting),@(FFLiveBottomToolTypeRoomSetting), @(FFLiveBottomToolTypeRoomScope),@(FFLiveBottomToolTypeBeautySticker), @(FFLiveBottomToolTypeNovaBuild)]];
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolView.m
...@@ -574,6 +574,8 @@ ...@@ -574,6 +574,8 @@
image = [FUSShowRoomCenterBunble imageNamed:@"live_RoomScope_normal"]; image = [FUSShowRoomCenterBunble imageNamed:@"live_RoomScope_normal"];
} }
[self.roomScopeBtn setImage:image forState:UIControlStateNormal]; [self.roomScopeBtn setImage:image forState:UIControlStateNormal];
// 房间私密度切换后，同步刷新「房间设置」弹窗的功能列表（例如：公开屋才显示“限时表演”）
[self.bottomSubView fus_updateToolView2Types];
} else { } else {
[self fus_insertBtnWithType:FUSLiveBottomToolTypeShare index:self.divisionBtnType]; [self fus_insertBtnWithType:FUSLiveBottomToolTypeShare index:self.divisionBtnType];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputToolAlertView.swift
...@@ -37,7 +37,7 @@ import RxCocoa ...@@ -37,7 +37,7 @@ import RxCocoa
case .liveFunction: case .liveFunction:
return [FUSLiveBottomToolTypeTask, FUSLiveBottomToolTypeExchange, FUSLiveBottomToolTypeScreenShot, FUSLiveBottomToolTypeMessageBox, FUSLiveBottomToolTypeMessage, FUSLiveBottomToolTypeAudienceMessage] return [FUSLiveBottomToolTypeTask, FUSLiveBottomToolTypeExchange, FUSLiveBottomToolTypeScreenShot, FUSLiveBottomToolTypeMessageBox, FUSLiveBottomToolTypeMessage, FUSLiveBottomToolTypeAudienceMessage]
case .roomSetting: case .roomSetting:
return [FUSLiveBottomToolTypeLiveSetting, FUSLiveBottomToolTypeRoomSetting, FUSLiveBottomToolTypeLiveManage/*, .novaBuild*/, FUSLiveBottomToolTypeStartPictureInPicture, FUSLiveBottomToolTypePK] return [FUSLiveBottomToolTypeLiveSetting, FUSLiveBottomToolTypeRoomSetting, FUSLiveBottomToolTypeShowTime, FUSLiveBottomToolTypeLiveManage/*, .novaBuild*/, FUSLiveBottomToolTypeStartPictureInPicture, FUSLiveBottomToolTypePK]
case .broadcastFunction: case .broadcastFunction:
// return [.RoomScope, .PK] // return [.RoomScope, .PK]
return [FUSLiveBottomToolTypeRoomScope, FUSLiveBottomToolTypeBeautySticker] return [FUSLiveBottomToolTypeRoomScope, FUSLiveBottomToolTypeBeautySticker]
...@@ -414,6 +414,8 @@ extension FUSLiveBottomToolType{ ...@@ -414,6 +414,8 @@ extension FUSLiveBottomToolType{
return .fus_versionLocalString("聊天") return .fus_versionLocalString("聊天")
case FUSLiveBottomToolTypePK: case FUSLiveBottomToolTypePK:
return .fus_versionLocalString("PK") return .fus_versionLocalString("PK")
case FUSLiveBottomToolTypeShowTime:
return .fus_versionLocalString("限时表演")
// case FUSLiveBottomToolTypeLuckWheel: // case FUSLiveBottomToolTypeLuckWheel:
// return .fus_versionLocalString("转盘") // return .fus_versionLocalString("转盘")
// case FUSLiveBottomToolTypeOpenRoom: // case FUSLiveBottomToolTypeOpenRoom:
...@@ -444,6 +446,8 @@ extension FUSLiveBottomToolType{ ...@@ -444,6 +446,8 @@ extension FUSLiveBottomToolType{
return FUSShowRoomCenterBunble.imageNamed(isSelect ? "live_chat_tool_msgBox_highlight" : "live_chat_tool_msgBox_normal") return FUSShowRoomCenterBunble.imageNamed(isSelect ? "live_chat_tool_msgBox_highlight" : "live_chat_tool_msgBox_normal")
case FUSLiveBottomToolTypePK: case FUSLiveBottomToolTypePK:
return FUSShowRoomCenterBunble.versionImageNamed(isSelect ? "Live_bottom_PK_Preesed" : "Live_bottom_PK_Normal") return FUSShowRoomCenterBunble.versionImageNamed(isSelect ? "Live_bottom_PK_Preesed" : "Live_bottom_PK_Normal")
case FUSLiveBottomToolTypeShowTime:
return FUSShowRoomCenterBunble.versionImageNamed("Live_bottom_showTime")
case FUSLiveBottomToolTypeGameEntrance: case FUSLiveBottomToolTypeGameEntrance:
return FUSShowRoomCenterBunble.versionImageNamed(isSelect ? "live_game_entrance_preesed" : "live_game_entrance_normal") return FUSShowRoomCenterBunble.versionImageNamed(isSelect ? "live_game_entrance_preesed" : "live_game_entrance_normal")
case FUSLiveBottomToolTypeTask: case FUSLiveBottomToolTypeTask:
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveShowTimePopView.h 0 → 100644
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
/// “限时表演”底部弹窗（集票数量配置）
@interface FUSLiveShowTimePopView : UIView
/// 在指定容器上展示弹窗
/// - Parameter onView: 承载弹窗的父视图
+ (instancetype)fus_showOnView:(UIView *)onView;
@end
NS_ASSUME_NONNULL_END
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