Skip to content

pidan / FuSiLive

Go to a project
Commit db487087 by suolong
Options

付费房窗口弹窗口

parent 40204c7d
Inline Side-by-side
Showing with 677 additions and 33 deletions
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
......@@ -1777,6 +1777,8 @@
BED65D002C62148700668116 /* TTSDKLisenceFile in Resources */ = {isa = PBXBuildFile; fileRef = BED65CFE2C62148700668116 /* TTSDKLisenceFile */; };
BEEAB2532D3380FA008CD059 /* FusAnchorRewardView.h in Headers */ = {isa = PBXBuildFile; fileRef = BEEAB2512D3380FA008CD059 /* FusAnchorRewardView.h */; };
BEEAB2542D3380FA008CD059 /* FusAnchorRewardView.m in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2522D3380FA008CD059 /* FusAnchorRewardView.m */; };
00F0A0132F5F0A1B00C0FFEE /* FusAnchorPayRoomView.h in Headers */ = {isa = PBXBuildFile; fileRef = 00F0A0112F5F0A1B00C0FFEE /* FusAnchorPayRoomView.h */; };
00F0A0142F5F0A1B00C0FFEE /* FusAnchorPayRoomView.m in Sources */ = {isa = PBXBuildFile; fileRef = 00F0A0122F5F0A1B00C0FFEE /* FusAnchorPayRoomView.m */; };
BEEAB2632D34CC60008CD059 /* FUSLiveStartSetPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2612D34CC60008CD059 /* FUSLiveStartSetPrivacyView.swift */; };
BEEAB2642D34CC60008CD059 /* FUSLiveStartContentWarningView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2602D34CC60008CD059 /* FUSLiveStartContentWarningView.swift */; };
BEEAB2652D34CC60008CD059 /* FUSLiveStartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2622D34CC60008CD059 /* FUSLiveStartView.swift */; };
......@@ -4132,6 +4134,8 @@
BED65CFE2C62148700668116 /* TTSDKLisenceFile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TTSDKLisenceFile; sourceTree = "<group>"; };
BEEAB2512D3380FA008CD059 /* FusAnchorRewardView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FusAnchorRewardView.h; sourceTree = "<group>"; };
BEEAB2522D3380FA008CD059 /* FusAnchorRewardView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FusAnchorRewardView.m; sourceTree = "<group>"; };
00F0A0112F5F0A1B00C0FFEE /* FusAnchorPayRoomView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FusAnchorPayRoomView.h; sourceTree = "<group>"; };
00F0A0122F5F0A1B00C0FFEE /* FusAnchorPayRoomView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FusAnchorPayRoomView.m; sourceTree = "<group>"; };
BEEAB2552D34CC60008CD059 /* FUSLiveStartBeautyFavoritesEditView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartBeautyFavoritesEditView.swift; sourceTree = "<group>"; };
BEEAB2562D34CC60008CD059 /* FUSLiveStartBeautyFavoritesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartBeautyFavoritesView.swift; sourceTree = "<group>"; };
BEEAB2572D34CC60008CD059 /* FUSLiveStartBeautySetItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartBeautySetItemView.swift; sourceTree = "<group>"; };
......@@ -7288,6 +7292,7 @@
00E2A8182F21C44C003B779E /* UserGuideTipsView */,
BEEAB2712D34F8DF008CD059 /* PopularListView */,
BEEAB2502D337F87008CD059 /* AnchorReward */,
00F0A0102F5F0A1B00C0FFEE /* PayRoom */,
BEB504712D2E8FD100EA6E6F /* LiveThemeView */,
BED655C12C5B745D00668116 /* Activity */,
BED655DC2C5B745D00668116 /* AudienceListView */,
......@@ -7724,6 +7729,15 @@
path = AnchorReward;
sourceTree = "<group>";
};
00F0A0102F5F0A1B00C0FFEE /* PayRoom */ = {
isa = PBXGroup;
children = (
00F0A0112F5F0A1B00C0FFEE /* FusAnchorPayRoomView.h */,
00F0A0122F5F0A1B00C0FFEE /* FusAnchorPayRoomView.m */,
);
path = PayRoom;
sourceTree = "<group>";
};
BEEAB2712D34F8DF008CD059 /* PopularListView */ = {
isa = PBXGroup;
children = (
......@@ -8749,6 +8763,7 @@
BE189DC52C733B460008418B /* FSREffectViewController.h in Headers */,
BED658DE2C5B745E00668116 /* FUSAudiencePopView.h in Headers */,
BEEAB2532D3380FA008CD059 /* FusAnchorRewardView.h in Headers */,
00F0A0132F5F0A1B00C0FFEE /* FusAnchorPayRoomView.h in Headers */,
BED65A572C5B745F00668116 /* FUSLiveTreasureBoxRecordDetailView.h in Headers */,
BED658C02C5B745E00668116 /* FUSLiveHalfWebViewCatalogueView.h in Headers */,
BED65A542C5B745F00668116 /* FUSLiveTreasureBoxListIconView.h in Headers */,
......@@ -10687,6 +10702,7 @@
BE189E242C733B460008418B /* FSRLinkmicdictActiveMotorEffectView.m in Sources */,
BED65A2E2C5B745F00668116 /* FUSLiveShareHttpHelper.m in Sources */,
BEEAB2542D3380FA008CD059 /* FusAnchorRewardView.m in Sources */,
00F0A0142F5F0A1B00C0FFEE /* FusAnchorPayRoomView.m in Sources */,
BED65ABF2C5B745F00668116 /* FUSHomeNovaListBroadcastHelper.m in Sources */,
BED6598C2C5B745E00668116 /* FUSLiveDewIncreaseView.m in Sources */,
BE189DE22C733B460008418B /* FSRSettingOnlineViewController.m in Sources */,
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/live_anchor_payTitleIcon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "live_anchor_payTitleIcon.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_anchor_payTitleIcon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_anchor_payTitleIcon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/live_anchor_yingHuo.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "live_anchor_yingHuo.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_anchor_yingHuo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_anchor_yingHuo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/live_start_view_question_btn.imageset/Contents.json 0 → 100644
{
"images" : [
{
"filename" : "live_start_view_question_btn.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_start_view_question_btn@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_start_view_question_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.h
......@@ -56,8 +56,8 @@ typedef NS_ENUM(NSInteger,FUSbarrageType) {
typedef NS_ENUM(NSInteger,FUSLiveRoomScopeType) {
FUSLiveRoomScopeTypeOpen = 0, // 公开屋
FUSLiveRoomScopeTypePassword = 4, // 私享屋
FUSLiveRoomScopeTypePay = 5 //付费房
FUSLiveRoomScopeTypePay = 3, //付费房
FUSLiveRoomScopeTypePassword = 4 // 私享屋
// FUSLiveRoomScopeTypeFollow, // 追踪圈
// FUSLiveRoomScopeTypeIntimacy, // 亲密圈
};
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHttpHelper.h
......@@ -1051,6 +1051,19 @@ NS_ASSUME_NONNULL_BEGIN
succeed:(void (^)(FUSGetSuccessRecommendResultModel *model))succeed
failure:(void (^)(NSString *msg, NSInteger code))failure;
/// 视图-主播获取左侧小窗付费房信息
/// @param uid 用户ID
/// @param roomId 房间ID
/// @param channelId 直播频道ID
/// @param roundId 付费房回合ID
/// @param failure 0
+(void)fus_requestGetPayRoomDataWithUid:(NSString *)uid
RoomId:(NSString *)roomId
channelId:(NSString *)channelId
roundId:(NSString *)roundId
succeed:(void (^)(NSDictionary *dataDict))succeed
failure:(void(^)(NSString *msg,NSInteger code))failure;
@end
NS_ASSUME_NONNULL_END
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHttpHelper.m
......@@ -2948,4 +2948,31 @@
}];
}
/// 视图-主播获取左侧小窗付费房信息
/// @param uid 用户ID
/// @param roomId 房间ID
/// @param channelId 直播频道ID
/// @param roundId 付费房回合ID
/// @param failure 0
+(void)fus_requestGetPayRoomDataWithUid:(NSString *)uid
RoomId:(NSString *)roomId
channelId:(NSString *)channelId
roundId:(NSString *)roundId
succeed:(void (^)(NSDictionary *dataDict))succeed
failure:(void(^)(NSString *msg,NSInteger code))failure
{
NSDictionary *parm = @{@"uid": uid,
@"roomId":roomId,
@"channelId":channelId,
@"roundId":roundId};
[FUSHttpHelper postRequestBinaryWithUrl:FUSShowRoomURLs.fus_URL_liveGetPayRoomData params:parm success:^(NSDictionary * _Nullable dataDict, int code) {
if (succeed) {
succeed(dataDict);
}
}failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) failure(dataDict[@"msg"],code);
}];
}
@end
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolView.m
......@@ -568,6 +568,8 @@
UIImage *image;
if (FUSLiveHelper.shareInstance.roomScopeType == FUSLiveRoomScopeTypePassword) {
image = [FUSShowRoomCenterBunble imageNamed:@"live_RoomScope_password"];
} else if (FUSLiveHelper.shareInstance.roomScopeType == FUSLiveRoomScopeTypePay) {
image = [FUSShowRoomCenterBunble imageNamed:@"live_RoomScope_pay"];
} else {
image = [FUSShowRoomCenterBunble imageNamed:@"live_RoomScope_normal"];
}
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
......@@ -31,6 +31,7 @@
#import "FUSLiveAlertNotificationView.h"
#import "FUSLiveWecomeEnterView.h"
#import "FusAnchorRewardView.h"
#import "FusAnchorPayRoomView.h"
#import "GGFPSLabel.h"
......@@ -330,6 +331,8 @@ BDAlphaPlayerMetalViewDelegate
@property (nonatomic, assign) BOOL requestingAnchorRewardView;
@property (nonatomic, weak) FusAnchorPayRoomView *anchorPayRoomView;
@property (nonatomic, assign) CGRect activityChangeFrame;
/// 半屏网页的管理，内部全是弱引用，放心添加网页
......@@ -1374,6 +1377,19 @@ BDAlphaPlayerMetalViewDelegate
}
}
- (void)fus_updateAnchorPayRoomViewIfNeeded {
if (self.anchorPayRoomView.superview) {
return;
}
__weak typeof(self) weakSelf = self;
[FusAnchorPayRoomView fus_showAnchorPayRoomViewIfNeeded:^(FusAnchorPayRoomView * _Nonnull view) {
view.y = weakSelf.pusherPopularView.bottom;
weakSelf.anchorPayRoomView = view;
}];
}
/**
搭建主播模式 HeadView
*/
......@@ -6853,10 +6869,29 @@ BDAlphaPlayerMetalViewDelegate
}
[self fus_updateRewardViewIfNeeded];
[self.anchorPayRoomView removeFromSuperview];
self.anchorPayRoomView = nil;
[self.passwordRoomIconImageView removeFromSuperview];
self.passwordRoomIconImageView = nil;
break;
case FUSLiveRoomScopeTypePay:
[self.anchorRewardView removeFromSuperview];
self.anchorRewardView = nil;
self.requestingAnchorRewardView = NO;
[self.passwordRoomIconImageView removeFromSuperview];
self.passwordRoomIconImageView = nil;
if (FUSLiveHelper.shareInstance.liveType == FUSLiveTypeAnchor) {
[self fus_updateAnchorPayRoomViewIfNeeded];
} else {
[self.anchorPayRoomView removeFromSuperview];
self.anchorPayRoomView = nil;
}
break;
case FUSLiveRoomScopeTypePassword:
......@@ -6865,6 +6900,10 @@ BDAlphaPlayerMetalViewDelegate
}
[self.anchorRewardView removeFromSuperview];
self.anchorRewardView = nil;
self.requestingAnchorRewardView = NO;
[self.anchorPayRoomView removeFromSuperview];
self.anchorPayRoomView = nil;
[self fus_showPasswordAnim];
break;
......@@ -7345,4 +7384,3 @@ BDAlphaPlayerMetalViewDelegate
}
@end
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PayRoom/FusAnchorPayRoomView.h 0 → 100644
//
// FusAnchorPayRoomView.h
// FUSShowRoomModule
//
// Created by 索隆 on 2026/3/10.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface FusAnchorPayRoomView : UIView
+ (void)fus_showAnchorPayRoomViewIfNeeded:(void(^)(FusAnchorPayRoomView *view))viewHasShowhandler;
@end
NS_ASSUME_NONNULL_END
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/PayRoom/FusAnchorPayRoomView.m 0 → 100644
//
// FusAnchorPayRoomView.m
// FUSShowRoomModule
//
// Created by 索隆 on 2026/3/10.
//
#import "FusAnchorPayRoomView.h"
#import <FUSFoundation/FUSFoundation.h>
#import <FUSCommon/FUSCommon.h>
#import "FUSLiveHelper.h"
#import "FUSLiveHttpHelper.h"
@interface FUSPayRoomPayViewingData : FUSBaseModel
@property (nonatomic, copy) NSString *payViewingNum;
@end
@implementation FUSPayRoomPayViewingData
@end
@interface FUSPayRoomPreviewData : FUSBaseModel
@property (nonatomic, copy) NSString *previewNum;
@end
@implementation FUSPayRoomPreviewData
@end
@interface FUSPayRoomIncomeData : FUSBaseModel
@property (nonatomic, copy) NSString *income;
@end
@implementation FUSPayRoomIncomeData
@end
@interface FUSPayRoomGetPayRoomDataModel : FUSBaseModel
@property (nonatomic, strong) FUSPayRoomPayViewingData *payViewingData;
@property (nonatomic, strong) FUSPayRoomPreviewData *previewData;
@property (nonatomic, strong) FUSPayRoomIncomeData *incomeData;
@end
@implementation FUSPayRoomGetPayRoomDataModel
+ (NSDictionary *)modelContainerPropertyGenericClass {
return @{
@"payViewingData": [FUSPayRoomPayViewingData class],
@"previewData": [FUSPayRoomPreviewData class],
@"incomeData": [FUSPayRoomIncomeData class]
};
}
@end
@interface FusAnchorPayRoomView ()
@property (nonatomic, strong) UIButton *arrowBtn;
@property (nonatomic, strong) UIView *contentView;
@property (nonatomic, assign) CGFloat originalHeight;
@property (nonatomic, strong) UIButton *coverBtn;
@property (nonatomic, strong) UIVisualEffectView *blurView;
@property (nonatomic, strong) UIView *headerView;
@property (nonatomic, strong) UIView *titleContainerView;
@property (nonatomic, strong) UIImageView *titleIconView;
@property (nonatomic, strong) UILabel *titleLabel;
@property (nonatomic, strong) UILabel *accompanyLabel;
@property (nonatomic, strong) UILabel *trialLabel;
@property (nonatomic, strong) UILabel *incomeLabel;
@property (nonatomic, strong) UIView *statsBackgroundView;
@property (nonatomic, strong) UIView *statsSeparatorView1;
@property (nonatomic, strong) UIView *statsSeparatorView2;
@property (nonatomic, assign) BOOL didRequestPayRoomData;
@property (nonatomic, assign) BOOL isRequestingPayRoomData;
@property (nonatomic, strong) FUSPayRoomGetPayRoomDataModel *payRoomDataModel;
@end
@implementation FusAnchorPayRoomView
+ (void)fus_showAnchorPayRoomViewIfNeeded:(void(^)(FusAnchorPayRoomView *view))viewHasShowhandler {
if (FUSLiveHelper.shareInstance.liveType != FUSLiveTypeAnchor) {
return;
}
if (FUSLiveHelper.shareInstance.roomScopeType != FUSLiveRoomScopeTypePay) {
return;
}
CGFloat viewW = 120;
CGFloat viewH = 123;
CGFloat viewY = UIView.fus_SafeTop + 135;
FusAnchorPayRoomView *payRoomView = [[FusAnchorPayRoomView alloc] initWithFrame:CGRectMake(10, viewY, viewW, viewH)];
payRoomView.originalHeight = payRoomView.height;
UIView *containerView = [[FUSLiveHelper shareInstance].currentFunctionView fus_viewWithLayer:FUSLiveFunctionLayerFunctionButtons];
[containerView addSubview:payRoomView];
if (viewHasShowhandler) {
viewHasShowhandler(payRoomView);
}
}
- (instancetype)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
if (self) {
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_recieveGiftChangeNotification:) name:STR(ROOM_CID_GIFT_CHANGE) object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_recieveSomeoneEnterRoomNotification:) name:STR(ROOM_CID_SOMEBODY_JOIN) object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_recieveSomeoneExitRoomNotification:) name:STR(ROOM_CID_EXIT) object:nil];
self.backgroundColor = UIColor.clearColor;
self.clipsToBounds = NO;
self.contentView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.width - 14, self.height)];
self.contentView.layer.cornerRadius = 8;
self.contentView.layer.masksToBounds = YES;
[self addSubview:self.contentView];
UIBlurEffect *effect = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark];
self.blurView = [[UIVisualEffectView alloc] initWithEffect:effect];
self.blurView.frame = self.contentView.bounds;
self.blurView.alpha = 0.85;
[self.contentView addSubview:self.blurView];
self.headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.contentView.width, 33)];
self.headerView.backgroundColor = [UIColor colorWithRed:(45.0 / 255.0) green:(226.0 / 255.0) blue:(224.0 / 255.0) alpha:1.0];
[self.contentView addSubview:self.headerView];
self.titleContainerView = [[UIView alloc] initWithFrame:CGRectZero];
self.titleContainerView.backgroundColor = UIColor.clearColor;
[self.headerView addSubview:self.titleContainerView];
self.titleIconView = [[UIImageView alloc] initWithFrame:CGRectMake(8, 0, 16, 16)];
self.titleIconView.centerY = 33 / 2.0;
self.titleIconView.contentMode = UIViewContentModeScaleAspectFit;
self.titleIconView.image = [FUSShowRoomCenterBunble imageNamed:@"live_anchor_payTitleIcon"];
[self.titleContainerView addSubview:self.titleIconView];
self.titleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
self.titleLabel.font = [UIFont boldSystemFontOfSize:13];
self.titleLabel.textColor = [UIColor colorWithRed:0 green:(51.0 / 255.0) blue:(51.0 / 255.0) alpha:1.0];
self.titleLabel.textAlignment = NSTextAlignmentLeft;
self.titleLabel.text = [NSString fus_localString:@"付费房"];
[self.titleContainerView addSubview:self.titleLabel];
CGFloat statsY = self.headerView.bottom;
CGFloat statsW = self.contentView.width;
CGFloat statsH = self.contentView.height - statsY;
self.statsBackgroundView = [[UIView alloc] initWithFrame:CGRectMake(0, statsY, statsW, statsH)];
self.statsBackgroundView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.35];
self.statsBackgroundView.layer.cornerRadius = 0;
self.statsBackgroundView.layer.masksToBounds = YES;
[self.contentView addSubview:self.statsBackgroundView];
CGFloat itemH = statsH / 3.0;
self.accompanyLabel = [[UILabel alloc] initWithFrame:CGRectMake(9, 0, statsW - 9, itemH)];
self.trialLabel = [[UILabel alloc] initWithFrame:CGRectMake(9, itemH, statsW - 9, itemH)];
self.incomeLabel = [[UILabel alloc] initWithFrame:CGRectMake(9, itemH * 2.0, statsW - 9, itemH)];
NSArray<UILabel *> *labels = @[self.accompanyLabel, self.trialLabel, self.incomeLabel];
for (UILabel *label in labels) {
label.font = [UIFont fus_themeFont:9];
label.textColor = [UIColor colorWithWhite:1 alpha:0.9];
label.textAlignment = NSTextAlignmentLeft;
label.numberOfLines = 1;
[self.statsBackgroundView addSubview:label];
}
self.statsSeparatorView1 = [[UIView alloc] initWithFrame:CGRectMake(10, itemH, statsW - 20, 0.5)];
self.statsSeparatorView1.backgroundColor = [UIColor colorWithWhite:1 alpha:0.15];
[self.statsBackgroundView addSubview:self.statsSeparatorView1];
self.statsSeparatorView2 = [[UIView alloc] initWithFrame:CGRectMake(10, itemH * 2.0, statsW - 20, 0.5)];
self.statsSeparatorView2.backgroundColor = [UIColor colorWithWhite:1 alpha:0.15];
[self.statsBackgroundView addSubview:self.statsSeparatorView2];
[self fus_refreshContentTexts];
[self fus_requestPayRoomDataIfNeeded];
self.arrowBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.arrowBtn.frame = CGRectMake(self.contentView.width, 0, 14, 17);
self.arrowBtn.centerY = 16.5;
[self.arrowBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_anchor_reward_arrow_left"] forState:UIControlStateNormal];
[self.arrowBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_anchor_reward_arrow_right"] forState:UIControlStateSelected];
[self.arrowBtn addTarget:self action:@selector(fus_clickArrowBtnAction:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:self.arrowBtn];
self.coverBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.coverBtn.frame = self.bounds;
self.coverBtn.hidden = YES;
[self.coverBtn addTarget:self action:@selector(fus_clickArrowBtnAction:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:self.coverBtn];
}
return self;
}
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
- (void)layoutSubviews {
[super layoutSubviews];
if (!CGAffineTransformIsIdentity(self.transform)) {
return;
}
self.contentView.frame = CGRectMake(0, 0, self.width - 14, self.height);
self.blurView.frame = self.contentView.bounds;
self.headerView.frame = CGRectMake(0, 0, self.contentView.width, 33);
self.titleIconView.centerY = self.headerView.height / 2.0;
self.titleLabel.size = [self.titleLabel sizeThatFits:CGSizeMake(self.headerView.width, self.headerView.height)];
self.titleLabel.height = self.headerView.height;
self.titleIconView.frame = CGRectMake(0, 0, 16, 16);
self.titleIconView.centerY = self.headerView.height / 2.0;
self.titleLabel.frame = CGRectMake(self.titleIconView.right + 6, 0, self.titleLabel.width, self.headerView.height);
self.titleContainerView.size = CGSizeMake(self.titleLabel.right, self.headerView.height);
self.titleContainerView.center = CGPointMake(self.headerView.width / 2.0, self.headerView.height / 2.0);
CGFloat statsY = self.headerView.bottom;
CGFloat statsW = self.contentView.width;
CGFloat statsH = self.contentView.height - statsY;
self.statsBackgroundView.frame = CGRectMake(0, statsY, statsW, statsH);
CGFloat itemH = statsH / 3.0;
self.accompanyLabel.frame = CGRectMake(9, 0, statsW - 9, itemH);
self.trialLabel.frame = CGRectMake(9, itemH, statsW - 9, itemH);
self.incomeLabel.frame = CGRectMake(9, itemH * 2.0, statsW - 9, itemH);
self.statsSeparatorView1.frame = CGRectMake(10, itemH, statsW - 20, 0.5);
self.statsSeparatorView2.frame = CGRectMake(10, itemH * 2.0, statsW - 20, 0.5);
self.arrowBtn.frame = CGRectMake(self.contentView.width, 0, 14, 17);
self.arrowBtn.centerY = 16.5;
self.coverBtn.frame = self.bounds;
}
- (void)fus_requestPayRoomDataIfNeeded {
[self fus_requestPayRoomDataWithForce:NO];
}
- (void)fus_requestPayRoomDataWithForce:(BOOL)force {
if (self.isRequestingPayRoomData) {
return;
}
if (self.didRequestPayRoomData) {
if (!force) {
return;
}
} else {
self.didRequestPayRoomData = YES;
}
self.isRequestingPayRoomData = YES;
NSString *uid = [[FUSCacheDataShare shareStore].userVerifyInfo.uid description];
FUSRoomInfoModel *roomInfoModel = [FUSLiveHelper shareInstance].roomInfoModel;
NSString *roomId = [roomInfoModel.roomId description];
NSString *channelId = [roomInfoModel.channelId description];
NSString *roundId = @"";
if ([NSString isNull:uid] || [NSString isNull:roomId] || [NSString isNull:channelId]) {
self.isRequestingPayRoomData = NO;
return;
}
__weak typeof(self) weakSelf = self;
[FUSLiveHttpHelper fus_requestGetPayRoomDataWithUid:uid RoomId:roomId channelId:channelId roundId:roundId succeed:^(NSDictionary *dataDict) {
NSDictionary *payload = nil;
if ([dataDict[@"data"] isKindOfClass:[NSDictionary class]]) {
payload = dataDict[@"data"];
} else {
payload = dataDict;
}
FUSPayRoomGetPayRoomDataModel *model = [FUSPayRoomGetPayRoomDataModel fus_modelWithDict:payload];
dispatch_async(dispatch_get_main_queue(), ^{
__strong typeof(weakSelf) strongSelf = weakSelf;
if (!strongSelf) {
return;
}
strongSelf.payRoomDataModel = model;
[strongSelf fus_refreshContentTexts];
strongSelf.isRequestingPayRoomData = NO;
});
} failure:^(NSString *msg, NSInteger code) {
dispatch_async(dispatch_get_main_queue(), ^{
__strong typeof(weakSelf) strongSelf = weakSelf;
if (!strongSelf) {
return;
}
strongSelf.didRequestPayRoomData = NO;
strongSelf.isRequestingPayRoomData = NO;
});
}];
}
- (NSAttributedString *)fus_infoLineWithTitle:(NSString *)title value:(NSString *)value suffix:(NSString *)suffix {
NSString *safeTitle = title ?: @"";
NSString *safeValue = value ?: @"";
NSString *safeSuffix = suffix ?: @"";
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] init];
NSDictionary *titleAttrs = @{
NSFontAttributeName: [UIFont fus_themeFont:9],
NSForegroundColorAttributeName: [UIColor colorWithWhite:1 alpha:0.75]
};
NSDictionary *valueAttrs = @{
NSFontAttributeName: [UIFont fus_themeFont:9],
NSForegroundColorAttributeName: [UIColor colorWithWhite:1 alpha:0.95]
};
[attr appendAttributedString:[[NSAttributedString alloc] initWithString:safeTitle attributes:titleAttrs]];
[attr appendAttributedString:[[NSAttributedString alloc] initWithString:safeValue attributes:valueAttrs]];
[attr appendAttributedString:[[NSAttributedString alloc] initWithString:safeSuffix attributes:titleAttrs]];
return attr;
}
- (NSAttributedString *)fus_incomeLineWithValue:(NSString *)value {
NSString *incomeValue = ([NSString isNull:value] ? @"0" : value);
NSMutableAttributedString *attr = [[NSMutableAttributedString alloc] init];
NSDictionary *titleAttrs = @{
NSFontAttributeName: [UIFont fus_themeFont:9],
NSForegroundColorAttributeName: [UIColor colorWithWhite:1 alpha:0.75]
};
NSDictionary *incomeAttrs = @{
NSFontAttributeName: [UIFont fus_themeFont:9],
NSForegroundColorAttributeName: [UIColor colorWithRed:(34.0 / 255.0) green:(233.0 / 255.0) blue:(130.0 / 255.0) alpha:1.0]
};
[attr appendAttributedString:[[NSAttributedString alloc] initWithString:[NSString fus_localString:@"本场收入："] attributes:titleAttrs]];
UIImage *icon = [FUSShowRoomCenterBunble imageNamed:@"live_anchor_yingHuo"];
if (icon) {
NSTextAttachment *attachment = [[NSTextAttachment alloc] init];
attachment.image = icon;
attachment.bounds = CGRectMake(0, -2, 12, 12);
[attr appendAttributedString:[NSAttributedString attributedStringWithAttachment:attachment]];
[attr appendAttributedString:[[NSAttributedString alloc] initWithString:@" " attributes:incomeAttrs]];
}
[attr appendAttributedString:[[NSAttributedString alloc] initWithString:incomeValue attributes:incomeAttrs]];
return attr;
}
- (void)fus_refreshContentTexts {
NSString *accompanyValue = [self.payRoomDataModel.payViewingData.payViewingNum description];
if ([NSString isNull:accompanyValue]) {
accompanyValue = [[FUSLiveHelper shareInstance].roomInfoModel.num description];
}
if ([NSString isNull:accompanyValue]) {
accompanyValue = @"0";
}
NSString *trialValue = [self.payRoomDataModel.previewData.previewNum description];
if ([NSString isNull:trialValue]) {
trialValue = @"0";
}
NSString *incomeValue = [self.payRoomDataModel.incomeData.income description];
if ([NSString isNull:incomeValue]) {
incomeValue = [[FUSLiveHelper shareInstance].roomInfoModel.bonds description];
}
if ([NSString isNull:incomeValue]) {
incomeValue = @"0";
}
self.accompanyLabel.attributedText = [self fus_infoLineWithTitle:[NSString fus_localString:@"陪伴中："] value:accompanyValue suffix:[NSString fus_localString:@"人"]];
self.trialLabel.attributedText = [self fus_infoLineWithTitle:[NSString fus_localString:@"试看中："] value:trialValue suffix:[NSString fus_localString:@"人"]];
self.incomeLabel.attributedText = [self fus_incomeLineWithValue:incomeValue];
}
- (void)fus_recieveGiftChangeNotification:(NSNotification *)notification {
FUSSocketMessageModel *messageModel = notification.object;
if (![[[[FUSLiveHelper shareInstance] roomInfoModel] roomId] isEqualToString:[NSString stringWithFormat:@"%d", messageModel.extend1]]) {
return;
}
NSDictionary *dict = [messageModel fus_getJsonDict];
NSString *bonds = [dict[@"bonds"] description];
if (![NSString isNull:bonds]) {
[FUSLiveHelper shareInstance].roomInfoModel.bonds = bonds;
}
[self fus_refreshContentTexts];
}
- (void)fus_recieveSomeoneEnterRoomNotification:(NSNotification *)notification {
FUSSocketMessageModel *messageModel = notification.object;
if (![[[[FUSLiveHelper shareInstance] roomInfoModel] roomId] isEqualToString:[NSString stringWithFormat:@"%d", messageModel.extend1]]) {
return;
}
[self fus_refreshContentTexts];
}
- (void)fus_recieveSomeoneExitRoomNotification:(NSNotification *)notification {
FUSSocketMessageModel *messageModel = notification.object;
if (![[[[FUSLiveHelper shareInstance] roomInfoModel] roomId] isEqualToString:[NSString stringWithFormat:@"%d", messageModel.extend1]]) {
return;
}
[self fus_refreshContentTexts];
}
- (void)fus_clickArrowBtnAction:(UIButton *)sender {
self.userInteractionEnabled = NO;
if (self.arrowBtn.isSelected == NO) {
self.arrowBtn.selected = YES;
CGFloat scaleFactor = 0.617;
CGSize originalSize = self.size;
[UIView animateWithDuration:0.3 animations:^{
self.height = 33;
self.transform = CGAffineTransformTranslate(CGAffineTransformScale(CGAffineTransformIdentity, scaleFactor, scaleFactor), -originalSize.width * scaleFactor / 2, -33 * scaleFactor / 2);
self.contentView.height = 33;
self.contentView.layer.cornerRadius = 5;
self.contentView.layer.masksToBounds = YES;
} completion:^(BOOL finished) {
self.userInteractionEnabled = YES;
self.coverBtn.hidden = NO;
}];
} else {
[self.layer removeAllAnimations];
self.arrowBtn.selected = NO;
[self fus_requestPayRoomDataWithForce:YES];
[UIView animateWithDuration:0.3 animations:^{
self.transform = CGAffineTransformIdentity;
self.height = self.originalHeight;
self.contentView.height = self.originalHeight;
self.contentView.layer.cornerRadius = 8;
self.contentView.layer.masksToBounds = YES;
} completion:^(BOOL finished) {
self.userInteractionEnabled = YES;
self.coverBtn.hidden = YES;
}];
}
}
@end
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartSetPrivacyView.swift
......@@ -221,7 +221,21 @@ import FUSCommon
case 1:
self.scopeType = .password
case 2:
if requestType == 0 {
if let payData = FUSLiveHelper.shareInstance().liveBeforeReadyInfo?.payData {
if (payData.enable ?? "0").intValue != 1 {
FUSAlertView.showAlert(withTitle: payData.warnTitle ?? "",
message: payData.warnSubTitle ?? "",
cancelButtonTitle: nil,
otherButtonTitles: [String.fus_localString("知道了")])
break
} else {
self.scopeType = .pay
}
}
} else {
self.scopeType = .pay
}
// case 2:
// self.scopeType = .intimacy
default:
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartView.swift
......@@ -71,6 +71,7 @@ import FUSCommon
let closeBtn = UIButton(type: .custom)
let privacyView = FUSLiveStartContentPrivacyView()
let passwordBtn = UIButton(type: .custom)
let questionBtn = UIButton(type: .custom)
let themeView = FUSLiveStartContentThemeEditView()
let shareView = FUSLiveStartContentShareView()
let bottomView = FUSLiveStartContentBottomView()
......@@ -115,6 +116,12 @@ import FUSCommon
self.passwordBtn.layer.cornerRadius = 16
self.passwordBtn.layer.masksToBounds = true
self.questionBtn.isHidden = true
headerView.addSubview(self.questionBtn)
self.questionBtn.setBackgroundImage(FUSShowRoomCenterBunble.imageNamed("live_start_view_question_btn"), for: .normal)
self.questionBtn.layer.cornerRadius = 16
self.questionBtn.layer.masksToBounds = true
self.passwordBtn.snp.makeConstraints { make in
make.left.equalTo(self.privacyView.snp.right).offset(8)
......@@ -122,6 +129,12 @@ import FUSCommon
make.width.equalTo(32)
make.height.equalTo(32)
}
self.questionBtn.snp.makeConstraints { make in
make.left.equalTo(self.privacyView.snp.right).offset(8)
make.centerY.equalTo(self.privacyView)
make.width.equalTo(32)
make.height.equalTo(32)
}
contentView.addSubview(themeView)
themeView.snp.makeConstraints { make in
......@@ -208,35 +221,6 @@ import FUSCommon
}
})
} else if scopeType == .pay {
guard let payData = FUSLiveHelper.shareInstance().liveBeforeReadyInfo?.payData else {
model.scopeType = scopeType
model.password = ""
self?.startLiveModel.accept(model)
return
}
if (payData.enable ?? "0").intValue != 1 {
let title = payData.warnTitle ?? ""
let message = payData.warnSubTitle ?? ""
if !title.isEmpty || !message.isEmpty {
FUSAlertView.showAlert(withTitle: title.isEmpty ? .fus_localString("提示") : title,
message: message.isEmpty ? (payData.tips ?? "") : message,
cancelButtonTitle: nil,
otherButtonTitles: [String.fus_localString("确认")])
} else if let tips = payData.tips, !tips.isEmpty {
FUSDialogView.fus_showDialog(tips)
}
return
}
model.scopeType = scopeType
model.password = ""
self?.startLiveModel.accept(model)
if let tips = payData.tips, !tips.isEmpty {
FUSDialogView.fus_showDialog(tips)
}
} else {
model.scopeType = scopeType
model.password = ""
......@@ -269,6 +253,13 @@ import FUSCommon
self?.clickCloseBtnActionHandler?(self?.closeBtn)
}).disposed(by: disposeBag)
questionBtn.rx.tap.subscribe(onNext: {[weak self] in
let tips = FUSLiveHelper.shareInstance().liveBeforeReadyInfo?.payData?.tips
if let t = tips, t.count > 0 {
FUSDialogView.fus_showDialog(t)
}
}).disposed(by: disposeBag)
//开播按钮
bottomView.startClickHandler = {[weak self] in
......@@ -357,6 +348,7 @@ import FUSCommon
self?.privacyView.type = model.scopeType
self?.passwordBtn.isHidden = model.scopeType != .password
self?.questionBtn.isHidden = model.scopeType != .pay
self?.liveActivityView.isHidden = model.scopeType == .password
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Others/FUSShowRoomURLs.h
......@@ -541,7 +541,8 @@ NS_ASSUME_NONNULL_BEGIN
/// PK主播领取奖励
+ (NSString *)fus_URL_vsHostdataRewardBatchGet;
/// 主播获取左侧小窗付费房信息
+ (NSString *)fus_URL_liveGetPayRoomData;
/// 获取首页自动跳转直播间
+ (NSString *)fus_URL_indexGetSuccessRecommendResult;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Others/FUSShowRoomURLs.m
......@@ -881,6 +881,13 @@
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/index/getSuccessRecommendResult.html"];
}
/// 主播获取左侧小窗付费房信息
+ (NSString *)fus_URL_liveGetPayRoomData
{
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"payRoom/getPayRoomData"];
}
@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