Skip to content

pidan / FuSiLive

Go to a project
Commit 9094016d by pierce
Options

补充提交一个

parent 31871e38
Inline Side-by-side
Showing with 58 additions and 52 deletions
FuSiLive.xcodeproj/project.pbxproj
......@@ -1042,12 +1042,10 @@
BED0FBF92C0C49CA0017B285 /* FUSTestScrollViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BED0F75A2C0C49C80017B285 /* FUSTestScrollViewController.m */; };
BED0FBFA2C0C49CA0017B285 /* FUSTestViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = BED0F75C2C0C49C80017B285 /* FUSTestViewController.m */; };
BED0FBFB2C0C49CA0017B285 /* FUSTestViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BED0F75D2C0C49C80017B285 /* FUSTestViewController.xib */; };
BED0FBFC2C0C49CA0017B285 /* heaer1@2x.jpg in Resources */ = {isa = PBXBuildFile; fileRef = BED0F75F2C0C49C80017B285 /* heaer1@2x.jpg */; };
BED0FBFF2C0C49CA0017B285 /* FUSTestScrollHeaderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BED0F7662C0C49C80017B285 /* FUSTestScrollHeaderCell.m */; };
BED0FC002C0C49CA0017B285 /* FUSVideoControllPanelView.m in Sources */ = {isa = PBXBuildFile; fileRef = BED0F7682C0C49C80017B285 /* FUSVideoControllPanelView.m */; };
BED0FC012C0C49CA0017B285 /* FUSVideoControllPanelView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BED0F7692C0C49C80017B285 /* FUSVideoControllPanelView.xib */; };
BED0FC022C0C49CA0017B285 /* MLSuspendingView.m in Sources */ = {isa = PBXBuildFile; fileRef = BED0F76B2C0C49C80017B285 /* MLSuspendingView.m */; };
BED0FC032C0C49CA0017B285 /* background.png in Resources */ = {isa = PBXBuildFile; fileRef = BED0F76D2C0C49C80017B285 /* background.png */; };
BED0FC042C0C49CA0017B285 /* FUSIntimatesFriendModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BED0F7702C0C49C80017B285 /* FUSIntimatesFriendModel.m */; };
BED0FC052C0C49CA0017B285 /* FUSIntimateFriendDataHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = BED0F7732C0C49C80017B285 /* FUSIntimateFriendDataHelper.m */; };
BED0FC062C0C49CA0017B285 /* FUSIntimateFriendDBOperate.m in Sources */ = {isa = PBXBuildFile; fileRef = BED0F7752C0C49C80017B285 /* FUSIntimateFriendDBOperate.m */; };
......@@ -3104,7 +3102,6 @@
BED0F75B2C0C49C80017B285 /* FUSTestViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSTestViewController.h; sourceTree = "<group>"; };
BED0F75C2C0C49C80017B285 /* FUSTestViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSTestViewController.m; sourceTree = "<group>"; };
BED0F75D2C0C49C80017B285 /* FUSTestViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FUSTestViewController.xib; sourceTree = "<group>"; };
BED0F75F2C0C49C80017B285 /* heaer1@2x.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "heaer1@2x.jpg"; sourceTree = "<group>"; };
BED0F7642C0C49C80017B285 /* FUSTestScrollCollectionsCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSTestScrollCollectionsCell.h; sourceTree = "<group>"; };
BED0F7652C0C49C80017B285 /* FUSTestScrollHeaderCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSTestScrollHeaderCell.h; sourceTree = "<group>"; };
BED0F7662C0C49C80017B285 /* FUSTestScrollHeaderCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSTestScrollHeaderCell.m; sourceTree = "<group>"; };
......@@ -3113,7 +3110,6 @@
BED0F7692C0C49C80017B285 /* FUSVideoControllPanelView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FUSVideoControllPanelView.xib; sourceTree = "<group>"; };
BED0F76A2C0C49C80017B285 /* MLSuspendingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MLSuspendingView.h; sourceTree = "<group>"; };
BED0F76B2C0C49C80017B285 /* MLSuspendingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MLSuspendingView.m; sourceTree = "<group>"; };
BED0F76D2C0C49C80017B285 /* background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = background.png; sourceTree = "<group>"; };
BED0F76F2C0C49C80017B285 /* FUSIntimatesFriendModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSIntimatesFriendModel.h; sourceTree = "<group>"; };
BED0F7702C0C49C80017B285 /* FUSIntimatesFriendModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSIntimatesFriendModel.m; sourceTree = "<group>"; };
BED0F7722C0C49C80017B285 /* FUSIntimateFriendDataHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSIntimateFriendDataHelper.h; sourceTree = "<group>"; };
......@@ -7402,7 +7398,6 @@
BED0F7602C0C49C80017B285 /* Other */ = {
isa = PBXGroup;
children = (
BED0F75F2C0C49C80017B285 /* heaer1@2x.jpg */,
);
path = Other;
sourceTree = "<group>";
......@@ -7428,7 +7423,6 @@
BED0F75E2C0C49C80017B285 /* Controller */,
BED0F7602C0C49C80017B285 /* Other */,
BED0F76C2C0C49C80017B285 /* View */,
BED0F76D2C0C49C80017B285 /* background.png */,
);
path = Test;
sourceTree = "<group>";
......@@ -8664,7 +8658,6 @@
BE8C62342C3BFE0400991716 /* backpack_bg_light_anim_15@2x.png in Resources */,
BED0FA812C0C49C90017B285 /* FUSLiveMessageBoxChatCell.xib in Resources */,
BEDC6F642C09DAE900505F76 /* zone_voice_sign_setting_play_anim_6@3x.png in Resources */,
BED0FC032C0C49CA0017B285 /* background.png in Resources */,
BEDC6F4F2C09DAE900505F76 /* live_linkmic_bgImg.png in Resources */,
BED0FAF92C0C49CA0017B285 /* FUSVideoAuthorizationView.xib in Resources */,
BED0FC602C0C49CA0017B285 /* FUSMyZoneSignTagAddressCell.xib in Resources */,
......@@ -8840,7 +8833,6 @@
00A0C5602C2676010044A41D /* FUSLoginViewController.xib in Resources */,
BED0F9FD2C0C49C90017B285 /* FUSVideoEndedViewBottomCell.xib in Resources */,
BEDC6F2C2C09DAE900505F76 /* live_head_follow_btn_anim_3@2x.png in Resources */,
BED0FBFC2C0C49CA0017B285 /* heaer1@2x.jpg in Resources */,
BED0FA042C0C49C90017B285 /* FUSHalfWebViewCollectionViewCell.xib in Resources */,
BEDC6EC62C09DAE800505F76 /* img_1_2.png in Resources */,
BEDC6F882C09DAE900505F76 /* Emoji.plist in Resources */,
......
FuSiLive/Classes/Foundation/DataStores/FUSUserDefaultsStore.h
......@@ -176,7 +176,7 @@
#define LIVE_HOST_GIFT_VIEW_SWITCH @"liveHostGiftViewSwitch"
// 直播间礼物面板富豪进度条是否显示
//#define LIVE_LIVERICHSWITCH @"liveRichSwitch"
#define LIVE_LIVERICHSWITCH @"liveRichSwitch"
// 直播间背包道具，记录最后一次打开背包道具页面的时间
#define LIVE_LAST_OPEN_PROPS_PAGE_TIME @"LIVE_LAST_OPEN_PROPS_PAGE_TIME"
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
......@@ -610,6 +610,10 @@ FUSLinkMicUserListDelegate
[[self fus_viewWithLayer:FUSLiveFunctionLayerRoomInfos] addSubview:_headView];
self.popularView = [[FUSPopularProgressView alloc] initWithFrame:CGRectMake(12, self.headView.bottom, 48, 48)];
__weak typeof(self) weakSelf = self;
self.popularView.tapPopularViewHandler = ^{
[weakSelf fus_showAudiencePopViewStartWithContribute:YES];
};
[[self fus_viewWithLayer:FUSLiveFunctionLayerRoomInfos] addSubview:self.popularView];
}
......@@ -974,6 +978,10 @@ FUSLinkMicUserListDelegate
self.pusherPopularView = [[FUSPopularProgressView alloc] initWithFrame:CGRectMake(12, self.pusherHeadView.bottom, 48, 48)];
__weak typeof(self) weakSelf = self;
self.pusherPopularView.tapPopularViewHandler = ^{
[weakSelf fus_showAudiencePopViewStartWithContribute:YES];
};
[self.pusherContentView addSubview:self.pusherPopularView];
}
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeadView/FUSLiveHeadView.m
......@@ -34,7 +34,7 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
/**
热力值 View
*/
@property (nonatomic, strong) FUSLiveHotPowerView *heatPowerView;
//@property (nonatomic, strong) FUSLiveHotPowerView *heatPowerView;
/**
// 显示在线人数的 ColoectionView
......@@ -118,7 +118,7 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
[self initTicketView];
[self initHeatPowerView];
// [self initHeatPowerView];
[self initOnlineUserListView];
......@@ -185,31 +185,31 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
}];
// frame 改变回调
[_coinTicketView setFrameDidChange:^(CGFloat maxX) {
weakSelf.heatPowerView.x = CGRectGetMaxX(weakSelf.coinTicketView.frame) + 5;
}];
// [_coinTicketView setFrameDidChange:^(CGFloat maxX) {
// weakSelf.heatPowerView.x = CGRectGetMaxX(weakSelf.coinTicketView.frame) + 5;
// }];
}
/**
搭建热力值按钮
*/
- (void)initHeatPowerView
{
self.heatPowerView = [[FUSLiveHotPowerView alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_coinTicketView.frame) + 5, CGRectGetMaxY(_portraitView.frame) + 15, 80, 22)];
[self addSubview:_heatPowerView];
__weak typeof(self) weakSelf = self;
// 热力值点击回调
[_heatPowerView setHotPowerViewClickHandler:^{
FUSLogInfo(@"点击热力值");
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(fus_headViewClickHeatPower)]) {
[weakSelf.delegate fus_headViewClickHeatPower];
}
}];
}
///**
// 搭建热力值按钮
// */
//- (void)initHeatPowerView
//{
// self.heatPowerView = [[FUSLiveHotPowerView alloc] initWithFrame:CGRectMake(CGRectGetMaxX(_coinTicketView.frame) + 5, CGRectGetMaxY(_portraitView.frame) + 15, 80, 22)];
// [self addSubview:_heatPowerView];
//
// __weak typeof(self) weakSelf = self;
// // 热力值点击回调
// [_heatPowerView setHotPowerViewClickHandler:^{
//
// FUSLogInfo(@"点击热力值");
// if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(fus_headViewClickHeatPower)]) {
// [weakSelf.delegate fus_headViewClickHeatPower];
// }
// }];
//}
/**
搭建在线用户列表
......@@ -350,18 +350,18 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
_userInfoLabel.font = [UIFont fus_themeFont:10];
_userInfoLabel.textColor = [UIColor colorWithWhite:1 alpha:0.5];
[self insertSubview:_userInfoLabel belowSubview:_heatPowerView];
[self insertSubview:_userInfoLabel belowSubview:_coinTicketView];
}
CGFloat bitrateImageWidth = 15.0;
if (!_waterMark) {
_waterMark = [[UIImageView alloc] init];
_waterMark.frame = CGRectMake(self.width - WATERMARK_W - 10, 0, WATERMARK_W, 20);
_waterMark.centerY = _heatPowerView.centerY;
_waterMark.centerY = _coinTicketView.centerY;
_waterMark.contentMode = UIViewContentModeScaleAspectFit;
_waterMark.image = [UIImage imageNamed:@"live_watermark"];
_waterMark.hidden = YES;
[self insertSubview:_waterMark belowSubview:_heatPowerView];
[self insertSubview:_waterMark belowSubview:_coinTicketView];
}
if (!_bitrateImageView) {
......@@ -369,8 +369,8 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
_bitrateImageView.contentMode = UIViewContentModeScaleAspectFit;
_bitrateImageView.image = [UIImage imageNamed:@"live_push_bitrate_icon"];
_bitrateImageView.alpha = 0;
_bitrateImageView.centerY = _heatPowerView.centerY;
[self insertSubview:_bitrateImageView belowSubview:_heatPowerView];
_bitrateImageView.centerY = _coinTicketView.centerY;
[self insertSubview:_bitrateImageView belowSubview:_coinTicketView];
}
if (!_bitrateLabel) {
......@@ -386,7 +386,7 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
_bitrateLabel.centerY = _bitrateImageView.centerY;
_bitrateLabel.alpha = 0;
[self insertSubview:_bitrateLabel belowSubview:_heatPowerView];
[self insertSubview:_bitrateLabel belowSubview:_coinTicketView];
}
}
......@@ -398,16 +398,16 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
*/
- (void)registeNotification
{
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recieveHotScoreChangeNotification:) name:kDidHotScoreChangeNotification object:nil];
// [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(recieveHotScoreChangeNotification:) name:kDidHotScoreChangeNotification object:nil];
}
/**
接收热力值变化通知
*/
- (void)recieveHotScoreChangeNotification:(NSNotification *)notification
{
[self.heatPowerView fus_setupHeatScore:[FUSLiveHelper shareInstance].roomInfoModel.hotScore rank:[FUSLiveHelper shareInstance].roomInfoModel.hotRank];
}
///**
// 接收热力值变化通知
// */
//- (void)recieveHotScoreChangeNotification:(NSNotification *)notification
//{
// [self.heatPowerView fus_setupHeatScore:[FUSLiveHelper shareInstance].roomInfoModel.hotScore rank:[FUSLiveHelper shareInstance].roomInfoModel.hotRank];
//}
#pragma mark - Method
- (void)fus_headViewAnchorOffline:(BOOL)offline{
......@@ -551,7 +551,7 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
*/
- (void)fus_setupHotScore:(NSString *)hotScore hotRank:(NSString *)hotRank
{
[self.heatPowerView fus_setupHeatScore:hotScore rank:hotRank];
// [self.heatPowerView fus_setupHeatScore:hotScore rank:hotRank];
}
/**
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/ProgressView/FUSPopularProgressView.h
......@@ -11,6 +11,9 @@ NS_ASSUME_NONNULL_BEGIN
@interface FUSPopularProgressView : UIView
/// 点击事件
@property (nonatomic, copy) void(^tapPopularViewHandler)(void);
- (void)fus_setNumber:(NSInteger)number;
@end
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/ProgressView/FUSPopularProgressView.m
......@@ -55,12 +55,15 @@
self.numberLabel.text = @"0";
[self addSubview:self.numberLabel];
__weak typeof(self) weakSelf = self;
UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id _Nonnull sender) {
FUSWKWebViewController *webVc = [[FUSWKWebViewController alloc] init];
webVc.webUrlString = FUSCacheDataShare.shareStore.settingInitDataModel.fusiConfig.popularAddress;
webVc.shouldIncludeIdentifyInfo = YES;
[[UIViewController fus_topViewController].navigationController pushViewController:webVc animated:YES];
if (weakSelf.tapPopularViewHandler) {
weakSelf.tapPopularViewHandler();
}
// FUSWKWebViewController *webVc = [[FUSWKWebViewController alloc] init];
// webVc.webUrlString = FUSCacheDataShare.shareStore.settingInitDataModel.fusiConfig.popularAddress;
// webVc.shouldIncludeIdentifyInfo = YES;
// [[UIViewController fus_topViewController].navigationController pushViewController:webVc animated:YES];
}];
tapGesture.numberOfTapsRequired = 1;
[self addGestureRecognizer:tapGesture];
......
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