Skip to content

pidan / FuSiLive

Go to a project
Commit 33905c2c by pierce
Options

修改UI

parent 8c41982c
Inline Side-by-side
Showing with 119 additions and 120 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/FUSStyleButton.m
...@@ -225,16 +225,16 @@ ...@@ -225,16 +225,16 @@
[self setTitleColor:[UIColor whiteColor] forState:UIControlStateDisabled]; [self setTitleColor:[UIColor whiteColor] forState:UIControlStateDisabled];
self.layer.cornerRadius = self.height / 2.0f; self.layer.cornerRadius = self.height / 2.0f;
self.layer.masksToBounds = YES; self.layer.masksToBounds = YES;
self.backgroundColor = [UIColor fus_appMainColor]; self.backgroundColor = [UIColor fus_diamondBlue];
} }
break; break;
case FUSButtonStyleBlueBorder: case FUSButtonStyleBlueBorder:
{ {
[self cleanStyle]; [self cleanStyle];
[self setTitleColor:[UIColor fus_appMainColor] forState:UIControlStateNormal]; [self setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
self.layer.cornerRadius = self.height / 2.0f; self.layer.cornerRadius = self.height / 2.0f;
self.layer.masksToBounds = YES; self.layer.masksToBounds = YES;
self.layer.borderColor = UIColor.fus_appMainColor.CGColor; self.layer.borderColor = UIColor.fus_diamondBlue.CGColor;
self.layer.borderWidth = 1; self.layer.borderWidth = 1;
self.backgroundColor = [UIColor clearColor]; self.backgroundColor = [UIColor clearColor];
} }
......
FuSiLive/Classes/BaoFang/OpenScreenPush/View/FUSOpenScreenPushView.m
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
self.picPageControl.numberOfPages = openScreenPushModel.img.count; self.picPageControl.numberOfPages = openScreenPushModel.img.count;
self.picPageControl.currentPage = 0; self.picPageControl.currentPage = 0;
self.picPageControl.pageIndicatorTintColor = [UIColor colorWithHex:@"B3B3B3"]; self.picPageControl.pageIndicatorTintColor = [UIColor colorWithHex:@"B3B3B3"];
self.picPageControl.currentPageIndicatorTintColor = [UIColor colorWithHex:@"2BE1B0"]; self.picPageControl.currentPageIndicatorTintColor = [UIColor fus_diamondBlue];
if (openScreenPushModel.img.count > 1) { if (openScreenPushModel.img.count > 1) {
self.picPageControl.hidden = NO; self.picPageControl.hidden = NO;
......
FuSiLive/Classes/Board/View/BoardPopupView/FireCount/FUSFireCountTableViewCell.xib
...@@ -76,9 +76,9 @@ ...@@ -76,9 +76,9 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_normal" translatesAutoresizingMaskIntoConstraints="NO" id="wq7-T4-CP0"> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_normal" translatesAutoresizingMaskIntoConstraints="NO" id="wq7-T4-CP0">
<rect key="frame" x="141" y="15" width="13" height="15"/> <rect key="frame" x="141" y="15.5" width="13" height="14"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="15" id="7ez-1b-Xza"/> <constraint firstAttribute="height" constant="14" id="7ez-1b-Xza"/>
</constraints> </constraints>
</imageView> </imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="aV3-TM-xFk"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="aV3-TM-xFk">
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<resources> <resources>
<image name="fireFly_zone_fireCount_Top1" width="53" height="64"/> <image name="fireFly_zone_fireCount_Top1" width="53" height="64"/>
<image name="fireFly_zone_fireCount_Top1_rank" width="43" height="11"/> <image name="fireFly_zone_fireCount_Top1_rank" width="43" height="11"/>
<image name="fireFly_zone_fireCount_fire" width="15" height="15"/> <image name="fireFly_zone_fireCount_fire" width="12" height="15.5"/>
<image name="vip_icon_normal" width="13" height="13"/> <image name="vip_icon_normal" width="13" height="13"/>
</resources> </resources>
</document> </document>
FuSiLive/Classes/Foundation/Http/FUSURLDictionary.h
...@@ -1049,7 +1049,7 @@ ...@@ -1049,7 +1049,7 @@
#define URL_WEB_ARBIC_HELP DNS_WEB(@"/Nesting/help/l7.html") #define URL_WEB_ARBIC_HELP DNS_WEB(@"/Nesting/help/l7.html")
// 《直播 & 社区公约》 // 《直播 & 社区公约》
#define URL_WEB_REGULATION DNS_WEB(@"fusi/help/index.html")//DNS_WEB(@"/regulation.html") #define URL_WEB_REGULATION DNS_WEB(@"/fusi/help/index.html")//DNS_WEB(@"/regulation.html")
// 主播时长查询 // 主播时长查询
#define URL_LIVE_TIME_SEARCH DNS_WEB(@"/Nesting/queryTime/index.html") #define URL_LIVE_TIME_SEARCH DNS_WEB(@"/Nesting/queryTime/index.html")
......
FuSiLive/Classes/Foundation/View/CustomView/FUSNameLevelView.xib
...@@ -36,9 +36,9 @@ ...@@ -36,9 +36,9 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_normal" translatesAutoresizingMaskIntoConstraints="NO" id="wzh-4h-Drs"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_normal" translatesAutoresizingMaskIntoConstraints="NO" id="wzh-4h-Drs">
<rect key="frame" x="57.5" y="1.5" width="13" height="13"/> <rect key="frame" x="57.5" y="1" width="13" height="14"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="13" id="Vgo-JX-t0s"/> <constraint firstAttribute="height" constant="14" id="Vgo-JX-t0s"/>
</constraints> </constraints>
</imageView> </imageView>
</subviews> </subviews>
......
FuSiLive/Classes/FusiLive-Bridging-Header.h
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#import "FUSMyZoneViewController.h" #import "FUSMyZoneViewController.h"
#import "FUSBaoFangHttpHelper.h" #import "FUSBaoFangHttpHelper.h"
#import "FUSSingleDailyCheckInView.h" #import "FUSSingleDailyCheckInView.h"
#import "FUSGotBackpackItemAnimView.h"
#import "FUSMyEditNameAlertView.h" #import "FUSMyEditNameAlertView.h"
// MARK: -- 直播间 // MARK: -- 直播间
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/FUSIMGiftView.m
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
_rechargeBtn.frame = CGRectMake(CGRectGetMaxX(_diamondCountBtn.frame) + 8, 0 ,btnWidth, _giftBottomView.height); _rechargeBtn.frame = CGRectMake(CGRectGetMaxX(_diamondCountBtn.frame) + 8, 0 ,btnWidth, _giftBottomView.height);
NSString *title = [NSString stringWithFormat:@"%@ >",[NSString fus_localString:@"储值"]]; NSString *title = [NSString stringWithFormat:@"%@ >",[NSString fus_localString:@"储值"]];
NSMutableAttributedString *atrTitle = [[NSMutableAttributedString alloc] initWithString:title]; NSMutableAttributedString *atrTitle = [[NSMutableAttributedString alloc] initWithString:title];
[atrTitle addAttributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"2BE1B0"]} range:NSMakeRange(0, [NSString fus_localString:@"储值"].length)]; [atrTitle addAttributes:@{NSForegroundColorAttributeName:[UIColor fus_diamondBlue]} range:NSMakeRange(0, [NSString fus_localString:@"储值"].length)];
[atrTitle addAttributes:@{NSForegroundColorAttributeName:[UIColor grayColor]} range:NSMakeRange([NSString fus_localString:@"储值"].length ,title.length - [NSString fus_localString:@"储值"].length)]; [atrTitle addAttributes:@{NSForegroundColorAttributeName:[UIColor grayColor]} range:NSMakeRange([NSString fus_localString:@"储值"].length ,title.length - [NSString fus_localString:@"储值"].length)];
// [_rechargeBtn setTitle:title forState:UIControlStateNormal]; // [_rechargeBtn setTitle:title forState:UIControlStateNormal];
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FunctionViews/FUSVideoChatGiftView.m
...@@ -150,7 +150,7 @@ if (@available(iOS 11.0, *)) {height = 290 + UIView.fus_SafeBottom;}\ ...@@ -150,7 +150,7 @@ if (@available(iOS 11.0, *)) {height = 290 + UIView.fus_SafeBottom;}\
_jewelCountBtn.titleLabel.font = [UIFont fus_themeFont:14]; _jewelCountBtn.titleLabel.font = [UIFont fus_themeFont:14];
[_jewelCountBtn addTarget:self action:@selector(fus_onClickMyJewelCount:) forControlEvents:UIControlEventTouchUpInside]; [_jewelCountBtn addTarget:self action:@selector(fus_onClickMyJewelCount:) forControlEvents:UIControlEventTouchUpInside];
[_jewelCountBtn setImageEdgeInsets:UIEdgeInsetsMake(3, 0, 3, 0)]; [_jewelCountBtn setImageEdgeInsets:UIEdgeInsetsMake(3, 0, 3, 0)];
[_jewelCountBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal]; [_jewelCountBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
_jewelCountBtn.imageView.contentMode = UIViewContentModeScaleAspectFit; _jewelCountBtn.imageView.contentMode = UIViewContentModeScaleAspectFit;
[_bgView addSubview:_jewelCountBtn]; [_bgView addSubview:_jewelCountBtn];
} }
...@@ -172,7 +172,7 @@ if (@available(iOS 11.0, *)) {height = 290 + UIView.fus_SafeBottom;}\ ...@@ -172,7 +172,7 @@ if (@available(iOS 11.0, *)) {height = 290 + UIView.fus_SafeBottom;}\
_rechargetBtn.imageEdgeInsets = UIEdgeInsetsMake(0, labelWidth, 0, -labelWidth); _rechargetBtn.imageEdgeInsets = UIEdgeInsetsMake(0, labelWidth, 0, -labelWidth);
_rechargetBtn.titleEdgeInsets = UIEdgeInsetsMake(0, -imageWidth, 0, imageWidth); _rechargetBtn.titleEdgeInsets = UIEdgeInsetsMake(0, -imageWidth, 0, imageWidth);
[_rechargetBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal]; [_rechargetBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
[_rechargetBtn addTarget:self action:@selector(fus_onClickReChargeBtn:) forControlEvents:UIControlEventTouchUpInside]; [_rechargetBtn addTarget:self action:@selector(fus_onClickReChargeBtn:) forControlEvents:UIControlEventTouchUpInside];
[_bgView addSubview:_rechargetBtn]; [_bgView addSubview:_rechargetBtn];
} }
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FunctionViews/FUSVideoChatUserInfoView.m
...@@ -462,7 +462,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\ ...@@ -462,7 +462,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
_nickNameLabel.font = [UIFont fus_themeBoldFont:21];; _nickNameLabel.font = [UIFont fus_themeBoldFont:21];;
[self.bgView addSubview:_nickNameLabel]; [self.bgView addSubview:_nickNameLabel];
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 30, 15)]; _richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 28, 14)];
_richImageView.contentMode = UIViewContentModeScaleAspectFit; _richImageView.contentMode = UIViewContentModeScaleAspectFit;
[self.bgView addSubview:_richImageView]; [self.bgView addSubview:_richImageView];
} }
...@@ -499,7 +499,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\ ...@@ -499,7 +499,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
- (void)fus_initSignLabel { - (void)fus_initSignLabel {
_signLabel = [[UILabel alloc] initWithFrame:CGRectMake(15, CGRectGetMaxY(_fireFlyIDLabel.frame) + 55, self.bgView.width - 30, 15)]; _signLabel = [[UILabel alloc] initWithFrame:CGRectMake(15, CGRectGetMaxY(_fireFlyIDLabel.frame) + 55, self.bgView.width - 30, 15)];
_signLabel.textColor = [UIColor fus_textColorRich]; _signLabel.textColor = [UIColor fus_textColorRich];
_signLabel.font = [UIFont fus_themeFont:13]; _signLabel.font = [UIFont fus_themeFont:15];
// _signLabel.adjustsFontSizeToFitWidth = YES; // _signLabel.adjustsFontSizeToFitWidth = YES;
_signLabel.textAlignment = NSTextAlignmentCenter; _signLabel.textAlignment = NSTextAlignmentCenter;
[self.bgView addSubview:_signLabel]; [self.bgView addSubview:_signLabel];
...@@ -522,7 +522,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\ ...@@ -522,7 +522,7 @@ if (@available(iOS 11.0, *)) {height = 80 + UIView.fus_SafeBottom;}\
UILabel *label = label = [[UILabel alloc] initWithFrame:CGRectMake(0, bgView.centerY - 10, bgView.width, 20)]; UILabel *label = label = [[UILabel alloc] initWithFrame:CGRectMake(0, bgView.centerY - 10, bgView.width, 20)];
label.textColor = UIColor.fus_textColorRich; label.textColor = UIColor.fus_textColorRich;
label.textAlignment = NSTextAlignmentCenter; label.textAlignment = NSTextAlignmentCenter;
label.font = [UIFont italicSystemFontOfSize:26]; label.font = [UIFont fus_custom1ItalicFont:26];
[bgView addSubview:label]; [bgView addSubview:label];
switch (i) { switch (i) {
......
FuSiLive/Classes/NewLive/Main/Other/FunctionViewHelper/FUSLiveChatDataSourceHelper.m
...@@ -883,7 +883,7 @@ ...@@ -883,7 +883,7 @@
hasShowVipIcon = YES; hasShowVipIcon = YES;
UIImage *levelImage = [UIImage fus_imageWithLevel:model.level.integerValue]; UIImage *levelImage = [UIImage fus_imageWithLevel:model.level.integerValue];
if (levelImage) { if (levelImage) {
CGFloat imageH = levelImageHeight; CGFloat imageH = 14;
CGFloat imageW = levelImageHeight / levelImage.size.height * levelImage.size.width; CGFloat imageW = levelImageHeight / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageW,imageH) alignToFont:FUS_LIVE_FONT(fontSize) alignment:YYTextVerticalAlignmentCenter]; NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageW,imageH) alignToFont:FUS_LIVE_FONT(fontSize) alignment:YYTextVerticalAlignmentCenter];
// 让VIP图标图标往下偏移 // 让VIP图标图标往下偏移
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSContributeCellTableViewCell.m
...@@ -225,14 +225,14 @@ ...@@ -225,14 +225,14 @@
self.vipImageView.image = [UIImage fus_imageWithLevel:level]; self.vipImageView.image = [UIImage fus_imageWithLevel:level];
if (level <= 30) { if (level <= 30) {
[self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) { [self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(13); make.width.height.mas_equalTo(14);
make.centerY.equalTo(self.nicknameLabel.mas_centerY); make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4); make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}]; }];
} else { } else {
[self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) { [self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(13); make.height.mas_equalTo(14);
make.width.mas_equalTo(26); make.width.mas_equalTo(28);
make.centerY.equalTo(self.nicknameLabel.mas_centerY); make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4); make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}]; }];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/UserList/FUSAudienceListView.m
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
self.openVIPBtn = [FUSStyleButton buttonWithType:UIButtonTypeCustom]; self.openVIPBtn = [FUSStyleButton buttonWithType:UIButtonTypeCustom];
self.openVIPBtn.style = FUSButtonStyleBlue; self.openVIPBtn.style = FUSButtonStyleBlue;
self.openVIPBtn.titleLabel.font = [UIFont fus_themeFont:12]; self.openVIPBtn.titleLabel.font = [UIFont fus_themeBoldFont:12];
[self.openVIPBtn setTitle:[NSString fus_localString:@"去开通"] forState:UIControlStateNormal]; [self.openVIPBtn setTitle:[NSString fus_localString:@"去开通"] forState:UIControlStateNormal];
[self.openVIPBtn setTitleColor:UIColor.fus_textColorRich forState:UIControlStateNormal]; [self.openVIPBtn setTitleColor:UIColor.fus_textColorRich forState:UIControlStateNormal];
self.openVIPBtn.layer.cornerRadius = 13; self.openVIPBtn.layer.cornerRadius = 13;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/UserList/FUSAudienceTableViewCell.m
...@@ -160,14 +160,14 @@ ...@@ -160,14 +160,14 @@
self.vipImageView.image = [UIImage fus_imageWithLevel:level]; self.vipImageView.image = [UIImage fus_imageWithLevel:level];
if (level <= 30) { if (level <= 30) {
[self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) { [self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.width.height.mas_equalTo(13); make.width.height.mas_equalTo(14);
make.centerY.equalTo(self.nicknameLabel.mas_centerY); make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4); make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}]; }];
} else { } else {
[self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) { [self.vipImageView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.height.mas_equalTo(13); make.height.mas_equalTo(14);
make.width.mas_equalTo(26); make.width.mas_equalTo(28);
make.centerY.equalTo(self.nicknameLabel.mas_centerY); make.centerY.equalTo(self.nicknameLabel.mas_centerY);
make.left.equalTo(self.onlineLabel.mas_right).offset(4); make.left.equalTo(self.onlineLabel.mas_right).offset(4);
}]; }];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputBulletsListCell.m
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
self.contentBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.contentBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.contentBtn.userInteractionEnabled = NO; self.contentBtn.userInteractionEnabled = NO;
self.contentBtn.frame = CGRectMake(0, 0, 82.5, 22); self.contentBtn.frame = CGRectMake(0, 0, 82.5, 22);
[self.contentBtn setTitleColor:UIColor.fus_textColorMedium forState:UIControlStateNormal]; [self.contentBtn setTitleColor:[UIColor colorWithHex:@"22222b"] forState:UIControlStateNormal];
[self.contentBtn setTitleColor:UIColor.fus_textColorRich forState:UIControlStateSelected]; [self.contentBtn setTitleColor:[UIColor colorWithHex:@"282828"] forState:UIControlStateSelected];
self.contentBtn.titleLabel.font = [UIFont fus_themeFont:12]; self.contentBtn.titleLabel.font = [UIFont fus_themeFont:12];
self.contentBtn.layer.cornerRadius = 11; self.contentBtn.layer.cornerRadius = 11;
self.contentBtn.layer.masksToBounds = YES; self.contentBtn.layer.masksToBounds = YES;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ChatInputView/FUSLiveChatInputTaskListView.swift
...@@ -178,12 +178,12 @@ class FUSLiveChatInputTaskListView: UIView, UITableViewDelegate, UITableViewData ...@@ -178,12 +178,12 @@ class FUSLiveChatInputTaskListView: UIView, UITableViewDelegate, UITableViewData
dewView.addDewAward(withAmount:"\(listModel.award)" , textColor: UIColor.fus_dewBlue()) dewView.addDewAward(withAmount:"\(listModel.award)" , textColor: UIColor.fus_dewBlue())
UIApplication.shared.keyWindow?.addSubview(dewView) UIApplication.shared.keyWindow?.addSubview(dewView)
} else{ } else{
FUSGotBackpackItemAnimView.fus_show(with: .type2, icon: listModel.icon, name: listModel.getTips, goodsType: FUSGotBackpackItemGoodsType(rawValue: UInt(listModel.classify)) ?? .goodsTypeNone, isMotorHasWear: false)
let awardView = FUSSingleDailyCheckInView.fus_() // let awardView = FUSSingleDailyCheckInView.fus_()
awardView.frame = UIScreen.main.bounds // awardView.frame = UIScreen.main.bounds
awardView.backgroundColor = UIColor.init(white: 0, alpha: 0.6) // awardView.backgroundColor = UIColor.init(white: 0, alpha: 0.6)
awardView.fus_showCheckInSucceed(withIcon: listModel.icon, desc: listModel.getTips, award: String(listModel.award), animated: false) // awardView.fus_showCheckInSucceed(withIcon: listModel.icon, desc: listModel.getTips, award: String(listModel.award), animated: false)
UIApplication.shared.keyWindow?.addSubview(awardView) // UIApplication.shared.keyWindow?.addSubview(awardView)
} }
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/FUSGiftCenter/FUSGiftAnimation/FUSGiftAnimation.m
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
if (levelStr.integerValue > 0) { if (levelStr.integerValue > 0) {
UIImage *levelImage = [UIImage fus_imageWithLevel:levelStr.integerValue]; UIImage *levelImage = [UIImage fus_imageWithLevel:levelStr.integerValue];
CGFloat height = 25; CGFloat height = 14;
CGFloat width = height / levelImage.size.height * levelImage.size.width; CGFloat width = height / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(width, height) alignToFont:[UIFont fus_themeFont:15] alignment:YYTextVerticalAlignmentCenter]; NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(width, height) alignToFont:[UIFont fus_themeFont:15] alignment:YYTextVerticalAlignmentCenter];
[attr appendAttributedString:levelAttr]; [attr appendAttributedString:levelAttr];
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
_faceImageView.layer.cornerRadius = _faceImageView.height / 2.0; _faceImageView.layer.cornerRadius = _faceImageView.height / 2.0;
_faceImageView.layer.masksToBounds = YES; _faceImageView.layer.masksToBounds = YES;
_faceImageView.layer.borderWidth = 1; _faceImageView.layer.borderWidth = 1;
_faceImageView.layer.borderColor = [[UIColor colorWithHex:@"2be1b0"] CGColor]; _faceImageView.layer.borderColor = [[UIColor fus_diamondBlue] CGColor];
[_bgImageView addSubview:_faceImageView]; [_bgImageView addSubview:_faceImageView];
_senderInfoLabel = [[YYLabel alloc] init]; _senderInfoLabel = [[YYLabel alloc] init];
...@@ -523,7 +523,7 @@ ...@@ -523,7 +523,7 @@
UIImage *levelImage = [UIImage fus_imageWithLevel:model.level.integerValue]; UIImage *levelImage = [UIImage fus_imageWithLevel:model.level.integerValue];
if (levelImage) { if (levelImage) {
CGFloat imageH = 15; CGFloat imageH = 14;
CGFloat imageW = imageH / levelImage.size.height * levelImage.size.width; CGFloat imageW = imageH / levelImage.size.height * levelImage.size.width;
NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageW, imageH) alignToFont:[UIFont fus_themeFont:13] alignment:YYTextVerticalAlignmentCenter]; NSAttributedString *levelAttr = [NSAttributedString attachmentStringWithContent:levelImage contentMode:UIViewContentModeScaleAspectFit attachmentSize:CGSizeMake(imageW, imageH) alignToFont:[UIFont fus_themeFont:13] alignment:YYTextVerticalAlignmentCenter];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/FUSGiftCenter/FUSGiftAnimation/FUSWEBPGiftAnimation.m
...@@ -96,20 +96,12 @@ ...@@ -96,20 +96,12 @@
resourceMd5:resourceMd5 completion:^(YYImage *yyImage) { resourceMd5:resourceMd5 completion:^(YYImage *yyImage) {
if (!yyImage) { if (!yyImage) {
[weakSelf fus_endGiftAnimation];
return; return;
} }
weakSelf.retryTime = 0; weakSelf.retryTime = 0;
// dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
// YYImage *yyImage = [YYImage imageWithData:webpImageData];
// yyImage.preloadAllAnimatedImageFrames = YES;
// dispatch_async(dispatch_get_main_queue(), ^{
[weakSelf displayWithWebpImage:yyImage]; [weakSelf displayWithWebpImage:yyImage];
// });
// });
}]; }];
} }
...@@ -133,8 +125,12 @@ ...@@ -133,8 +125,12 @@
if (self.didEndAnimation) { if (self.didEndAnimation) {
self.didEndAnimation(weakSelf.animationModel); self.didEndAnimation(weakSelf.animationModel);
} }
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fus_timeOutAnimation) object:nil];
}); });
}
- (void)fus_timeOutAnimation {
[self fus_endGiftAnimation];
} }
- (void)fus_removeGiftAnimation - (void)fus_removeGiftAnimation
...@@ -177,7 +173,8 @@ ...@@ -177,7 +173,8 @@
[self fus_endGiftAnimation]; [self fus_endGiftAnimation];
return; return;
} }
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fus_timeOutAnimation) object:nil];
[self performSelector:@selector(fus_timeOutAnimation) withObject:nil afterDelay:30];
// 图片资源已经加载到内存中 // 图片资源已经加载到内存中
_webpImageView.image = webpImage; _webpImageView.image = webpImage;
_webpImageView.animationRepeatCount = 1; _webpImageView.animationRepeatCount = 1;
...@@ -205,6 +202,7 @@ ...@@ -205,6 +202,7 @@
- (void)dealloc - (void)dealloc
{ {
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fus_timeOutAnimation) object:nil];
if (_webpImageView.observationInfo) { if (_webpImageView.observationInfo) {
[_webpImageView removeObserver:self forKeyPath:@"currentAnimatedImageIndex"]; [_webpImageView removeObserver:self forKeyPath:@"currentAnimatedImageIndex"];
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftCollectionViewCell.m
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
if ([model.givecurrency isEqualToString:@"5"]) { if ([model.givecurrency isEqualToString:@"5"]) {
[_priceBtn setTitleColor:[UIColor colorWithHex:@"3CAFF3"] forState:UIControlStateNormal]; [_priceBtn setTitleColor:[UIColor fus_dewBlue] forState:UIControlStateNormal];
}else{ }else{
[_priceBtn setTitleColor:[UIColor colorWithHex:@"58DBD7"] forState:UIControlStateNormal]; [_priceBtn setTitleColor:[UIColor colorWithHex:@"58DBD7"] forState:UIControlStateNormal];
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftView.m
...@@ -671,7 +671,7 @@ static FUSLiveGiftView *giftView = nil; ...@@ -671,7 +671,7 @@ static FUSLiveGiftView *giftView = nil;
_gemBtn.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter; _gemBtn.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
_gemBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentCenter; _gemBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentCenter;
[_gemBtn setImage:[UIImage imageNamed:@"common_assets_diamond_23x23"] forState:UIControlStateNormal]; [_gemBtn setImage:[UIImage imageNamed:@"common_assets_diamond_23x23"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal]; [_gemBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
_gemBtn.titleLabel.font = [UIFont fus_themeFont:13]; _gemBtn.titleLabel.font = [UIFont fus_themeFont:13];
[_gemBtn sizeToFit]; [_gemBtn sizeToFit];
_gemBtn.centerY = _bottomBGView.height / 2.0; _gemBtn.centerY = _bottomBGView.height / 2.0;
...@@ -684,7 +684,7 @@ static FUSLiveGiftView *giftView = nil; ...@@ -684,7 +684,7 @@ static FUSLiveGiftView *giftView = nil;
- (void)initRechargeButton - (void)initRechargeButton
{ {
_rechargeBtn = [UIButton buttonWithType:UIButtonTypeCustom]; _rechargeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[_rechargeBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal]; [_rechargeBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
[_rechargeBtn setTitle:[NSString fus_localString:@"储值"] forState:UIControlStateNormal]; [_rechargeBtn setTitle:[NSString fus_localString:@"储值"] forState:UIControlStateNormal];
_rechargeBtn.titleLabel.font = [UIFont fus_themeFont:13]; _rechargeBtn.titleLabel.font = [UIFont fus_themeFont:13];
[_rechargeBtn setImage:[[UIImage imageNamed:@"live_icon_gift_recharge_arrow"] fusrtl_imageFlippedForRightToLeftLayoutDirection] forState:UIControlStateNormal]; [_rechargeBtn setImage:[[UIImage imageNamed:@"live_icon_gift_recharge_arrow"] fusrtl_imageFlippedForRightToLeftLayoutDirection] forState:UIControlStateNormal];
...@@ -1501,34 +1501,34 @@ static FUSLiveGiftView *giftView = nil; ...@@ -1501,34 +1501,34 @@ static FUSLiveGiftView *giftView = nil;
FUSLiveGiftDataModel *dataModel = self.categoryDataSource[_selectedIndexPath.section].giftDataArr[_selectedIndexPath.item]; FUSLiveGiftDataModel *dataModel = self.categoryDataSource[_selectedIndexPath.section].giftDataArr[_selectedIndexPath.item];
if ([FUSLiveGiftDataModel fus_isNullWithModel:dataModel]) { if ([FUSLiveGiftDataModel fus_isNullWithModel:dataModel]) {
[_gemBtn setImage:[UIImage imageNamed:@"common_assets_diamond_23x23"] forState:UIControlStateNormal]; [_gemBtn setImage:[UIImage imageNamed:@"common_assets_diamond_23x23"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal]; [_gemBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
[self fus_updataDiamondCountFromSever:NO]; [self fus_updataDiamondCountFromSever:NO];
[_rechargeBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal]; [_rechargeBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
[_rechargeBtn setTitle:[NSString fus_localString:@"储值"] forState:UIControlStateNormal]; [_rechargeBtn setTitle:[NSString fus_localString:@"储值"] forState:UIControlStateNormal];
return; return;
} }
if ([dataModel.currency isEqualToString:@"5"]) { if ([dataModel.currency isEqualToString:@"5"]) {
[_gemBtn setImage:[UIImage imageNamed:@"common_assets_dew_giftPanel"] forState:UIControlStateNormal]; [_gemBtn setImage:[UIImage imageNamed:@"common_assets_dew_giftPanel"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor colorWithHex:@"3CAFF3"] forState:UIControlStateNormal]; [_gemBtn setTitleColor:[UIColor fus_dewBlue] forState:UIControlStateNormal];
[self fus_setDiamondCount:[FUSCacheDataShare shareStore].userDetailInfo.chip]; [self fus_setDiamondCount:[FUSCacheDataShare shareStore].userDetailInfo.chip];
[_rechargeBtn setTitleColor:[UIColor colorWithHex:@"3CAFF3"] forState:UIControlStateNormal]; [_rechargeBtn setTitleColor:[UIColor fus_dewBlue] forState:UIControlStateNormal];
[_rechargeBtn setTitle:[NSString fus_localString:@"买入"] forState:UIControlStateNormal]; [_rechargeBtn setTitle:[NSString fus_localString:@"买入"] forState:UIControlStateNormal];
} else { } else {
[_gemBtn setImage:[UIImage imageNamed:@"common_assets_diamond_23x23"] forState:UIControlStateNormal]; [_gemBtn setImage:[UIImage imageNamed:@"common_assets_diamond_23x23"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal]; [_gemBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
[self fus_updataDiamondCountFromSever:NO]; [self fus_updataDiamondCountFromSever:NO];
[_rechargeBtn setTitleColor:[UIColor colorWithHex:@"2BE1B0"] forState:UIControlStateNormal]; [_rechargeBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
[_rechargeBtn setTitle:[NSString fus_localString:@"储值"] forState:UIControlStateNormal]; [_rechargeBtn setTitle:[NSString fus_localString:@"储值"] forState:UIControlStateNormal];
} }
}else if (giftType == FUSDewGift) { }else if (giftType == FUSDewGift) {
[_gemBtn setImage:[UIImage imageNamed:@"common_assets_dew_giftPanel"] forState:UIControlStateNormal]; [_gemBtn setImage:[UIImage imageNamed:@"common_assets_dew_giftPanel"] forState:UIControlStateNormal];
[_gemBtn setTitleColor:[UIColor colorWithHex:@"3CAFF3"] forState:UIControlStateNormal]; [_gemBtn setTitleColor:[UIColor fus_dewBlue] forState:UIControlStateNormal];
[self fus_setDiamondCount:[FUSCacheDataShare shareStore].userDetailInfo.chip]; [self fus_setDiamondCount:[FUSCacheDataShare shareStore].userDetailInfo.chip];
[_rechargeBtn setTitleColor:[UIColor colorWithHex:@"3CAFF3"] forState:UIControlStateNormal]; [_rechargeBtn setTitleColor:[UIColor fus_dewBlue] forState:UIControlStateNormal];
[_rechargeBtn setTitle:[NSString fus_localString:@"买入"] forState:UIControlStateNormal]; [_rechargeBtn setTitle:[NSString fus_localString:@"买入"] forState:UIControlStateNormal];
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeadView/FUSLiveCoinTicketView.m
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
self.titleBGImageView = [[UIImageView alloc] initWithFrame:CGRectMake(4, 2, _bgView.height - 4, _bgView.height - 4)]; self.titleBGImageView = [[UIImageView alloc] initWithFrame:CGRectMake(4, 2, _bgView.height - 4, _bgView.height - 4)];
_titleBGImageView.centerY = _bgView.height / 2.0 - 1; _titleBGImageView.centerY = _bgView.height / 2.0 - 1;
}else if (self.type == FUSLiveCoinTicketViewTypeHeatPower || self.type == FUSLiveCoinTicketViewTypeHeatRank){ }else if (self.type == FUSLiveCoinTicketViewTypeHeatPower || self.type == FUSLiveCoinTicketViewTypeHeatRank){
self.titleBGImageView = [[UIImageView alloc] initWithFrame:CGRectMake(7, 2, 12, 8.5)]; // self.titleBGImageView = [[UIImageView alloc] initWithFrame:CGRectMake(7, 2, 12, 8.5)];
_titleBGImageView.centerY = _bgView.height / 2.0; // _titleBGImageView.centerY = _bgView.height / 2.0;
} }
_titleBGImageView.contentMode = UIViewContentModeScaleAspectFit; _titleBGImageView.contentMode = UIViewContentModeScaleAspectFit;
...@@ -125,7 +125,8 @@ ...@@ -125,7 +125,8 @@
if (self.type == FUSLiveCoinTicketViewTypeCoinTicket) { if (self.type == FUSLiveCoinTicketViewTypeCoinTicket) {
_titleBGImageView.image = [UIImage imageNamed:@"live_coin_bg_view"]; _titleBGImageView.image = [UIImage imageNamed:@"live_coin_bg_view"];
} else if (self.type == FUSLiveCoinTicketViewTypeHeatPower || self.type == FUSLiveCoinTicketViewTypeHeatRank) { } else if (self.type == FUSLiveCoinTicketViewTypeHeatPower || self.type == FUSLiveCoinTicketViewTypeHeatRank) {
_titleBGImageView.image = [UIImage imageNamed:@"live_coin_heat_bg"]; _titleBGImageView.hidden = YES;
// _titleBGImageView.image = [UIImage imageNamed:@"live_coin_heat_bg"];
} }
} }
...@@ -166,6 +167,7 @@ ...@@ -166,6 +167,7 @@
self.rankLabel = [[UILabel alloc] initWithFrame:_numberView.frame]; self.rankLabel = [[UILabel alloc] initWithFrame:_numberView.frame];
self.rankLabel.font = [UIFont fus_themeFont:12]; self.rankLabel.font = [UIFont fus_themeFont:12];
self.rankLabel.textColor = UIColor.fus_appMainColor; self.rankLabel.textColor = UIColor.fus_appMainColor;
self.rankLabel.center = CGPointMake(self.width / 2.0, self.height / 2.0);
[self addSubview:self.rankLabel]; [self addSubview:self.rankLabel];
[_titleBGImageView fusrtl_resetFrameToFitRTL]; [_titleBGImageView fusrtl_resetFrameToFitRTL];
...@@ -259,7 +261,8 @@ ...@@ -259,7 +261,8 @@
self.bgView.width = self.width; self.bgView.width = self.width;
self.titleBGImageView.x = 7; self.titleBGImageView.x = 7;
self.rankLabel.x = leadingSpace + 2; // self.rankLabel.x = leadingSpace + 2;
self.rankLabel.center = CGPointMake(self.width / 2.0, self.height / 2.0);
self.arrowImageView.x = CGRectGetMaxX(self.rankLabel.frame) + 3; self.arrowImageView.x = CGRectGetMaxX(self.rankLabel.frame) + 3;
[_titleBGImageView fusrtl_resetFrameToFitRTL]; [_titleBGImageView fusrtl_resetFrameToFitRTL];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/Popular/ProgressView/FUSPopularProgressView.m
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
self.layer.borderColor = [UIColor whiteColor].CGColor; self.layer.borderColor = [UIColor whiteColor].CGColor;
self.layer.borderWidth = 0.5; self.layer.borderWidth = 0.5;
CGRect rect = CGRectInset(self.bounds, 4, 4); CGRect rect = CGRectInset(self.bounds, 3, 3 );
self.progressBGView = [[UIView alloc] initWithFrame:rect]; self.progressBGView = [[UIView alloc] initWithFrame:rect];
self.progressBGView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.30]; self.progressBGView.backgroundColor = [UIColor colorWithWhite:0 alpha:0.30];
self.progressBGView.layer.cornerRadius = self.progressBGView.width / 2.0f; self.progressBGView.layer.cornerRadius = self.progressBGView.width / 2.0f;
......
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.m
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#import "FUSDewAwardAnimationView.h" #import "FUSDewAwardAnimationView.h"
#import <StoreKit/StoreKit.h> #import <StoreKit/StoreKit.h>
#import "FUSSettingViewController.h" #import "FUSSettingViewController.h"
#import "FUSGotBackpackItemAnimView.h"
#import <FirebaseAnalytics/FirebaseAnalytics.h> #import <FirebaseAnalytics/FirebaseAnalytics.h>
...@@ -118,7 +119,7 @@ static NSString *const reuseIdentifyCell = @"cell"; ...@@ -118,7 +119,7 @@ static NSString *const reuseIdentifyCell = @"cell";
_segmentView.isEqualSpace = YES; _segmentView.isEqualSpace = YES;
_segmentView.itemFont = [UIFont fus_themeFont:15]; _segmentView.itemFont = [UIFont fus_themeFont:15];
_segmentView.backgroundColor = [UIColor clearColor]; _segmentView.backgroundColor = [UIColor clearColor];
[_segmentView fus_setItemTitleColor:[UIColor fus_themeColor] forState:UIControlStateSelected]; [_segmentView fus_setItemTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateSelected];
[_segmentView fus_setItemTitleColor:[UIColor fus_textColorMedium] forState:UIControlStateNormal]; [_segmentView fus_setItemTitleColor:[UIColor fus_textColorMedium] forState:UIControlStateNormal];
[_segmentView fus_setUnderLineSelectedImage:[[UIImage imageNamed:@"common_icon_segment_selected"] imageByTintColor:[UIColor fus_themeColor]]]; [_segmentView fus_setUnderLineSelectedImage:[[UIImage imageNamed:@"common_icon_segment_selected"] imageByTintColor:[UIColor fus_themeColor]]];
[self.view addSubview:_segmentView]; [self.view addSubview:_segmentView];
...@@ -436,15 +437,15 @@ static NSString *const reuseIdentifyCell = @"cell"; ...@@ -436,15 +437,15 @@ static NSString *const reuseIdentifyCell = @"cell";
[dewAnimView addDewAwardWithAmount:[NSString stringWithFormat:@"%ld",listModel.award] textColor:[UIColor fus_dewBlue]]; [dewAnimView addDewAwardWithAmount:[NSString stringWithFormat:@"%ld",listModel.award] textColor:[UIColor fus_dewBlue]];
[UIApplication.sharedApplication.keyWindow addSubview:dewAnimView]; [UIApplication.sharedApplication.keyWindow addSubview:dewAnimView];
} else { } else {
[FUSGotBackpackItemAnimView fus_showWithType:FUSGotBackpackItemAnimType2 icon:listModel.icon name:listModel.getTips goodsType:listModel.classify isMotorHasWear:NO];
FUSSingleDailyCheckInView *awardView = [FUSSingleDailyCheckInView fus_dailyCheckInView]; // FUSSingleDailyCheckInView *awardView = [FUSSingleDailyCheckInView fus_dailyCheckInView];
awardView.frame = UIView.fus_screenFrame; // awardView.frame = UIView.fus_screenFrame;
awardView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.6]; // awardView.backgroundColor = [[UIColor blackColor] colorWithAlphaComponent:0.6];
[awardView fus_showCheckInSucceedWithIcon:listModel.icon // [awardView fus_showCheckInSucceedWithIcon:listModel.icon
desc:listModel.getTips // desc:listModel.getTips
award:@(listModel.award).description // award:@(listModel.award).description
animated:NO]; // animated:NO];
[UIApplication.sharedApplication.keyWindow addSubview:awardView]; // [UIApplication.sharedApplication.keyWindow addSubview:awardView];
} }
} }
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSGotBackpackItemAnimView.h
...@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface FUSGotBackpackItemAnimView : UIView @interface FUSGotBackpackItemAnimView : UIView
+ (void)ff_showWithType:(FUSGotBackpackItemAnimType)type + (void)fus_showWithType:(FUSGotBackpackItemAnimType)type
icon:(NSString *)iconUrl icon:(NSString *)iconUrl
name:(NSString *)name name:(NSString *)name
goodsType:(FUSGotBackpackItemGoodsType)goodsType goodsType:(FUSGotBackpackItemGoodsType)goodsType
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSGotBackpackItemAnimView.m
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
@implementation FUSGotBackpackItemAnimView @implementation FUSGotBackpackItemAnimView
+ (void)ff_showWithType:(FUSGotBackpackItemAnimType)type + (void)fus_showWithType:(FUSGotBackpackItemAnimType)type
icon:(NSString *)iconUrl icon:(NSString *)iconUrl
name:(NSString *)name name:(NSString *)name
goodsType:(FUSGotBackpackItemGoodsType)goodsType goodsType:(FUSGotBackpackItemGoodsType)goodsType
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[self.iconImageView setWebImageWithSubURLString:iconUrl placeholder:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) { [self.iconImageView setWebImageWithSubURLString:iconUrl placeholder:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
if (image) { if (image) {
[weakSelf ff_showImageAnim:image]; [weakSelf fus_showImageAnim:image];
} else { } else {
[weakSelf removeFromSuperview]; [weakSelf removeFromSuperview];
} }
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
return self; return self;
} }
- (void)ff_showImageAnim:(UIImage *)image { - (void)fus_showImageAnim:(UIImage *)image {
self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6]; self.backgroundColor = [UIColor colorWithWhite:0 alpha:0.6];
if (self.goodsType == FUSGotBackpackItemGoodsTypeGift) { if (self.goodsType == FUSGotBackpackItemGoodsTypeGift) {
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
self.nameContentView.centerX = self.iconImageView.centerX; self.nameContentView.centerX = self.iconImageView.centerX;
self.hidden = NO; self.hidden = NO;
// FUSBackpackButton *backpackButton = [FUSBackpackButton ff_showBackpackButton]; // FUSBackpackButton *backpackButton = [FUSBackpackButton fus_showBackpackButton];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
...@@ -186,20 +186,22 @@ ...@@ -186,20 +186,22 @@
} }
// self.backpackButton = backpackButton; // self.backpackButton = backpackButton;
// [self ff_showMovingToBackpackBtn:backpackButton]; [self fus_showMoving/*ToBackpackBtn:backpackButton*/];
}); });
} }
//- (void)ff_showMovingToBackpackBtn:(FUSBackpackButton *)backpackButton { - (void)fus_showMoving/*ToBackpackBtn:(FUSBackpackButton *)backpackButton*/ {
//
// CGFloat popDutation = 0; // CGFloat popDutation = 0;
// CGFloat moveDutation = 0.4; CGFloat moveDutation = 0.4;
//
// [UIView animateWithDuration:moveDutation animations:^{ [UIView animateWithDuration:moveDutation animations:^{
// self.nameContentView.alpha = 0; self/*.nameContentView*/.alpha = 0;
// self.nameContentView.transform = CGAffineTransformScale(CGAffineTransformIdentity, 0.1, 0.1); // self/*.nameContentView*/.transform = CGAffineTransformScale(CGAffineTransformIdentity, 0.1, 0.1);
//
// }]; } completion:^(BOOL finished) {
[self removeFromSuperview];
}];
// //
// CAAnimationGroup *moveOutAnimGroup = [CAAnimationGroup animation]; // CAAnimationGroup *moveOutAnimGroup = [CAAnimationGroup animation];
// moveOutAnimGroup.delegate = (id)[YYWeakProxy proxyWithTarget:self]; // moveOutAnimGroup.delegate = (id)[YYWeakProxy proxyWithTarget:self];
...@@ -208,12 +210,6 @@ ...@@ -208,12 +210,6 @@
// moveOutAnimGroup.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn]; // moveOutAnimGroup.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
// moveOutAnimGroup.fillMode = kCAFillModeForwards; // moveOutAnimGroup.fillMode = kCAFillModeForwards;
// //
//// CAKeyframeAnimation *popScaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
//// popScaleAnimation.values = @[@1,@1.3,@1];
//// popScaleAnimation.keyTimes = @[@0,@0.6,@1];
//// popScaleAnimation.timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseIn];
//// popScaleAnimation.duration = popDutation;
////
// CAKeyframeAnimation *moveOutScaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"]; // CAKeyframeAnimation *moveOutScaleAnimation = [CAKeyframeAnimation animationWithKeyPath:@"transform.scale"];
// moveOutScaleAnimation.values = @[@1,@0.7,@0];//@[@1,@0.8,@0.6,@0.4,@0.1]; // moveOutScaleAnimation.values = @[@1,@0.7,@0];//@[@1,@0.8,@0.6,@0.4,@0.1];
// moveOutScaleAnimation.keyTimes = @[@0,@0.6,@1];//@[@0,@0.2,@0.4,@0.6,@1]; // moveOutScaleAnimation.keyTimes = @[@0,@0.6,@1];//@[@0,@0.2,@0.4,@0.6,@1];
...@@ -230,10 +226,10 @@ ...@@ -230,10 +226,10 @@
// //
// moveOutAnimGroup.animations = @[moveOutScaleAnimation,positionAnimation]; // moveOutAnimGroup.animations = @[moveOutScaleAnimation,positionAnimation];
// [self.iconImageView.layer addAnimation:moveOutAnimGroup forKey:@"FUSGotBackpackMoveOutAnim"]; // [self.iconImageView.layer addAnimation:moveOutAnimGroup forKey:@"FUSGotBackpackMoveOutAnim"];
//} }
//
//- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag { //- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag {
// [self.backpackButton ff_startRemoveCountDown]; // [self.backpackButton fus_startRemoveCountDown];
// [self removeFromSuperview]; // [self removeFromSuperview];
//} //}
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterHeaderSimpleTableViewCell.xib
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<device id="retina4_7" orientation="portrait" appearance="light"/> <device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
...@@ -20,23 +20,14 @@ ...@@ -20,23 +20,14 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新手任务" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FWv-iM-weK"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新手任务" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FWv-iM-weK">
<rect key="frame" x="20" y="12" width="69.5" height="20.5"/> <rect key="frame" x="20" y="12" width="69.5" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<view alpha="0.20000000000000001" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UsE-jb-O0d">
<rect key="frame" x="20" y="43" width="290" height="1"/>
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="w75-bY-ocO"/>
</constraints>
</view>
</subviews> </subviews>
<color key="backgroundColor" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1" colorSpace="calibratedRGB"/>
<constraints> <constraints>
<constraint firstAttribute="bottom" secondItem="UsE-jb-O0d" secondAttribute="bottom" id="18a-pr-Vks"/>
<constraint firstItem="FWv-iM-weK" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="7Rs-i0-11Y"/> <constraint firstItem="FWv-iM-weK" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="7Rs-i0-11Y"/>
<constraint firstItem="FWv-iM-weK" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="JSX-Eq-4Yk"/> <constraint firstItem="FWv-iM-weK" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="JSX-Eq-4Yk"/>
<constraint firstAttribute="trailing" secondItem="UsE-jb-O0d" secondAttribute="trailing" constant="10" id="Otw-ch-aU3"/>
<constraint firstItem="UsE-jb-O0d" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="20" id="Zda-Np-xrd"/>
</constraints> </constraints>
</tableViewCellContentView> </tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/> <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterListTableViewCell.h
...@@ -15,6 +15,7 @@ typedef void(^OperationTaskListBlock)(FUSTaskCenterListModel *model,UIButton *se ...@@ -15,6 +15,7 @@ typedef void(^OperationTaskListBlock)(FUSTaskCenterListModel *model,UIButton *se
@property (nonatomic, strong) FUSTaskCenterListModel *listModel; @property (nonatomic, strong) FUSTaskCenterListModel *listModel;
@property (nonatomic, copy) OperationTaskListBlock operationTaskListBlock; @property (nonatomic, copy) OperationTaskListBlock operationTaskListBlock;
@property (strong, nonatomic) IBOutlet UIView *liveView;
@end @end
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterListTableViewCell.m
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
weakSelf.imageWidthConstraint.constant = 16; weakSelf.imageWidthConstraint.constant = 16;
} }
}]; }];
self.awardLabel.textColor = [UIColor fus_textColorLight]; self.awardLabel.textColor = [UIColor fus_diamondBlue];
self.addlabel.textColor = [UIColor fus_textColorLight]; self.addlabel.textColor = [UIColor fus_diamondBlue];
} }
if ([NSString isNullWithString:listModel.tagValue]) { if ([NSString isNullWithString:listModel.tagValue]) {
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterListTableViewCell.xib
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iwt-SR-z91"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iwt-SR-z91">
<rect key="frame" x="20" y="40" width="200" height="16"/> <rect key="frame" x="20" y="40" width="200" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="0.41960784313725491" green="0.45490196078431372" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新手大礼包" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oRB-IO-xec"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新手大礼包" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oRB-IO-xec">
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="750" constant="10" id="QrD-mc-JjG"/> <constraint firstAttribute="width" relation="greaterThanOrEqual" priority="750" constant="10" id="QrD-mc-JjG"/>
</constraints> </constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.15686274509803921" green="0.15686274509803921" blue="0.15686274509803921" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vuj-9P-CdU"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vuj-9P-CdU">
...@@ -113,6 +113,7 @@ ...@@ -113,6 +113,7 @@
<outlet property="detailLabel" destination="iwt-SR-z91" id="kdA-bg-PZD"/> <outlet property="detailLabel" destination="iwt-SR-z91" id="kdA-bg-PZD"/>
<outlet property="expTimeLabel" destination="vuj-9P-CdU" id="LUp-Pj-033"/> <outlet property="expTimeLabel" destination="vuj-9P-CdU" id="LUp-Pj-033"/>
<outlet property="imageWidthConstraint" destination="R4K-BJ-QMZ" id="K4Z-8f-lu3"/> <outlet property="imageWidthConstraint" destination="R4K-BJ-QMZ" id="K4Z-8f-lu3"/>
<outlet property="liveView" destination="23y-Os-R55" id="sjS-wN-lIL"/>
<outlet property="operationBtn" destination="VBv-Bq-UZB" id="0RD-iD-3Hb"/> <outlet property="operationBtn" destination="VBv-Bq-UZB" id="0RD-iD-3Hb"/>
<outlet property="taskNameLabel" destination="oRB-IO-xec" id="szN-TL-KfO"/> <outlet property="taskNameLabel" destination="oRB-IO-xec" id="szN-TL-KfO"/>
</connections> </connections>
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterProcessTableViewCell.h
...@@ -15,6 +15,9 @@ typedef void(^OperationTaskProcessBlock)(FUSTaskCenterListModel *model,UIButton ...@@ -15,6 +15,9 @@ typedef void(^OperationTaskProcessBlock)(FUSTaskCenterListModel *model,UIButton
@property (nonatomic, assign) NSInteger anchorType; @property (nonatomic, assign) NSInteger anchorType;
@property (nonatomic, strong) FUSTaskCenterListModel *listModel; @property (nonatomic, strong) FUSTaskCenterListModel *listModel;
@property (nonatomic, copy) OperationTaskProcessBlock operationTaskProcessBlock; @property (nonatomic, copy) OperationTaskProcessBlock operationTaskProcessBlock;
@property (strong, nonatomic) IBOutlet UIView *lineView;
@end @end
NS_ASSUME_NONNULL_END NS_ASSUME_NONNULL_END
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterProcessTableViewCell.m
...@@ -100,8 +100,8 @@ ...@@ -100,8 +100,8 @@
if (![NSString isNullWithString:listModel.tagValue]) { if (![NSString isNullWithString:listModel.tagValue]) {
self.awardLabel.text = listModel.tagValue; self.awardLabel.text = listModel.tagValue;
self.awardLabel.textColor = [UIColor fus_textColorLight]; self.awardLabel.textColor = [UIColor fus_diamondBlue];
self.addLabel.textColor = [UIColor fus_textColorLight]; self.addLabel.textColor = [UIColor fus_diamondBlue];
} }
} }
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterProcessTableViewCell.xib
...@@ -49,13 +49,13 @@ ...@@ -49,13 +49,13 @@
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="250" constant="27.5" id="OZm-fY-Bat"/> <constraint firstAttribute="width" relation="greaterThanOrEqual" priority="250" constant="27.5" id="OZm-fY-Bat"/>
</constraints> </constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.15686274509803921" green="0.15686274509803921" blue="0.15686274509803921" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="------" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8v6-UE-dIy"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="------" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8v6-UE-dIy">
<rect key="frame" x="20" y="36" width="230" height="14.5"/> <rect key="frame" x="20" y="36" width="230" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.41960784313725491" green="0.45490196078431372" blue="0.50196078431372548" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RbH-RC-F8l" customClass="FUSStyleButton"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RbH-RC-F8l" customClass="FUSStyleButton">
...@@ -128,6 +128,7 @@ ...@@ -128,6 +128,7 @@
<outlet property="btnConstrant" destination="ZlU-VB-AeZ" id="MWo-Ga-fxv"/> <outlet property="btnConstrant" destination="ZlU-VB-AeZ" id="MWo-Ga-fxv"/>
<outlet property="detailLabel" destination="8v6-UE-dIy" id="tNE-Re-0Zj"/> <outlet property="detailLabel" destination="8v6-UE-dIy" id="tNE-Re-0Zj"/>
<outlet property="imageWidthConstraint" destination="ogJ-Ij-RNm" id="Ybs-7c-I53"/> <outlet property="imageWidthConstraint" destination="ogJ-Ij-RNm" id="Ybs-7c-I53"/>
<outlet property="lineView" destination="qPl-w4-kgo" id="iGu-xX-upi"/>
<outlet property="operationBtn" destination="RbH-RC-F8l" id="wtc-x8-Amr"/> <outlet property="operationBtn" destination="RbH-RC-F8l" id="wtc-x8-Amr"/>
<outlet property="taskProcessLabel" destination="EyC-iH-DvF" id="s5u-4V-YfW"/> <outlet property="taskProcessLabel" destination="EyC-iH-DvF" id="s5u-4V-YfW"/>
<outlet property="taskTitleLabel" destination="bfp-Ws-YBS" id="lUa-EV-zX5"/> <outlet property="taskTitleLabel" destination="bfp-Ws-YBS" id="lUa-EV-zX5"/>
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterTableViewCell.m
...@@ -206,6 +206,7 @@ static NSString *const reuseIdentifyNoTaskCell = @"FUSMissionCenterNoTaskCell"; ...@@ -206,6 +206,7 @@ static NSString *const reuseIdentifyNoTaskCell = @"FUSMissionCenterNoTaskCell";
weakSelf.operationTaskBlock(model,sender,weakSelf.currentModel); weakSelf.operationTaskBlock(model,sender,weakSelf.currentModel);
} }
}; };
listCell.liveView.hidden = (indexPath.row == weakSelf.currentModel.tasklist.count);
return listCell; return listCell;
} else if (listModel.type == 2) { } else if (listModel.type == 2) {
FUSTaskCenterTextTableViewCell *textCell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifyTextCell forIndexPath:indexPath]; FUSTaskCenterTextTableViewCell *textCell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifyTextCell forIndexPath:indexPath];
...@@ -229,6 +230,7 @@ static NSString *const reuseIdentifyNoTaskCell = @"FUSMissionCenterNoTaskCell"; ...@@ -229,6 +230,7 @@ static NSString *const reuseIdentifyNoTaskCell = @"FUSMissionCenterNoTaskCell";
weakSelf.operationTaskBlock(model,sender,weakSelf.currentModel); weakSelf.operationTaskBlock(model,sender,weakSelf.currentModel);
} }
}; };
processCell.lineView.hidden = (indexPath.row == weakSelf.currentModel.tasklist.count);
return processCell; return processCell;
} else { } else {
FUSTaskCenterListTableViewCell *listCell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifyListCell forIndexPath:indexPath]; FUSTaskCenterListTableViewCell *listCell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifyListCell forIndexPath:indexPath];
...@@ -240,6 +242,7 @@ static NSString *const reuseIdentifyNoTaskCell = @"FUSMissionCenterNoTaskCell"; ...@@ -240,6 +242,7 @@ static NSString *const reuseIdentifyNoTaskCell = @"FUSMissionCenterNoTaskCell";
weakSelf.operationTaskBlock(model,sender,weakSelf.currentModel); weakSelf.operationTaskBlock(model,sender,weakSelf.currentModel);
} }
}; };
listCell.liveView.hidden = (indexPath.row == weakSelf.currentModel.tasklist.count);
return listCell; return listCell;
} }
} }
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterTableViewCell.xib
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<device id="retina4_7" orientation="portrait" appearance="light"/> <device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
...@@ -18,22 +18,22 @@ ...@@ -18,22 +18,22 @@
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LWc-0B-lGP"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="LWc-0B-lGP">
<rect key="frame" x="10" y="10" width="300" height="98"/> <rect key="frame" x="10" y="0.0" width="300" height="108"/>
</imageView> </imageView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="eGI-j1-i70"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="eGI-j1-i70">
<rect key="frame" x="10" y="10" width="300" height="98"/> <rect key="frame" x="10" y="0.0" width="300" height="108"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</tableView> </tableView>
</subviews> </subviews>
<constraints> <constraints>
<constraint firstAttribute="trailing" secondItem="eGI-j1-i70" secondAttribute="trailing" constant="10" id="3Nl-2s-hKt"/> <constraint firstAttribute="trailing" secondItem="eGI-j1-i70" secondAttribute="trailing" constant="10" id="3Nl-2s-hKt"/>
<constraint firstAttribute="trailing" secondItem="LWc-0B-lGP" secondAttribute="trailing" constant="10" id="7vT-Be-1pg"/> <constraint firstAttribute="trailing" secondItem="LWc-0B-lGP" secondAttribute="trailing" constant="10" id="7vT-Be-1pg"/>
<constraint firstItem="LWc-0B-lGP" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="IUt-c0-jUI"/> <constraint firstItem="LWc-0B-lGP" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="IUt-c0-jUI"/>
<constraint firstItem="LWc-0B-lGP" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="SA1-dz-kuL"/> <constraint firstItem="LWc-0B-lGP" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="SA1-dz-kuL"/>
<constraint firstItem="eGI-j1-i70" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="TNL-8c-JqK"/> <constraint firstItem="eGI-j1-i70" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="TNL-8c-JqK"/>
<constraint firstAttribute="bottom" secondItem="eGI-j1-i70" secondAttribute="bottom" id="XfK-5w-fBj"/> <constraint firstAttribute="bottom" secondItem="eGI-j1-i70" secondAttribute="bottom" id="XfK-5w-fBj"/>
<constraint firstAttribute="bottom" secondItem="LWc-0B-lGP" secondAttribute="bottom" id="ds1-9h-g16"/> <constraint firstAttribute="bottom" secondItem="LWc-0B-lGP" secondAttribute="bottom" id="ds1-9h-g16"/>
<constraint firstItem="eGI-j1-i70" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="gIM-HN-b8o"/> <constraint firstItem="eGI-j1-i70" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="gIM-HN-b8o"/>
</constraints> </constraints>
</tableViewCellContentView> </tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/> <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
......
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