Skip to content

pidan / FuSiLive

Go to a project
Commit ff509071 by ludi
Options

修复一系列bug

parent 7d632915
Expand all
Inline Side-by-side
Showing with 172 additions and 65 deletions
DevelopmentPods/FUSCommon/FUSCommon/Classes/Common/View/FUSWebShareView.m
...@@ -262,9 +262,9 @@ ...@@ -262,9 +262,9 @@
{ {
self.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.3]; self.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.3];
if (_from == FUSFromInvitShare) { if (_from == FUSFromInvitShare) {
self.btnArr = @[@(FacebookPlatform), @(TwitterPlatform), /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink),@(BarcodePhotoPlatform)]; self.btnArr = @[@(FacebookPlatform), /*@(TwitterPlatform),*/ /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink),@(BarcodePhotoPlatform)];
} else { } else {
self.btnArr = @[@(FacebookPlatform), @(TwitterPlatform), /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink)]; self.btnArr = @[@(FacebookPlatform), /*@(TwitterPlatform),*/ /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink)];
} }
if (_from == FUSFromInvitShare) { if (_from == FUSFromInvitShare) {
......
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>74</integer> <integer>72</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>75</integer> <integer>71</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule.xcodeproj/xcuserdata/aaa.xcuserdatad/xcschemes/xcschememanagement.plist
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key> <key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>72</integer> <integer>73</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>76</integer> <integer>74</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/cell/FUSHomeAnchorListSmallCell.m
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#import "FUSHomeAnchorListSmallCell.h" #import "FUSHomeAnchorListSmallCell.h"
#import "FUSBaoFangTagView.h" #import "FUSBaoFangTagView.h"
#import "FUSPKLiveAnimateImageView.h"
#import <Masonry/Masonry.h> #import <Masonry/Masonry.h>
...@@ -22,6 +23,8 @@ ...@@ -22,6 +23,8 @@
@property (nonatomic, strong) UILabel *nickNameLabel; @property (nonatomic, strong) UILabel *nickNameLabel;
/// 这个是龟龟左上角new的那个图标，找了一万年没找到 /// 这个是龟龟左上角new的那个图标，找了一万年没找到
@property (nonatomic, strong) FUSBaoFangTagView *tagView; @property (nonatomic, strong) FUSBaoFangTagView *tagView;
///pk标识动画
@property (nonatomic, strong) FUSPKLiveAnimateImageView *PKAnimationImageView;
///底部的阴影View ///底部的阴影View
@property (nonatomic, strong) UIImageView *bottomAlphaBgView; @property (nonatomic, strong) UIImageView *bottomAlphaBgView;
...@@ -98,6 +101,15 @@ ...@@ -98,6 +101,15 @@
self.tagView.itemSpace = 4; self.tagView.itemSpace = 4;
[self.contentView addSubview:self.tagView]; [self.contentView addSubview:self.tagView];
self.PKAnimationImageView = [[FUSPKLiveAnimateImageView alloc] init];
[self.contentView addSubview:self.PKAnimationImageView];
[self.PKAnimationImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(self.hotNumBtn.mas_left).offset(-4);
make.height.equalTo(self.hotNumBtn.mas_height);
make.width.equalTo(self.hotNumBtn.mas_height).multipliedBy(43.0 / 22.0);
make.top.equalTo(self.hotNumBtn.mas_top);
}];
self.hotNumBtn.hidden = YES; self.hotNumBtn.hidden = YES;
self.locationBtn.hidden = YES; self.locationBtn.hidden = YES;
} }
...@@ -109,11 +121,22 @@ ...@@ -109,11 +121,22 @@
#pragma mark --- notification #pragma mark --- notification
- (void)fus_enterLiveRoom { - (void)fus_enterLiveRoom {
[self.tagView fus_stopAllTagsAnim]; [self.tagView fus_stopAllTagsAnim];
self.PKAnimationImageView.hidden = YES;
[self.PKAnimationImageView stopAnimating];
} }
- (void)fus_quickLiveRoom { - (void)fus_quickLiveRoom {
//pk动画 //pk动画
[self.tagView fus_startAllTagsAnim]; [self.tagView fus_startAllTagsAnim];
//pk动画
if (self.model.isPk.boolValue) {
self.PKAnimationImageView.hidden = NO;
[self.PKAnimationImageView startAnimating];
} else {
self.PKAnimationImageView.hidden = YES;
[self.PKAnimationImageView stopAnimating];
}
} }
#pragma mark --- getter and setter #pragma mark --- getter and setter
...@@ -161,6 +184,14 @@ ...@@ -161,6 +184,14 @@
self.tagView.hidden = NO; self.tagView.hidden = NO;
[self.tagView fus_refreshTagImagesWithModel:model]; [self.tagView fus_refreshTagImagesWithModel:model];
if (model.isPk.boolValue) {
self.PKAnimationImageView.hidden = NO;
[self.PKAnimationImageView startAnimating];
} else {
self.PKAnimationImageView.hidden = YES;
[self.PKAnimationImageView stopAnimating];
}
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[self.bgImageView setBaoFangCoverWebImageWithSubURLString:model.face placeholder:[UIImage fus_defaultIcon] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) { [self.bgImageView setBaoFangCoverWebImageWithSubURLString:model.face placeholder:[UIImage fus_defaultIcon] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
// 防止下载到图片的时候，cell已经被重用了 // 防止下载到图片的时候，cell已经被重用了
...@@ -185,6 +216,8 @@ ...@@ -185,6 +216,8 @@
self.hotNumBtn.hidden = YES; self.hotNumBtn.hidden = YES;
self.tagView.hidden = YES; self.tagView.hidden = YES;
self.bottomAlphaBgView.hidden = YES; self.bottomAlphaBgView.hidden = YES;
self.PKAnimationImageView.hidden = YES;
[self.PKAnimationImageView stopAnimating];
__weak typeof(self) weakSelf = self;; __weak typeof(self) weakSelf = self;;
[self.bgImageView setBaoFangCoverWebImageWithSubURLString:[FUSConfig.sharedInstanced.pathConfigs thumbImageUrl:model.fus_insertModel.cover] placeholder:[UIImage fus_defaultIcon] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) { [self.bgImageView setBaoFangCoverWebImageWithSubURLString:[FUSConfig.sharedInstanced.pathConfigs thumbImageUrl:model.fus_insertModel.cover] placeholder:[UIImage fus_defaultIcon] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/cell/FUSPKLiveAnimateImageView.h 0 → 100644
//
// FUSPKLiveAnimateImageView.h
// FUSShowRoomModule
//
// Created by aaa on 2024/10/24.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface FUSPKLiveAnimateImageView : UIImageView
/// 高亮时开始播放动画
@property (nonatomic, assign) BOOL startAnimWhenHighlighted;
@end
NS_ASSUME_NONNULL_END
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/HomePage/cell/FUSPKLiveAnimateImageView.m 0 → 100644
//
// FUSPKLiveAnimateImageView.m
// FUSShowRoomModule
//
// Created by aaa on 2024/10/24.
//
#import "FUSPKLiveAnimateImageView.h"
@implementation FUSPKLiveAnimateImageView
- (instancetype)init {
if (self = [super init]) {
[self fus_initial];
}
return self;
}
- (instancetype)initWithCoder:(NSCoder *)aDecoder {
if (self = [super initWithCoder:aDecoder]) {
[self fus_initial];
}
return self;
}
- (instancetype)initWithFrame:(CGRect)frame {
if (self = [super initWithFrame:frame]) {
[self fus_initial];
}
return self;
}
- (void)setHighlighted:(BOOL)highlighted
{
[super setHighlighted:highlighted];
if (self.startAnimWhenHighlighted) {
[self startAnimating];
}
}
- (void)fus_initial {
self.startAnimWhenHighlighted = YES;
NSMutableArray *imageArr = [NSMutableArray array];
for (int i = 1; i <= 19; i++) {
UIImage *image = [FUSShowRoomCenterBunble imageNamed:[NSString stringWithFormat:@"PK_Cover_Animation_%d",i]];
if (image) {
[imageArr addObject:image];
}
}
for (int i = 0; i < (NSInteger)(12 * 2); i++) {
UIImage *image = [FUSShowRoomCenterBunble imageNamed:@"PK_Cover_Animation_19"];
if (image) {
[imageArr addObject:image];
}
}
self.animationImages = imageArr;
self.animationDuration = imageArr.count / 12;
}
@end
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/Other/FunctionViewHelper/FUSLiveChatDataSourceHelper.m
...@@ -1625,14 +1625,17 @@ ...@@ -1625,14 +1625,17 @@
model.nickname = [NSString fus_localString:@"直播消息"]; model.nickname = [NSString fus_localString:@"直播消息"];
// 取本地数据 // 取本地数据
NSDictionary *dict = [[NSUserDefaults standardUserDefaults] objectForKey:FUSLiveUDKeys.fus_ROOM_TIP_MESSAGE]; NSDictionary *dict = [[NSUserDefaults standardUserDefaults] objectForKey:FUSLiveUDKeys.fus_ROOM_TIP_MESSAGE];
NSString *message; NSMutableString *message;
if ([dict isKindOfClass:[NSDictionary class]]) { if ([dict isKindOfClass:[NSDictionary class]]) {
message = [dict objectForKey:@"content"]; message = [[NSMutableString alloc] initWithString:[dict objectForKey:@"content"]];
}else if ([dict isKindOfClass:[NSString class]]){ }else if ([dict isKindOfClass:[NSString class]]){
message = (NSString *)dict; message = [[NSMutableString alloc] initWithString:(NSString *)dict];
}
if ([message containsString:@"fusi："]) {
[message replaceCharactersInRange:[message rangeOfString:@"fusi："] withString:@"Fusi Club："];
} }
if (!message || FUSConfig.sharedInstanced.devConfigs.appStatus) { if (!message || FUSConfig.sharedInstanced.devConfigs.appStatus) {
message = [NSString fus_localString:@"请维护聊天秩序，勿传播低俗、引诱、暴露图片、敏感内容及广告等，违者将封停帐号。"]; message = [[NSMutableString alloc] initWithString:[NSString fus_localString:@"请维护聊天秩序，勿传播低俗、引诱、暴露图片、敏感内容及广告等，违者将封停帐号。"]];
} }
model.msg = message; model.msg = message;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/BlurImageView/FUSBlurImageView.m
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
- (void)fus_setImageWithName:(NSString *)imageName blur:(BOOL)isBlur{ - (void)fus_setImageWithName:(NSString *)imageName blur:(BOOL)isBlur{
self.blurView.hidden = (imageName.length == 0)||!isBlur; self.blurView.hidden = (imageName.length == 0)||!isBlur;
UIImage *image = [UIImage imageNamed:imageName]; UIImage *image = [FUSShowRoomCenterBunble imageNamed:imageName];
// 取消上一次的下载任务，预防修改了图片以后，图片才下载到 // 取消上一次的下载任务，预防修改了图片以后，图片才下载到
[self.imageView cancelCurrentImageRequest]; [self.imageView cancelCurrentImageRequest];
self.imageView.image = image; self.imageView.image = image;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveShareView.m
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
{ {
self.bgViewHeightConstraint.constant = 130 + UIView.fus_SafeBottom; self.bgViewHeightConstraint.constant = 130 + UIView.fus_SafeBottom;
self.btnArr = @[@(FriendChatShare),@(FacebookPlatform), @(TwitterPlatform), /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink)]; self.btnArr = @[@(FriendChatShare),@(FacebookPlatform), /*@(TwitterPlatform),*/ /*@(WechatFriendPlatform), @(WechatCirclePaltform),*/ @(LineSharePlatform), @(WhatsAppPlatform), @(CopyLink)];
[self initShareBtn]; [self initShareBtn];
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/HeadView/FUSLivePortraitView.m
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#import "FUSRadarAnimImageViewView.h" #import "FUSRadarAnimImageViewView.h"
#import <SJAttributesFactory/SJAttributesFactory.h> #import <SJAttributesFactory/SJAttributesFactory.h>
#define LIKE_BTN_MARGIN 4 #define LIKE_BTN_MARGIN 0
#define MAX_NICKNAME_WIDTH 70 #define MAX_NICKNAME_WIDTH 70
@interface FUSLivePortraitView () @interface FUSLivePortraitView ()
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
minXDistance = 0; minXDistance = 0;
toleranceSpace = 4; toleranceSpace = 4;
bgXPosition = 0; bgXPosition = 0;
rightSpace = 8; rightSpace = 4;
_faceAnimFinished = YES; _faceAnimFinished = YES;
[self initUI]; [self initUI];
...@@ -218,10 +218,10 @@ ...@@ -218,10 +218,10 @@
[_likeBtn addTarget:self action:@selector(fus_onClickLikeButton:) forControlEvents:UIControlEventTouchUpInside]; [_likeBtn addTarget:self action:@selector(fus_onClickLikeButton:) forControlEvents:UIControlEventTouchUpInside];
[self addSubview:_likeBtn]; [self addSubview:_likeBtn];
} }
// 红心是live_room_card_followed_btn
[_likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_room_card_followed_btn"] forState:UIControlStateNormal]; [_likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_head_follow_btn"] forState:UIControlStateNormal];
[_likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_head_follow_tick_btn"] forState:UIControlStateSelected]; [_likeBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_head_follow_tick_btn"] forState:UIControlStateSelected];
_likeBtn.hidden = NO; _likeBtn.hidden = YES;
CGRect frame = CGRectMake(CGRectGetMaxX(_autoScrollNicknameLabel.frame) > CGRectGetMaxX(_wordLabel.frame) ? CGRectGetMaxX(_autoScrollNicknameLabel.frame) + LIKE_BTN_MARGIN : CGRectGetMaxX(_wordLabel.frame) + LIKE_BTN_MARGIN, 5, self.height - 10, self.height - 10); CGRect frame = CGRectMake(CGRectGetMaxX(_autoScrollNicknameLabel.frame) > CGRectGetMaxX(_wordLabel.frame) ? CGRectGetMaxX(_autoScrollNicknameLabel.frame) + LIKE_BTN_MARGIN : CGRectGetMaxX(_wordLabel.frame) + LIKE_BTN_MARGIN, 5, self.height - 10, self.height - 10);
_likeBtn.frame = frame; _likeBtn.frame = frame;
...@@ -288,6 +288,9 @@ ...@@ -288,6 +288,9 @@
#pragma mark - Method #pragma mark - Method
- (void)fus_setLike:(BOOL)isLike{ - (void)fus_setLike:(BOOL)isLike{
if ([_currentModel.roomId isEqualToString:[[FUSCacheDataShare shareStore]userDetailInfo].uid]) {
return;
}
_likeBtn.hidden = NO; _likeBtn.hidden = NO;
_likeBtn.selected = isLike; _likeBtn.selected = isLike;
} }
...@@ -355,14 +358,23 @@ ...@@ -355,14 +358,23 @@
[_autoScrollNicknameLabel sizeToFit]; [_autoScrollNicknameLabel sizeToFit];
_autoScrollNicknameLabel.height = 13; _autoScrollNicknameLabel.height = 13;
CGFloat nickNameLabelWidth = [_autoScrollNicknameLabel.text sizeWithFont:[UIFont fus_themeFont:11] maxWidth:MAXFLOAT].width; if (![model.roomId isEqualToString:[[FUSCacheDataShare shareStore]userDetailInfo].uid] &&
CGFloat msgLabelWidth = [_autoScrollMsgLabel.attributedText boundingRectWithSize:CGSizeMake(MAXFLOAT, 13) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin context:nil].size.width; model.liked) {
// NSLog(@"_autoScrollNicknameLabel.width :%f _autoScrollMsgLabel.width: %f",nickNameLabelWidth, msgLabelWidth); [self fus_setLike:[model.liked boolValue]];
}
CGFloat nickNameLabelWidth = [_autoScrollNicknameLabel.text sizeWithFont:[UIFont fus_themeFont:11] maxWidth:MAXFLOAT].width + 4;
CGFloat msgLabelWidth = [_autoScrollMsgLabel.attributedText boundingRectWithSize:CGSizeMake(MAXFLOAT, 13) options:NSStringDrawingUsesFontLeading | NSStringDrawingUsesLineFragmentOrigin context:nil].size.width + 4;
// 兼容如果自己开播，没有关注按钮的时候，最长可以加一个关注按钮的长度
CGFloat maxNickNameWidth = MAX_NICKNAME_WIDTH;
if ([_currentModel.roomId isEqualToString:[[FUSCacheDataShare shareStore]userDetailInfo].uid]) {
maxNickNameWidth += (LIKE_BTN_MARGIN + _likeBtn.width + rightSpace);
}
// 如果超过最大长度， // 如果超过最大长度，
if (MAX(nickNameLabelWidth, msgLabelWidth) > MAX_NICKNAME_WIDTH) { if (MAX(nickNameLabelWidth, msgLabelWidth) > maxNickNameWidth) {
_autoScrollNicknameLabel.width = MAX_NICKNAME_WIDTH; _autoScrollNicknameLabel.width = maxNickNameWidth;
_autoScrollMsgLabel.width = MAX_NICKNAME_WIDTH; _autoScrollMsgLabel.width = maxNickNameWidth;
}else if (nickNameLabelWidth < msgLabelWidth) { }else if (nickNameLabelWidth < msgLabelWidth) {
_autoScrollNicknameLabel.width = msgLabelWidth; _autoScrollNicknameLabel.width = msgLabelWidth;
_autoScrollMsgLabel.width = msgLabelWidth; _autoScrollMsgLabel.width = msgLabelWidth;
...@@ -370,12 +382,6 @@ ...@@ -370,12 +382,6 @@
_autoScrollNicknameLabel.width = nickNameLabelWidth; _autoScrollNicknameLabel.width = nickNameLabelWidth;
_autoScrollMsgLabel.width = nickNameLabelWidth; _autoScrollMsgLabel.width = nickNameLabelWidth;
} }
// if (MAX(_autoScrollNicknameLabel.width, _autoScrollMsgLabel.width) > MAX_NICKNAME_WIDTH) {
// _autoScrollNicknameLabel.width = MAX_NICKNAME_WIDTH;
// _autoScrollMsgLabel.width = MAX_NICKNAME_WIDTH;
// }else if (_autoScrollNicknameLabel.width < _autoScrollMsgLabel.width) {
// _autoScrollNicknameLabel.width = _autoScrollMsgLabel.width;
// }
// 更新 View // 更新 View
[self updateFrameWithAnimate:animate]; [self updateFrameWithAnimate:animate];
...@@ -387,10 +393,6 @@ ...@@ -387,10 +393,6 @@
// // 未追踪 // // 未追踪
// [self fus_setLike:NO]; // [self fus_setLike:NO];
// } // }
if (![model.roomId isEqualToString:[[FUSCacheDataShare shareStore]userDetailInfo].uid] &&
model.liked) {
[self fus_setLike:[model.liked boolValue]];
}
// // 设置富豪等级 头像边框 // // 设置富豪等级 头像边框
// if (model.level.integerValue == 0) { // if (model.level.integerValue == 0) {
...@@ -628,7 +630,8 @@ ...@@ -628,7 +630,8 @@
[self.layer removeAllAnimations]; [self.layer removeAllAnimations];
// 是否有追踪按钮 // 是否有追踪按钮
if (self.likeBtn && _likeBtn.superview) { // if (self.likeBtn && _likeBtn.superview) {
if (self.likeBtn.isHidden == NO) {
// 增加按钮长度 // 增加按钮长度
maxX += _likeBtn.width; maxX += _likeBtn.width;
...@@ -640,7 +643,7 @@ ...@@ -640,7 +643,7 @@
if (animate) { if (animate) {
[UIView animateWithDuration:.35 delay:0 options:UIViewAnimationOptionAllowUserInteraction animations:^{ [UIView animateWithDuration:.35 delay:0 options:UIViewAnimationOptionAllowUserInteraction animations:^{
self.likeBtn.x = CGRectGetMaxX(self.autoScrollNicknameLabel.frame) > CGRectGetMaxX(self.autoScrollMsgLabel.frame) ? CGRectGetMaxX(self.autoScrollNicknameLabel.frame) + LIKE_BTN_MARGIN : CGRectGetMaxX(self.autoScrollMsgLabel.frame) + LIKE_BTN_MARGIN; self.likeBtn.x = CGRectGetMaxX(self.autoScrollNicknameLabel.frame) > CGRectGetMaxX(self.autoScrollMsgLabel.frame) ? CGRectGetMaxX(self.autoScrollNicknameLabel.frame) + LIKE_BTN_MARGIN : CGRectGetMaxX(self.autoScrollMsgLabel.frame) + LIKE_BTN_MARGIN;
self.width = (maxX + self->rightSpace + 5) > 80 ? (maxX + self->rightSpace + 5) : 80; self.width = (maxX + self->rightSpace + 3) > 80 ? (maxX + self->rightSpace + 3) : 80;
self.bgView.width = self.width - self->bgXPosition; self.bgView.width = self.width - self->bgXPosition;
// self.bgImageView.frame = self.bgView.frame; // self.bgImageView.frame = self.bgView.frame;
self.grayView.frame = self.bgView.bounds; self.grayView.frame = self.bgView.bounds;
...@@ -649,7 +652,7 @@ ...@@ -649,7 +652,7 @@
}]; }];
}else{ }else{
_likeBtn.x = CGRectGetMaxX(_autoScrollNicknameLabel.frame) > CGRectGetMaxX(_autoScrollMsgLabel.frame) ? CGRectGetMaxX(_autoScrollNicknameLabel.frame) + LIKE_BTN_MARGIN : CGRectGetMaxX(_autoScrollMsgLabel.frame) + LIKE_BTN_MARGIN; _likeBtn.x = CGRectGetMaxX(_autoScrollNicknameLabel.frame) > CGRectGetMaxX(_autoScrollMsgLabel.frame) ? CGRectGetMaxX(_autoScrollNicknameLabel.frame) + LIKE_BTN_MARGIN : CGRectGetMaxX(_autoScrollMsgLabel.frame) + LIKE_BTN_MARGIN;
self.width = (maxX + rightSpace + 5) > 80 ? (maxX + rightSpace + 5) : 80; self.width = (maxX + rightSpace + 3) > 80 ? (maxX + rightSpace + 3) : 80;
self.bgView.width = self.width - bgXPosition; self.bgView.width = self.width - bgXPosition;
// _bgImageView.frame = _bgView.frame; // _bgImageView.frame = _bgView.frame;
_grayView.frame = _bgView.bounds; _grayView.frame = _bgView.bounds;
...@@ -671,7 +674,7 @@ ...@@ -671,7 +674,7 @@
if (animate) { if (animate) {
[UIView animateWithDuration:.35 animations:^{ [UIView animateWithDuration:.35 animations:^{
self.width = (maxX + self->rightSpace + 5) > 80 ? (maxX + self->rightSpace + 5) : 80; self.width = (maxX + self->rightSpace + 3) > 80 ? (maxX + self->rightSpace + 3) : 80;
self.bgView.width = self.width - self->bgXPosition; self.bgView.width = self.width - self->bgXPosition;
// self.bgImageView.frame = self.bgView.frame; // self.bgImageView.frame = self.bgView.frame;
self.grayView.frame = self.bgView.bounds; self.grayView.frame = self.bgView.bounds;
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/Push/FUSVideoStartSetScopeBtnView.m
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
@interface FUSVideoStartSetScopeBtnView () @interface FUSVideoStartSetScopeBtnView ()
@property (strong, nonatomic) IBOutlet UIButton *facebookShareBtn; @property (strong, nonatomic) IBOutlet UIButton *facebookShareBtn;
@property (strong, nonatomic) IBOutlet UIButton *twitterShareBtn; //@property (strong, nonatomic) IBOutlet UIButton *twitterShareBtn;
@property (strong, nonatomic) IBOutlet UIButton *lineShareBtn; @property (strong, nonatomic) IBOutlet UIButton *lineShareBtn;
//@property (strong, nonatomic) IBOutlet UIButton *wechatShareBtn; //@property (strong, nonatomic) IBOutlet UIButton *wechatShareBtn;
//@property (strong, nonatomic) IBOutlet UIButton *wcCircleShareBtn; //@property (strong, nonatomic) IBOutlet UIButton *wcCircleShareBtn;
...@@ -93,8 +93,8 @@ ...@@ -93,8 +93,8 @@
[self.facebookShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_facebook"] forState:UIControlStateNormal]; [self.facebookShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_facebook"] forState:UIControlStateNormal];
[self.facebookShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_facebook_selected"] forState:UIControlStateSelected]; [self.facebookShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_facebook_selected"] forState:UIControlStateSelected];
[self.twitterShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_twitter"] forState:UIControlStateNormal]; // [self.twitterShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_twitter"] forState:UIControlStateNormal];
[self.twitterShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_twitter_selected"] forState:UIControlStateSelected]; // [self.twitterShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_twitter_selected"] forState:UIControlStateSelected];
[self.lineShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_line"] forState:UIControlStateNormal]; [self.lineShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_line"] forState:UIControlStateNormal];
[self.lineShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_line_selected"] forState:UIControlStateSelected]; [self.lineShareBtn setImage:[FUSShowRoomCenterBunble imageNamed:@"live_start_share_line_selected"] forState:UIControlStateSelected];
...@@ -115,9 +115,11 @@ ...@@ -115,9 +115,11 @@
FUSVideoStartShareType shareType = FUSVideoStartShareTypeNone; FUSVideoStartShareType shareType = FUSVideoStartShareTypeNone;
if (self.facebookShareBtn.isSelected) { if (self.facebookShareBtn.isSelected) {
shareType = FUSVideoStartShareTypeFacebook; shareType = FUSVideoStartShareTypeFacebook;
} else if (self.twitterShareBtn.isSelected) { }
shareType = FUSVideoStartShareTypeTwitter; // else if (self.twitterShareBtn.isSelected) {
} else if (self.lineShareBtn.isSelected) { // shareType = FUSVideoStartShareTypeTwitter;
// }
else if (self.lineShareBtn.isSelected) {
shareType = FUSVideoStartShareTypeLine; shareType = FUSVideoStartShareTypeLine;
} }
// else if (self.wechatShareBtn.isSelected) { // else if (self.wechatShareBtn.isSelected) {
...@@ -165,7 +167,7 @@ ...@@ -165,7 +167,7 @@
self.facebookShareBtn.selected = NO; self.facebookShareBtn.selected = NO;
self.lineShareBtn.selected = NO; self.lineShareBtn.selected = NO;
// self.wechatShareBtn.selected = NO; // self.wechatShareBtn.selected = NO;
self.twitterShareBtn.selected = NO; // self.twitterShareBtn.selected = NO;
// self.wcCircleShareBtn.selected = NO; // self.wcCircleShareBtn.selected = NO;
sender.selected = selected; sender.selected = selected;
} }
......
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>71</integer> <integer>75</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>73</integer> <integer>76</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/NewsFeed/RichEditor/View/FUSNewsFeedDetailToolView.xib
...@@ -88,23 +88,15 @@ ...@@ -88,23 +88,15 @@
<rect key="frame" x="0.0" y="0.0" width="364" height="81"/> <rect key="frame" x="0.0" y="0.0" width="364" height="81"/>
<subviews> <subviews>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xco-Ox-50v"> <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Xco-Ox-50v">
<rect key="frame" x="10" y="0.0" width="69" height="81"/> <rect key="frame" x="10" y="0.0" width="86" height="81"/>
<state key="normal" image="newsfeed_share_Facebook"/> <state key="normal" image="newsfeed_share_Facebook"/>
<state key="highlighted" image="newsfeed_share_Facebook_preesed"/> <state key="highlighted" image="newsfeed_share_Facebook_preesed"/>
<connections> <connections>
<action selector="onClickShareBtn:" destination="iN0-l3-epB" eventType="touchUpInside" id="6ds-Wa-vM6"/> <action selector="onClickShareBtn:" destination="iN0-l3-epB" eventType="touchUpInside" id="6ds-Wa-vM6"/>
</connections> </connections>
</button> </button>
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="c9B-ub-ur8">
<rect key="frame" x="79" y="0.0" width="68.5" height="81"/>
<state key="normal" image="newsfeed_share_twitter"/>
<state key="highlighted" image="newsfeed_share_twitter_preesed"/>
<connections>
<action selector="onClickShareBtn:" destination="iN0-l3-epB" eventType="touchUpInside" id="MaD-wT-ofU"/>
</connections>
</button>
<button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cnY-pD-KW8"> <button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cnY-pD-KW8">
<rect key="frame" x="216.5" y="0.0" width="68.5" height="81"/> <rect key="frame" x="182" y="0.0" width="86" height="81"/>
<state key="normal" image="newsfeed_share_whatsapp"/> <state key="normal" image="newsfeed_share_whatsapp"/>
<state key="highlighted" image="newsfeed_share_whatsapp_preesed"/> <state key="highlighted" image="newsfeed_share_whatsapp_preesed"/>
<connections> <connections>
...@@ -112,7 +104,7 @@ ...@@ -112,7 +104,7 @@
</connections> </connections>
</button> </button>
<button opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1h0-RP-Gur"> <button opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1h0-RP-Gur">
<rect key="frame" x="285" y="0.0" width="69" height="81"/> <rect key="frame" x="268" y="0.0" width="86" height="81"/>
<state key="normal" image="newsfeed_share_link"/> <state key="normal" image="newsfeed_share_link"/>
<state key="highlighted" image="newsfeed_share_link_preesed"/> <state key="highlighted" image="newsfeed_share_link_preesed"/>
<connections> <connections>
...@@ -120,7 +112,7 @@ ...@@ -120,7 +112,7 @@
</connections> </connections>
</button> </button>
<button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VSI-D8-5bU"> <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VSI-D8-5bU">
<rect key="frame" x="147.5" y="0.0" width="69" height="81"/> <rect key="frame" x="96" y="0.0" width="86" height="81"/>
<state key="normal" image="newsfeed_share_line"/> <state key="normal" image="newsfeed_share_line"/>
<state key="highlighted" image="newsfeed_share_line_preesed"/> <state key="highlighted" image="newsfeed_share_line_preesed"/>
<connections> <connections>
...@@ -132,21 +124,17 @@ ...@@ -132,21 +124,17 @@
<constraints> <constraints>
<constraint firstItem="Xco-Ox-50v" firstAttribute="top" secondItem="OYo-U4-EF2" secondAttribute="top" id="4jV-Fo-22D"/> <constraint firstItem="Xco-Ox-50v" firstAttribute="top" secondItem="OYo-U4-EF2" secondAttribute="top" id="4jV-Fo-22D"/>
<constraint firstItem="cnY-pD-KW8" firstAttribute="top" secondItem="Xco-Ox-50v" secondAttribute="top" id="5si-nT-Yzh"/> <constraint firstItem="cnY-pD-KW8" firstAttribute="top" secondItem="Xco-Ox-50v" secondAttribute="top" id="5si-nT-Yzh"/>
<constraint firstItem="c9B-ub-ur8" firstAttribute="top" secondItem="Xco-Ox-50v" secondAttribute="top" id="9az-QO-4vC"/>
<constraint firstItem="cnY-pD-KW8" firstAttribute="width" secondItem="Xco-Ox-50v" secondAttribute="width" id="AUN-Xn-W0v"/> <constraint firstItem="cnY-pD-KW8" firstAttribute="width" secondItem="Xco-Ox-50v" secondAttribute="width" id="AUN-Xn-W0v"/>
<constraint firstItem="1h0-RP-Gur" firstAttribute="width" secondItem="Xco-Ox-50v" secondAttribute="width" id="J81-5e-ONf"/> <constraint firstItem="1h0-RP-Gur" firstAttribute="width" secondItem="Xco-Ox-50v" secondAttribute="width" id="J81-5e-ONf"/>
<constraint firstItem="Xco-Ox-50v" firstAttribute="leading" secondItem="OYo-U4-EF2" secondAttribute="leading" constant="10" id="LGz-od-NsO"/> <constraint firstItem="Xco-Ox-50v" firstAttribute="leading" secondItem="OYo-U4-EF2" secondAttribute="leading" constant="10" id="LGz-od-NsO"/>
<constraint firstAttribute="height" constant="81" id="Sl7-Nc-BdK"/> <constraint firstAttribute="height" constant="81" id="Sl7-Nc-BdK"/>
<constraint firstItem="1h0-RP-Gur" firstAttribute="top" secondItem="OYo-U4-EF2" secondAttribute="top" id="TG9-N8-B30"/> <constraint firstItem="1h0-RP-Gur" firstAttribute="top" secondItem="OYo-U4-EF2" secondAttribute="top" id="TG9-N8-B30"/>
<constraint firstItem="VSI-D8-5bU" firstAttribute="leading" secondItem="c9B-ub-ur8" secondAttribute="trailing" id="W2x-6v-hYF"/>
<constraint firstItem="cnY-pD-KW8" firstAttribute="leading" secondItem="VSI-D8-5bU" secondAttribute="trailing" id="XD5-8d-8HA"/> <constraint firstItem="cnY-pD-KW8" firstAttribute="leading" secondItem="VSI-D8-5bU" secondAttribute="trailing" id="XD5-8d-8HA"/>
<constraint firstItem="c9B-ub-ur8" firstAttribute="bottom" secondItem="Xco-Ox-50v" secondAttribute="bottom" id="YAr-7D-Wth"/>
<constraint firstItem="VSI-D8-5bU" firstAttribute="width" secondItem="Xco-Ox-50v" secondAttribute="width" id="YEl-JJ-u3v"/> <constraint firstItem="VSI-D8-5bU" firstAttribute="width" secondItem="Xco-Ox-50v" secondAttribute="width" id="YEl-JJ-u3v"/>
<constraint firstAttribute="bottom" secondItem="Xco-Ox-50v" secondAttribute="bottom" id="aqS-B3-sKY"/> <constraint firstAttribute="bottom" secondItem="Xco-Ox-50v" secondAttribute="bottom" id="aqS-B3-sKY"/>
<constraint firstItem="c9B-ub-ur8" firstAttribute="width" secondItem="Xco-Ox-50v" secondAttribute="width" id="eib-VB-jwR"/> <constraint firstItem="VSI-D8-5bU" firstAttribute="leading" secondItem="Xco-Ox-50v" secondAttribute="trailing" id="bCi-VZ-7gt"/>
<constraint firstItem="VSI-D8-5bU" firstAttribute="top" secondItem="Xco-Ox-50v" secondAttribute="top" id="gOu-2o-Ok3"/> <constraint firstItem="VSI-D8-5bU" firstAttribute="top" secondItem="Xco-Ox-50v" secondAttribute="top" id="gOu-2o-Ok3"/>
<constraint firstItem="1h0-RP-Gur" firstAttribute="bottom" secondItem="Xco-Ox-50v" secondAttribute="bottom" id="gj3-Ee-GnR"/> <constraint firstItem="1h0-RP-Gur" firstAttribute="bottom" secondItem="Xco-Ox-50v" secondAttribute="bottom" id="gj3-Ee-GnR"/>
<constraint firstItem="c9B-ub-ur8" firstAttribute="leading" secondItem="Xco-Ox-50v" secondAttribute="trailing" id="i4K-WP-dcz"/>
<constraint firstAttribute="trailing" secondItem="1h0-RP-Gur" secondAttribute="trailing" constant="10" id="o5J-Bp-fpW"/> <constraint firstAttribute="trailing" secondItem="1h0-RP-Gur" secondAttribute="trailing" constant="10" id="o5J-Bp-fpW"/>
<constraint firstItem="VSI-D8-5bU" firstAttribute="bottom" secondItem="Xco-Ox-50v" secondAttribute="bottom" id="oTT-ZO-cKa"/> <constraint firstItem="VSI-D8-5bU" firstAttribute="bottom" secondItem="Xco-Ox-50v" secondAttribute="bottom" id="oTT-ZO-cKa"/>
<constraint firstItem="1h0-RP-Gur" firstAttribute="leading" secondItem="cnY-pD-KW8" secondAttribute="trailing" id="rme-Ul-V4q"/> <constraint firstItem="1h0-RP-Gur" firstAttribute="leading" secondItem="cnY-pD-KW8" secondAttribute="trailing" id="rme-Ul-V4q"/>
...@@ -207,8 +195,6 @@ ...@@ -207,8 +195,6 @@
<image name="newsfeed_share_line_preesed" width="45" height="45"/> <image name="newsfeed_share_line_preesed" width="45" height="45"/>
<image name="newsfeed_share_link" width="45" height="45"/> <image name="newsfeed_share_link" width="45" height="45"/>
<image name="newsfeed_share_link_preesed" width="45" height="45"/> <image name="newsfeed_share_link_preesed" width="45" height="45"/>
<image name="newsfeed_share_twitter" width="45" height="45"/>
<image name="newsfeed_share_twitter_preesed" width="45" height="45"/>
<image name="newsfeed_share_whatsapp" width="45" height="45"/> <image name="newsfeed_share_whatsapp" width="45" height="45"/>
<image name="newsfeed_share_whatsapp_preesed" width="45" height="45"/> <image name="newsfeed_share_whatsapp_preesed" width="45" height="45"/>
</resources> </resources>
......
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