Skip to content

pidan / FuSiLive

Go to a project
Commit 1b6d0878 by pierce
Options

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

parents 36252819 25787902
Inline Side-by-side
Showing with 40 additions and 18 deletions
FuSiLive/Classes/Foundation/Http/FUSURLDictionary.h
...@@ -839,7 +839,7 @@ ...@@ -839,7 +839,7 @@
#define URL_WEB_BACKPACK_CONSUME_RECORD DNS_WEB(@"/Nesting/backpack/consume.html") #define URL_WEB_BACKPACK_CONSUME_RECORD DNS_WEB(@"/Nesting/backpack/consume.html")
// 账号管理 // 账号管理
#define URL_WEB_ACCOUNT_MANAGER DNS_WEB(@"/Nesting/logOff/index.html") #define URL_WEB_ACCOUNT_MANAGER DNS_WEB(@"/vestApp/logOff/index.html")
// 首页-榜单 // 首页-榜单
#define URL_WEB_HOME_RANK DNS_WEB(@"/allRank/index.html") #define URL_WEB_HOME_RANK DNS_WEB(@"/allRank/index.html")
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMessageFunctionColumnView.m
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
}]; }];
UILabel *tempTitleLabel = [[UILabel alloc] init]; UILabel *tempTitleLabel = [[UILabel alloc] init];
tempTitleLabel.font = [UIFont fus_themeFont:11]; tempTitleLabel.font = [UIFont fus_themeBoldFont:11];
tempTitleLabel.textColor = [UIColor fus_textColorRich]; tempTitleLabel.textColor = [UIColor fus_textColorRich];
[tempBgView addSubview:tempTitleLabel]; [tempBgView addSubview:tempTitleLabel];
[tempTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) { [tempTitleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyHeaderView.m
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
[self.vipMarkImgView mas_makeConstraints:^(MASConstraintMaker *make) { [self.vipMarkImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(nickNameBgView); make.right.equalTo(nickNameBgView);
make.centerY.equalTo(nickNameBgView.mas_centerY); make.centerY.equalTo(nickNameBgView.mas_centerY);
make.left.equalTo(self.levelLabel.mas_right).offset(3); make.left.equalTo(self.levelLabel.mas_right).offset(2);
// make.size.mas_equalTo(CGSizeMake(14, 14)); // make.size.mas_equalTo(CGSizeMake(14, 14));
make.height.offset(14); make.height.offset(14);
}]; }];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/View/FUSImAnchorHeaderView.m
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
[self.vipMarkImgView mas_makeConstraints:^(MASConstraintMaker *make) { [self.vipMarkImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(nickNameBgView); make.right.equalTo(nickNameBgView);
make.centerY.equalTo(nickNameBgView.mas_centerY); make.centerY.equalTo(nickNameBgView.mas_centerY);
make.left.equalTo(self.levelLabel.mas_right).offset(3); make.left.equalTo(self.levelLabel.mas_right).offset(2);
// make.size.mas_equalTo(CGSizeMake(14, 14)); // make.size.mas_equalTo(CGSizeMake(14, 14));
make.height.offset(14); make.height.offset(14);
}]; }];
......
FuSiLive/Classes/InstantMessaging/Other/FUSIMChatService.m
...@@ -2645,11 +2645,19 @@ ...@@ -2645,11 +2645,19 @@
if (diamondIsNoEnough) diamondIsNoEnough(); if (diamondIsNoEnough) diamondIsNoEnough();
} else if (code == -3024) { } else if (code == -3024) {
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"提示"] message:dataDict[@"msg"] cancelButtonTitle:[NSString fus_localString:@"我再想想"] otherButtonTitles:@[[NSString fus_localString:@"私信"],[NSString fus_localString:@"送礼物"]] clickBlock:^(NSInteger buttonIndex) { // [FUSAlertView showAlertWithTitle:[NSString fus_localString:@"提示"] message:dataDict[@"msg"] cancelButtonTitle:[NSString fus_localString:@"我再想想"] otherButtonTitles:@[[NSString fus_localString:@"私信"],[NSString fus_localString:@"送礼物"]] clickBlock:^(NSInteger buttonIndex) {
// if (jumpToChatPage) {
// if (buttonIndex == 1) {
// jumpToChatPage(0);
// } else if (buttonIndex == 2) {
// jumpToChatPage(1);
// }
// }
// }];
[FUSAlertView showAlertWithTitle:[NSString fus_localString:@"提示"] message:dataDict[@"msg"] cancelButtonTitle:[NSString fus_localString:@"我再想想"] otherButtonTitles:@[[NSString fus_localString:@"送礼物"]] clickBlock:^(NSInteger buttonIndex) {
if (jumpToChatPage) { if (jumpToChatPage) {
if (buttonIndex == 1) { if (buttonIndex == 1) {
jumpToChatPage(0);
} else if (buttonIndex == 2) {
jumpToChatPage(1); jumpToChatPage(1);
} }
} }
......
FuSiLive/Classes/Setting/Controller/FUSBlackListViewController.m
...@@ -63,8 +63,10 @@ ...@@ -63,8 +63,10 @@
if (_blackListArray.count > 0) { if (_blackListArray.count > 0) {
_tableView.tableFooterView = nil; _tableView.tableFooterView = nil;
}else{ }else{
FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH / 2.0f)]; FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH - [UIView fus_NavgationBarHeight] - 100)];
[emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"firefly_black_placeholder_img"] title:[NSString fus_localString:@"空空如也"] buttonTittle:nil]; [emptyView fus_setEmptyViewIcon:[UIImage fus_emptyImg] title:[NSString fus_localString:@"空空如也"] buttonTittle:nil];
emptyView.contentVerticalOffset = -20;
emptyView.imageScale = 0.3;
_tableView.tableFooterView = emptyView; _tableView.tableFooterView = emptyView;
} }
[_tableView reloadData]; [_tableView reloadData];
......
FuSiLive/Classes/Setting/Controller/FUSSettingViewController.m
...@@ -517,7 +517,7 @@ ...@@ -517,7 +517,7 @@
FUSCustomSettingGroup *group7 = [FUSCustomSettingGroup fus_settingGroup]; FUSCustomSettingGroup *group7 = [FUSCustomSettingGroup fus_settingGroup];
group7.groupHeaderHeight = 40; group7.groupHeaderHeight = 0;
group7.groupHeaderOriginY = 10; group7.groupHeaderOriginY = 10;
group7.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"]; group7.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"];
group7.groupHeaderTextFont = [UIFont fus_themeFont:12]; group7.groupHeaderTextFont = [UIFont fus_themeFont:12];
......
FuSiLive/Classes/ZhaiXin/Official/View/OfficialMsgCell/FUSOfficialMultiLineTableViewCell.m
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
self.officialBgView.backgroundColor = [UIColor fus_textInputBackgroundGrayColor]; self.officialBgView.backgroundColor = [UIColor fus_textInputBackgroundGrayColor];
self.titleLabel.textColor = [UIColor fus_textColorRich]; self.titleLabel.textColor = [UIColor fus_textColorRich];
self.contentLabel.textColor = [UIColor fus_textColorMedium]; self.contentLabel.textColor = [UIColor fus_textColorMedium];
self.bottomClickableIdentifyLabel.textColor = [UIColor fus_themeColor]; self.bottomClickableIdentifyLabel.textColor = [UIColor fus_diamondBlue];
} }
......
FuSiLive/Classes/Zone/Controller/FUSMotoringWareHouseViewController.m
...@@ -209,11 +209,11 @@ ...@@ -209,11 +209,11 @@
cell.model = self.motoringArr[indexPath.section]; cell.model = self.motoringArr[indexPath.section];
// if (indexPath.section == self.motoringArr.count - 1) { if (indexPath.section == self.motoringArr.count - 1) {
// cell.cellLineView.hidden = YES; cell.cellLineView.hidden = YES;
// }else{ }else{
// cell.cellLineView.hidden = NO; cell.cellLineView.hidden = NO;
// } }
return cell; return cell;
} }
......
FuSiLive/Classes/Zone/View/FUSMotoringTableViewCell.h
...@@ -12,6 +12,6 @@ ...@@ -12,6 +12,6 @@
@property (nonatomic,strong) FUSZoneMotoringModel *model; @property (nonatomic,strong) FUSZoneMotoringModel *model;
@property (weak, nonatomic) IBOutlet UIView *cellLineView; @property (nonatomic, strong) UIView *cellLineView;
@end @end
FuSiLive/Classes/Zone/View/FUSMotoringTableViewCell.m
...@@ -34,6 +34,16 @@ ...@@ -34,6 +34,16 @@
self.layer.masksToBounds = YES; self.layer.masksToBounds = YES;
self.motoringNameLabel.textColor = [UIColor fus_textColorRich]; self.motoringNameLabel.textColor = [UIColor fus_textColorRich];
self.cellLineView = [[UIView alloc] init];
self.cellLineView.backgroundColor = [UIColor fus_lineColor];
[self.contentView addSubview:self.cellLineView];
[self.cellLineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.inset(16);
make.bottom.offset(0);
make.height.offset(0.5);
}];
} }
- (void)setModel:(FUSZoneMotoringModel *)model - (void)setModel:(FUSZoneMotoringModel *)model
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneFireCountCell.m
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
self.selectionStyle = UITableViewCellSelectionStyleNone; self.selectionStyle = UITableViewCellSelectionStyleNone;
self.receiveFireLabel.textColor = [UIColor fus_textColorRich]; self.receiveFireLabel.textColor = [UIColor fus_textColorRich];
self.fireCountLabel.textColor = [UIColor fus_fireGreen];
UIView *lineView = [[UIView alloc] init]; UIView *lineView = [[UIView alloc] init];
lineView.backgroundColor = [UIColor fus_lineColor]; lineView.backgroundColor = [UIColor fus_lineColor];
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneSendJewelCountCell.m
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
self.selectionStyle = UITableViewCellSelectionStyleNone; self.selectionStyle = UITableViewCellSelectionStyleNone;
self.sendJewelLabel.textColor = [UIColor fus_textColorRich]; self.sendJewelLabel.textColor = [UIColor fus_textColorRich];
self.sendJewelCountLabel.textColor = [UIColor fus_diamondBlue];
UIView *lineView = [[UIView alloc] init]; UIView *lineView = [[UIView alloc] init];
lineView.backgroundColor = [UIColor fus_lineColor]; lineView.backgroundColor = [UIColor fus_lineColor];
......
FuSiLive/FUSAPPConfigs/FUSFuSiWebViewEventHelper.m
...@@ -705,7 +705,7 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey"; ...@@ -705,7 +705,7 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey";
FUSWebActionModel *model = [FUSWebActionModel fus_modelWithDict:action]; FUSWebActionModel *model = [FUSWebActionModel fus_modelWithDict:action];
if (model) { if (model) {
UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom]; UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
[btn setWebBackgroundImageWithSubURLString:model.imgUrl]; [btn setWebImageWithSubURLString:model.imgUrl placeholder:nil];
btn.imageView.contentMode = UIViewContentModeScaleAspectFit; btn.imageView.contentMode = UIViewContentModeScaleAspectFit;
btn.frame = CGRectMake(lastX, y, btnSize, btnSize); btn.frame = CGRectMake(lastX, y, btnSize, btnSize);
btn.imageEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 0); btn.imageEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 0);
......
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