Skip to content

pidan / FuSiLive

Go to a project
Commit db487087 by suolong
Options

付费房窗口弹窗口

parent 40204c7d
Expand all
Inline Side-by-side
Showing with 231 additions and 33 deletions
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/project.pbxproj
...@@ -1777,6 +1777,8 @@ ...@@ -1777,6 +1777,8 @@
BED65D002C62148700668116 /* TTSDKLisenceFile in Resources */ = {isa = PBXBuildFile; fileRef = BED65CFE2C62148700668116 /* TTSDKLisenceFile */; }; BED65D002C62148700668116 /* TTSDKLisenceFile in Resources */ = {isa = PBXBuildFile; fileRef = BED65CFE2C62148700668116 /* TTSDKLisenceFile */; };
BEEAB2532D3380FA008CD059 /* FusAnchorRewardView.h in Headers */ = {isa = PBXBuildFile; fileRef = BEEAB2512D3380FA008CD059 /* FusAnchorRewardView.h */; }; BEEAB2532D3380FA008CD059 /* FusAnchorRewardView.h in Headers */ = {isa = PBXBuildFile; fileRef = BEEAB2512D3380FA008CD059 /* FusAnchorRewardView.h */; };
BEEAB2542D3380FA008CD059 /* FusAnchorRewardView.m in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2522D3380FA008CD059 /* FusAnchorRewardView.m */; }; 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 */; }; BEEAB2632D34CC60008CD059 /* FUSLiveStartSetPrivacyView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2612D34CC60008CD059 /* FUSLiveStartSetPrivacyView.swift */; };
BEEAB2642D34CC60008CD059 /* FUSLiveStartContentWarningView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2602D34CC60008CD059 /* FUSLiveStartContentWarningView.swift */; }; BEEAB2642D34CC60008CD059 /* FUSLiveStartContentWarningView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2602D34CC60008CD059 /* FUSLiveStartContentWarningView.swift */; };
BEEAB2652D34CC60008CD059 /* FUSLiveStartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2622D34CC60008CD059 /* FUSLiveStartView.swift */; }; BEEAB2652D34CC60008CD059 /* FUSLiveStartView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BEEAB2622D34CC60008CD059 /* FUSLiveStartView.swift */; };
...@@ -4132,6 +4134,8 @@ ...@@ -4132,6 +4134,8 @@
BED65CFE2C62148700668116 /* TTSDKLisenceFile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TTSDKLisenceFile; sourceTree = "<group>"; }; 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>"; }; 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>"; }; 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>"; }; 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>"; }; 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>"; }; BEEAB2572D34CC60008CD059 /* FUSLiveStartBeautySetItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FUSLiveStartBeautySetItemView.swift; sourceTree = "<group>"; };
...@@ -7288,6 +7292,7 @@ ...@@ -7288,6 +7292,7 @@
00E2A8182F21C44C003B779E /* UserGuideTipsView */, 00E2A8182F21C44C003B779E /* UserGuideTipsView */,
BEEAB2712D34F8DF008CD059 /* PopularListView */, BEEAB2712D34F8DF008CD059 /* PopularListView */,
BEEAB2502D337F87008CD059 /* AnchorReward */, BEEAB2502D337F87008CD059 /* AnchorReward */,
00F0A0102F5F0A1B00C0FFEE /* PayRoom */,
BEB504712D2E8FD100EA6E6F /* LiveThemeView */, BEB504712D2E8FD100EA6E6F /* LiveThemeView */,
BED655C12C5B745D00668116 /* Activity */, BED655C12C5B745D00668116 /* Activity */,
BED655DC2C5B745D00668116 /* AudienceListView */, BED655DC2C5B745D00668116 /* AudienceListView */,
...@@ -7724,6 +7729,15 @@ ...@@ -7724,6 +7729,15 @@
path = AnchorReward; path = AnchorReward;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
00F0A0102F5F0A1B00C0FFEE /* PayRoom */ = {
isa = PBXGroup;
children = (
00F0A0112F5F0A1B00C0FFEE /* FusAnchorPayRoomView.h */,
00F0A0122F5F0A1B00C0FFEE /* FusAnchorPayRoomView.m */,
);
path = PayRoom;
sourceTree = "<group>";
};
BEEAB2712D34F8DF008CD059 /* PopularListView */ = { BEEAB2712D34F8DF008CD059 /* PopularListView */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
...@@ -8749,6 +8763,7 @@ ...@@ -8749,6 +8763,7 @@
BE189DC52C733B460008418B /* FSREffectViewController.h in Headers */, BE189DC52C733B460008418B /* FSREffectViewController.h in Headers */,
BED658DE2C5B745E00668116 /* FUSAudiencePopView.h in Headers */, BED658DE2C5B745E00668116 /* FUSAudiencePopView.h in Headers */,
BEEAB2532D3380FA008CD059 /* FusAnchorRewardView.h in Headers */, BEEAB2532D3380FA008CD059 /* FusAnchorRewardView.h in Headers */,
00F0A0132F5F0A1B00C0FFEE /* FusAnchorPayRoomView.h in Headers */,
BED65A572C5B745F00668116 /* FUSLiveTreasureBoxRecordDetailView.h in Headers */, BED65A572C5B745F00668116 /* FUSLiveTreasureBoxRecordDetailView.h in Headers */,
BED658C02C5B745E00668116 /* FUSLiveHalfWebViewCatalogueView.h in Headers */, BED658C02C5B745E00668116 /* FUSLiveHalfWebViewCatalogueView.h in Headers */,
BED65A542C5B745F00668116 /* FUSLiveTreasureBoxListIconView.h in Headers */, BED65A542C5B745F00668116 /* FUSLiveTreasureBoxListIconView.h in Headers */,
...@@ -10687,6 +10702,7 @@ ...@@ -10687,6 +10702,7 @@
BE189E242C733B460008418B /* FSRLinkmicdictActiveMotorEffectView.m in Sources */, BE189E242C733B460008418B /* FSRLinkmicdictActiveMotorEffectView.m in Sources */,
BED65A2E2C5B745F00668116 /* FUSLiveShareHttpHelper.m in Sources */, BED65A2E2C5B745F00668116 /* FUSLiveShareHttpHelper.m in Sources */,
BEEAB2542D3380FA008CD059 /* FusAnchorRewardView.m in Sources */, BEEAB2542D3380FA008CD059 /* FusAnchorRewardView.m in Sources */,
00F0A0142F5F0A1B00C0FFEE /* FusAnchorPayRoomView.m in Sources */,
BED65ABF2C5B745F00668116 /* FUSHomeNovaListBroadcastHelper.m in Sources */, BED65ABF2C5B745F00668116 /* FUSHomeNovaListBroadcastHelper.m in Sources */,
BED6598C2C5B745E00668116 /* FUSLiveDewIncreaseView.m in Sources */, BED6598C2C5B745E00668116 /* FUSLiveDewIncreaseView.m in Sources */,
BE189DE22C733B460008418B /* FSRSettingOnlineViewController.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) { ...@@ -56,8 +56,8 @@ typedef NS_ENUM(NSInteger,FUSbarrageType) {
typedef NS_ENUM(NSInteger,FUSLiveRoomScopeType) { typedef NS_ENUM(NSInteger,FUSLiveRoomScopeType) {
FUSLiveRoomScopeTypeOpen = 0, // 公开屋 FUSLiveRoomScopeTypeOpen = 0, // 公开屋
FUSLiveRoomScopeTypePassword = 4, // 私享屋 FUSLiveRoomScopeTypePay = 3, //付费房
FUSLiveRoomScopeTypePay = 5 //付费房 FUSLiveRoomScopeTypePassword = 4 // 私享屋
// FUSLiveRoomScopeTypeFollow, // 追踪圈 // FUSLiveRoomScopeTypeFollow, // 追踪圈
// FUSLiveRoomScopeTypeIntimacy, // 亲密圈 // FUSLiveRoomScopeTypeIntimacy, // 亲密圈
}; };
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHttpHelper.h
...@@ -1051,6 +1051,19 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -1051,6 +1051,19 @@ NS_ASSUME_NONNULL_BEGIN
succeed:(void (^)(FUSGetSuccessRecommendResultModel *model))succeed succeed:(void (^)(FUSGetSuccessRecommendResultModel *model))succeed
failure:(void (^)(NSString *msg, NSInteger code))failure; 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 @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHttpHelper.m
...@@ -2948,4 +2948,31 @@ ...@@ -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 @end
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolView.m
...@@ -568,6 +568,8 @@ ...@@ -568,6 +568,8 @@
UIImage *image; UIImage *image;
if (FUSLiveHelper.shareInstance.roomScopeType == FUSLiveRoomScopeTypePassword) { if (FUSLiveHelper.shareInstance.roomScopeType == FUSLiveRoomScopeTypePassword) {
image = [FUSShowRoomCenterBunble imageNamed:@"live_RoomScope_password"]; image = [FUSShowRoomCenterBunble imageNamed:@"live_RoomScope_password"];
} else if (FUSLiveHelper.shareInstance.roomScopeType == FUSLiveRoomScopeTypePay) {
image = [FUSShowRoomCenterBunble imageNamed:@"live_RoomScope_pay"];
} else { } else {
image = [FUSShowRoomCenterBunble imageNamed:@"live_RoomScope_normal"]; image = [FUSShowRoomCenterBunble imageNamed:@"live_RoomScope_normal"];
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#import "FUSLiveAlertNotificationView.h" #import "FUSLiveAlertNotificationView.h"
#import "FUSLiveWecomeEnterView.h" #import "FUSLiveWecomeEnterView.h"
#import "FusAnchorRewardView.h" #import "FusAnchorRewardView.h"
#import "FusAnchorPayRoomView.h"
#import "GGFPSLabel.h" #import "GGFPSLabel.h"
...@@ -330,6 +331,8 @@ BDAlphaPlayerMetalViewDelegate ...@@ -330,6 +331,8 @@ BDAlphaPlayerMetalViewDelegate
@property (nonatomic, assign) BOOL requestingAnchorRewardView; @property (nonatomic, assign) BOOL requestingAnchorRewardView;
@property (nonatomic, weak) FusAnchorPayRoomView *anchorPayRoomView;
@property (nonatomic, assign) CGRect activityChangeFrame; @property (nonatomic, assign) CGRect activityChangeFrame;
/// 半屏网页的管理，内部全是弱引用，放心添加网页 /// 半屏网页的管理，内部全是弱引用，放心添加网页
...@@ -1374,6 +1377,19 @@ BDAlphaPlayerMetalViewDelegate ...@@ -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 搭建主播模式 HeadView
*/ */
...@@ -6853,10 +6869,29 @@ BDAlphaPlayerMetalViewDelegate ...@@ -6853,10 +6869,29 @@ BDAlphaPlayerMetalViewDelegate
} }
[self fus_updateRewardViewIfNeeded]; [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 removeFromSuperview];
self.passwordRoomIconImageView = nil; self.passwordRoomIconImageView = nil;
if (FUSLiveHelper.shareInstance.liveType == FUSLiveTypeAnchor) {
[self fus_updateAnchorPayRoomViewIfNeeded];
} else {
[self.anchorPayRoomView removeFromSuperview];
self.anchorPayRoomView = nil;
}
break; break;
case FUSLiveRoomScopeTypePassword: case FUSLiveRoomScopeTypePassword:
...@@ -6865,6 +6900,10 @@ BDAlphaPlayerMetalViewDelegate ...@@ -6865,6 +6900,10 @@ BDAlphaPlayerMetalViewDelegate
} }
[self.anchorRewardView removeFromSuperview]; [self.anchorRewardView removeFromSuperview];
self.anchorRewardView = nil; self.anchorRewardView = nil;
self.requestingAnchorRewardView = NO;
[self.anchorPayRoomView removeFromSuperview];
self.anchorPayRoomView = nil;
[self fus_showPasswordAnim]; [self fus_showPasswordAnim];
break; break;
...@@ -7345,4 +7384,3 @@ BDAlphaPlayerMetalViewDelegate ...@@ -7345,4 +7384,3 @@ BDAlphaPlayerMetalViewDelegate
} }
@end @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/Push/LiveStartView/FUSLiveStartSetPrivacyView.swift
...@@ -221,7 +221,21 @@ import FUSCommon ...@@ -221,7 +221,21 @@ import FUSCommon
case 1: case 1:
self.scopeType = .password self.scopeType = .password
case 2: 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 self.scopeType = .pay
}
// case 2: // case 2:
// self.scopeType = .intimacy // self.scopeType = .intimacy
default: default:
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/LiveStartView/FUSLiveStartView.swift
...@@ -71,6 +71,7 @@ import FUSCommon ...@@ -71,6 +71,7 @@ import FUSCommon
let closeBtn = UIButton(type: .custom) let closeBtn = UIButton(type: .custom)
let privacyView = FUSLiveStartContentPrivacyView() let privacyView = FUSLiveStartContentPrivacyView()
let passwordBtn = UIButton(type: .custom) let passwordBtn = UIButton(type: .custom)
let questionBtn = UIButton(type: .custom)
let themeView = FUSLiveStartContentThemeEditView() let themeView = FUSLiveStartContentThemeEditView()
let shareView = FUSLiveStartContentShareView() let shareView = FUSLiveStartContentShareView()
let bottomView = FUSLiveStartContentBottomView() let bottomView = FUSLiveStartContentBottomView()
...@@ -115,6 +116,12 @@ import FUSCommon ...@@ -115,6 +116,12 @@ import FUSCommon
self.passwordBtn.layer.cornerRadius = 16 self.passwordBtn.layer.cornerRadius = 16
self.passwordBtn.layer.masksToBounds = true 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 self.passwordBtn.snp.makeConstraints { make in
make.left.equalTo(self.privacyView.snp.right).offset(8) make.left.equalTo(self.privacyView.snp.right).offset(8)
...@@ -122,6 +129,12 @@ import FUSCommon ...@@ -122,6 +129,12 @@ import FUSCommon
make.width.equalTo(32) make.width.equalTo(32)
make.height.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) contentView.addSubview(themeView)
themeView.snp.makeConstraints { make in themeView.snp.makeConstraints { make in
...@@ -208,35 +221,6 @@ import FUSCommon ...@@ -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 { } else {
model.scopeType = scopeType model.scopeType = scopeType
model.password = "" model.password = ""
...@@ -269,6 +253,13 @@ import FUSCommon ...@@ -269,6 +253,13 @@ import FUSCommon
self?.clickCloseBtnActionHandler?(self?.closeBtn) self?.clickCloseBtnActionHandler?(self?.closeBtn)
}).disposed(by: disposeBag) }).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 bottomView.startClickHandler = {[weak self] in
...@@ -357,6 +348,7 @@ import FUSCommon ...@@ -357,6 +348,7 @@ import FUSCommon
self?.privacyView.type = model.scopeType self?.privacyView.type = model.scopeType
self?.passwordBtn.isHidden = model.scopeType != .password self?.passwordBtn.isHidden = model.scopeType != .password
self?.questionBtn.isHidden = model.scopeType != .pay
self?.liveActivityView.isHidden = model.scopeType == .password self?.liveActivityView.isHidden = model.scopeType == .password
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Others/FUSShowRoomURLs.h
...@@ -541,7 +541,8 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -541,7 +541,8 @@ NS_ASSUME_NONNULL_BEGIN
/// PK主播领取奖励 /// PK主播领取奖励
+ (NSString *)fus_URL_vsHostdataRewardBatchGet; + (NSString *)fus_URL_vsHostdataRewardBatchGet;
/// 主播获取左侧小窗付费房信息
+ (NSString *)fus_URL_liveGetPayRoomData;
/// 获取首页自动跳转直播间 /// 获取首页自动跳转直播间
+ (NSString *)fus_URL_indexGetSuccessRecommendResult; + (NSString *)fus_URL_indexGetSuccessRecommendResult;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Others/FUSShowRoomURLs.m
...@@ -881,6 +881,13 @@ ...@@ -881,6 +881,13 @@
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/index/getSuccessRecommendResult.html"]; return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"/index/getSuccessRecommendResult.html"];
} }
/// 主播获取左侧小窗付费房信息
+ (NSString *)fus_URL_liveGetPayRoomData
{
return [FUSConfig.sharedInstanced.pathConfigs apiUrl:@"payRoom/getPayRoomData"];
}
@end @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