Skip to content

pidan / FuSiLive

Go to a project
Commit 1eb0470e by ludi
Options

完成新版本ui调整

parent 74f7e096
Expand all
Inline Side-by-side
Showing with 70 additions and 34 deletions
FuSiLive.xcodeproj/project.pbxproj
...@@ -501,7 +501,7 @@ ...@@ -501,7 +501,7 @@
"$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty", "$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty",
); );
LOCALIZATION_PREFERS_STRING_CATALOGS = NO; LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.1;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-isystem", "-isystem",
...@@ -769,7 +769,7 @@ ...@@ -769,7 +769,7 @@
"$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty", "$(PROJECT_DIR)/FuSiLive/Classes/FUSModules/FUSLiveModule/NewLive/Main/View/StreamView/Beauty/ByteDanceBeauty",
); );
LOCALIZATION_PREFERS_STRING_CATALOGS = NO; LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 1.0; MARKETING_VERSION = 1.1;
OTHER_CFLAGS = ( OTHER_CFLAGS = (
"$(inherited)", "$(inherited)",
"-isystem", "-isystem",
......
Modules/FUSChatCenterModule/FUSChatCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key> <key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>75</integer> <integer>76</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>72</integer> <integer>71</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/live_chat_icon_gift_type2.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_chat_icon_gift_type2@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_chat_icon_gift_type2@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/FUSShowRoomBundle.bundle/FUSShowRoomAssets.xcassets/live/live_head_follow_tick_btn.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "live_head_follow_tick_btn@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "live_head_follow_tick_btn@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FUSLiveHelper.h
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#import "FUSAgoraHelper.h" #import "FUSAgoraHelper.h"
#import "FUSLiveStreamView.h" #import "FUSLiveStreamView.h"
#import "FUSRoomQuickChatListModel.h" #import "FUSRoomQuickChatListModel.h"
#import "FUSBaoFangAnchorModel.h"
typedef enum : NSInteger { typedef enum : NSInteger {
defaultRoom = 0 defaultRoom = 0
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveBottomToolView.m
...@@ -364,12 +364,14 @@ ...@@ -364,12 +364,14 @@
case FUSLiveBottomToolTypeGift: case FUSLiveBottomToolTypeGift:
{ {
if (isSelect){ if (isSelect){
image = [UIImage fus_liveGiftImage_normal]; // image = [UIImage fus_liveGiftImage_normal];
image = [FUSShowRoomCenterBunble imageNamed:@"live_chat_icon_gift_type2"];
[self.giftBtn setImage:image forState:UIControlStateHighlighted]; [self.giftBtn setImage:image forState:UIControlStateHighlighted];
} }
else else
{ {
image = [UIImage fus_liveGiftImage_normal]; // image = [UIImage fus_liveGiftImage_normal];
image = [FUSShowRoomCenterBunble imageNamed:@"live_chat_icon_gift_type2"];
[self.giftBtn setImage:image forState:UIControlStateNormal]; [self.giftBtn setImage:image forState:UIControlStateNormal];
btn = self.giftBtn; btn = self.giftBtn;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
...@@ -605,7 +605,7 @@ UIGestureRecognizerDelegate ...@@ -605,7 +605,7 @@ UIGestureRecognizerDelegate
_headView.delegate = self; _headView.delegate = self;
[[self fus_viewWithLayer:FUSLiveFunctionLayerRoomInfos] addSubview:_headView]; [[self fus_viewWithLayer:FUSLiveFunctionLayerRoomInfos] addSubview:_headView];
self.popularView = [[FUSPopularProgressView alloc] initWithFrame:CGRectMake(12, self.headView.bottom, 48, 48)]; self.popularView = [[FUSPopularProgressView alloc] initWithFrame:CGRectMake(12, self.headView.bottom, 60, 60)];
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
self.popularView.tapPopularViewHandler = ^{ self.popularView.tapPopularViewHandler = ^{
[weakSelf fus_headViewClickHeatPower]; [weakSelf fus_headViewClickHeatPower];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/HeadView/FUSLiveHeadView.h
...@@ -160,6 +160,9 @@ typedef NS_ENUM(NSInteger, FUSLiveHeadViewType) { ...@@ -160,6 +160,9 @@ typedef NS_ENUM(NSInteger, FUSLiveHeadViewType) {
*/ */
- (void)fus_setupLiked:(BOOL)liked; - (void)fus_setupLiked:(BOOL)liked;
/// 显示点击关注的动画，给外面某些比如一个接口就是送礼并且自动关注的动作调用,这个会弹出关注成功的toast，与fus_setupLiked的区别就是，fus_setupLiked仅仅作为更新其状态
-(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow;
/** /**
清除 HeadView 的数据 清除 HeadView 的数据
*/ */
...@@ -204,7 +207,5 @@ typedef NS_ENUM(NSInteger, FUSLiveHeadViewType) { ...@@ -204,7 +207,5 @@ typedef NS_ENUM(NSInteger, FUSLiveHeadViewType) {
- (void)fus_updateUserListModel:(id)userListModel; - (void)fus_updateUserListModel:(id)userListModel;
/// 显示点击关注的动画，给外面某些比如一个接口就是送礼并且自动关注的动作调用
-(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow;
@end @end
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/HeadView/FUSLiveHeadView.m
...@@ -605,11 +605,7 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati ...@@ -605,11 +605,7 @@ NSString * const kDidHotScoreChangeNotification = @"kDidHotScoreChangeNotificati
*/ */
- (void)fus_setupLiked:(BOOL)liked - (void)fus_setupLiked:(BOOL)liked
{ {
if (!liked) { [_portraitView fus_setLike:liked];
[_portraitView fus_showLikeButtonWithAnimation:YES];
} else {
[_portraitView fus_dismissLikeButtonWithAnimation:YES];
}
} }
- (void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow{ - (void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow{
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/HeadView/FUSLivePortraitView.h
...@@ -52,19 +52,13 @@ ...@@ -52,19 +52,13 @@
@property (nonatomic, copy) void(^clickPortraitViewHandler)(void); @property (nonatomic, copy) void(^clickPortraitViewHandler)(void);
#pragma mark - Method #pragma mark - Method
/**
显示追踪按钮
@param animate 是否动画显示
*/
- (void)fus_showLikeButtonWithAnimation:(BOOL)animate;
/** /// 设置是否关注
隐藏追踪按钮 /// @param isLike 是否关注
-(void)fus_setLike:(BOOL)isLike;
@param animate 是否动画显示
*/ /// 显示点击关注的动画，给外面某些比如一个接口就是送礼并且自动关注的动作调用，说白了，就是会显示动画，比如多一个toast提示
- (void)fus_dismissLikeButtonWithAnimation:(BOOL)animate; -(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow;
/** /**
根据 model 设置 PortraitView 根据 model 设置 PortraitView
...@@ -81,9 +75,6 @@ ...@@ -81,9 +75,6 @@
*/ */
- (void)fus_onClickLikeButton:(UIButton *)sender; - (void)fus_onClickLikeButton:(UIButton *)sender;
/// 显示点击关注的动画，给外面某些比如一个接口就是送礼并且自动关注的动作调用
-(void)fus_showClickLikeAnimateWithIsFollow:(BOOL)isFollow;
- (void)fus_anchorOffline:(BOOL)offline; - (void)fus_anchorOffline:(BOOL)offline;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/Popular/ProgressView/FUSPopularProgressView.m
...@@ -44,13 +44,14 @@ ...@@ -44,13 +44,14 @@
self.progressView.y = self.progressBGView.height; self.progressView.y = self.progressBGView.height;
[self.progressBGView addSubview:self.progressView]; [self.progressBGView addSubview:self.progressView];
CGFloat iconWidth = 20;
self.iconImageView = [[UIImageView alloc] initWithImage:[FUSShowRoomCenterBunble imageNamed:@"live_heat_progress_icon"]]; self.iconImageView = [[UIImageView alloc] initWithImage:[FUSShowRoomCenterBunble imageNamed:@"live_heat_progress_icon"]];
self.iconImageView.frame = CGRectMake((self.width - 15) / 2.0, 9, 15, 15); self.iconImageView.frame = CGRectMake((self.width - iconWidth) / 2.0, 12, iconWidth, iconWidth);
[self addSubview:self.iconImageView]; [self addSubview:self.iconImageView];
self.numberLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.iconImageView.bottom, self.width, 16)]; self.numberLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, self.iconImageView.bottom + 4, self.width, 16)];
self.numberLabel.textColor = [UIColor whiteColor]; self.numberLabel.textColor = [UIColor whiteColor];
self.numberLabel.font = [UIFont fus_themeBoldFont:9]; self.numberLabel.font = [UIFont fus_themeBoldFont:12];
self.numberLabel.textAlignment = NSTextAlignmentCenter; self.numberLabel.textAlignment = NSTextAlignmentCenter;
self.numberLabel.text = @"0"; self.numberLabel.text = @"0";
[self addSubview:self.numberLabel]; [self addSubview:self.numberLabel];
......
Modules/FUSUserCenterModule/FUSUserCenterModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key> <key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>76</integer> <integer>72</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>71</integer> <integer>75</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
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