Skip to content

pidan / FuSiLive

Go to a project
Commit 0895668d by ludi
Options

修改了一系列ui，先同步一下

parent 477ce416
Expand all
Inline Side-by-side
Showing with 280 additions and 151 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/NSString/NSString+Check.h
......@@ -61,4 +61,7 @@
/// 判断是否是16进制的颜色字符串
- (BOOL)isHexColor;
/// 兼容string没有stringValue
- (NSString *)stringValue;
@end
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/NSString/NSString+Check.m
......@@ -121,4 +121,8 @@
return resultRGBA;
}
- (NSString *)stringValue{
return self;
}
@end
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/EmptyView/FUSEmptyView.m
......@@ -161,9 +161,11 @@
//文字的frame
_emptyTitleLabel.centerX = _emptyContentBgView.width / 2.0f;
_emptyTitleLabel.y = 0;
// _emptyTitleLabel.y = 0;
_emptyTitleLabel.y = self.contentVerticalOffset;
if (self.type == FUSEmptyViewTypeImage) {
_emptyTitleLabel.y = CGRectGetMaxY(_emptyImageView.frame);
// _emptyTitleLabel.y = CGRectGetMaxY(_emptyImageView.frame);
_emptyTitleLabel.y = CGRectGetMaxY(_emptyImageView.frame) + self.contentVerticalOffset;
}
//button
......@@ -190,7 +192,6 @@
default:
break;
}
_emptyContentBgView.y = _emptyContentBgView.y + self.contentVerticalOffset;
self.bgImageView.frame = self.bounds;
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/SegmentView/FUSSegmentControlView.h
......@@ -70,6 +70,9 @@ typedef NS_ENUM(NSInteger, FUSSegmentControlSlideType) {
//下划线，默认黑色
@property (nonatomic, strong) UIView *underLine;
/// 下划线宽度
@property (nonatomic, assign) CGFloat underLineWidth;
//设置所有按钮居中（平分整个 segmentView 的宽度）
@property (nonatomic, assign) BOOL isEqualSpace;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/SegmentView/FUSSegmentControlView.m
......@@ -302,6 +302,10 @@ typedef enum :NSInteger{
_underLine.width = self.width;
}
if (_underLineWidth > 0) {
_underLine.width = self.underLineWidth;
}
if(_lastBtn.tag != sender.tag){
_lastBtn.selected = NO;
_lastBtn.titleLabel.font = _itemFont;
......@@ -801,6 +805,10 @@ typedef enum :NSInteger{
if (self.lastBtn.tag < _itemBtns.count) {
_underLine.width = ([(UIButton *)_itemBtns[self.lastBtn.tag] width]-4)/UNDERLINE_WIDTH_SCALE;
if (_underLineWidth > 0) {
_underLine.width = self.underLineWidth;
}
}else{
FUSLogDebug(@"segmentView occur error");
}
......@@ -810,6 +818,9 @@ typedef enum :NSInteger{
_btnX = 0;
_space = 0;
_underLine.width = self.width;
if (_underLineWidth > 0) {
_underLine.width = self.underLineWidth;
}
}
}else{
_underLine.hidden = YES;
......@@ -1239,6 +1250,9 @@ typedef enum :NSInteger{
_bgScrollView.hidden = NO;
}
_underLine.width = self.width/self.itemBtns.count;
if (_underLineWidth > 0) {
_underLine.width = self.underLineWidth;
}
_underLine.x = 0;
}
}
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.h
......@@ -20,6 +20,7 @@
+ (UIColor *)fus_listBGColor;
+ (UIColor *)fus_listBGPressColor;
/// 一般cell的分割线 dddddd
+ (UIColor *)fus_lineColor;
+(UIColor *)fus_separatorLineColor;
......
FuSiLive/Assets.xcassets/BaoFang/DailyCheckIn/daily_check_inrotation_lightimg.imageset/Contents.json
......@@ -9,7 +9,7 @@
"scale" : "2x"
},
{
"filename" : "daily_check_inrotation_lightimg@3x.png",
"filename" : "20240708-204601.png",
"idiom" : "universal",
"scale" : "3x"
}
......
FuSiLive/Assets.xcassets/IMMessage/chat_im_message_bg_right.imageset/Contents.json
......@@ -5,18 +5,18 @@
"scale" : "1x"
},
{
"filename" : "20240709-120654.png",
"idiom" : "universal",
"filename" : "消息背景2@2x.png",
"scale" : "2x"
},
{
"filename" : "20240709-120649.png",
"idiom" : "universal",
"filename" : "消息背景2@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
FuSiLive/Assets.xcassets/fusiPart/tabbar/fus_tabbar_item_home_white.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_tabbar_item_home_white@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_tabbar_item_home_white@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Classes/BaoFang/DailyCheckIn/View/FUSSingleDailyCheckInView.m
......@@ -75,16 +75,15 @@
self.checkInSuccessAnimationImageView.animationRepeatCount = 1;
self.checkInSuccessAnimationImageView.image = [UIImage imageNamed:@"CheckInSuccessAnimation_34"];
// CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"];
// //默认是顺时针效果，若将fromValue和toValue的值互换，则为逆时针效果
// animation.fromValue = [NSNumber numberWithFloat:0.f];
// animation.toValue = [NSNumber numberWithFloat: M_PI *2];
// animation.duration = 4;
// animation.autoreverses = NO;
// animation.fillMode = kCAFillModeForwards;
// animation.repeatCount = MAXFLOAT; //如果这里想设置成一直自旋转，可以设置为MAXFLOAT，否则设置具体的数值则代表执行多少次
// [self.rotationLightImageView.layer addAnimation:animation forKey:nil];
self.rotationLightImageView.hidden = YES;
CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"];
//默认是顺时针效果，若将fromValue和toValue的值互换，则为逆时针效果
animation.fromValue = [NSNumber numberWithFloat:0.f];
animation.toValue = [NSNumber numberWithFloat: M_PI *2];
animation.duration = 4;
animation.autoreverses = NO;
animation.fillMode = kCAFillModeForwards;
animation.repeatCount = MAXFLOAT; //如果这里想设置成一直自旋转，可以设置为MAXFLOAT，否则设置具体的数值则代表执行多少次
[self.rotationLightImageView.layer addAnimation:animation forKey:nil];
}
// 构造方法
......
FuSiLive/Classes/BaoFang/Main/Model/FUSBaoFangAnchorModel.h
......@@ -177,4 +177,7 @@ typedef NS_ENUM(NSInteger,FUSBaoFangRecommendType) {
/// 插入的模型
@property (nonatomic, strong) FUSBaoFangAnchorInsertModel *fus_insertModel;
/// 提供一个将主播列表的其他模块（如：新星主播模块）生成FUSBaoFangAnchorMicUserModel模型插入列表中的方法
+(NSMutableArray<FUSBaoFangAnchorMicUserModel *> *)fus_sortInsertModelWithDataDict:(NSDictionary *)dataDict;
@end
FuSiLive/Classes/BaoFang/Main/Model/FUSBaoFangAnchorModel.m
......@@ -49,6 +49,54 @@
@"micTakes" : FUSBaoFangAnchorMicUserModel.class};
}
+ (NSMutableArray<FUSBaoFangAnchorMicUserModel *> *)fus_sortInsertModelWithDataDict:(NSDictionary *)dataDict{
NSMutableArray *resList = [[NSMutableArray alloc] init];
//拼接rooms
NSArray *dataList = dataDict[@"rooms"];
if (dataList != nil && dataList.count > 0) {
for (NSDictionary *tempData in dataList) {
FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
[tempModel fus_setValueWithDict:tempData];
[resList appendObject:tempModel];
}
}
// 拼接插入模型
//1=活动宣传版面。2=新星主播模块。3=FUSI主播应援模块。
NSDictionary *insertItemTypeDict = @{@"activityInfo": @"1", @"novaInfo": @"2", @"supportInfo": @"3"};
NSArray *insertItemSortList = @[@"activityInfo", @"novaInfo", @"supportInfo"];
NSMutableArray *otherInserItemList = [[NSMutableArray alloc] init];
// 挑选出需要插入的模型
[insertItemSortList enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(NSString * _Nonnull insertKey, NSUInteger idx, BOOL * _Nonnull stop) {
NSDictionary *inserDict = dataDict[insertKey];
if (inserDict != nil && inserDict.allKeys.count > 0) {
FUSBaoFangAnchorInsertModel *insertModel = [[FUSBaoFangAnchorInsertModel alloc] init];
[insertModel fus_setValueWithDict:inserDict];
FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
tempModel.fus_itemType = [insertItemTypeDict[insertKey] intValue];
tempModel.fus_insertModel = insertModel;
[otherInserItemList addObject:tempModel];
// if (insertModel.index <= resList.count) {
// [resList insertObject:tempModel atIndex:insertModel.index];
// }
}
}];
// 先将插入顺序从小到大排列，这样小的先插入，就不会影响最终大的排序
[otherInserItemList sortUsingComparator:^NSComparisonResult(FUSBaoFangAnchorModel * obj1, FUSBaoFangAnchorModel * obj2) {
return obj1.fus_insertModel.index > obj2.fus_insertModel.index;
}];
// 按照index插入
for (FUSBaoFangAnchorModel *tempModel in otherInserItemList) {
if (tempModel.fus_insertModel.index > resList.count) {
continue;
}
[resList insertObject:tempModel atIndex:tempModel.fus_insertModel.index];
}
return resList;
}
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];
}
......
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangCacheOperate.m
......@@ -71,34 +71,49 @@
NSDictionary *dataDict = [FUSCustomizedInfosStore fus_readCommonInfosWithKey:STORE_HOME_VEST_ROOM_GET_LIST];
NSMutableArray *resList = [[NSMutableArray alloc] init];
//拼接rooms
NSArray *dataList = dataDict[@"rooms"];
if (dataList != nil && dataList.count > 0) {
for (NSDictionary *tempData in dataList) {
FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
[tempModel fus_setValueWithDict:tempData];
[resList appendObject:tempModel];
}
}
// 拼接插入模型
//1=活动宣传版面。2=新星主播模块。3=FUSI主播应援模块。
NSDictionary *insertItemTypeDict = @{@"activityInfo": @"1", @"novaInfo": @"2", @"supportInfo": @"3"};
NSArray *insertItemSortList = @[@"activityInfo", @"novaInfo", @"supportInfo"];
[insertItemSortList enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(NSString * _Nonnull insertKey, NSUInteger idx, BOOL * _Nonnull stop) {
NSDictionary *inserDict = dataDict[insertKey];
if (inserDict != nil && inserDict.allKeys.count > 0) {
FUSBaoFangAnchorInsertModel *insertModel = [[FUSBaoFangAnchorInsertModel alloc] init];
[insertModel fus_setValueWithDict:inserDict];
FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
tempModel.fus_itemType = [insertItemTypeDict[insertKey] intValue];
tempModel.fus_insertModel = insertModel;
if (insertModel.index <= resList.count) {
[resList insertObject:tempModel atIndex:insertModel.index];
}
}
}];
resList = [FUSBaoFangAnchorModel fus_sortInsertModelWithDataDict:dataDict];
// //拼接rooms
// NSArray *dataList = dataDict[@"rooms"];
// if (dataList != nil && dataList.count > 0) {
// for (NSDictionary *tempData in dataList) {
// FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
// [tempModel fus_setValueWithDict:tempData];
// [resList appendObject:tempModel];
// }
// }
// // 拼接插入模型
// //1=活动宣传版面。2=新星主播模块。3=FUSI主播应援模块。
// NSDictionary *insertItemTypeDict = @{@"activityInfo": @"1", @"novaInfo": @"2", @"supportInfo": @"3"};
// NSArray *insertItemSortList = @[@"activityInfo", @"novaInfo", @"supportInfo"];
// NSMutableArray *otherInserItemList = [[NSMutableArray alloc] init];
//
// // 挑选出需要插入的模型
// [insertItemSortList enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(NSString * _Nonnull insertKey, NSUInteger idx, BOOL * _Nonnull stop) {
// NSDictionary *inserDict = dataDict[insertKey];
// if (inserDict != nil && inserDict.allKeys.count > 0) {
//
// FUSBaoFangAnchorInsertModel *insertModel = [[FUSBaoFangAnchorInsertModel alloc] init];
// [insertModel fus_setValueWithDict:inserDict];
// FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
// tempModel.fus_itemType = [insertItemTypeDict[insertKey] intValue];
// tempModel.fus_insertModel = insertModel;
// [otherInserItemList addObject:tempModel];
//// if (insertModel.index <= resList.count) {
//// [resList insertObject:tempModel atIndex:insertModel.index];
//// }
// }
// }];
// // 先将插入顺序从小到大排列，这样小的先插入，就不会影响最终大的排序
// [otherInserItemList sortUsingComparator:^NSComparisonResult(FUSBaoFangAnchorModel * obj1, FUSBaoFangAnchorModel * obj2) {
// return obj1.fus_insertModel.index > obj2.fus_insertModel.index;
// }];
// // 按照index插入
// for (FUSBaoFangAnchorModel *tempModel in otherInserItemList) {
// if (tempModel.fus_insertModel.index > resList.count) {
// continue;
// }
// [resList insertObject:tempModel atIndex:tempModel.fus_insertModel.index];
// }
success(resList);
}else if (type == ReadCacheFromTypeServer) {
......
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangHttpHelper.m
......@@ -825,34 +825,7 @@
[FUSHttpHelper postRequestBinaryWithUrl:URL_HOME_VEST_ROOM_GETLIST params:nil success:^(NSDictionary *dataDict, int code) {
[FUSCustomizedInfosStore fus_addCommonInfosWithKey:STORE_HOME_VEST_ROOM_GET_LIST value:dataDict];
NSMutableArray *resList = [[NSMutableArray alloc] init];
//拼接rooms
NSArray *dataList = dataDict[@"rooms"];
if (dataList != nil && dataList.count > 0) {
for (NSDictionary *tempData in dataList) {
FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
[tempModel fus_setValueWithDict:tempData];
[resList appendObject:tempModel];
}
}
// 拼接插入模型
//1=活动宣传版面。2=新星主播模块。3=FUSI主播应援模块。
NSDictionary *insertItemTypeDict = @{@"activityInfo": @"1", @"novaInfo": @"2", @"supportInfo": @"3"};
NSArray *insertItemSortList = @[@"activityInfo", @"novaInfo", @"supportInfo"];
[insertItemSortList enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(NSString * _Nonnull insertKey, NSUInteger idx, BOOL * _Nonnull stop) {
NSDictionary *inserDict = dataDict[insertKey];
if (inserDict != nil && inserDict.allKeys.count > 0) {
FUSBaoFangAnchorInsertModel *insertModel = [[FUSBaoFangAnchorInsertModel alloc] init];
[insertModel fus_setValueWithDict:inserDict];
FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
tempModel.fus_itemType = [insertItemTypeDict[insertKey] intValue];
tempModel.fus_insertModel = insertModel;
if (insertModel.index <= resList.count) {
[resList insertObject:tempModel atIndex:insertModel.index];
}
}
}];
resList = [FUSBaoFangAnchorModel fus_sortInsertModelWithDataDict:dataDict];
success(resList);
} failure:^(NSDictionary *dataDict, int code) {
......
FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSCustomSettingCell.m
......@@ -86,6 +86,9 @@
if (_item.cellStyle != UITableViewCellStyleSubtitle) {
self.textLabel.centerY = CGRectGetMidY(self.contentView.bounds);
self.textLabel.x = 50;
if (self.imageView.image == nil) {
self.textLabel.x = 16;
}
self.detailTextLabel.centerY = self.textLabel.centerY;
}
[self fus_fitRTLViews];
......
FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.m
......@@ -30,43 +30,43 @@
UIViewController *vc = nil;
// 测试原生客服
// FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:![NSString isNull:uid] ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
// serviceChat.isServiceAccount = YES;
// if (![NSString isNull:welcomeStr]) {
// serviceChat.welcomeStr = welcomeStr;
// }
// vc = serviceChat;
FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:![NSString isNull:uid] ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
serviceChat.isServiceAccount = YES;
if (![NSString isNull:welcomeStr]) {
serviceChat.welcomeStr = welcomeStr;
}
vc = serviceChat;
// 普通调起客服流程
if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 1) {
if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:uid ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
serviceChat.isServiceAccount = YES;
if (![NSString isNull:welcomeStr]) {
serviceChat.welcomeStr = welcomeStr;
}
vc = serviceChat;
} else {
FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
NSString *webURL = FUSLocalizationHelper.isArbicLanguage ? URL_WEB_ARBIC_HELP : URL_WEB_HELP;
webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
vc = webVC;
}
}else if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 2) {
FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
NSString *webURL = [FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.url;
webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
vc = webVC;
}
NSArray *viewControllers = self.viewControllers;
UIViewController *viewVC = [viewControllers lastObject];
if ([viewVC isKindOfClass:[FUSSingleChatViewController class]]){
return;
}
// if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 1) {
//
// if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
//
// FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:uid ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
// serviceChat.isServiceAccount = YES;
// if (![NSString isNull:welcomeStr]) {
// serviceChat.welcomeStr = welcomeStr;
// }
// vc = serviceChat;
// } else {
//
// FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
// NSString *webURL = FUSLocalizationHelper.isArbicLanguage ? URL_WEB_ARBIC_HELP : URL_WEB_HELP;
// webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
// vc = webVC;
// }
// }else if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 2) {
//
// FUSWKWebViewController *webVC = [[FUSWKWebViewController alloc] init];
// NSString *webURL = [FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.url;
// webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID];
// vc = webVC;
// }
// NSArray *viewControllers = self.viewControllers;
// UIViewController *viewVC = [viewControllers lastObject];
// if ([viewVC isKindOfClass:[FUSSingleChatViewController class]]){
// return;
// }
[self pushViewController:vc animated:animate];
}
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ResponsibilityConfirm/FUSResponsibilityConfirmAlertView.m
......@@ -116,7 +116,7 @@
self.okBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.okBtn.titleLabel.font = [UIFont fus_themeBoldFont:18];
[self.okBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[self.okBtn setBackgroundColor:[UIColor fus_diamondBlue]];
[self.okBtn setBackgroundColor:[UIColor fus_themeColor]];
[self.okBtn setTitle:[NSString fus_localString:@"开始直播"] forState:UIControlStateNormal];
self.okBtn.layer.cornerRadius = 54 / 2.0f;
self.okBtn.layer.masksToBounds = YES;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ShowbroadcastGuide/FUSShowBroadcastGuideAlertView.m
......@@ -117,7 +117,7 @@
UIButton *okBtn = [UIButton buttonWithType:UIButtonTypeCustom];
okBtn.layer.cornerRadius = 50 / 2.0f;
okBtn.layer.masksToBounds = YES;
okBtn.backgroundColor = [UIColor fus_diamondBlue];
okBtn.backgroundColor = [UIColor fus_themeColor];
[okBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[okBtn setTitle:[NSString fus_localString:@"确定"] forState:UIControlStateNormal];
[self.contentView addSubview:okBtn];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/FUSHomePageViewController.m
......@@ -258,7 +258,7 @@
if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
return;
}
// [self fus_showDailyCheckInView:nil];
[FUSBaoFangHttpHelper fus_requestTodayTaskCheckInSuccess:^(FUSCheckInModel *model) {
if (model) {
[self fus_showDailyCheckInView:model];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomeView.m
......@@ -105,7 +105,7 @@
collectionViewLayout:[[UICollectionViewFlowLayout alloc]init]];
self.collectionView.scrollsToTop = YES;
// self.collectionView.contentInset = UIEdgeInsetsMake(self.titleContainerView.height + 0, 0, UIView.fus_tabbarHeight, 0);
self.collectionView.contentInset = UIEdgeInsetsMake(self.titleContainerView.height + 0, 0, UIView.fus_tabbarHeight, 0);
self.collectionView.contentInset = UIEdgeInsetsMake(self.titleContainerView.height + 4, 0, UIView.fus_tabbarHeight, 0);
self.collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
self.collectionView.backgroundColor = [UIColor clearColor];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMessageView.m
......@@ -200,6 +200,7 @@
_segCtrlView.alignment = FUSSegmentControlAlignmentLeft;
// _segCtrlView.underLine = underLineView;
_segCtrlView.underLine.backgroundColor = [UIColor fus_textColorRich];
_segCtrlView.underLineWidth = 8;
_segCtrlView.isShowUnderLine = YES;
if (UIView.fus_screenW > 320) {
_segCtrlView.space = 30;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomeViewViewModel.m
......@@ -180,12 +180,13 @@
- (void)fus_reloadData{
if (self.anchorListType == FUSHomeViewAnchorListTypeNormal) {
if (self.homeLanguageGetList == nil || self.homeLanguageGetList.count <= 0) {
[self fus_loadHomeLanguageListWithAnchorList:YES readFrom:ReadCacheFromTypeServer];
}else {
[self fus_loadvestRoomGetlistAutoCall:YES readFrom:ReadCacheFromTypeServer];
}
// if (self.homeLanguageGetList == nil || self.homeLanguageGetList.count <= 0) {
//
// [self fus_loadHomeLanguageListWithAnchorList:YES readFrom:ReadCacheFromTypeServer];
// }else {
// [self fus_loadvestRoomGetlistAutoCall:YES readFrom:ReadCacheFromTypeServer];
// }
[self fus_loadHomeLanguageListWithAnchorList:YES readFrom:ReadCacheFromTypeServer];
}else {
[self fus_loadhomeVestFollowGetlistAutoCall:YES];
}
......
FuSiLive/Classes/FusiVersionFeature/ViewController/Tabbar/FUSFloatTabbarView.m
......@@ -59,7 +59,7 @@
_fansUnreadCount = 0;
self.shouldBarCenterTransparency = NO;
self.barItemImageNameList = @[@"fus_tabbar_item_my_unselect", @"fus_tabbar_item_home_unselect", @"fus_tabbar_item_message_unselect"];
self.barItemImageNameWhiteList = @[@"fus_tabbar_item_my_white", @"fus_tabbar_item_home_unselect", @"fus_tabbar_item_message_white"];
self.barItemImageNameWhiteList = @[@"fus_tabbar_item_my_white", @"fus_tabbar_item_home_white", @"fus_tabbar_item_message_white"];
self.barItemSelectedImageNameList = @[@"fus_tabbar_item_my_select", @"fus_tabbar_item_home_select", @"fus_tabbar_item_message_select"];
}
......@@ -148,6 +148,11 @@
}else {
tempBtn.selected = NO;
}
// 特殊逻辑，当tabbar为非透明，也就是白色底色，并且选中的时候，中间logo就需要变成有色的了
if (!self.shouldBarCenterTransparency && _currentIndex == 1 && i == 1) {
[tempBtn setImage:[UIImage imageNamed:@"fus_tabbar_item_home_white"] forState:UIControlStateSelected];
}
}
}
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/AudienceListView/ContributeList/FUSContributeListView.m
......@@ -73,6 +73,8 @@
self.emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, 400)];
self.emptyView.contentAligment = FUSEmptyViewAligmentCenter;
[self.emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"fireFly_zone_empty_fireCount"] title:[NSString fus_localString:@"当前还没用户上榜"] buttonTittle:nil];
self.emptyView.imageScale = 0.5;
self.emptyView.contentVerticalOffset = -40;
self.emptyView.backgroundColor = [UIColor clearColor];
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
......
FuSiLive/Classes/Setting/Controller/FUSSettingViewController.m
......@@ -150,7 +150,7 @@
group1.groupHeaderTextFont = [UIFont fus_themeFont:12];
group1.itemsHeight = kThirdPartyAccountSettingItemHeight;
group1.groupFooterTextBgColor = [UIColor colorWithHex:@"#2B3238" alpha:0.5];
group1.groupFooterTextBgColor = [UIColor fus_lineColor];
group1.groupFooterOriginY = 6;
group1.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
group1.groupFooterOriginX = 16;
......@@ -204,7 +204,7 @@
group2.groupHeaderTextFont = [UIFont fus_themeFont:12];
group2.groupHeaderText = [NSString fus_localString:@"账号安全"];
group2.groupFooterTextBgColor = [UIColor colorWithHex:@"#2B3238" alpha:0.5];
group2.groupFooterTextBgColor = [UIColor fus_lineColor];
group2.groupFooterOriginY = 6;
group2.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
group2.groupFooterOriginX = 16;
......@@ -277,7 +277,7 @@
_liveRoomSettingGroup.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"];
_liveRoomSettingGroup.groupHeaderTextFont = [UIFont fus_themeFont:12];
_liveRoomSettingGroup.groupFooterTextBgColor = [UIColor colorWithHex:@"#2B3238" alpha:0.5];
_liveRoomSettingGroup.groupFooterTextBgColor = [UIColor fus_lineColor];
_liveRoomSettingGroup.groupFooterOriginY = 6;
_liveRoomSettingGroup.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
_liveRoomSettingGroup.groupFooterOriginX = 16;
......@@ -366,7 +366,7 @@
_chatSettingGroup.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"];
_chatSettingGroup.groupHeaderTextFont = [UIFont fus_themeFont:12];
_chatSettingGroup.groupFooterTextBgColor = [UIColor colorWithHex:@"#2B3238" alpha:0.5];
_chatSettingGroup.groupFooterTextBgColor = [UIColor fus_lineColor];
_chatSettingGroup.groupFooterOriginY = 6;
_chatSettingGroup.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
_chatSettingGroup.groupFooterOriginX = 16;
......@@ -394,7 +394,7 @@
groupLanguage.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"];
groupLanguage.groupHeaderTextFont = [UIFont fus_themeFont:12];
groupLanguage.groupFooterTextBgColor = [UIColor colorWithHex:@"#2B3238" alpha:0.5];
groupLanguage.groupFooterTextBgColor = [UIColor fus_lineColor];
groupLanguage.groupFooterOriginY = 6;
groupLanguage.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
groupLanguage.groupFooterOriginX = 16;
......
FuSiLive/Classes/SingleChat/Main/View/FUSChatCell/FUSChatTextCell.m
......@@ -198,7 +198,8 @@
labelLeftSpace += 5;
self.background.frame = CGRectMake(self.width - 15 - width , 8, width, height);
// color = [UIColor colorWithHex:@"ff9518"];
color = [UIColor colorWithHex:@"2DD8C4"];
// color = [UIColor colorWithHex:@"2DD8C4"];
color = [UIColor fus_themeColor];
}
self.background.backgroundColor = color;
......
FuSiLive/Classes/SingleChat/Main/View/FUSChatTextInputView/FUSChatTextView.m
......@@ -160,7 +160,7 @@
[_sendBtn addTarget:self action:@selector(onClickSendBtn:) forControlEvents:UIControlEventTouchUpInside];
[_sendBtn setTitle:[NSString fus_localString:@"发送"] forState:UIControlStateNormal];
[_sendBtn setTitleColor:[UIColor colorWithHex:@"808080"] forState:UIControlStateDisabled];
[_sendBtn setTitleColor:[UIColor colorWithHex:@"FFFFFF"] forState:UIControlStateNormal];
[_sendBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[self addSubview:_sendBtn];
if (_textView.text.length) {
......
FuSiLive/Classes/ZhaiXin/Main/View/FUSZhaiXinTableView.m
......@@ -254,6 +254,8 @@
if (_dataArray.count == 0) {
// FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH - UIView.fus_StatusBarAndNavgationBarHeight - UIView.fus_tabbarHeight)];
FUSEmptyView *emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, self.height - self.headerView.height)];
emptyView.imageScale = 0.5;
emptyView.contentVerticalOffset = -40;
[emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:[NSString fus_localString:@"您还没有收到私信"] buttonTittle:nil];
self.tableFooterView = emptyView;
} else {
......
FuSiLive/Classes/Zone/Other/FUSMyZoneCellManager.m
......@@ -111,7 +111,7 @@ typedef NS_ENUM(NSUInteger, FUSMyZoneSectionType) {
if ([cellIdentifier isEqualToString:kFUSMyZoneFocusAndFansCellID]) {
return 69.0f;
} else if ([cellIdentifier isEqualToString:kFUSMyZoneInfoCellID]) {
CGFloat height = 125;
CGFloat height = 97;
return height;
} else if ([cellIdentifier isEqualToString:kFUSMyZoneFireCountCellID]) {
return 65.0f;
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneFireCountCell.m
......@@ -23,6 +23,15 @@
self.selectionStyle = UITableViewCellSelectionStyleNone;
self.receiveFireLabel.textColor = [UIColor fus_textColorRich];
UIView *lineView = [[UIView alloc] init];
lineView.backgroundColor = [UIColor fus_lineColor];
[self.contentView addSubview:lineView];
[lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.offset(0);
make.left.right.inset(15);
make.height.offset(0.5);
}];
}
- (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone {
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneInfoCell.m
......@@ -46,6 +46,8 @@
_levelLabel.layer.masksToBounds = YES;
_focusLabel.text = [NSString fus_localString:@"追踪"];
_fansLabel.text = [NSString fus_localString:@"粉丝"];
_fansNumLabel.font = [UIFont fus_custom1ItalicFont:22];
_focusNumLabel.font = [UIFont fus_custom1ItalicFont:22];
self.nickNameLabel.textColor = [UIColor fus_textColorRich];
self.nickNameLabel.font = [UIFont fus_themeBoldFont:22];
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneMotoringCell.m
......@@ -54,9 +54,8 @@
self.motorImageView.hidden = NO;
[self.motorImageView setWebImageWithSubURLString:zoneModel.motoring[@"resource"] placeholder:nil];
}
if (isMyZone && zoneModel.motoringTotal) {
self.motorCountLabel.text = @(zoneModel.motoringTotal).description;
if (isMyZone && zoneModel && zoneModel.motoringTotal) {
self.motorCountLabel.text = [NSString stringWithFormat:@"%ld",zoneModel.motoringTotal];
self.countLabelLeftConstraint.constant = 8;
self.motorCountLabel.hidden = NO;
} else {
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneSendJewelCountCell.m
......@@ -23,6 +23,15 @@
self.selectionStyle = UITableViewCellSelectionStyleNone;
self.sendJewelLabel.textColor = [UIColor fus_textColorRich];
UIView *lineView = [[UIView alloc] init];
lineView.backgroundColor = [UIColor fus_lineColor];
[self.contentView addSubview:lineView];
[lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.offset(0);
make.left.right.inset(15);
make.height.offset(0.5);
}];
}
- (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone {
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneSignTagAddressCell.m
......@@ -63,6 +63,15 @@
self.cityAndCountryLabel.textColor = [UIColor fus_textColorRich];
self.signLabel.textColor = [UIColor fus_textColorRich];
[self.recordOrPlayBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
UIView *lineView = [[UIView alloc] init];
lineView.backgroundColor = [UIColor fus_lineColor];
[self.contentView addSubview:lineView];
[lineView mas_makeConstraints:^(MASConstraintMaker *make) {
make.bottom.offset(0);
make.left.right.inset(15);
make.height.offset(0.5);
}];
}
- (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone {
......@@ -275,12 +284,13 @@
// 下面的空白区域
height += 25;
if (!FUSConfig.sharedInstanced.devConfigs.appStatus
&& ((![NSDictionary isNull:model.voiceChat]
&& ![NSString isNull:model.voiceChat[@"url"]])
|| [model.uid isEqual:[FUSCacheDataShare shareStore].userDetailInfo.uid])) {
height += (15 + 24);
}
//这个不知道什么适配，导致下面空白很多
// if (!FUSConfig.sharedInstanced.devConfigs.appStatus
// && ((![NSDictionary isNull:model.voiceChat]
// && ![NSString isNull:model.voiceChat[@"url"]])
// || [model.uid isEqual:[FUSCacheDataShare shareStore].userDetailInfo.uid])) {
// height += (15 + 24);
// }
return height;
}
......
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