Skip to content

pidan / FuSiLive

Go to a project
Commit 60f0d171 by pierce
Options

修改UI

parent 5655d8fd
Inline Side-by-side
Showing with 55 additions and 37 deletions
FuSiLive/Assets.xcassets/Live/live_end_bgView.imageset/Contents.json → FuSiLive/Assets.xcassets/Live/PK/Anchor_Type_Top_PK_title.imageset/Contents.json
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "直播结束-背景框@2x.png", "filename" : "Anchor_Type_Top_PK_title@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "直播结束-背景框@3x.png", "filename" : "Anchor_Type_Top_PK_title@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
FuSiLive/Classes/NewLive/Main/View/EndView/FUSVideoEndView.xib
...@@ -53,8 +53,15 @@ ...@@ -53,8 +53,15 @@
<constraint firstAttribute="width" secondItem="4lP-m3-7ef" secondAttribute="height" multiplier="1:1" id="tO3-Xs-hhU"/> <constraint firstAttribute="width" secondItem="4lP-m3-7ef" secondAttribute="height" multiplier="1:1" id="tO3-Xs-hhU"/>
</constraints> </constraints>
</imageView> </imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="live_end_bgView" translatesAutoresizingMaskIntoConstraints="NO" id="dPl-j4-Psk"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dPl-j4-Psk">
<rect key="frame" x="49.5" y="132.5" width="293" height="292"/> <rect key="frame" x="49.5" y="132.5" width="276" height="302"/>
<color key="backgroundColor" white="1" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="12"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
</userDefinedRuntimeAttributes>
</imageView> </imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vIC-W9-pba"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vIC-W9-pba">
<rect key="frame" x="77.5" y="152.5" width="220" height="84"/> <rect key="frame" x="77.5" y="152.5" width="220" height="84"/>
...@@ -277,12 +284,12 @@ ...@@ -277,12 +284,12 @@
<constraint firstItem="vIC-W9-pba" firstAttribute="top" secondItem="GUU-Av-Kfk" secondAttribute="bottom" constant="36" id="4fr-Qx-jiH"/> <constraint firstItem="vIC-W9-pba" firstAttribute="top" secondItem="GUU-Av-Kfk" secondAttribute="bottom" constant="36" id="4fr-Qx-jiH"/>
<constraint firstItem="cZ6-iF-4dC" firstAttribute="leading" secondItem="dPl-j4-Psk" secondAttribute="leading" constant="28" id="8oi-be-Mzp"/> <constraint firstItem="cZ6-iF-4dC" firstAttribute="leading" secondItem="dPl-j4-Psk" secondAttribute="leading" constant="28" id="8oi-be-Mzp"/>
<constraint firstItem="4lP-m3-7ef" firstAttribute="top" secondItem="irB-kM-nDY" secondAttribute="top" id="9pG-ij-UYY"/> <constraint firstItem="4lP-m3-7ef" firstAttribute="top" secondItem="irB-kM-nDY" secondAttribute="top" id="9pG-ij-UYY"/>
<constraint firstItem="dPl-j4-Psk" firstAttribute="bottom" secondItem="cZ6-iF-4dC" secondAttribute="bottom" constant="20" id="BGg-85-QI3"/> <constraint firstItem="dPl-j4-Psk" firstAttribute="bottom" secondItem="cZ6-iF-4dC" secondAttribute="bottom" constant="30" id="BGg-85-QI3"/>
<constraint firstItem="GUU-Av-Kfk" firstAttribute="top" secondItem="4lP-m3-7ef" secondAttribute="bottom" constant="14" id="E9L-dT-zjK"/> <constraint firstItem="GUU-Av-Kfk" firstAttribute="top" secondItem="4lP-m3-7ef" secondAttribute="bottom" constant="14" id="E9L-dT-zjK"/>
<constraint firstAttribute="bottom" secondItem="D7R-By-tUA" secondAttribute="bottom" constant="20" id="EBO-VM-BR6"/> <constraint firstAttribute="bottom" secondItem="D7R-By-tUA" secondAttribute="bottom" constant="20" id="EBO-VM-BR6"/>
<constraint firstItem="vIC-W9-pba" firstAttribute="top" secondItem="dPl-j4-Psk" secondAttribute="top" constant="20" id="Nnh-Jf-Y5i"/> <constraint firstItem="vIC-W9-pba" firstAttribute="top" secondItem="dPl-j4-Psk" secondAttribute="top" constant="20" id="Nnh-Jf-Y5i"/>
<constraint firstItem="ecO-cN-fZd" firstAttribute="centerX" secondItem="irB-kM-nDY" secondAttribute="centerX" id="P8c-nx-Ian"/> <constraint firstItem="ecO-cN-fZd" firstAttribute="centerX" secondItem="irB-kM-nDY" secondAttribute="centerX" id="P8c-nx-Ian"/>
<constraint firstItem="dPl-j4-Psk" firstAttribute="trailing" secondItem="cZ6-iF-4dC" secondAttribute="trailing" constant="45" id="QMX-cp-UoH"/> <constraint firstItem="dPl-j4-Psk" firstAttribute="trailing" secondItem="cZ6-iF-4dC" secondAttribute="trailing" constant="28" id="QMX-cp-UoH"/>
<constraint firstItem="vIC-W9-pba" firstAttribute="centerX" secondItem="irB-kM-nDY" secondAttribute="centerX" id="RBH-vi-Ui0"/> <constraint firstItem="vIC-W9-pba" firstAttribute="centerX" secondItem="irB-kM-nDY" secondAttribute="centerX" id="RBH-vi-Ui0"/>
<constraint firstItem="hGk-iW-KuY" firstAttribute="height" secondItem="D7R-By-tUA" secondAttribute="height" id="WSm-XP-swa"/> <constraint firstItem="hGk-iW-KuY" firstAttribute="height" secondItem="D7R-By-tUA" secondAttribute="height" id="WSm-XP-swa"/>
<constraint firstItem="P4q-9q-rhL" firstAttribute="centerX" secondItem="irB-kM-nDY" secondAttribute="centerX" id="XJ8-vy-dfM"/> <constraint firstItem="P4q-9q-rhL" firstAttribute="centerX" secondItem="irB-kM-nDY" secondAttribute="centerX" id="XJ8-vy-dfM"/>
...@@ -349,7 +356,6 @@ ...@@ -349,7 +356,6 @@
</objects> </objects>
<resources> <resources>
<image name="live_coin_bg_view" width="12" height="15.5"/> <image name="live_coin_bg_view" width="12" height="15.5"/>
<image name="live_end_bgView" width="279.5" height="287"/>
<image name="live_end_view_line" width="282.5" height="2"/> <image name="live_end_view_line" width="282.5" height="2"/>
</resources> </resources>
</document> </document>
FuSiLive/Classes/NewLive/Main/View/FunctionView/Activity/FUSLiveHalfWebViewCatalogueView.m
...@@ -66,7 +66,8 @@ ...@@ -66,7 +66,8 @@
_bgView = [[UIView alloc] initWithFrame:CGRectMake(0, self.height - 150, self.width, 150)]; _bgView = [[UIView alloc] initWithFrame:CGRectMake(0, self.height - 150, self.width, 150)];
_bgView.alpha = 0; _bgView.alpha = 0;
_bgView.backgroundColor = [[UIColor colorWithHex:@"#201B2C"] colorWithAlphaComponent:0.95]; _bgView.backgroundColor = [UIColor fus_appBGColor];
[_bgView addRoundedCorners:UIRectCornerTopLeft|UIRectCornerTopRight withRadii:CGSizeMake(12, 12)];
_bgView.y = self.height; _bgView.y = self.height;
[self addSubview:_bgView]; [self addSubview:_bgView];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/GiftView/FUSLiveGiftSendToUserView.m
...@@ -68,7 +68,8 @@ ...@@ -68,7 +68,8 @@
#pragma mark - UI Update #pragma mark - UI Update
- (void)initial { - (void)initial {
self.backgroundColor = [[UIColor colorWithHex:@"11121A"] colorWithAlphaComponent:0.88]; self.backgroundColor = [UIColor fus_appBGColor];
[self addRoundedCorners:UIRectCornerTopLeft|UIRectCornerTopRight withRadii:CGSizeMake(12, 12)];
CGSize faceIconSize = CGSizeMake(kUserIconWidth, kUserIconWidth); CGSize faceIconSize = CGSizeMake(kUserIconWidth, kUserIconWidth);
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeadView/FUSLiveCoinTicketView.m
...@@ -112,8 +112,8 @@ ...@@ -112,8 +112,8 @@
[self addSubview:_bgView]; [self addSubview:_bgView];
if (self.type == FUSLiveCoinTicketViewTypeCoinTicket) { if (self.type == FUSLiveCoinTicketViewTypeCoinTicket) {
self.titleBGImageView = [[UIImageView alloc] initWithFrame:CGRectMake(4, 2, _bgView.height - 4, _bgView.height - 4)]; self.titleBGImageView = [[UIImageView alloc] initWithFrame:CGRectMake(4, 4, _bgView.height - 8, _bgView.height - 8)];
_titleBGImageView.centerY = _bgView.height / 2.0 - 1; _titleBGImageView.centerY = _bgView.height / 2.0 - 2;
}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;
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
{ {
leadingSpace = CGRectGetMaxX(_titleBGImageView.frame) + 2; leadingSpace = CGRectGetMaxX(_titleBGImageView.frame) + 2;
if (self.type == FUSLiveCoinTicketViewTypeCoinTicket) { if (self.type == FUSLiveCoinTicketViewTypeCoinTicket) {
leadingSpace -= 5; leadingSpace -= 3;
} }
tailSpace = 3.0; tailSpace = 3.0;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/HeadView/FUSLivePortraitView.m
...@@ -194,6 +194,7 @@ ...@@ -194,6 +194,7 @@
_audienceBtn.frame = CGRectMake(_autoScrollNicknameLabel.x, CGRectGetMaxY(_autoScrollNicknameLabel.frame) + 0, 50, 13); _audienceBtn.frame = CGRectMake(_autoScrollNicknameLabel.x, CGRectGetMaxY(_autoScrollNicknameLabel.frame) + 0, 50, 13);
_audienceBtn.titleLabel.numberOfLines = 1; _audienceBtn.titleLabel.numberOfLines = 1;
_audienceBtn.titleLabel.font = [UIFont fus_themeFont:9]; _audienceBtn.titleLabel.font = [UIFont fus_themeFont:9];
_audienceBtn.titleEdgeInsets = UIEdgeInsetsMake(0, 2, 0, 0);
_audienceBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; _audienceBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
[_audienceBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal]; [_audienceBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[_audienceBtn setImage:[UIImage imageNamed:@"live_head_audience_icon"] forState:UIControlStateNormal]; [_audienceBtn setImage:[UIImage imageNamed:@"live_head_audience_icon"] forState:UIControlStateNormal];
...@@ -238,6 +239,7 @@ ...@@ -238,6 +239,7 @@
// 更新 Frame // 更新 Frame
[_audienceBtn sizeToFit]; [_audienceBtn sizeToFit];
_audienceBtn.height = 13; _audienceBtn.height = 13;
_audienceBtn.width += 5;
[self updateFrameWithAnimate:YES]; [self updateFrameWithAnimate:YES];
...@@ -393,6 +395,7 @@ ...@@ -393,6 +395,7 @@
// 更新 Frame // 更新 Frame
[_audienceBtn sizeToFit]; [_audienceBtn sizeToFit];
_audienceBtn.height = 13; _audienceBtn.height = 13;
_audienceBtn.width += 5;
// 更新 View // 更新 View
[self updateFrameWithAnimate:animate]; [self updateFrameWithAnimate:animate];
...@@ -550,6 +553,7 @@ ...@@ -550,6 +553,7 @@
_audience = @""; _audience = @"";
[_audienceBtn setTitle:_audience forState:UIControlStateNormal]; [_audienceBtn setTitle:_audience forState:UIControlStateNormal];
[_audienceBtn sizeToFit]; [_audienceBtn sizeToFit];
_audienceBtn.width += 5;
[self fus_dismissLikeButtonWithAnimation:NO]; [self fus_dismissLikeButtonWithAnimation:NO];
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/MessageBox/FUSLiveMessageBoxView.m
...@@ -167,7 +167,8 @@ static dispatch_queue_t get_live_message_box_parse_queue(){ ...@@ -167,7 +167,8 @@ static dispatch_queue_t get_live_message_box_parse_queue(){
[_emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:[NSString fus_localString:@"您还没有收到私信"] buttonTittle:nil]; [_emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:[NSString fus_localString:@"您还没有收到私信"] buttonTittle:nil];
_emptyView.hidden = YES; _emptyView.hidden = YES;
_emptyView.backgroundColor = [UIColor clearColor]; _emptyView.backgroundColor = [UIColor clearColor];
_emptyView.center = CGPointMake(_bgView.width / 2.0, (_bgView.height / 2.0) + _headBGView.height / 2.0); _emptyView.contentVerticalOffset = -15;
_emptyView.center = CGPointMake(_bgView.width / 2.0, (_bgView.height / 2.0));
[_bgView insertSubview:_emptyView belowSubview:_tableView]; [_bgView insertSubview:_emptyView belowSubview:_tableView];
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/Model/FUSPKReceiveInviteSocketModel.h
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface FUSPKReceiveInviteSocketModel : FUSBaseModel @interface FUSPKReceiveInviteSocketModel : FUSBaseModel
// 类型 1-好友pk 2热门主播pk // 类型 1-好友pk 2人气直播PK
@property (nonatomic,copy) NSString *type; @property (nonatomic,copy) NSString *type;
// 自己的id // 自己的id
@property (nonatomic,copy) NSString *uid; @property (nonatomic,copy) NSString *uid;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/View/PKPrepareView/FUSPKAnchorTypeSelectView.h
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
typedef NS_ENUM(NSUInteger, FUSPKViewStyle) { typedef NS_ENUM(NSUInteger, FUSPKViewStyle) {
FUSPKViewStyleHotAnchorPK = 2, // 热门主播PK FUSPKViewStyleHotAnchorPK = 2, // 人气直播PK
FUSPKViewStyleAllRandomAnchorPK = 3, // 全寨随机PK FUSPKViewStyleAllRandomAnchorPK = 3, // 全寨随机PK
FUSPKViewStyleActivityPK = 4, // 活动PK FUSPKViewStyleActivityPK = 4, // 活动PK
FUSPKViewStyleRules = 5, // 规则 FUSPKViewStyleRules = 5, // 规则
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/View/PKPrepareView/FUSPKAnchorTypeSelectView.m
...@@ -93,6 +93,10 @@ typedef NS_ENUM(NSInteger,PKAnchorType) { ...@@ -93,6 +93,10 @@ typedef NS_ENUM(NSInteger,PKAnchorType) {
topBgView.backgroundColor = [UIColor clearColor]; topBgView.backgroundColor = [UIColor clearColor];
[bottomWholeBgView addSubview:topBgView]; [bottomWholeBgView addSubview:topBgView];
UIImageView *titleImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"Anchor_Type_Top_PK_title"]];
titleImageView.center = CGPointMake(topBgView.width / 2.0f, topBgView.height / 2.0f);
[topBgView addSubview:titleImageView];
// 规则按钮 // 规则按钮
UIButton *PKRuleBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, HEADERVIEW_HEIGHT, HEADERVIEW_HEIGHT)]; UIButton *PKRuleBtn = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, HEADERVIEW_HEIGHT, HEADERVIEW_HEIGHT)];
PKRuleBtn.tag = PKTopRule; PKRuleBtn.tag = PKTopRule;
...@@ -188,7 +192,7 @@ typedef NS_ENUM(NSInteger,PKAnchorType) { ...@@ -188,7 +192,7 @@ typedef NS_ENUM(NSInteger,PKAnchorType) {
*/ */
- (void)showViewWithPKStyle:(FUSPKViewStyle)pKStyle { - (void)showViewWithPKStyle:(FUSPKViewStyle)pKStyle {
switch (pKStyle) { switch (pKStyle) {
case FUSPKViewStyleHotAnchorPK:// 热门主播pk case FUSPKViewStyleHotAnchorPK:// 人气直播PK
if (_delegate && [_delegate respondsToSelector:@selector(homeView:didClickViewPKStyle:styleModel:)]) { if (_delegate && [_delegate respondsToSelector:@selector(homeView:didClickViewPKStyle:styleModel:)]) {
[_delegate homeView:self didClickViewPKStyle:FUSPKViewStyleHotAnchorPK styleModel:_currentModel]; [_delegate homeView:self didClickViewPKStyle:FUSPKViewStyleHotAnchorPK styleModel:_currentModel];
} }
...@@ -215,7 +219,7 @@ typedef NS_ENUM(NSInteger,PKAnchorType) { ...@@ -215,7 +219,7 @@ typedef NS_ENUM(NSInteger,PKAnchorType) {
- (void)onClickAnchorTypeBtn:(UIButton *)sender { - (void)onClickAnchorTypeBtn:(UIButton *)sender {
_currentModel = self.allPKStyleArr[sender.tag]; _currentModel = self.allPKStyleArr[sender.tag];
switch (_currentModel.type.integerValue) { switch (_currentModel.type.integerValue) {
case 2:// 热门主播pk case 2:// 人气直播PK
if (_delegate && [_delegate respondsToSelector:@selector(homeView:didClickViewPKStyle:styleModel:)]) { if (_delegate && [_delegate respondsToSelector:@selector(homeView:didClickViewPKStyle:styleModel:)]) {
[_delegate homeView:self didClickViewPKStyle:FUSPKViewStyleHotAnchorPK styleModel:_currentModel]; [_delegate homeView:self didClickViewPKStyle:FUSPKViewStyleHotAnchorPK styleModel:_currentModel];
} }
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/PK/View/PKPrepareView/FUSPKStyleView.m
...@@ -414,7 +414,7 @@ typedef NS_ENUM(NSUInteger, FUSPKStyleViewShowType) { ...@@ -414,7 +414,7 @@ typedef NS_ENUM(NSUInteger, FUSPKStyleViewShowType) {
- (void)homeView:(FUSPKAnchorTypeSelectView *)homeView didClickViewPKStyle:(FUSPKViewStyle)viewPKStyle styleModel:(FUSPKStyleModel *)styleModel { - (void)homeView:(FUSPKAnchorTypeSelectView *)homeView didClickViewPKStyle:(FUSPKViewStyle)viewPKStyle styleModel:(FUSPKStyleModel *)styleModel {
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
switch (viewPKStyle) { switch (viewPKStyle) {
case FUSPKViewStyleHotAnchorPK:// 热门主播PK case FUSPKViewStyleHotAnchorPK:// 人气直播PK
{ {
[FUSTalkingData fus_trackEvent:EVENT_LIVEROOM_PK_HOT_LIST]; [FUSTalkingData fus_trackEvent:EVENT_LIVEROOM_PK_HOT_LIST];
if (!_PKAnchorListView) { if (!_PKAnchorListView) {
...@@ -428,7 +428,7 @@ typedef NS_ENUM(NSUInteger, FUSPKStyleViewShowType) { ...@@ -428,7 +428,7 @@ typedef NS_ENUM(NSUInteger, FUSPKStyleViewShowType) {
self.PKAnchorListView.frame = CGRectMake(UIView.fus_screenW, self.height - height, self.width, height); self.PKAnchorListView.frame = CGRectMake(UIView.fus_screenW, self.height - height, self.width, height);
self.PKAnchorListView.tragetVC = _tragetVC; self.PKAnchorListView.tragetVC = _tragetVC;
self.PKAnchorListView.PKType = FUSPKTypeHotAnchor; self.PKAnchorListView.PKType = FUSPKTypeHotAnchor;
self.PKAnchorListView.title = [NSString fus_localString:@"热门主播PK"]; self.PKAnchorListView.title = [NSString fus_localString:@"人气直播PK"];
[self.PKAnchorListView requestAnchorListData]; [self.PKAnchorListView requestAnchorListData];
[UIView animateWithDuration:0.25 animations:^{ [UIView animateWithDuration:0.25 animations:^{
weakSelf.homeView.x = -UIView.fus_screenW; weakSelf.homeView.x = -UIView.fus_screenW;
......
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.m
...@@ -119,9 +119,9 @@ static NSString *const reuseIdentifyCell = @"cell"; ...@@ -119,9 +119,9 @@ 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_diamondBlue] forState:UIControlStateSelected]; [_segmentView fus_setItemTitleColor:[UIColor fus_textColorRich] 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"]];
[self.view addSubview:_segmentView]; [self.view addSubview:_segmentView];
self.segmentView.hidden = YES; self.segmentView.hidden = YES;
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterTableViewCell.m
...@@ -268,7 +268,7 @@ static NSString *const reuseIdentifyNoTaskCell = @"FUSMissionCenterNoTaskCell"; ...@@ -268,7 +268,7 @@ static NSString *const reuseIdentifyNoTaskCell = @"FUSMissionCenterNoTaskCell";
} }
} else { } else {
if (indexPath.row == 0) { if (indexPath.row == 0) {
return 60; return 44;
} else { } else {
if (_currentModel.tasklist.count == 0) { if (_currentModel.tasklist.count == 0) {
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterTableViewCell.xib
...@@ -18,22 +18,23 @@ ...@@ -18,22 +18,23 @@
<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="0.0" width="300" height="108"/> <rect key="frame" x="0.0" y="0.0" width="320" 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="0.0" width="300" height="108"/> <rect key="frame" x="0.0" y="0.0" width="320" 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 firstItem="LWc-0B-lGP" firstAttribute="leading" secondItem="eGI-j1-i70" secondAttribute="leading" id="2eM-3r-PdA"/>
<constraint firstAttribute="trailing" secondItem="LWc-0B-lGP" secondAttribute="trailing" constant="10" id="7vT-Be-1pg"/> <constraint firstItem="LWc-0B-lGP" firstAttribute="trailing" secondItem="eGI-j1-i70" secondAttribute="trailing" id="3AE-di-ruL"/>
<constraint firstAttribute="trailing" secondItem="eGI-j1-i70" secondAttribute="trailing" id="3Nl-2s-hKt"/>
<constraint firstItem="LWc-0B-lGP" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" 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="eGI-j1-i70" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" 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 firstItem="LWc-0B-lGP" firstAttribute="bottom" secondItem="eGI-j1-i70" secondAttribute="bottom" id="Z7c-yf-V9U"/>
<constraint firstItem="eGI-j1-i70" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="gIM-HN-b8o"/> <constraint firstItem="eGI-j1-i70" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="gIM-HN-b8o"/>
<constraint firstItem="LWc-0B-lGP" firstAttribute="top" secondItem="eGI-j1-i70" secondAttribute="top" id="yKV-sn-ksV"/>
</constraints> </constraints>
</tableViewCellContentView> </tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/> <viewLayoutGuide key="safeArea" id="aW0-zy-SZf"/>
......
FuSiLive/Resources/LocalizationString/Fusi_Arbic.strings
...@@ -458,7 +458,7 @@ ...@@ -458,7 +458,7 @@
"额头" = "جبين"; "额头" = "جبين";
"热门主播PK" = "تحديPK المذيعين الساخنة"; "人气直播PK" = "تحديPK المذيعين الساخنة";
"%@以上" = "أكثر من %@"; "%@以上" = "أكثر من %@";
......
FuSiLive/Resources/LocalizationString/Fusi_Chinese.strings
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
"额头" = "額頭"; "额头" = "額頭";
"热门主播PK" = "熱門主播PK"; "人气直播PK" = "人氣主播PK";
"%@以上" = "%@以上"; "%@以上" = "%@以上";
......
FuSiLive/Resources/LocalizationString/Fusi_Chinese_Traditional.strings
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
"额头" = "額頭"; "额头" = "額頭";
"热门主播PK" = "熱門主播PK"; "人气直播PK" = "人氣主播PK";
"%@以上" = "%@以上"; "%@以上" = "%@以上";
......
FuSiLive/Resources/LocalizationString/Fusi_English.strings
...@@ -468,7 +468,7 @@ ...@@ -468,7 +468,7 @@
"额头" = "Forehead"; "额头" = "Forehead";
"热门主播PK" = "PK hot broadcasters"; "人气直播PK" = "PK hot broadcasters";
"%@以上" = "More than %@"; "%@以上" = "More than %@";
......
FuSiLive/Resources/LocalizationString/Fusi_Indonesian.strings
...@@ -464,7 +464,7 @@ ...@@ -464,7 +464,7 @@
"额头" = "Dahi"; "额头" = "Dahi";
"热门主播PK" = "Penyiar PK populer"; "人气直播PK" = "Penyiar PK populer";
"%@以上" = "Lebih dari %@"; "%@以上" = "Lebih dari %@";
......
FuSiLive/Resources/LocalizationString/Fusi_Japanese.strings
...@@ -466,7 +466,7 @@ ...@@ -466,7 +466,7 @@
"额头" = "額"; "额头" = "額";
"热门主播PK" = "PKホット配信者"; "人气直播PK" = "PKホット配信者";
"%@以上" = "%@以上"; "%@以上" = "%@以上";
......
FuSiLive/Resources/LocalizationString/Fusi_Thai.strings
...@@ -464,7 +464,7 @@ ...@@ -464,7 +464,7 @@
"额头" = "หน้าผาก"; "额头" = "หน้าผาก";
"热门主播PK" = "การออกอากาศด่วน PK"; "人气直播PK" = "การออกอากาศด่วน PK";
"%@以上" = "มากกว่า %@"; "%@以上" = "มากกว่า %@";
......
FuSiLive/Resources/LocalizationString/Fusi_vietnamese.strings
...@@ -466,7 +466,7 @@ ...@@ -466,7 +466,7 @@
"额头" = "Trán"; "额头" = "Trán";
"热门主播PK" = "PK phổ biến"; "人气直播PK" = "PK phổ biến";
"%@以上" = "Nhiều hơn %@"; "%@以上" = "Nhiều hơn %@";
......
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