Skip to content

pidan / FuSiLive

Go to a project
Commit 2da22bdc by ludi
Options

Merge branch 'feature/UI修改版本' of http://git.yabolive.net:88/pidan/FuSiLive into feature/UI修改版本

parents a8290344 d1b4e5d7
Inline Side-by-side
Showing with 581 additions and 415 deletions
FuSiLive.xcodeproj/project.pbxproj
......@@ -195,6 +195,7 @@
BE03983E2C134566003EB21B /* Vectors.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE0397B72C134566003EB21B /* Vectors.swift */; };
BE03983F2C134566003EB21B /* AnimationTextProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = BE0397B92C134566003EB21B /* AnimationTextProvider.swift */; };
BE05F46C2C203D0C006A8993 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = BE05F46B2C203D0C006A8993 /* Assets.xcassets */; };
BE2732412C2BFAA100276177 /* FUSLivePopularRankModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BE2732402C2BFAA000276177 /* FUSLivePopularRankModel.m */; };
BE5EF4322C1FEB7F00C0F018 /* FUSContributeListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BE5EF4312C1FEB7F00C0F018 /* FUSContributeListModel.m */; };
BE5EF4352C1FEBA100C0F018 /* FUSContributeNextSendDataModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BE5EF4342C1FEBA100C0F018 /* FUSContributeNextSendDataModel.m */; };
BE5EF4382C20185700C0F018 /* FUSLiveContributeView.m in Sources */ = {isa = PBXBuildFile; fileRef = BE5EF4372C20185700C0F018 /* FUSLiveContributeView.m */; };
......@@ -230,11 +231,11 @@
BE818A912C22BD8F004C8C6B /* live_minimize_anim_21@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE818A782C22BD8F004C8C6B /* live_minimize_anim_21@2x.png */; };
BE818A922C22BD8F004C8C6B /* live_minimize_anim_22@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE818A792C22BD8F004C8C6B /* live_minimize_anim_22@2x.png */; };
BE818A932C22BD8F004C8C6B /* live_minimize_anim_23@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = BE818A7A2C22BD8F004C8C6B /* live_minimize_anim_23@2x.png */; };
BE818A9C2C22E2DA004C8C6B /* FUSHeatingPowerListView.m in Sources */ = {isa = PBXBuildFile; fileRef = BE818A962C22E2D9004C8C6B /* FUSHeatingPowerListView.m */; };
BE818A9D2C22E2DA004C8C6B /* FUSHeatingPowerListView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BE818A972C22E2D9004C8C6B /* FUSHeatingPowerListView.xib */; };
BE818A9E2C22E2DA004C8C6B /* FUSHeatingPowerTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BE818A992C22E2D9004C8C6B /* FUSHeatingPowerTableViewCell.m */; };
BE818A9F2C22E2DA004C8C6B /* FUSHeatingPowerTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BE818A9A2C22E2D9004C8C6B /* FUSHeatingPowerTableViewCell.xib */; };
BE818AA42C22E397004C8C6B /* FUSHeatingProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = BE818AA32C22E397004C8C6B /* FUSHeatingProgressView.m */; };
BE818A9C2C22E2DA004C8C6B /* FUSPopularListView.m in Sources */ = {isa = PBXBuildFile; fileRef = BE818A962C22E2D9004C8C6B /* FUSPopularListView.m */; };
BE818A9D2C22E2DA004C8C6B /* FUSPopularListView.xib in Resources */ = {isa = PBXBuildFile; fileRef = BE818A972C22E2D9004C8C6B /* FUSPopularListView.xib */; };
BE818A9E2C22E2DA004C8C6B /* FUSPopularTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = BE818A992C22E2D9004C8C6B /* FUSPopularTableViewCell.m */; };
BE818A9F2C22E2DA004C8C6B /* FUSPopularTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = BE818A9A2C22E2D9004C8C6B /* FUSPopularTableViewCell.xib */; };
BE818AA42C22E397004C8C6B /* FUSPopularProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = BE818AA32C22E397004C8C6B /* FUSPopularProgressView.m */; };
BEC996202BFCD19700EBD348 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = BEC9961F2BFCD19700EBD348 /* main.m */; };
BECDD3522C13098800576A03 /* FUSLiveGiftDataCenter.m in Sources */ = {isa = PBXBuildFile; fileRef = BECDD34E2C13098700576A03 /* FUSLiveGiftDataCenter.m */; };
BECDD3532C13098800576A03 /* FUSLiveNormalGiftView.m in Sources */ = {isa = PBXBuildFile; fileRef = BECDD34F2C13098700576A03 /* FUSLiveNormalGiftView.m */; };
......@@ -1666,6 +1667,8 @@
BE0397B92C134566003EB21B /* AnimationTextProvider.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AnimationTextProvider.swift; sourceTree = "<group>"; };
BE05F46B2C203D0C006A8993 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
BE093BD02C07587100A4D28E /* FuSiLivePrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FuSiLivePrefixHeader.pch; sourceTree = "<group>"; };
BE27323F2C2BFAA000276177 /* FUSLivePopularRankModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSLivePopularRankModel.h; sourceTree = "<group>"; };
BE2732402C2BFAA000276177 /* FUSLivePopularRankModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSLivePopularRankModel.m; sourceTree = "<group>"; };
BE5EF4302C1FEB7F00C0F018 /* FUSContributeListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSContributeListModel.h; sourceTree = "<group>"; };
BE5EF4312C1FEB7F00C0F018 /* FUSContributeListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSContributeListModel.m; sourceTree = "<group>"; };
BE5EF4332C1FEBA100C0F018 /* FUSContributeNextSendDataModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSContributeNextSendDataModel.h; sourceTree = "<group>"; };
......@@ -1713,14 +1716,14 @@
BE818A782C22BD8F004C8C6B /* live_minimize_anim_21@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "live_minimize_anim_21@2x.png"; sourceTree = "<group>"; };
BE818A792C22BD8F004C8C6B /* live_minimize_anim_22@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "live_minimize_anim_22@2x.png"; sourceTree = "<group>"; };
BE818A7A2C22BD8F004C8C6B /* live_minimize_anim_23@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "live_minimize_anim_23@2x.png"; sourceTree = "<group>"; };
BE818A952C22E2D9004C8C6B /* FUSHeatingPowerListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSHeatingPowerListView.h; sourceTree = "<group>"; };
BE818A962C22E2D9004C8C6B /* FUSHeatingPowerListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSHeatingPowerListView.m; sourceTree = "<group>"; };
BE818A972C22E2D9004C8C6B /* FUSHeatingPowerListView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FUSHeatingPowerListView.xib; sourceTree = "<group>"; };
BE818A982C22E2D9004C8C6B /* FUSHeatingPowerTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSHeatingPowerTableViewCell.h; sourceTree = "<group>"; };
BE818A992C22E2D9004C8C6B /* FUSHeatingPowerTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FUSHeatingPowerTableViewCell.m; path = "../New Group/FUSHeatingPowerTableViewCell.m"; sourceTree = "<group>"; };
BE818A9A2C22E2D9004C8C6B /* FUSHeatingPowerTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FUSHeatingPowerTableViewCell.xib; sourceTree = "<group>"; };
BE818AA22C22E397004C8C6B /* FUSHeatingProgressView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSHeatingProgressView.h; sourceTree = "<group>"; };
BE818AA32C22E397004C8C6B /* FUSHeatingProgressView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSHeatingProgressView.m; sourceTree = "<group>"; };
BE818A952C22E2D9004C8C6B /* FUSPopularListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSPopularListView.h; sourceTree = "<group>"; };
BE818A962C22E2D9004C8C6B /* FUSPopularListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUSPopularListView.m; sourceTree = "<group>"; };
BE818A972C22E2D9004C8C6B /* FUSPopularListView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FUSPopularListView.xib; sourceTree = "<group>"; };
BE818A982C22E2D9004C8C6B /* FUSPopularTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUSPopularTableViewCell.h; sourceTree = "<group>"; };
BE818A992C22E2D9004C8C6B /* FUSPopularTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FUSPopularTableViewCell.m; path = "../New Group/FUSPopularTableViewCell.m"; sourceTree = "<group>"; };
BE818A9A2C22E2D9004C8C6B /* FUSPopularTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FUSPopularTableViewCell.xib; sourceTree = "<group>"; };
BE818AA22C22E397004C8C6B /* FUSPopularProgressView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSPopularProgressView.h; sourceTree = "<group>"; };
BE818AA32C22E397004C8C6B /* FUSPopularProgressView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSPopularProgressView.m; sourceTree = "<group>"; };
BEC9960A2BFCD19500EBD348 /* FuSiLive.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FuSiLive.app; sourceTree = BUILT_PRODUCTS_DIR; };
BEC9961E2BFCD19700EBD348 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
BEC9961F2BFCD19700EBD348 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
......@@ -4559,24 +4562,26 @@
path = Live_minimize_bg_anim;
sourceTree = "<group>";
};
BE818A9B2C22E2D9004C8C6B /* HeatingPower */ = {
BE818A9B2C22E2D9004C8C6B /* Popular */ = {
isa = PBXGroup;
children = (
BE818AA12C22E372004C8C6B /* ProgressView */,
BE818AA02C22E360004C8C6B /* Rank */,
);
path = HeatingPower;
path = Popular;
sourceTree = "<group>";
};
BE818AA02C22E360004C8C6B /* Rank */ = {
isa = PBXGroup;
children = (
BE818A952C22E2D9004C8C6B /* FUSHeatingPowerListView.h */,
BE818A962C22E2D9004C8C6B /* FUSHeatingPowerListView.m */,
BE818A972C22E2D9004C8C6B /* FUSHeatingPowerListView.xib */,
BE818A982C22E2D9004C8C6B /* FUSHeatingPowerTableViewCell.h */,
BE818A992C22E2D9004C8C6B /* FUSHeatingPowerTableViewCell.m */,
BE818A9A2C22E2D9004C8C6B /* FUSHeatingPowerTableViewCell.xib */,
BE818A952C22E2D9004C8C6B /* FUSPopularListView.h */,
BE818A962C22E2D9004C8C6B /* FUSPopularListView.m */,
BE818A972C22E2D9004C8C6B /* FUSPopularListView.xib */,
BE818A982C22E2D9004C8C6B /* FUSPopularTableViewCell.h */,
BE818A992C22E2D9004C8C6B /* FUSPopularTableViewCell.m */,
BE818A9A2C22E2D9004C8C6B /* FUSPopularTableViewCell.xib */,
BE27323F2C2BFAA000276177 /* FUSLivePopularRankModel.h */,
BE2732402C2BFAA000276177 /* FUSLivePopularRankModel.m */,
);
path = Rank;
sourceTree = "<group>";
......@@ -4584,8 +4589,8 @@
BE818AA12C22E372004C8C6B /* ProgressView */ = {
isa = PBXGroup;
children = (
BE818AA22C22E397004C8C6B /* FUSHeatingProgressView.h */,
BE818AA32C22E397004C8C6B /* FUSHeatingProgressView.m */,
BE818AA22C22E397004C8C6B /* FUSPopularProgressView.h */,
BE818AA32C22E397004C8C6B /* FUSPopularProgressView.m */,
);
path = ProgressView;
sourceTree = "<group>";
......@@ -6716,7 +6721,7 @@
BED0F5512C0C49C80017B285 /* FunctionView */ = {
isa = PBXGroup;
children = (
BE818A9B2C22E2D9004C8C6B /* HeatingPower */,
BE818A9B2C22E2D9004C8C6B /* Popular */,
BE5F4D332C1D7FE0004B54AA /* AudienceListView */,
BED0F3AF2C0C49C80017B285 /* GiftView */,
BED0F3962C0C49C80017B285 /* Activity */,
......@@ -9100,7 +9105,7 @@
BED0FA3A2C0C49C90017B285 /* FUSRoomShareButton.xib in Resources */,
BED0FC1F2C0C49CA0017B285 /* FUSOfficialImageTableViewCell.xib in Resources */,
BED0FBED2C0C49CA0017B285 /* FUSScale3ViewController.xib in Resources */,
BE818A9D2C22E2DA004C8C6B /* FUSHeatingPowerListView.xib in Resources */,
BE818A9D2C22E2DA004C8C6B /* FUSPopularListView.xib in Resources */,
BED0F9662C0C49C90017B285 /* FUSNameLevelView.xib in Resources */,
BEDC6F622C09DAE900505F76 /* zone_voice_sign_setting_play_anim_4@3x.png in Resources */,
BEDC6F252C09DAE900505F76 /* common_alert_view_btn.png in Resources */,
......@@ -9112,7 +9117,7 @@
BED0FAFD2C0C49CA0017B285 /* FUSVideoStartSetScopeBtnView.xib in Resources */,
BED0FA252C0C49C90017B285 /* FUSLiveBeautyStickerSettingView.xib in Resources */,
BED0FBF02C0C49CA0017B285 /* FUSAPISelectViewController.xib in Resources */,
BE818A9F2C22E2DA004C8C6B /* FUSHeatingPowerTableViewCell.xib in Resources */,
BE818A9F2C22E2DA004C8C6B /* FUSPopularTableViewCell.xib in Resources */,
BED0FA212C0C49C90017B285 /* FUSLiveBeautyParameterView.xib in Resources */,
BED0FBE12C0C49CA0017B285 /* FUSPhotoCollectionViewCell.xib in Resources */,
BEDC6F422C09DAE900505F76 /* live_link_micro_request_2.png in Resources */,
......@@ -9348,7 +9353,7 @@
BED0FA452C0C49C90017B285 /* FUSBulletModel.m in Sources */,
BED0F9A92C0C49C90017B285 /* FUSVideoChatCommunicationView.m in Sources */,
BED0F9A82C0C49C90017B285 /* FUSVideoChatBaseView.m in Sources */,
BE818AA42C22E397004C8C6B /* FUSHeatingProgressView.m in Sources */,
BE818AA42C22E397004C8C6B /* FUSPopularProgressView.m in Sources */,
BE0397CB2C134566003EB21B /* LayerTransformNode.swift in Sources */,
BED0FBE82C0C49CA0017B285 /* FUSScale1ViewController.m in Sources */,
BED0FC502C0C49CA0017B285 /* FUSMyZoneBaseCell.m in Sources */,
......@@ -9528,7 +9533,7 @@
BED0F96A2C0C49C90017B285 /* FUSChatGiftDataModel.m in Sources */,
BED0F9A62C0C49C90017B285 /* FUSSingleLiveEndedPopView.m in Sources */,
BED0FB032C0C49CA0017B285 /* FUSTTStreamPlayer.m in Sources */,
BE818A9E2C22E2DA004C8C6B /* FUSHeatingPowerTableViewCell.m in Sources */,
BE818A9E2C22E2DA004C8C6B /* FUSPopularTableViewCell.m in Sources */,
BED0FB802C0C49CA0017B285 /* FUSPaymentSegmentView.m in Sources */,
BE0397C52C134566003EB21B /* TextCompositionLayer.swift in Sources */,
BED0FC392C0C49CA0017B285 /* FUSReportOptionModel.m in Sources */,
......@@ -9858,7 +9863,7 @@
BED0FA402C0C49C90017B285 /* FUSBulletMessageBaseView.m in Sources */,
BED0FB7C2C0C49CA0017B285 /* FUSCategoryTableViewCell.m in Sources */,
BE0397E92C134566003EB21B /* ShapeTransform.swift in Sources */,
BE818A9C2C22E2DA004C8C6B /* FUSHeatingPowerListView.m in Sources */,
BE818A9C2C22E2DA004C8C6B /* FUSPopularListView.m in Sources */,
BED0FA262C0C49C90017B285 /* FUSLiveBottomToolManager.m in Sources */,
BE03981A2C134566003EB21B /* AnimationContext.swift in Sources */,
BED0FB132C0C49CA0017B285 /* FUSNewsFeedLikeListViewController.m in Sources */,
......@@ -9983,6 +9988,7 @@
BED0FC942C0C49CA0017B285 /* FUSRankProgressView.m in Sources */,
BED0F8BC2C0C49C80017B285 /* FUSBaoFangJacketHelper.m in Sources */,
BED0F93D2C0C49C90017B285 /* FUSAlbumModel.m in Sources */,
BE2732412C2BFAA100276177 /* FUSLivePopularRankModel.m in Sources */,
BED0FC4A2C0C49CA0017B285 /* FUSCameraRecordView.m in Sources */,
BED0F8C22C0C49C80017B285 /* FUSRecommendedCell.m in Sources */,
00A2D4982C1AEFBF00A15ECA /* FUSHomeNaviView.m in Sources */,
......
FuSiLive/Assets.xcassets/Live/Borad/Contents.json
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/Live/live_head_audience_icon.imageset/Contents.json
......@@ -5,18 +5,18 @@
"scale" : "1x"
},
{
"filename" : "气@2x.png",
"idiom" : "universal",
"filename" : "直播间-观众人数icon@2x.png",
"scale" : "2x"
},
{
"filename" : "气@3x.png",
"idiom" : "universal",
"filename" : "直播间-观众人数icon@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Classes/Foundation/Http/FUSURLDictionary.h
......@@ -757,7 +757,7 @@
#define URL_BOARD_GUIRENRANK DNS_FUS_API(@"/rank/guard.html")
// 热力值榜单
#define URL_BOARD_HEATING_POWER DNS_FUS_API(@"/rank/hot.html")
#define URL_BOARD_HEATING_POWER DNS_FUS_API(@"/rank/popular/list")
// 热力榜榜单说明
#define URL_BOARD_README_HEATING_POWER DNS_WEB(@"/Nesting/help/hot.html")
......
FuSiLive/Classes/Foundation/Socket/SocketMessage/FUSSocketMessageDelegate.h
......@@ -86,7 +86,7 @@
#define ROOM_CID_LIVE_SCOPE_DID_CHANGED 11008 // 切换直播范围
#define ROOM_CID_LIVE_ROOM_TYPE_CHANGED 11009 // 切换直播类型
#define ROOM_CID_BECOME_FANS_GROUP_MEMBER 11010 // 用户成为粉丝团成员
#define ROOM_CID_RoomPopularChanged 11015 // 人气值变化消息
#define ROOM_CID_RoomPopularChanged 11019 // 人气值变化消息
#define ROOM_CID_LINKMIC_SENDINVIT 30001 // 主播发送连麦邀请
#define ROOM_CID_LINKMIC_REPLYINVIT 30002 // 用户回复连麦邀请
......
FuSiLive/Classes/NewLive/Main/Model/FUSRoomInfoModel.h
......@@ -67,8 +67,8 @@
/// 人气指数
@property (nonatomic, assign) NSInteger popularScore;
// 时长计时器集合（单位：秒），珍爱任务相关，如果有返回数据，就开启倒计时，倒计时结束请求接口提醒后台
@property (nonatomic, copy) NSArray<NSNumber *> *onlineSync;
/// 人气排名
@property (nonatomic, assign) NSInteger popularRank;
- (void)fus_setModelWithMyRoomInfos;
......
FuSiLive/Classes/NewLive/Main/Other/FUSLiveHttpHelper.h
......@@ -17,6 +17,7 @@
#import "FUSLiveStickerModel.h"
#import "FUSPKRoomPKInfoModel.h"
#import "FUSBoardModel.h"
#import "FUSLivePopularRankModel.h"
#import "FUSLiveHelper.h"
@class FUSBarrageCardModel;
......@@ -787,8 +788,9 @@
@param success 成功回调
@param failure 失败回调
*/
+ (void)fus_requestHeatingPowerDataWithRoomID:(NSString *)roomID
success:(void(^)(NSArray<FUSBoardModel *> *heatingPowerArr))success
+ (void)fus_requestPopularDataWithRoomID:(NSString *)roomID
channelId:(NSString *)channelId
success:(void(^)(NSArray<FUSLivePopularRankModel *> *popularArr))success
failure:(void(^)(NSString *, int))failure;
@end
FuSiLive/Classes/NewLive/Main/Other/FUSLiveHttpHelper.m
......@@ -435,9 +435,9 @@
roomInfoModel.monGuard = [dataDict[@"room"][@"monGuard"] description];
roomInfoModel.micMode = micMode;
roomInfoModel.livetime = [dataDict[@"livetime"] integerValue];
roomInfoModel.onlineSync = dataDict[@"onlineSync"];
roomInfoModel.popular = dataDict[@"popular"];
roomInfoModel.popularScore = [dataDict[@"popularScore"] integerValue];
roomInfoModel.popularRank = [dataDict[@"popularRank"] integerValue];
[FUSLiveHelper shareInstance].richValue = roomDict[@"rich"];
......@@ -2528,28 +2528,31 @@
@param success 成功回调
@param failure 失败回调
*/
+ (void)fus_requestHeatingPowerDataWithRoomID:(NSString *)roomID success:(void(^)(NSArray<FUSBoardModel *> *heatingPowerArr))success
+ (void)fus_requestPopularDataWithRoomID:(NSString *)roomID
channelId:(NSString *)channelId
success:(void(^)(NSArray<FUSLivePopularRankModel *> *popularArr))success
failure:(void(^)(NSString *, int))failure
{
NSDictionary *params = @{@"roomid":roomID};
NSDictionary *params = @{@"roomid":roomID,
@"channelId":channelId};
[FUSHttpHelper postRequestBinaryWithUrl:URL_BOARD_HEATING_POWER params:params success:^(NSDictionary *dataDict, int code) {
if (dataDict[@"hotResult"]) {
[FUSLiveHelper shareInstance].roomInfoModel.hotScore = [NSString stringWithObject:dataDict[@"hotResult"][@"score"]];
[FUSLiveHelper shareInstance].roomInfoModel.hotRank = [NSString stringWithObject:dataDict[@"hotResult"][@"rank"]];
if (dataDict[@"rankList"]) {
[[NSNotificationCenter defaultCenter] postNotificationName:kDidHotScoreChangeNotification object:nil];
}
NSArray *popularArr = dataDict[@"rankList"];
if (dataDict[@"ranklist"]) {
if (popularArr.count) {
NSArray *heatingPowerArr = dataDict[@"ranklist"];
NSMutableArray *muArr = [NSMutableArray array];
for (NSDictionary *dict in popularArr) {
FUSLivePopularRankModel *areaModel = [FUSLivePopularRankModel fus_modelWithDict:dict];
if (areaModel.uid.integerValue == FUSLiveHelper.shareInstance.roomInfoModel.roomId.integerValue) {
if (heatingPowerArr.count) {
[FUSLiveHelper shareInstance].roomInfoModel.hotScore = @(areaModel.score).description;
[FUSLiveHelper shareInstance].roomInfoModel.hotRank = @(areaModel.rankId).description;
NSMutableArray *muArr = [NSMutableArray array];
for (NSDictionary *dict in heatingPowerArr) {
FUSBoardModel *areaModel = [FUSBoardModel fus_modelWithDict:dict];
[[NSNotificationCenter defaultCenter] postNotificationName:kDidHotScoreChangeNotification object:nil];
}
[muArr addObject:areaModel];
}
......
FuSiLive/Classes/NewLive/Main/Other/FunctionViewHelper/FUSLiveChatDataSourceHelper.m
......@@ -940,7 +940,7 @@
}
// 新用户标签
if (model.msgType.integerValue != 1 && !model.isHide.boolValue) {
if (model.msgType.integerValue != 1 && !model.isHide.boolValue && model.barrageType.integerValue == 0) {
UIImage *image = nil;
CGRect frame = CGRectZero;
......@@ -1290,8 +1290,6 @@
__weak typeof(self) weakSelf = self;
CGSize imageSize = CGSizeMake(45, 20);
// 弹幕都不显示在线等级，FuSi5.5.0的需求
message.lev = nil;
NSMutableAttributedString *bulletAttr = [self createContentAttributedStringWithModel:message imageSize:imageSize fontSize:14];
dispatch_async(dispatch_get_main_queue(), ^{
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSLiveContributeView.m
......@@ -86,6 +86,8 @@
- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
NSInteger page = scrollView.contentOffset.x / scrollView.width;
self.segmentView.selectedType = self.typeList[page].integerValue;
[self.myContributeView setListModel:self.listViews[@(page)].listModel];
}
@end
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSMyContributeView.m
......@@ -7,6 +7,8 @@
#import "FUSMyContributeView.h"
#import "FUSGiftDataCenter.h"
@interface FUSMyContributeView ()
/// 排名
......@@ -34,7 +36,13 @@
@property (nonatomic, strong) UILabel *sendGiftLabel;
/// 礼物图标+文案按钮
@property (nonatomic, strong) UIButton *giftBtn;
@property (nonatomic, strong) UIView *giftView;
/// 礼物图标
@property (nonatomic, strong) UIImageView *giftImageView;
/// 礼物数量
@property (nonatomic, strong) UILabel *giftLabel;
/// 赠送点击响应的按钮
@property (nonatomic, strong) UIButton *sendBtn;
......@@ -99,10 +107,18 @@
self.sendGiftLabel.textAlignment = NSTextAlignmentCenter;
[self.sendGiftView addSubview:self.sendGiftLabel];
self.giftBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[self.giftBtn setTitleColor:UIColor.fus_textColorDeep forState:UIControlStateNormal];
self.giftBtn.titleLabel.font = [UIFont fus_themeMediumFont:12];
[self.sendGiftView addSubview:self.giftBtn];
self.giftView = [[UIView alloc] init];
self.giftView.backgroundColor = [UIColor clearColor];
[self.sendGiftView addSubview:self.giftView];
self.giftImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 20, 20)];
self.giftImageView.contentMode = UIViewContentModeScaleAspectFit;
[self.giftView addSubview:self.giftImageView];
self.giftLabel = [[UILabel alloc] init];
self.giftLabel.textColor = UIColor.fus_textColorDeep;
self.giftLabel.font = [UIFont fus_themeMediumFont:12];
[self.giftView addSubview:self.giftLabel];
self.sendBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[self.sendBtn addTarget:self action:@selector(fus_clickSendGiftAction:) forControlEvents:UIControlEventTouchUpInside];
......@@ -156,10 +172,21 @@
make.top.equalTo(self.sendGiftView).offset(5);
}];
[self.giftBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.equalTo(self.sendGiftView);
[self.giftView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.sendGiftLabel.mas_bottom).offset(-3);
make.height.equalTo(self.sendGiftView).multipliedBy(0.5);
make.centerX.equalTo(self.sendGiftView);
make.height.mas_equalTo(18);
}];
[self.giftImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.top.bottom.equalTo(self.giftView);
make.width.mas_equalTo(18);
}];
[self.giftLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.giftImageView.mas_right).mas_offset(3);
make.right.equalTo(self.giftView).mas_offset(-3);
make.top.bottom.equalTo(self.giftView);
}];
[self.sendBtn mas_makeConstraints:^(MASConstraintMaker *make) {
......@@ -199,8 +226,14 @@
[self.faceImageView setWebImageWithSubURLString:FUSCacheDataShare.shareStore.userDetailInfo.face];
self.nicknameLabel.text = FUSCacheDataShare.shareStore.userDetailInfo.nickname;
[self.giftBtn setWebImageWithSubURLString:listModel.sendData.icon placeholder:nil];
[self.giftBtn setTitle:[NSString stringWithFormat:@"x%@",listModel.sendData.num] forState:UIControlStateNormal];
if (listModel.sendData.num.integerValue > 0) {
self.sendGiftView.hidden = NO;
FUSLiveGiftDataModel *giftModel = [FUSGiftDataCenter sharedCenter].liveGiftDict[listModel.sendData.gid];
[self.giftImageView setWebImageWithSubURLString:giftModel.resource];
self.giftLabel.text = [NSString stringWithFormat:@"x%@",listModel.sendData.num];
} else {
self.sendGiftView.hidden = YES;
}
}
- (void)fus_clickSendGiftAction:(UIButton *)sender {
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
......@@ -16,7 +16,7 @@
#import "FUSBulletsScreenView.h"
#import "FUSMotorsView.h"
#import "FUSLiveHeadPusherView.h"
#import "FUSHeatingPowerListView.h"
#import "FUSPopularListView.h"
#import "FUSLiveChatInputHelper.h"
#import "FUSLiveChatDataSourceHelper.h"
#import "FUSLiveHttpHelper.h"
......@@ -95,7 +95,7 @@
#import "EventTrackParams.h"
#import "FUSAudiencePopView.h"
#import "FUSHeatingProgressView.h"
#import "FUSPopularProgressView.h"
// 粒子发射器 cell 重用标识符
#define EMITTER_REUSE_IDENTIFIER @"emitterReuseIdentifier"
......@@ -133,7 +133,7 @@ FUSLinkMicUserListDelegate
@property (nonatomic, strong) FUSLiveHeadView *headView;
/// 人气值 View
@property (nonatomic, strong) FUSHeatingProgressView *popularView;
@property (nonatomic, strong) FUSPopularProgressView *popularView;
/// 用户数据
@property (nonatomic, strong) FUSLiveHeaderUserListViewModel *userListViewModel;
......@@ -146,7 +146,7 @@ FUSLinkMicUserListDelegate
/**
热力值榜单弹出视图
*/
@property (nonatomic, strong) FUSHeatingPowerListView *heatingPowerPopView;
@property (nonatomic, strong) FUSPopularListView *popularPopView;
/**
活动 View
......@@ -603,11 +603,14 @@ FUSLinkMicUserListDelegate
_headView.delegate = self;
[[self fus_viewWithLayer:FUSLiveFunctionLayerRoomInfos] addSubview:_headView];
self.popularView = [[FUSHeatingProgressView alloc] initWithFrame:CGRectMake(12, self.headView.bottom, 48, 48)];
self.popularView = [[FUSPopularProgressView alloc] initWithFrame:CGRectMake(12, self.headView.bottom, 48, 48)];
[[self fus_viewWithLayer:FUSLiveFunctionLayerRoomInfos] addSubview:self.popularView];
__weak typeof(self) weakSelf = self;
UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithActionBlock:^(id _Nonnull sender) {
[weakSelf fus_headViewClickHeatPower];
FUSWKWebViewController *webVc = [[FUSWKWebViewController alloc] init];
webVc.webUrlString = FUSCacheDataShare.shareStore.settingInitDataModel.fusiConfig.popularAddress;
webVc.shouldIncludeIdentifyInfo = YES;
[FUSLiveHelper.shareInstance.fus_getTargetViewController.navigationController pushViewController:webVc animated:YES];
}];
tapGesture.numberOfTapsRequired = 1;
[self.popularView addGestureRecognizer:tapGesture];
......@@ -1740,7 +1743,7 @@ FUSLinkMicUserListDelegate
}
[weakSelf.userInfoView fus_dismissUserInfoViewWithAnimate:YES];
[weakSelf.heatingPowerPopView fus_dismissViewAnimation:YES];
[weakSelf.popularPopView fus_dismissViewAnimation:YES];
[weakSelf.bottomToolView fus_dismissMessageBoxView];
[weakSelf.liveFireCountView removeFromSuperview];
weakSelf.liveFireCountView = nil;
......@@ -1966,15 +1969,9 @@ FUSLinkMicUserListDelegate
return;
}
// 更新围观人数
[self.headView fus_setupAudience:num];
[self.userListViewModel recieveSomeoneEnterRoomWithSocketModel:messageModel messageDict:dict];
self.heatingPowerPopView.roomModel = [FUSLiveHelper shareInstance].roomInfoModel;
if (self.pusherHeadView) {
[self.pusherHeadView fus_setupAudience:num];
}
self.popularPopView.roomModel = [FUSLiveHelper shareInstance].roomInfoModel;
}
/**
......@@ -2006,13 +2003,7 @@ FUSLinkMicUserListDelegate
[_headView fus_headViewAnchorOffline:YES];
}
// 更新围观人数
[self.headView fus_setupAudience:num];
self.heatingPowerPopView.roomModel = [FUSLiveHelper shareInstance].roomInfoModel;
if (self.pusherHeadView) {
[self.pusherHeadView fus_setupAudience:num];
}
self.popularPopView.roomModel = [FUSLiveHelper shareInstance].roomInfoModel;
}
/**
......@@ -2983,7 +2974,7 @@ FUSLinkMicUserListDelegate
// 人气值变化消息
- (void)fus_roomPopularChanged:(NSNotification *)notification {
NSDictionary *dict = [notification.object fus_getJsonDict];
NSString *roomId = dict[@"roomid"];
NSString *roomId = dict[@"roomId"];
// 直播间ID
if (![NSString isNull:roomId]
......@@ -2993,13 +2984,15 @@ FUSLinkMicUserListDelegate
return;
}
NSDictionary *popular = dict[@"popular"];
NSString *score = [dict[@"popular"] description];
NSString *popularRank = [dict[@"popularRank"] description];
[self.headView fus_setupHotScore:score hotRank:popularRank];
[self.popularView fus_setNumber:[score integerValue]];
[self.headView fus_setupAudience:score];
if ([NSDictionary isNull:popular]) {
return;
if (self.pusherHeadView) {
[self.pusherHeadView fus_setupAudience:score];
}
[self.popularView fus_setNumber:[popular[@"score"] integerValue]];
}
- (void)fus_receiveBroadcastNotification:(NSNotification *)notification {
......@@ -4509,11 +4502,14 @@ FUSLinkMicUserListDelegate
[self.headView fus_setupPortraitViewWithRoomOwnerModel:[[FUSLiveHelper shareInstance] roomInfoModel] animate:YES];
// 设置债券 View
[self.headView fus_setupCoinTicket:[[[FUSLiveHelper shareInstance] roomInfoModel] bonds]];
NSString *score = [@([[FUSLiveHelper shareInstance] roomInfoModel].popularScore) description];
NSString *popularRank = [@([[FUSLiveHelper shareInstance] roomInfoModel].popularRank) description];
// 设置热力值
[self.headView fus_setupHotScore:[FUSLiveHelper shareInstance].roomInfoModel.hotScore hotRank:[FUSLiveHelper shareInstance].roomInfoModel.hotRank];
[self.headView fus_setupHotScore:score hotRank:popularRank];
[self.headView fus_startheatPowerViewTimer];
// 设置围观人数
[self.headView fus_setupAudience:[[[FUSLiveHelper shareInstance] roomInfoModel] num]];
[self.headView fus_setupAudience:score];
[self.popularView fus_setNumber:[score integerValue]];
if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor) {
[self fus_startRecordLiveTimeWithTime:[NSString stringWithFormat:@"%ld", model.livetime]];
......@@ -4524,7 +4520,7 @@ FUSLinkMicUserListDelegate
if (_pusherHeadView) {
// 设置主播模式数据
[_pusherHeadView fus_setupAudience:[[[FUSLiveHelper shareInstance] roomInfoModel] num]];
[_pusherHeadView fus_setupAudience:score];
[_pusherHeadView fus_setupCoinTicket:[[[FUSLiveHelper shareInstance] roomInfoModel] bonds]];
[_pusherHeadView fus_startheatPowerViewTimer];
}
......@@ -4559,8 +4555,10 @@ FUSLinkMicUserListDelegate
});
[self fus_resetNormalLiveUI];
self.popularView.hidden = NO;
if (model.roomType.integerValue == 2) {
[self fus_setLinkMicUI];
self.popularView.hidden = YES;
}
}
......@@ -4701,7 +4699,7 @@ FUSLinkMicUserListDelegate
[[FUSLiveGiftView shareGiftView] fus_dismissWithAnimate:NO needUpload:NO];
// [[FUSLiveGiftView shareGiftView] fus_resetGiftView]; //放到setup functionview上面
[_heatingPowerPopView fus_dismissViewAnimation:NO];
[_popularPopView fus_dismissViewAnimation:NO];
[self.activityView fus_cleanActivityView];
[self.activityView fus_updateActivityViewHeight:0];
......@@ -5853,19 +5851,19 @@ FUSLinkMicUserListDelegate
[FUSTalkingData fus_trackEvent:EVENT_ROOM_HOTRANK label:nil parameters:nil];
// 避免重复显示
if (_heatingPowerPopView.isOnShow == YES) return;
_heatingPowerPopView = [[FUSHeatingPowerListView alloc] initWithFrame:UIView.fus_screenFrame];
if (_popularPopView.isOnShow == YES) return;
_popularPopView = [[FUSPopularListView alloc] initWithFrame:UIView.fus_screenFrame];
// 为弹出框的控件赋值
_heatingPowerPopView.roomModel = [[FUSLiveHelper shareInstance] roomInfoModel];
_popularPopView.roomModel = [[FUSLiveHelper shareInstance] roomInfoModel];
// 点击用户跳转到对应空间
_heatingPowerPopView.userClickBlock = ^(NSString *uid){
_popularPopView.userClickBlock = ^(NSString *uid){
if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor) return;
FUSMyZoneViewController *zoneVc = [[FUSMyZoneViewController alloc] init];
zoneVc.zoneUid = uid;
[[weakSelf getViewController].navigationController pushViewController:zoneVc animated:YES];
};
// 点击自己弹出资料卡
_heatingPowerPopView.selfClickBlock = ^{
_popularPopView.selfClickBlock = ^{
if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor) return;
FUSRoomUserInfoModel *userInfoModel = [[FUSRoomUserInfoModel alloc] init];
[userInfoModel fus_setValueWithModel:[FUSLiveHelper shareInstance].roomInfoModel];
......@@ -5873,7 +5871,7 @@ FUSLinkMicUserListDelegate
[weakSelf.userInfoView fus_showUserInfoViewWithUserInfoViewType:FUSUserInfoViewTypeLive userInfoModel:userInfoModel shouldRequestData:YES];
};
// 点击榜单说明
_heatingPowerPopView.boardDescriptionClickBlock = ^{
_popularPopView.boardDescriptionClickBlock = ^{
[FUSTalkingData fus_trackEvent:EVENT_ROOM_HOT_RANK_EXPLAINATION];
FUSWKWebViewController *boardDescriptionVc = [[FUSWKWebViewController alloc]init];
NSString *lang = FUSLocalizationHelper.fus_currentLanguage.languageID;
......@@ -5883,11 +5881,11 @@ FUSLinkMicUserListDelegate
};
// 实现 dismiss 回调
[_heatingPowerPopView setDismissHandler:^{
[_popularPopView setDismissHandler:^{
[[FUSLiveHelper shareInstance] fus_setupScrollToSwitchRoomEnable:YES];
}];
[[FUSLiveHelper shareInstance] fus_setupScrollToSwitchRoomEnable:NO];
[_heatingPowerPopView fus_showViewWithSuperView:[self fus_viewWithLayer:FUSLiveFunctionLayerManualPopView]];
[_popularPopView fus_showViewWithSuperView:[self fus_viewWithLayer:FUSLiveFunctionLayerManualPopView]];
}
- (void)fus_headViewLikeSucceed {
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeadView/FUSLiveHeadPusherView.m
......@@ -253,14 +253,14 @@
/// 开启热力值的轮播计时器
- (void)fus_startheatPowerViewTimer {
[self.heatPowerView fus_startChangeTimer];
// [self.heatPowerView fus_startChangeTimer];
}
/**
收到热力值相关的的广播消息
*/
- (void)fus_receiveHeatPowerBroadcast:(FUSBroadcastModel *)broadcastModel {
[self.heatPowerView fus_addHeatBroadcast:broadcastModel.languageContent];
// [self.heatPowerView fus_addHeatBroadcast:broadcastModel.languageContent];
}
/**
......@@ -274,7 +274,7 @@
}
self.portraitView.audience = audience;
[self.heatPowerView fus_startChangeTimer];
// [self.heatPowerView fus_startChangeTimer];
}
/**
......@@ -340,7 +340,7 @@
- (void)fus_cleanHeadView;
{
[_userListView fus_cleanAllOnlineUsers];
[_heatPowerView fus_endChangeTimer];
// [_heatPowerView fus_endChangeTimer];
[_coinTicketView fus_cleanCoinTicketView];
}
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeadView/FUSLiveHeadView.m
......@@ -37,8 +37,8 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
@property (nonatomic, strong) FUSLiveHotPowerView *heatPowerView;
/**
// 显示在线人数的 ColoectionView
// */
// 显示在线人数的 ColoectionView
// */
@property (nonatomic, strong) FUSLiveHeaderUserListView *userListView;
/**
显示在线人数的 ColoectionView
......@@ -280,7 +280,7 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
收到热力值相关的的广播消息
*/
- (void)fus_receiveHeatPowerBroadcast:(FUSBroadcastModel *)broadcastModel {
[self.heatPowerView fus_addHeatBroadcast:broadcastModel.languageContent];
// [self.heatPowerView fus_addHeatBroadcast:broadcastModel.languageContent];
}
/**
......@@ -499,12 +499,13 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
}
[_portraitView fus_setupWithModel:model animate:animate];
_userInfoLabel.text = [NSString stringWithFormat:@"%@ %@",FUSLiveHelper.shareInstance.roomInfoModel.roomId,[[NSDate date] stringWithFormat:@"dd-MM-yyyy"]];
_userInfoLabel.text = [NSString stringWithFormat:@"%@ %@",FUSLiveHelper.shareInstance.roomInfoModel.roomId,[[NSDate date] stringWithFormat:@"dd/MM/yyyy"]];
[_userInfoLabel sizeToFit];
_userInfoLabel.height = 20;
_userInfoLabel.x = self.width - self.userInfoLabel.width - 10;
_userInfoLabel.y = 0;
_waterMark.centerX = _userInfoLabel.centerX;
_userInfoLabel.centerY = self.coinTicketView.centerY;
_waterMark.centerY = _userInfoLabel.centerY;
_waterMark.right = _userInfoLabel.left - 4;
}
/**
......@@ -652,7 +653,7 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
*/
- (void)fus_cleanHeadView
{
[_heatPowerView fus_endChangeTimer];
// [_heatPowerView fus_endChangeTimer];
[_portraitView fus_cleanPortraitView];
[_userListView fus_cleanAllOnlineUsers];
......@@ -678,7 +679,7 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
/// 开启热力值的轮播计时器
- (void)fus_startheatPowerViewTimer {
[self.heatPowerView fus_startChangeTimer];
// [self.heatPowerView fus_startChangeTimer];
}
- (void)fus_startHeadViewReceiveGiftAnimWithImgUrl:(NSString *)url{
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeadView/FUSLiveHotPowerView.h
......@@ -30,15 +30,15 @@ NS_ASSUME_NONNULL_BEGIN
*/
- (void)fus_setupHeatScore:(NSString *)heatScore rank:(NSString *)rank;
/// 设置热力值广播
/// @param broadcast 广播的内容
- (void)fus_addHeatBroadcast:(NSString *)broadcast;
///// 设置热力值广播
///// @param broadcast 广播的内容
//- (void)fus_addHeatBroadcast:(NSString *)broadcast;
/// 开启热力值排行榜切换的计时器
- (void)fus_startChangeTimer;
/// 关闭热力值排行榜切换的计时器
- (void)fus_endChangeTimer;
///// 开启热力值排行榜切换的计时器
//- (void)fus_startChangeTimer;
//
///// 关闭热力值排行榜切换的计时器
//- (void)fus_endChangeTimer;
@end
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeadView/FUSLiveHotPowerView.m
......@@ -24,7 +24,7 @@ typedef NS_ENUM(NSInteger,FUSLiveHotPowerViewShownType) {
/**
热力值 View
*/
@property (nonatomic, strong) FUSLiveCoinTicketView *heatPowerView;
//@property (nonatomic, strong) FUSLiveCoinTicketView *heatPowerView;
/**
热力排名 View
......@@ -32,22 +32,22 @@ typedef NS_ENUM(NSInteger,FUSLiveHotPowerViewShownType) {
@property (nonatomic, strong) FUSLiveCoinTicketView *heatRankView;
/// 热力值排名、热力值排名变化的lable
@property (nonatomic, strong) FUSAnimationLabel *heatBroadcastLabel;
//@property (nonatomic, strong) FUSAnimationLabel *heatBroadcastLabel;
// 点击的按键
@property (nonatomic, strong) UIButton *clickBtn;
// 热力值
@property (nonatomic, strong) NSString *heatPowerStr;
//@property (nonatomic, strong) NSString *heatPowerStr;
// 热力值排名
@property (nonatomic, strong) NSString *rankStr;
// 热力值广播
@property (nonatomic, strong) NSString *heatBroadcast;
//@property (nonatomic, strong) NSString *heatBroadcast;
// 内容切换的计时器
@property (nonatomic, strong) NSTimer *changingTimer;
//// 内容切换的计时器
//@property (nonatomic, strong) NSTimer *changingTimer;
// 当前的显示的内容类型
@property (nonatomic, assign) FUSLiveHotPowerViewShownType currentShownType;
......@@ -82,28 +82,28 @@ typedef NS_ENUM(NSInteger,FUSLiveHotPowerViewShownType) {
CGFloat rankLabelMargin = 8;
self.currentShownType = FUSLiveHotPowerViewShownTypeHeatPower;
self.heatPowerView = [[FUSLiveCoinTicketView alloc] initWithFrame:self.bounds type:FUSLiveCoinTicketViewTypeHeatPower side:FUSLiveCoinTicketViewSideLeft];
self.heatPowerView.bgView.backgroundColor = [UIColor clearColor];
// self.heatPowerView = [[FUSLiveCoinTicketView alloc] initWithFrame:self.bounds type:FUSLiveCoinTicketViewTypeHeatPower side:FUSLiveCoinTicketViewSideLeft];
// self.heatPowerView.bgView.backgroundColor = [UIColor clearColor];
__weak typeof(self) weakSelf = self;
self.heatPowerView.frameDidChange = ^(CGFloat maxX) {
if ((!weakSelf.heatPowerView.isHidden && weakSelf.width > 0)) {
weakSelf.width = weakSelf.heatPowerView.width;
weakSelf.clickBtn.frame = weakSelf.bounds;
}
if (weakSelf.frameDidChange) {
weakSelf.frameDidChange(CGRectGetMaxX(weakSelf.frame));
}
};
[self addSubview:self.heatPowerView];
// self.heatPowerView.frameDidChange = ^(CGFloat maxX) {
// if ((!weakSelf.heatPowerView.isHidden && weakSelf.width > 0)) {
// weakSelf.width = weakSelf.heatPowerView.width;
// weakSelf.clickBtn.frame = weakSelf.bounds;
// }
// if (weakSelf.frameDidChange) {
// weakSelf.frameDidChange(CGRectGetMaxX(weakSelf.frame));
// }
// };
// [self addSubview:self.heatPowerView];
self.heatRankView = [[FUSLiveCoinTicketView alloc] initWithFrame:self.bounds type:FUSLiveCoinTicketViewTypeHeatRank side:FUSLiveCoinTicketViewSideLeft];
self.heatRankView.bgView.backgroundColor = [UIColor clearColor];
self.heatRankView.frameDidChange = ^(CGFloat maxX) {
if ((!weakSelf.heatRankView.isHidden && weakSelf.width > 0)) {
// if ((!weakSelf.heatRankView.isHidden && weakSelf.width > 0)) {
weakSelf.width = weakSelf.heatRankView.width;
weakSelf.clickBtn.frame = weakSelf.bounds;
}
// }
if (weakSelf.frameDidChange) {
weakSelf.frameDidChange(CGRectGetMaxX(weakSelf.frame));
......@@ -113,17 +113,17 @@ typedef NS_ENUM(NSInteger,FUSLiveHotPowerViewShownType) {
self.clipsToBounds = YES;
self.heatBroadcastLabel = [[FUSAnimationLabel alloc] initWithFrame:self.bounds];
self.heatBroadcastLabel.x = rankLabelMargin;
self.heatBroadcastLabel.width = self.width - rankLabelMargin * 2;
self.heatBroadcastLabel.durationPerWidth = 4;
self.heatBroadcastLabel.shortBroadcastWithoutAnimationShownTime = 5;
self.heatBroadcastLabel.endBlock = ^{
[weakSelf fus_changeHotPowerContent];
[weakSelf fus_startChangeTimer];
};
self.heatBroadcastLabel.animationLabel.textAlignment = NSTextAlignmentCenter;
[self addSubview:self.heatBroadcastLabel];
// self.heatBroadcastLabel = [[FUSAnimationLabel alloc] initWithFrame:self.bounds];
// self.heatBroadcastLabel.x = rankLabelMargin;
// self.heatBroadcastLabel.width = self.width - rankLabelMargin * 2;
// self.heatBroadcastLabel.durationPerWidth = 4;
// self.heatBroadcastLabel.shortBroadcastWithoutAnimationShownTime = 5;
// self.heatBroadcastLabel.endBlock = ^{
// [weakSelf fus_changeHotPowerContent];
// [weakSelf fus_startChangeTimer];
// };
// self.heatBroadcastLabel.animationLabel.textAlignment = NSTextAlignmentCenter;
// [self addSubview:self.heatBroadcastLabel];
self.clickBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[self.clickBtn addTarget:self action:@selector(clickHotPowerViewAction:) forControlEvents:UIControlEventTouchUpInside];
......@@ -132,9 +132,9 @@ typedef NS_ENUM(NSInteger,FUSLiveHotPowerViewShownType) {
self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.24];
self.heatRankView.hidden = YES;
self.heatPowerView.hidden = NO;
self.heatBroadcastLabel.hidden = YES;
self.heatRankView.hidden = NO;
// self.heatPowerView.hidden = NO;
// self.heatBroadcastLabel.hidden = YES;
}
- (void)layoutSubviews {
......@@ -158,8 +158,8 @@ typedef NS_ENUM(NSInteger,FUSLiveHotPowerViewShownType) {
@param rank 排名
*/
- (void)fus_setupHeatScore:(NSString *)heatScore rank:(NSString *)rank {
self.heatPowerStr = heatScore;
if (rank.intValue > 50) {
// self.heatPowerStr = heatScore;
if (rank.intValue > 50 || rank.intValue <= 0) {
self.rankStr = FUSLocalizationHelper.localString(@"未上榜");
} else {
if ([NSString isNull:rank] || rank.intValue <= 0) {
......@@ -168,93 +168,93 @@ typedef NS_ENUM(NSInteger,FUSLiveHotPowerViewShownType) {
self.rankStr = [NSString stringWithFormat:@"%@:%@",FUSLocalizationHelper.localString(@"排名"),rank];
}
}
[self.heatPowerView fus_setupHeatScore:self.heatPowerStr];
// [self.heatPowerView fus_setupHeatScore:self.heatPowerStr];
[self.heatRankView fus_setupHeatRank:self.rankStr];
}
/// 设置热力值广播
/// @param broadcast 广播的内容
- (void)fus_addHeatBroadcast:(NSString *)broadcast {
self.heatBroadcast = broadcast;
}
///// 设置热力值广播
///// @param broadcast 广播的内容
//- (void)fus_addHeatBroadcast:(NSString *)broadcast {
// self.heatBroadcast = broadcast;
//}
/// 开启热力值排行榜切换的计时器
- (void)fus_startChangeTimer {
[self fus_endChangeTimer];
self.changingTimer = [NSTimer scheduledTimerWithTimeInterval:20 target:[YYWeakProxy proxyWithTarget:self] selector:@selector(fus_changeHotPowerContent) userInfo:nil repeats:YES];
}
/// 关闭热力值排行榜切换的计时器
- (void)fus_endChangeTimer {
[self.changingTimer invalidate];
self.changingTimer = nil;
}
//- (void)fus_startChangeTimer {
// [self fus_endChangeTimer];
// self.changingTimer = [NSTimer scheduledTimerWithTimeInterval:20 target:[YYWeakProxy proxyWithTarget:self] selector:@selector(fus_changeHotPowerContent) userInfo:nil repeats:YES];
//}
//
///// 关闭热力值排行榜切换的计时器
//- (void)fus_endChangeTimer {
// [self.changingTimer invalidate];
// self.changingTimer = nil;
//}
#pragma mark - Private Methods
// 切换内容的计时器
- (void)fus_changeHotPowerContent {
if ([NSString isNull:self.rankStr]
&& [NSString isNull:self.heatBroadcast]) {
return;
}
[self.heatBroadcastLabel changeTextColorWithString:self.heatBroadcast complete:^(NSMutableAttributedString *attributedString) {
// 缩回动画
[UIView animateWithDuration:0.5 animations:^{
self.width = 0;
} completion:^(BOOL finished) {
CGFloat finalWidth = 80;
self.heatRankView.hidden = YES;
self.heatPowerView.hidden = YES;
self.heatBroadcastLabel.hidden = YES;
// 如果有广播，优先播放广播
if (self.heatBroadcast) {
self.currentShownType = FUSLiveHotPowerViewShownTypeBroadcast;
self.heatBroadcastLabel.animationLabel.font = [UIFont fus_themeFont:12];
self.heatBroadcastLabel.animationLabel.textAlignment = NSTextAlignmentCenter;
[self.heatBroadcastLabel fus_setAnimationattrContent:attributedString];
finalWidth = MIN(finalWidth, self.heatBroadcastLabel.animationLabel.width);
self.heatBroadcastLabel.width = finalWidth;
finalWidth += self.heatBroadcastLabel.x * 2;
self.heatBroadcast = nil;
self.heatBroadcastLabel.hidden = NO;
} else {
// 如果热力值被隐藏了，则显示热力值
if (self.currentShownType == FUSLiveHotPowerViewShownTypeHeatPower) {
self.currentShownType = FUSLiveHotPowerViewShownTypeRank;
self.heatRankView.hidden = NO;
[self.heatRankView fus_setupHeatRank:self.rankStr];
finalWidth = self.heatRankView.width;
} else {
self.currentShownType = FUSLiveHotPowerViewShownTypeHeatPower;
self.heatPowerView.hidden = NO;
[self.heatPowerView fus_setupHeatScore:self.heatPowerStr];
finalWidth = self.heatPowerView.width;
}
[self.heatBroadcastLabel fus_finishAnimation];
}
// 展示动画
[UIView animateWithDuration:0.5 animations:^{
self.width = finalWidth;
} completion:^(BOOL finished) {
if (!self.heatBroadcastLabel.isHidden) {
[self.heatBroadcastLabel fus_startAnimation];
}
}];
if (self.frameDidChange) {
self.frameDidChange(self.x + finalWidth);
}
}];
}];
}
//// 切换内容的计时器
//- (void)fus_changeHotPowerContent {
//
// if ([NSString isNull:self.rankStr]
// && [NSString isNull:self.heatBroadcast]) {
// return;
// }
//
// [self.heatBroadcastLabel changeTextColorWithString:self.heatBroadcast complete:^(NSMutableAttributedString *attributedString) {
//
// // 缩回动画
// [UIView animateWithDuration:0.5 animations:^{
// self.width = 0;
// } completion:^(BOOL finished) {
//
// CGFloat finalWidth = 80;
// self.heatRankView.hidden = YES;
// self.heatPowerView.hidden = YES;
// self.heatBroadcastLabel.hidden = YES;
// // 如果有广播，优先播放广播
// if (self.heatBroadcast) {
//
// self.currentShownType = FUSLiveHotPowerViewShownTypeBroadcast;
// self.heatBroadcastLabel.animationLabel.font = [UIFont fus_themeFont:12];
// self.heatBroadcastLabel.animationLabel.textAlignment = NSTextAlignmentCenter;
// [self.heatBroadcastLabel fus_setAnimationattrContent:attributedString];
// finalWidth = MIN(finalWidth, self.heatBroadcastLabel.animationLabel.width);
// self.heatBroadcastLabel.width = finalWidth;
// finalWidth += self.heatBroadcastLabel.x * 2;
// self.heatBroadcast = nil;
// self.heatBroadcastLabel.hidden = NO;
//
// } else {
//
// // 如果热力值被隐藏了，则显示热力值
// if (self.currentShownType == FUSLiveHotPowerViewShownTypeHeatPower) {
// self.currentShownType = FUSLiveHotPowerViewShownTypeRank;
// self.heatRankView.hidden = NO;
// [self.heatRankView fus_setupHeatRank:self.rankStr];
// finalWidth = self.heatRankView.width;
// } else {
// self.currentShownType = FUSLiveHotPowerViewShownTypeHeatPower;
// self.heatPowerView.hidden = NO;
// [self.heatPowerView fus_setupHeatScore:self.heatPowerStr];
// finalWidth = self.heatPowerView.width;
// }
//
// [self.heatBroadcastLabel fus_finishAnimation];
// }
//
// // 展示动画
// [UIView animateWithDuration:0.5 animations:^{
// self.width = finalWidth;
// } completion:^(BOOL finished) {
// if (!self.heatBroadcastLabel.isHidden) {
// [self.heatBroadcastLabel fus_startAnimation];
// }
// }];
// if (self.frameDidChange) {
// self.frameDidChange(self.x + finalWidth);
// }
// }];
// }];
//}
- (void)clickHotPowerViewAction:(UIButton *)sender {
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeadView/FUSLivePortraitView.m
......@@ -382,8 +382,14 @@
_autoScrollNicknameLabel.width = MAX_NICKNAME_WIDTH;
}
if (![NSDictionary isNull:model.popular[@"score"]]) {
// 赋值文字内容
[_audienceBtn setTitle:model.num forState:UIControlStateNormal];
[_audienceBtn setTitle:model.popular[@"score"] forState:UIControlStateNormal];
} else {
// 赋值文字内容
[_audienceBtn setTitle:0 forState:UIControlStateNormal];
}
// 更新 Frame
[_audienceBtn sizeToFit];
_audienceBtn.height = 13;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/LinkMicro/Other/FUSAgoraHelper.m
......@@ -15,7 +15,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
@class FUSAgoraHelper;
@interface FUSAgoraHelper () <AgoraRtcEngineDelegate>
@interface FUSAgoraHelper () <AgoraRtcEngineDelegate, AgoraVideoFrameDelegate>
// 声网引擎
@property (nonatomic, strong) AgoraRtcEngineKit *agoraEngine;
......@@ -27,6 +27,9 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
// 重连的次数
@property (nonatomic, assign) NSInteger reconnectCount;
// 是否正在加入
@property (nonatomic, assign) BOOL isJoining;
// 自己是否在麦上
@property (nonatomic, assign) BOOL myselfIsOnMic;
......@@ -91,8 +94,27 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
[[NSNotificationCenter defaultCenter] removeObserver:self];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_becomeActiveNotification:) name:UIApplicationDidBecomeActiveNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_resignActiveNotification:) name:UIApplicationWillResignActiveNotification object:nil];
//添加对AVAudioSessionRouteChange的监听
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(handleRouteChangeNotification:) name:AVAudioSessionRouteChangeNotification object:nil];
}
- (void)handleRouteChangeNotification:(NSNotification *)notification {
NSNumber* reasonNumber =
notification.userInfo[AVAudioSessionRouteChangeReasonKey];
AVAudioSessionRouteChangeReason reason =
(AVAudioSessionRouteChangeReason)reasonNumber.unsignedIntegerValue;
if (reason == AVAudioSessionRouteChangeReasonCategoryChange) {
AVAudioSessionCategoryOptions currentCategoryOptions = [AVAudioSession sharedInstance].categoryOptions;
AVAudioSessionCategory currentCategory = [AVAudioSession sharedInstance].category;
//在需要进行对audioSession进行修正的场景下（RTC直播），修改category时options未包含mixWithOther，则给options追加mixWithOther
if (!(currentCategoryOptions & AVAudioSessionCategoryOptionMixWithOthers)) {
[[AVAudioSession sharedInstance] setCategory:currentCategory withOptions:currentCategoryOptions | AVAudioSessionCategoryOptionMixWithOthers error:nil];
}
}
}
- (void)fus_switchRole:(AgoraClientRole)role{
if (_role == role) {
......@@ -143,14 +165,21 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
return;
}
if (self.isJoining) {
return;
}
self.isJoining = YES;
_currentChannelId = channelId.integerValue;
AVAuthorizationStatus authStatus = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeAudio];
if (authStatus == AVAuthorizationStatusDenied || authStatus == AVAuthorizationStatusRestricted){
[FUSDialogView fus_showDialog:FUSLocalizationHelper.localString(@"未获得麦克风权限，上麦失败！")];
if (failure) {
failure();
}
self.isJoining = NO;
return;
}
......@@ -173,6 +202,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
failure();
}
self.isJoining = NO;
return;
}
......@@ -208,6 +238,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
}else if([FUSLiveHelper shareInstance].liveRoomType != FUSRoomTypeLinkMic){
[weakSelf.captureHelper fus_stopStreamPush];
[weakSelf.agoraEngine startRtmpStreamWithoutTranscoding:FUSLiveHelper.shareInstance.streamView.pushView.streamUrl];
}
FUSLogDebug(@"pp===准备进入成功 %@", channel);
......@@ -220,6 +251,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
if (success) {
success();
}
weakSelf.isJoining = NO;
}];
if (code < 0) {
......@@ -294,6 +326,8 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
[weakSelf.captureHelper fus_restartStreamPush];
[weakSelf.agoraEngine stopRtmpStream:[FUSLiveHelper shareInstance].streamView.pushView.streamUrl];
weakSelf.captureHelper.videoFrameCallBackHandler = nil;
[weakSelf.agoraEngine setVideoFrameDelegate:nil];
} else if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAudience && oldRoomType == FUSRoomTypeVideoLinkMic) {
[weakSelf.agoraEngine setVideoFrameDelegate:nil];
......@@ -326,7 +360,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
- (void)fus_destroy{
[self fus_stopRTCStreamingWithCompletion:^{
// [AgoraRtcEngineKit destroy];
[AgoraRtcEngineKit destroy];
self.agoraEngine = nil;
}];
}
......@@ -432,7 +466,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
[_agoraEngine enableLocalAudio:YES];
[_agoraEngine enableLocalVideo:YES];
_agoraEngine.delegate = self;
[_agoraEngine setAudioSessionOperationRestriction:AgoraAudioSessionOperationRestrictionDeactivateSession];
// [_agoraEngine setAudioSessionOperationRestriction:AgoraAudioSessionOperationRestrictionDeactivateSession];
// [_agoraEngine setEnableSpeakerphone:YES];
// [_agoraEngine disableExternalAudioSource];
......@@ -661,7 +695,7 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
}
}
- (void)rtcEngine:(AgoraRtcEngineKit *)engine didClientRoleChanged:(AgoraClientRole)oldRole newRole:(AgoraClientRole)newRole{
- (void)rtcEngine:(AgoraRtcEngineKit *)engine didClientRoleChanged:(AgoraClientRole)oldRole newRole:(AgoraClientRole)newRole newRoleOptions:(AgoraClientRoleOptions *)newRoleOptions {
if (ENABLE_TEST_VIEW) {
if (newRole == AgoraClientRoleBroadcaster) {
......@@ -737,23 +771,6 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
}
/**
* Event of the first frame of remote user is decoded successfully.
*
* @param engine The engine kit
* @param uid The remote user id
* @param size The size of video stream
* @param elapsed The elapsed time(ms) from the beginning of the session.
*/
- (void)rtcEngine:(AgoraRtcEngineKit *)engine firstRemoteVideoDecodedOfUid:(NSUInteger)uid size:(CGSize)size elapsed:(NSInteger)elapsed
{
if (ENABLE_TEST_VIEW) {
FUSLogInfo(@"=======>Agora First Remote Video Did Decoded");
[[NSNotificationCenter defaultCenter] postNotificationName:kStreamPlayViewDidStartPlayNotification object:@{@"uid":@(uid)}];
}
}
/**
* Event of remote user offlined
*
* @param engine The engine kit
......@@ -965,36 +982,6 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
FUSLogVerbose(@"FUSStreamPushView:第一帧来了");
}
/** Enables/disables the local video function of a specified user.
This method is only applicable to the scenario when the specified user only wants to watch the remote video without sending any video stream to the other user.
@param engine AgoraRtcEngineKit object.
@param enabled Enable or disable the local video function of a specified user:
* YES: Enabled. Other users in the channel can see the video of the specified user.
* NO: Disabled. Other users in the channel do not receive the video stream from the specified user, while the specified user can still receive the video streams from other users.
@param uid ID of the specified user.
*/
- (void)rtcEngine:(AgoraRtcEngineKit * _Nonnull)engine didLocalVideoEnabled:(BOOL)enabled byUid:(NSUInteger)uid
{
FUSLogVerbose(@"%s",__func__);
}
/** The video size or rotation of a specified remote user has changed.
@param engine AgoraRtcEngineKit object
@param uid User ID of the remote user or local user (0) whose video size or rotation has changed
@param size New video size
@param rotation New rotation of the video (0 to 360)
*/
- (void)rtcEngine:(AgoraRtcEngineKit * _Nonnull)engine videoSizeChangedOfUid:(NSUInteger)uid size:(CGSize)size rotation:(NSInteger)rotation
{
FUSLogVerbose(@"%s",__func__);
}
/** The remote video stream state has changed.
@param engine AgoraRtcEngineKit object
......@@ -1060,18 +1047,6 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
FUSLogVerbose(@"%s",__func__);
}
/** The statistics of the uploading local video streams.
Same as [localVideoStatBlock]([AgoraRtcEngineKit localVideoStatBlock:]). This method reports the statistics of the local video streams once every two seconds.
@param engine AgoraRtcEngineKit object.
@param stats Statistics of the uploading local video streams: AgoraRtcLocalVideoStats
*/
- (void)rtcEngine:(AgoraRtcEngineKit * _Nonnull)engine localVideoStats:(AgoraRtcLocalVideoStats * _Nonnull)stats
{
FUSLogVerbose(@"%s",__func__);
}
/** The statistics of the receiving remote video streams.
The SDK updates the application on the statistics of receiving remote video streams for each user/host once every 2 seconds.
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/LinkMicro/View/FUSLinkMicroUserListView.m
......@@ -335,6 +335,10 @@
arr = [NSMutableArray arrayWithArray:userModels];
// }
if (userModels.count == 0) {
FUSLogInfo(@"test");
}
[_models removeAllObjects];
[_models addObjectsFromArray:arr];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeatingPower/New Group/FUSHeatingPowerTableViewCell.m → FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/New Group/FUSPopularTableViewCell.m
//
// FUSHeatingPowerTableViewCell.m
// FUSPopularTableViewCell.m
// FusiLive
//
// Created by Xiang Liu on 2017/6/8.
// Copyright © 2024年 FuSiLive. All rights reserved.
//
#import "FUSHeatingPowerTableViewCell.h"
#import "FUSPopularTableViewCell.h"
#import "FUSNameLevelView.h"
#import "FUSCacheDataShare.h"
#import "FUSLiveHelper.h"
@interface FUSHeatingPowerTableViewCell ()
@interface FUSPopularTableViewCell ()
@property (weak, nonatomic) IBOutlet UILabel *rankingNumLabel;
@property (strong, nonatomic) IBOutlet UIImageView *rankImageView;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *rankingNumLabelWidth;
@property (weak, nonatomic) IBOutlet UIImageView *iconImageView;
@property (weak, nonatomic) IBOutlet FUSNameLevelView *nickNameLabel;
@property (weak, nonatomic) IBOutlet FUSLabel *heatingPowerLabel;
@property (weak, nonatomic) IBOutlet FUSLabel *popularLabel;
@end
@implementation FUSHeatingPowerTableViewCell
@implementation FUSPopularTableViewCell
- (void)awakeFromNib
{
......@@ -33,22 +33,22 @@
// 头像圆角
_iconImageView.layer.cornerRadius = 45.f/2;
_heatingPowerLabel.adjustsFontSizeToFitWidth = YES;
_popularLabel.adjustsFontSizeToFitWidth = YES;
self.selectedBackgroundView = [[UIView alloc] init];
self.selectedBackgroundView.backgroundColor = UIColor.fus_appBGPressColor;
}
- (void)setModel:(FUSBoardModel *)model
- (void)setModel:(FUSLivePopularRankModel *)model
{
_model = model;
_rankingNumLabel.text = model.rankId;
_rankingNumLabel.text = @(model.rankId).description;
_rankingNumLabel.adjustsFontSizeToFitWidth = YES;
if (model.rankId.integerValue <= 3) {
if (model.rankId <= 3) {
self.rankingNumLabel.hidden = YES;
self.rankImageView.hidden = NO;
self.rankImageView.image = [UIImage imageNamed:[NSString stringWithFormat:@"live_contribute_rank_%@",model.rankId]];
self.rankImageView.image = [UIImage imageNamed:[NSString stringWithFormat:@"live_contribute_rank_%zd",model.rankId]];
} else {
self.rankingNumLabel.hidden = NO;
self.rankImageView.hidden = YES;
......@@ -64,12 +64,12 @@
NSString *level = @"0";
if ([model.privilege[@"richPower"] integerValue] == 1) {
level = model.level;
level = @(model.level).description;
}
// 昵称
[_nickNameLabel fus_setDataWithName:model.nickname level:level number:nil defaultNameColor:UIColor.fus_textColorRich];
// 热力值
_heatingPowerLabel.text = model.score;
_popularLabel.text = @(model.score).description;
}
@end
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeatingPower/ProgressView/FUSHeatingProgressView.h → FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/ProgressView/FUSPopularProgressView.h
//
// FUSHeatingProgressView.h
// FUSPopularProgressView.h
// FuSiLive
//
// Created by pierce on 2024/6/19.
......@@ -9,7 +9,7 @@
NS_ASSUME_NONNULL_BEGIN
@interface FUSHeatingProgressView : UIView
@interface FUSPopularProgressView : UIView
- (void)fus_setNumber:(NSInteger)number;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeatingPower/ProgressView/FUSHeatingProgressView.m → FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/ProgressView/FUSPopularProgressView.m
//
// FUSHeatingProgressView.m
// FUSPopularProgressView.m
// FuSiLive
//
// Created by pierce on 2024/6/19.
//
#import "FUSHeatingProgressView.h"
#import "FUSPopularProgressView.h"
#import <FUSFoundation/XLWave.h>
@interface FUSHeatingProgressView ()
@interface FUSPopularProgressView ()
/// 波纹动画
@property (nonatomic, strong) UIView *progressBGView;
......@@ -21,7 +21,7 @@
@end
@implementation FUSHeatingProgressView
@implementation FUSPopularProgressView
- (instancetype)initWithFrame:(CGRect)frame {
self = [super initWithFrame:frame];
......@@ -60,6 +60,7 @@
}
- (void)fus_setNumber:(NSInteger)number {
/// 需求规定，以1500位分母，分为6档，我就不分档了。
CGFloat progress = number / 1500.0;
if (progress <= 0) {
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/Rank/FUSLivePopularRankModel.h 0 → 100644
//
// FUSLivePopularRankModel.h
// FuSiLive
//
// Created by pierce on 2024/6/26.
//
#import <FUSFoundation/FUSFoundation.h>
NS_ASSUME_NONNULL_BEGIN
@interface FUSLivePopularRankModel : FUSBaseModel
/// 年龄
@property (nonatomic, assign) NSInteger age;
/// 头像
@property (nonatomic, copy) NSString *face;
/// 是否在线
@property (nonatomic, assign) BOOL inOnline;
/// 是否付费用户
@property (nonatomic, assign) BOOL inPay;
/// 是否关注
@property (nonatomic, assign) BOOL isFollow;
/// 是否神秘人
@property (nonatomic, assign) BOOL isHide;
/// 是否新用户
@property (nonatomic, assign) BOOL isnew;
/// 在线等级
@property (nonatomic, assign) NSInteger lev;
/// 富豪等级
@property (nonatomic, assign) NSInteger level;
/// 直播状态
@property (nonatomic, assign) NSInteger liveState;
/// 昵称
@property (nonatomic, copy) NSString *nickname;
/// 富豪权益
@property (nonatomic, copy) NSDictionary *privilege;
/// 排名
@property (nonatomic, assign) NSInteger rankId;
/// 分数
@property (nonatomic, assign) NSInteger score;
/// 性别
@property (nonatomic, assign) NSInteger sex;
/// 用户id
@property (nonatomic, copy) NSString *uid;
@end
NS_ASSUME_NONNULL_END
FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/Rank/FUSLivePopularRankModel.m 0 → 100644
//
// FUSLivePopularRankModel.m
// FuSiLive
//
// Created by pierce on 2024/6/26.
//
#import "FUSLivePopularRankModel.h"
@implementation FUSLivePopularRankModel
@end
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeatingPower/Rank/FUSHeatingPowerListView.h → FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/Rank/FUSPopularListView.h
//
// FUSHeatingPowerListView.h
// FUSPopularListView.h
// FusiLive
//
// Created by Xiang Liu on 2017/6/8.
......@@ -9,7 +9,7 @@
#import <UIKit/UIKit.h>
#import "FUSRoomInfoModel.h"
@interface FUSHeatingPowerListView : UIView
@interface FUSPopularListView : UIView
/**
房主的信息model
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeatingPower/Rank/FUSHeatingPowerListView.m → FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/Rank/FUSPopularListView.m
//
// FUSHeatingPowerListView.m
// FUSPopularListView.m
// FusiLive
//
// Created by Xiang Liu on 2017/6/8.
// Copyright © 2024年 FuSiLive. All rights reserved.
//
#import "FUSHeatingPowerListView.h"
#import "FUSHeatingPowerTableViewCell.h"
#import "FUSBoardModel.h"
#import "FUSPopularListView.h"
#import "FUSPopularTableViewCell.h"
#import "FUSLivePopularRankModel.h"
#import "FUSNameLevelView.h"
#import "FUSLiveHttpHelper.h"
#import "FUSLiveHelper.h"
#import "FUSCacheDataShare.h"
#import "FUSEmptyView.h"
#import "MJRefreshBackGifFooter.h"
#define CellReuseIdentifier @"FUSHeatingPowerTableViewCell"
#define CellReuseIdentifier @"FUSPopularTableViewCell"
@interface FUSHeatingPowerListView () <UITableViewDelegate,UITableViewDataSource>
@interface FUSPopularListView () <UITableViewDelegate,UITableViewDataSource>
@property (weak, nonatomic) IBOutlet UILabel *heatingPowerTitle;
@property (weak, nonatomic) IBOutlet UIButton *heatingPowerExplanationBtn;
@property (nonatomic,strong) NSMutableArray *heatingPowerArr;
@property (weak, nonatomic) IBOutlet UILabel *popularTitle;
@property (weak, nonatomic) IBOutlet UIButton *popularExplanationBtn;
@property (nonatomic,strong) NSMutableArray *popularArr;
@property (weak, nonatomic) IBOutlet UIView *mainBgView;
@property (weak, nonatomic) IBOutlet UIView *contentView;
@property (weak, nonatomic) IBOutlet UITableView *heatingPowerTableView;
@property (weak, nonatomic) IBOutlet UITableView *popularTableView;
@property (strong, nonatomic) IBOutlet UIImageView *myrankImageView;
@property (weak, nonatomic) IBOutlet UILabel *myRankingLabel;
@property (weak, nonatomic) IBOutlet UIImageView *myIconImageView;
@property (weak, nonatomic) IBOutlet FUSNameLevelView *myNicknameLabel;
@property (weak, nonatomic) IBOutlet FUSLabel *myHeatingPowerLabel;
@property (weak, nonatomic) IBOutlet FUSLabel *myPopularLabel;
@property (nonatomic, strong) FUSEmptyView *emptyView;
@property (weak, nonatomic) IBOutlet UIView *bottomBgView;
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *tableViewBottomConstraint;
@end
@implementation FUSHeatingPowerListView
@implementation FUSPopularListView
- (NSMutableArray *)heatingPowerArr
- (NSMutableArray *)popularArr
{
if (_heatingPowerArr == nil) {
_heatingPowerArr = [NSMutableArray array];
if (_popularArr == nil) {
_popularArr = [NSMutableArray array];
}
return _heatingPowerArr;
return _popularArr;
}
- (instancetype)initWithFrame:(CGRect)frame
......@@ -51,10 +51,10 @@
self = [super initWithFrame:frame];
if (self) {
FUSHeatingPowerListView *xibView = [[[NSBundle mainBundle] loadNibNamed:NSStringFromClass([self class]) owner:self options:nil] firstObject];
FUSPopularListView *xibView = [[[NSBundle mainBundle] loadNibNamed:NSStringFromClass([self class]) owner:self options:nil] firstObject];
xibView.frame = frame;
self = xibView;
_heatingPowerTitle.text = FUSLocalizationHelper.localString(@"热门榜");
_popularTitle.text = FUSLocalizationHelper.localString(@"热门榜");
[self initView];
}
return self;
......@@ -63,36 +63,36 @@
- (void)initView
{
// 榜单TableView
_heatingPowerTableView.delegate = self;
_heatingPowerTableView.dataSource = self;
_popularTableView.delegate = self;
_popularTableView.dataSource = self;
self.mainBgView.backgroundColor = UIColor.fus_appBGColor;
[_heatingPowerTableView registerNib:[UINib nibWithNibName:CellReuseIdentifier bundle:nil] forCellReuseIdentifier:CellReuseIdentifier];
_heatingPowerTableView.tableFooterView = [[UIView alloc]init];
_heatingPowerTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
[_heatingPowerExplanationBtn setImage:UIImage.fus_helpIcon forState:UIControlStateNormal];
[_popularTableView registerNib:[UINib nibWithNibName:CellReuseIdentifier bundle:nil] forCellReuseIdentifier:CellReuseIdentifier];
_popularTableView.tableFooterView = [[UIView alloc]init];
_popularTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
[_popularExplanationBtn setImage:UIImage.fus_helpIcon forState:UIControlStateNormal];
// if (FUSLocalizationHelper.isArbicLanguage) {
_heatingPowerExplanationBtn.hidden = YES;
_popularExplanationBtn.hidden = YES;
// }
__weak typeof(self) weakSelf = self;
_heatingPowerTableView.mj_header = [FUSRefreshHeader headerWithRefreshingBlock:^{
_popularTableView.mj_header = [FUSRefreshHeader headerWithRefreshingBlock:^{
[FUSTalkingData fus_trackEvent:EVENT_ROOM_HOT_RANK_REFRESH];
[weakSelf requestHeatingPowerList];
[weakSelf requestPopularList];
}];
MJRefreshBackGifFooter *footerRefresh = [MJRefreshBackGifFooter footerWithRefreshingTarget:self refreshingAction:@selector(requestHeatingPowerList)];
MJRefreshBackGifFooter *footerRefresh = [MJRefreshBackGifFooter footerWithRefreshingTarget:self refreshingAction:@selector(requestPopularList)];
[footerRefresh setTitle:FUSLocalizationHelper.localString(@"加载更多") forState:MJRefreshStateIdle];
[footerRefresh setTitle:FUSLocalizationHelper.localString(@"加载更多") forState:MJRefreshStatePulling];
[footerRefresh setTitle:FUSLocalizationHelper.localString(@"正在加载...") forState:MJRefreshStateRefreshing];
[footerRefresh setTitle:FUSLocalizationHelper.localString(@"没有更多了") forState:MJRefreshStateNoMoreData];
footerRefresh.stateLabel.font = [UIFont systemFontOfSize:13 weight:UIFontWeightLight];
footerRefresh.stateLabel.textColor = [UIColor colorWithHex:@"#666666"];
_heatingPowerTableView.mj_footer = footerRefresh;
_popularTableView.mj_footer = footerRefresh;
// 排名Label
_myRankingLabel.adjustsFontSizeToFitWidth = YES;
_myIconImageView.layer.masksToBounds = YES;
_myIconImageView.layer.cornerRadius = _myIconImageView.height / 2.0;
_myHeatingPowerLabel.adjustsFontSizeToFitWidth = YES;
_myPopularLabel.adjustsFontSizeToFitWidth = YES;
}
- (void)setRoomModel:(FUSRoomInfoModel *)roomModel
......@@ -115,13 +115,13 @@
[_myNicknameLabel fus_setDataWithName:roomModel.nickName level:level number:nil defaultNameColor:UIColor.fus_textColorRich];
}
- (void)requestHeatingPowerList
- (void)requestPopularList
{
[FUSLiveHttpHelper fus_requestHeatingPowerDataWithRoomID:[FUSLiveHelper shareInstance].roomInfoModel.roomId success:^(NSArray<FUSBoardModel *> *heatingPowerArr) {
[FUSLiveHttpHelper fus_requestPopularDataWithRoomID:[FUSLiveHelper shareInstance].roomInfoModel.roomId channelId:[FUSLiveHelper shareInstance].roomInfoModel.channelId success:^(NSArray<FUSLivePopularRankModel *> *popularArr) {
self.bottomBgView.hidden = NO;
self.tableViewBottomConstraint.constant = 0;
[self.heatingPowerTableView.mj_header endRefreshing];
[self.heatingPowerTableView.mj_footer endRefreshingWithNoMoreData];
[self.popularTableView.mj_header endRefreshing];
[self.popularTableView.mj_footer endRefreshingWithNoMoreData];
[self.emptyView removeFromSuperview];
// 自己的排名
self.myRankingLabel.text = [FUSLiveHelper shareInstance].roomInfoModel.hotRank;
......@@ -134,33 +134,33 @@
self.myrankImageView.hidden = YES;
}
// 自己的热力值
self.myHeatingPowerLabel.text = [FUSLiveHelper shareInstance].roomInfoModel.hotScore;
self.myPopularLabel.text = [FUSLiveHelper shareInstance].roomInfoModel.hotScore;
// 热力值排行
[self.heatingPowerArr setArray:heatingPowerArr];
[self.heatingPowerTableView reloadData];
[self.popularArr setArray:popularArr];
[self.popularTableView reloadData];
} failure:^(NSString *msg, int errorCode) {
self.bottomBgView.hidden = YES;
self.tableViewBottomConstraint.constant = -65;
[self.heatingPowerTableView.mj_header endRefreshing];
[self.heatingPowerTableView.mj_footer endRefreshingWithNoMoreData];
[self.popularTableView.mj_header endRefreshing];
[self.popularTableView.mj_footer endRefreshingWithNoMoreData];
if (errorCode == -1000) {
//错误页面
[self.emptyView removeFromSuperview];
self.emptyView = nil;
[self.emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:FUSLocalizationHelper.localString(@"当前网络不好，下拉刷新试试") buttonTittle:nil];
[self.heatingPowerTableView addSubview:self.emptyView];
[self.popularTableView addSubview:self.emptyView];
}else {
[self.emptyView removeFromSuperview];
self.emptyView = nil;
[self.emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:msg buttonTittle:nil];
[self.heatingPowerTableView addSubview:self.emptyView];
[self.popularTableView addSubview:self.emptyView];
}
}];
}
- (IBAction)onTapHeatingPowerExplanationBtnAction:(id)sender {
- (IBAction)onTapPopularExplanationBtnAction:(id)sender {
[self fus_dismissViewAnimation:NO];
if (_boardDescriptionClickBlock) _boardDescriptionClickBlock();
}
......@@ -178,7 +178,7 @@
}];
// 请求热力值列表
[self requestHeatingPowerList];
[self requestPopularList];
}
- (void)fus_dismissViewAnimation:(BOOL)animation
......@@ -210,7 +210,7 @@
[self fus_dismissViewAnimation:YES];
}
- (IBAction)clickSelfHeatingPowerBtn:(UIButton *)sender
- (IBAction)clickSelfPopularBtn:(UIButton *)sender
{
if (_userClickBlock) _userClickBlock([FUSLiveHelper shareInstance].roomInfoModel.roomId);
}
......@@ -225,8 +225,8 @@
[self fus_dismissViewAnimation:NO];
// 回调点击用户的uid
if (self.heatingPowerArr.count > index) {
FUSBoardModel *boardModel = self.heatingPowerArr[index];
if (self.popularArr.count > index) {
FUSLivePopularRankModel *boardModel = self.popularArr[index];
if (![NSString isNull:boardModel.uid]) {
if (_userClickBlock) _userClickBlock(boardModel.uid);
}
......@@ -239,7 +239,7 @@
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
return self.heatingPowerArr.count;
return self.popularArr.count;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
......@@ -249,9 +249,9 @@
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
FUSHeatingPowerTableViewCell *heatingPowerCell = [tableView dequeueReusableCellWithIdentifier:CellReuseIdentifier forIndexPath:indexPath];
heatingPowerCell.model = self.heatingPowerArr[indexPath.row];
return heatingPowerCell;
FUSPopularTableViewCell *popularCell = [tableView dequeueReusableCellWithIdentifier:CellReuseIdentifier forIndexPath:indexPath];
popularCell.model = self.popularArr[indexPath.row];
return popularCell;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
......@@ -263,7 +263,7 @@
- (FUSEmptyView *)emptyView {
if (!_emptyView) {
_emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, _heatingPowerTableView.height - _tableViewBottomConstraint.constant)];
_emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, _popularTableView.height - _tableViewBottomConstraint.constant)];
_emptyView.contentAligment = FUSEmptyViewAligmentCenter;
[_emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:nil buttonTittle:nil];
}
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeatingPower/Rank/FUSHeatingPowerListView.xib → FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/Rank/FUSPopularListView.xib
......@@ -10,7 +10,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="FUSHeatingPowerListView">
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="FUSPopularListView">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
......@@ -36,7 +36,7 @@
<color key="titleColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="onTapHeatingPowerExplanationBtnAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="e0c-xd-Twm"/>
<action selector="onTapPopularExplanationBtnAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="e0c-xd-Twm"/>
</connections>
</button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门榜" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XEc-zv-0VG">
......@@ -128,8 +128,8 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_heatingPower_hot" translatesAutoresizingMaskIntoConstraints="NO" id="Noo-0c-BBA">
<rect key="frame" x="98.5" y="40" width="12.5" height="12.5"/>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_popular_hot" translatesAutoresizingMaskIntoConstraints="NO" id="Noo-0c-BBA">
<rect key="frame" x="98.5" y="40" width="128" height="128"/>
<color key="tintColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" secondItem="Noo-0c-BBA" secondAttribute="height" multiplier="1:1" id="Y6U-hc-qYS"/>
......@@ -138,11 +138,11 @@
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dCA-60-yaU">
<rect key="frame" x="0.0" y="0.0" width="375" height="65"/>
<connections>
<action selector="clickSelfHeatingPowerBtn:" destination="iN0-l3-epB" eventType="touchUpInside" id="gIe-Ne-Gx9"/>
<action selector="clickSelfPopularBtn:" destination="iN0-l3-epB" eventType="touchUpInside" id="gIe-Ne-Gx9"/>
</connections>
</button>
<label opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BgM-jW-rQL" customClass="FUSLabel">
<rect key="frame" x="116" y="39" width="7.5" height="17"/>
<rect key="frame" x="231.5" y="39" width="7.5" height="17"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="12"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
......@@ -213,15 +213,15 @@
<connections>
<outlet property="bottomBgView" destination="CrJ-BJ-q5L" id="Gwb-yY-Pk4"/>
<outlet property="contentView" destination="DlR-3B-K33" id="0cd-9h-s61"/>
<outlet property="heatingPowerExplanationBtn" destination="8MG-Kp-rCX" id="BXS-bb-CAC"/>
<outlet property="heatingPowerTableView" destination="0uU-G0-BQg" id="xQs-Il-vAd"/>
<outlet property="heatingPowerTitle" destination="XEc-zv-0VG" id="n0A-Pd-hwS"/>
<outlet property="mainBgView" destination="0K4-qu-piz" id="I8z-2E-32H"/>
<outlet property="myHeatingPowerLabel" destination="BgM-jW-rQL" id="2ps-ve-z6L"/>
<outlet property="myIconImageView" destination="lLs-a5-3U1" id="BEr-1Y-BMp"/>
<outlet property="myNicknameLabel" destination="Vn7-jU-7Kf" id="8YL-QC-64u"/>
<outlet property="myPopularLabel" destination="BgM-jW-rQL" id="2ps-ve-z6L"/>
<outlet property="myRankingLabel" destination="5ow-AJ-Hxg" id="8nt-ZP-epy"/>
<outlet property="myrankImageView" destination="ajw-7N-O82" id="Uri-fb-xDh"/>
<outlet property="popularExplanationBtn" destination="8MG-Kp-rCX" id="BXS-bb-CAC"/>
<outlet property="popularTableView" destination="0uU-G0-BQg" id="xQs-Il-vAd"/>
<outlet property="popularTitle" destination="XEc-zv-0VG" id="n0A-Pd-hwS"/>
<outlet property="tableViewBottomConstraint" destination="nkd-Il-0Ib" id="fYB-CA-Iim"/>
</connections>
<point key="canvasLocation" x="-728.79999999999995" y="-23.838080959520241"/>
......@@ -229,6 +229,6 @@
</objects>
<resources>
<image name="common_help_icon" width="17.5" height="17.5"/>
<image name="live_heatingPower_hot" width="12.5" height="12.5"/>
<image name="live_popular_hot" width="128" height="128"/>
</resources>
</document>
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeatingPower/Rank/FUSHeatingPowerTableViewCell.h → FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/Rank/FUSPopularTableViewCell.h
//
// FUSHeatingPowerTableViewCell.h
// FUSPopularTableViewCell.h
// FusiLive
//
// Created by Xiang Liu on 2017/6/8.
......@@ -7,10 +7,10 @@
//
#import <UIKit/UIKit.h>
#import "FUSBoardModel.h"
#import "FUSLivePopularRankModel.h"
@interface FUSHeatingPowerTableViewCell : UITableViewCell
@interface FUSPopularTableViewCell : UITableViewCell
@property (nonatomic,strong) FUSBoardModel *model;
@property (nonatomic,strong) FUSLivePopularRankModel *model;
@end
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeatingPower/Rank/FUSHeatingPowerTableViewCell.xib → FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/Rank/FUSPopularTableViewCell.xib
......@@ -9,7 +9,7 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="FUSHeatingPowerTableViewCell">
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="FUSPopularTableViewCell">
<rect key="frame" x="0.0" y="0.0" width="320" height="65"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
......@@ -58,14 +58,14 @@
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nnz-Qr-1JP" customClass="FUSLabel">
<rect key="frame" x="114.5" y="38" width="7.5" height="17"/>
<rect key="frame" x="230" y="38" width="7.5" height="17"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="12"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<size key="shadowOffset" width="0.0" height="0.0"/>
</label>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_heatingPower_hot" translatesAutoresizingMaskIntoConstraints="NO" id="8Wm-NY-C9H">
<rect key="frame" x="97" y="39" width="12.5" height="12.5"/>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_popular_hot" translatesAutoresizingMaskIntoConstraints="NO" id="8Wm-NY-C9H">
<rect key="frame" x="97" y="39" width="128" height="128"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="tPE-Th-gvf">
<rect key="frame" x="0.0" y="64.5" width="320" height="0.5"/>
......@@ -98,9 +98,9 @@
</tableViewCellContentView>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<connections>
<outlet property="heatingPowerLabel" destination="Nnz-Qr-1JP" id="4sy-FK-1Fq"/>
<outlet property="iconImageView" destination="fM0-ex-fyt" id="hgb-AK-0rn"/>
<outlet property="nickNameLabel" destination="6wI-Bd-29E" id="Sr6-JA-1jn"/>
<outlet property="popularLabel" destination="Nnz-Qr-1JP" id="4sy-FK-1Fq"/>
<outlet property="rankImageView" destination="S3D-jB-dHc" id="0FM-eK-dlY"/>
<outlet property="rankingNumLabel" destination="BYH-xW-6Mn" id="yDh-wA-aHS"/>
<outlet property="rankingNumLabelWidth" destination="Uuz-bC-jSa" id="z8e-BV-qju"/>
......@@ -109,6 +109,6 @@
</tableViewCell>
</objects>
<resources>
<image name="live_heatingPower_hot" width="12.5" height="12.5"/>
<image name="live_popular_hot" width="128" height="128"/>
</resources>
</document>
FuSiLive/Classes/NewLive/Main/View/MinimizeView/FUSLiveMinimizeView.m
......@@ -32,6 +32,9 @@ typedef NS_ENUM(NSInteger,FUSLiveMinimizeViewLevelType) {
// PK头像上面显示的logo
@property (nonatomic, strong) UIImageView *pkUserLogoImageView;
/// 连麦房背景头像
@property (nonatomic, strong) UIImageView *linkMicImageView;
// 内容
@property (nonatomic, strong) UIView *contentView;
......@@ -143,6 +146,8 @@ typedef NS_ENUM(NSInteger,FUSLiveMinimizeViewLevelType) {
[self.pkUserBgImageView addSubview:self.pkUserLogoImageView];
[self addSubview:self.roomUserBgImageView];
[self.roomUserBgImageView addSubview:self.roomUserlogoImageView];
[self addSubview:self.linkMicImageView];
[self addSubview:self.contentView];
[self.contentView addSubview:self.animImageView];
[self addSubview:self.closeBtn];
......@@ -161,8 +166,13 @@ typedef NS_ENUM(NSInteger,FUSLiveMinimizeViewLevelType) {
_type = type;
switch (type) {
case FUSLiveMinimizeViewTypeNormalLive:
[self.animImageView stopAnimating];
self.animImageView.hidden = YES;
self.linkMicImageView.hidden = YES;
self.pkUserBgImageView.hidden = YES;
self.roomUserBgImageView.hidden = NO;
[_roomUserBgImageView fus_setWebImageWithSubURLString:FUSLiveHelper.shareInstance.roomInfoModel.face placeholder:UIImage.fus_defaultIcon];
_roomUserBgImageView.layer.cornerRadius = 0;
self.roomUserlogoImageView.centerY = self.roomUserlogoImageView.height / 2.0 - 10;
......@@ -175,6 +185,10 @@ typedef NS_ENUM(NSInteger,FUSLiveMinimizeViewLevelType) {
case FUSLiveMinimizeViewTypePK:
[self.animImageView stopAnimating];
self.animImageView.hidden = YES;
self.linkMicImageView.hidden = YES;
self.pkUserBgImageView.hidden = NO;
self.roomUserBgImageView.hidden = NO;
[_roomUserBgImageView fus_setWebImageWithSubURLString:FUSLiveHelper.shareInstance.roomInfoModel.face placeholder:UIImage.fus_defaultIcon];
[_pkUserBgImageView fus_setWebImageWithSubURLString:FUSLiveHelper.shareInstance.roomInfoModel.face placeholder:UIImage.fus_defaultIcon];
self.roomUserlogoImageView.centerY = self.roomUserlogoImageView.height / 2.0 - 10;
......@@ -191,9 +205,15 @@ typedef NS_ENUM(NSInteger,FUSLiveMinimizeViewLevelType) {
case FUSLiveMinimizeViewTypeLinkMicRoom:
[self.animImageView startAnimating];
self.animImageView.hidden = NO;
[_roomUserBgImageView fus_setWebImageWithSubURLString:FUSLiveHelper.shareInstance.roomInfoModel.face placeholder:UIImage.fus_defaultIcon];
_roomUserBgImageView.layer.cornerRadius = _roomUserBgImageView.width / 2.0f;
_roomUserBgImageView.layer.masksToBounds = YES;
self.linkMicImageView.hidden = NO;
self.pkUserBgImageView.hidden = YES;
self.roomUserBgImageView.hidden = YES;
[_linkMicImageView setWebImageWithSubURLString:FUSLiveHelper.shareInstance.roomInfoModel.face];
_linkMicImageView.layer.cornerRadius = _linkMicImageView.width / 2.0f;
_linkMicImageView.layer.masksToBounds = YES;
self.closeBtn.origin = CGPointMake(self.contentView.right - self.closeBtn.width - 4, 4);
[self.closeBtn setImage:nil forState:UIControlStateNormal];
self.layer.cornerRadius = 0;
......@@ -246,9 +266,29 @@ typedef NS_ENUM(NSInteger,FUSLiveMinimizeViewLevelType) {
CGRect bounds = CGRectZero;
bounds.size = size;
switch (self.type) {
case FUSLiveMinimizeViewTypeNormalLive:
if (self.type != FUSLiveMinimizeViewTypeLinkMicRoom) {
self.roomUserBgImageView.hidden = NO;
self.pkUserBgImageView.hidden = YES;
self.linkMicImageView.hidden = YES;
break;
case FUSLiveMinimizeViewTypePK:
self.roomUserBgImageView.hidden = NO;
self.pkUserBgImageView.hidden = NO;
self.linkMicImageView.hidden = YES;
break;
case FUSLiveMinimizeViewTypeLinkMicRoom:
self.roomUserBgImageView.hidden = YES;
self.pkUserBgImageView.hidden = YES;
self.linkMicImageView.hidden = NO;
break;
}
if (self.type != FUSLiveMinimizeViewTypeLinkMicRoom) {
}
/// playerView 内部是有做动画的
......@@ -258,7 +298,8 @@ typedef NS_ENUM(NSInteger,FUSLiveMinimizeViewLevelType) {
switch (self.type) {
case FUSLiveMinimizeViewTypeNormalLive:
self.roomUserBgImageView.frame = bounds;
self.pkUserBgImageView.hidden = YES;
self.roomUserlogoImageView.centerY = self.roomUserBgImageView.height / 2.0 - 10;
self.roomUserlogoImageView.centerX = self.roomUserBgImageView.width / 2.0;
break;
case FUSLiveMinimizeViewTypePK: {
CGRect frame = bounds;
......@@ -266,12 +307,16 @@ typedef NS_ENUM(NSInteger,FUSLiveMinimizeViewLevelType) {
self.roomUserBgImageView.frame = frame;
frame.origin.x = frame.size.width;
self.pkUserBgImageView.frame = frame;
self.pkUserBgImageView.hidden = NO;
self.roomUserlogoImageView.centerY = self.roomUserBgImageView.height / 2.0 - 10;
self.roomUserlogoImageView.centerX = self.roomUserBgImageView.width / 2.0;
self.pkUserLogoImageView.centerY = self.pkUserBgImageView.height / 2.0 - 10;
self.pkUserLogoImageView.centerX = self.pkUserBgImageView.width / 2.0;
break;
}
case FUSLiveMinimizeViewTypeLinkMicRoom:
self.roomUserBgImageView.frame = CGRectInset(bounds, kFaceInset, kFaceInset);
self.pkUserBgImageView.hidden = YES;
self.linkMicImageView.frame = CGRectInset(bounds, kFaceInset, kFaceInset);
self.linkMicImageView.layer.cornerRadius = self.linkMicImageView.width / 2.0;
self.layer.masksToBounds = YES;
break;
}
......@@ -281,7 +326,6 @@ typedef NS_ENUM(NSInteger,FUSLiveMinimizeViewLevelType) {
} completion:^(BOOL finished) {
self.contentView.userInteractionEnabled = YES;
self.roomUserBgImageView.hidden = NO;
}];
}
......@@ -467,6 +511,17 @@ typedef NS_ENUM(NSInteger,FUSLiveMinimizeViewLevelType) {
}
- (UIImageView *)linkMicImageView {
if (!_linkMicImageView) {
_linkMicImageView = [[UIImageView alloc] init];
_linkMicImageView.contentMode = UIViewContentModeScaleAspectFill;
}
return _linkMicImageView;
}
- (UIView *)contentView {
if (!_contentView) {
_contentView = [[UIView alloc] initWithFrame:self.bounds];
......
FuSiLive/Classes/NewLive/Main/View/StreamView/FUSStreamPushView.m
......@@ -121,7 +121,7 @@ NSString * const kStreamRTCDidOfflineNotification = @"kStreamRTCDidOfflineNotifi
NSInteger targetBitrate = [agoraConfig[kLivePushConfigTargetBitrateKey] integerValue];
if (targetBitrate <= 0) {
targetBitrate = 500;
targetBitrate = 1000;
}
__block CGSize videoSize;
......@@ -167,7 +167,7 @@ NSString * const kStreamRTCDidOfflineNotification = @"kStreamRTCDidOfflineNotifi
[_agoraEngine enableVideo];
[_agoraEngine enableAudio];
[_agoraEngine enableLocalVideo:YES];
[_agoraEngine setAudioSessionOperationRestriction:AgoraAudioSessionOperationRestrictionAll];
// [_agoraEngine setAudioSessionOperationRestriction:AgoraAudioSessionOperationRestrictionAll];
[_agoraEngine setParameters:@"{\"che.audio.keep.audiosession\":true}"];
// [_agoraEngine disableExternalAudioSource];
......@@ -219,6 +219,12 @@ NSString * const kStreamRTCDidOfflineNotification = @"kStreamRTCDidOfflineNotifi
_agoraOtherPreview.backgroundColor = [UIColor clearColor];
_agoraOtherPreview.clipsToBounds = YES;
[self addSubview:_agoraOtherPreview];
[_agoraOtherPreview mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(floor(self.width / 2.0));
make.top.mas_equalTo(STREAM_VIEW_Y_POSITION);
make.width.mas_equalTo(ceil(self.width / 2.0));
make.height.mas_equalTo(height);
}];
self.localPreviewFrame = CGRectMake(0, STREAM_VIEW_Y_POSITION, ceil(self.width / 2.0), height);
......@@ -562,7 +568,7 @@ NSString * const kStreamRTCDidOfflineNotification = @"kStreamRTCDidOfflineNotifi
[FUSDeviceHelper fus_checkOldIPhoneDeviceHandler:^(BOOL oldDev) {
if (oldDev) {
[self.captureHelper fus_stopStreamPush];
[self.agoraEngine startRtmpStreamWithTranscoding:_captureHelper.pushUrl transcoding:NO];
[self.agoraEngine startRtmpStreamWithTranscoding:self.captureHelper.pushUrl transcoding:NO];
}
}];
......@@ -588,7 +594,7 @@ NSString * const kStreamRTCDidOfflineNotification = @"kStreamRTCDidOfflineNotifi
{
[FUSDeviceHelper fus_checkOldIPhoneDeviceHandler:^(BOOL oldDev) {
if (!oldDev && [FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor) {
[_captureHelper fus_stopStreamPush];
[self.captureHelper fus_stopStreamPush];
}
}];
}
......@@ -601,7 +607,7 @@ NSString * const kStreamRTCDidOfflineNotification = @"kStreamRTCDidOfflineNotifi
{// 推流到自己的 CDN v6.3改为和安卓一样使用旁路推流
// [FUSDeviceHelper fus_checkOldIPhoneDeviceHandler:^(BOOL oldDev) {
if ([FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor) {
[_captureHelper fus_restartStreamPush];
[self.captureHelper fus_restartStreamPush];
}
// }];
}
......@@ -627,8 +633,8 @@ NSString * const kStreamRTCDidOfflineNotification = @"kStreamRTCDidOfflineNotifi
if (oldDev && [FUSLiveHelper shareInstance].liveType == FUSLiveTypeAnchor) {
// 移除旁路推流
[_agoraEngine stopRtmpStream:_streamUrl];
[_captureHelper fus_restartStreamPush];
[self.agoraEngine stopRtmpStream:self.streamUrl];
[self.captureHelper fus_restartStreamPush];
}
}];
......
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