YUSHENG/featherVoice
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

提交

Browse Source
This commit is contained in:
启星
2025-11-21 16:17:05 +08:00
parent 7ac937ddbf
commit 8913ea6f48
283 changed files with 8474 additions and 800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
QXLive/Room(房间)/View/设置/QXRoomSettingView.h
View File

@@ -10,7 +10,7 @@
typedef NS_ENUM(NSInteger) {
/// 房间类型
/// 点唱房
/// 聊天房
QXRoomSettingTypeRoomTypeSing = 10,
/// 拍卖房
QXRoomSettingTypeRoomTypeAuction = 11,
@@ -24,6 +24,8 @@ typedef NS_ENUM(NSInteger) {
QXRoomSettingTypeRoomTypeFunny = 100,
/// 练歌房
QXRoomSettingTypeRoomTypeKSing = 200,
/// 点唱房
QXRoomSettingTypeRoomTypeSinger = 300,
/// 常用工具
/// 房间补贴

32
QXLive/Room(房间)/View/设置/QXRoomSettingView.m
View File

@@ -44,6 +44,8 @@
@property (nonatomic,strong)QXRoomSettingModel *roomTypeFunny;
/// 练歌房
@property (nonatomic,strong)QXRoomSettingModel *roomTypeKSing;
/// 练歌房
@property (nonatomic,strong)QXRoomSettingModel *roomTypeSinger;
@@ -174,6 +176,7 @@
NSArray *roomTypeArr;
NSArray *toolsArr;
NSArray *moreArr;
roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFriend,self.roomTypeKSing,self.roomTypeSinger];
switch (roleType) {
// 主持
case QXRoomRoleTypeCompere:{
@@ -181,13 +184,11 @@
// toolsArr = @[self.roomSubsidy,self.roomMessage,self.roomOrderMic,self.roomBgImage];
/// 暂时不需要房间补贴
toolsArr = @[self.roomMessage,self.roomOrderMic,self.roomBgImage];
roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFunny,self.roomTypeFriend,self.roomTypeKSing];
moreArr = @[self.redBag,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport];
}else{
// toolsArr = @[self.roomSubsidy,self.roomMessage,self.roomOrderMic,self.roomBgMusic,self.roomBgImage];
/// 暂时不需要房间补贴
toolsArr = @[self.roomMessage,self.roomOrderMic,self.roomBgImage];
roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFunny,self.roomTypeFriend];
moreArr = @[self.redBag,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport];
}
@@ -219,7 +220,6 @@
/// 暂时不需要房间补贴
toolsArr = @[self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgImage];
}
roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFunny,self.roomTypeFriend,self.roomTypeKSing];
moreArr = @[self.redBag,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport];
// roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
self.titles = @[QXText(@"房间类型"),QXText(@"常用工具"),QXText(@"更多操作")];
@@ -243,7 +243,6 @@
toolsArr = @[self.roomCompere,self.roomMessage,self.roomOrderMic,self.roomBgImage];
}
// roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeBoy,self.roomTypeGirl,self.roomTypeFriend];
roomTypeArr = @[self.roomTypeSing,self.roomTypeAuction,self.roomTypeFunny,self.roomTypeFriend,self.roomTypeKSing];
moreArr = @[self.redBag,self.roomSetting,self.roomEffects,self.drifPop,self.roomReport];
self.titles = @[QXText(@"房间类型"),QXText(@"常用工具"),QXText(@"更多操作")];
}
@@ -325,7 +324,14 @@
// [self.welcomeView showInView:self.viewController.view];
return;
}
if (model.type == QXRoomSettingTypeRoomTypeAuction || model.type == QXRoomSettingTypeRoomTypeSing || model.type == QXRoomSettingTypeRoomTypeBoy || model.type == QXRoomSettingTypeRoomTypeGirl || model.type == QXRoomSettingTypeRoomTypeFriend || model.type == QXRoomSettingTypeRoomTypeFunny || model.type == QXRoomSettingTypeRoomTypeKSing) {
if (model.type == QXRoomSettingTypeRoomTypeAuction
|| model.type == QXRoomSettingTypeRoomTypeSing
|| model.type == QXRoomSettingTypeRoomTypeBoy
|| model.type == QXRoomSettingTypeRoomTypeGirl
|| model.type == QXRoomSettingTypeRoomTypeFriend
|| model.type == QXRoomSettingTypeRoomTypeFunny
|| model.type == QXRoomSettingTypeRoomTypeKSing
|| model.type == QXRoomSettingTypeRoomTypeSinger) {
self.alertView.message = [NSString stringWithFormat:@"您确定要修改为%@房吗？",model.name];
[[QXGlobal shareGlobal] showView:self.alertView controller:self.viewController popType:(PopViewTypeTopToCenter) tapDismiss:NO finishBlock:^{
@@ -364,6 +370,8 @@
type = @"7";
}else if (roomType == QXRoomSettingTypeRoomTypeFunny) {
type = @"8";
}else if (roomType == QXRoomSettingTypeRoomTypeSinger) {
type = @"9";
}
[QXMineNetwork changeRoomTypeWithRoomId:self.roomModel.room_info.room_id type:type successBlock:^(NSDictionary * _Nonnull dict) {
@@ -391,9 +399,9 @@
-(QXRoomSettingModel *)roomTypeSing{
if (!_roomTypeSing) {
_roomTypeSing = [[QXRoomSettingModel alloc] init];
_roomTypeSing.name = QXText(@"点唱");
_roomTypeSing.name = QXText(@"交友");
_roomTypeSing.type = QXRoomSettingTypeRoomTypeSing;
_roomTypeSing.icon = @"room_set_room_type_sing";
_roomTypeSing.icon = @"room_set_room_type_funny";
}
return _roomTypeSing;
}
@@ -452,6 +460,16 @@
}
return _roomTypeFunny;
}
-(QXRoomSettingModel *)roomTypeSinger{
if (!_roomTypeSinger) {
_roomTypeSinger = [[QXRoomSettingModel alloc] init];
_roomTypeSinger.name = QXText(@"点唱");
_roomTypeSinger.type = QXRoomSettingTypeRoomTypeSinger;
_roomTypeSinger.icon = @"room_set_room_type_sing";
}
return _roomTypeSinger;
}
-(QXRoomSettingModel *)roomSubsidy{
if (!_roomSubsidy) {
_roomSubsidy = [[QXRoomSettingModel alloc] init];