Skip to content

pidan / FuSiLive

Go to a project
Commit 0895668d by ludi
Options

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

parent 477ce416
Inline Side-by-side
Showing with 274 additions and 144 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/NSString/NSString+Check.h
...@@ -61,4 +61,7 @@ ...@@ -61,4 +61,7 @@
/// 判断是否是16进制的颜色字符串 /// 判断是否是16进制的颜色字符串
- (BOOL)isHexColor; - (BOOL)isHexColor;
/// 兼容string没有stringValue
- (NSString *)stringValue;
@end @end
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Categories/NSString/NSString+Check.m
...@@ -121,4 +121,8 @@ ...@@ -121,4 +121,8 @@
return resultRGBA; return resultRGBA;
} }
- (NSString *)stringValue{
return self;
}
@end @end
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/EmptyView/FUSEmptyView.m
...@@ -161,9 +161,11 @@ ...@@ -161,9 +161,11 @@
//文字的frame //文字的frame
_emptyTitleLabel.centerX = _emptyContentBgView.width / 2.0f; _emptyTitleLabel.centerX = _emptyContentBgView.width / 2.0f;
_emptyTitleLabel.y = 0; // _emptyTitleLabel.y = 0;
_emptyTitleLabel.y = self.contentVerticalOffset;
if (self.type == FUSEmptyViewTypeImage) { if (self.type == FUSEmptyViewTypeImage) {
_emptyTitleLabel.y = CGRectGetMaxY(_emptyImageView.frame); // _emptyTitleLabel.y = CGRectGetMaxY(_emptyImageView.frame);
_emptyTitleLabel.y = CGRectGetMaxY(_emptyImageView.frame) + self.contentVerticalOffset;
} }
//button //button
...@@ -190,7 +192,6 @@ ...@@ -190,7 +192,6 @@
default: default:
break; break;
} }
_emptyContentBgView.y = _emptyContentBgView.y + self.contentVerticalOffset;
self.bgImageView.frame = self.bounds; self.bgImageView.frame = self.bounds;
} }
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/SegmentView/FUSSegmentControlView.h
...@@ -70,6 +70,9 @@ typedef NS_ENUM(NSInteger, FUSSegmentControlSlideType) { ...@@ -70,6 +70,9 @@ typedef NS_ENUM(NSInteger, FUSSegmentControlSlideType) {
//下划线，默认黑色 //下划线，默认黑色
@property (nonatomic, strong) UIView *underLine; @property (nonatomic, strong) UIView *underLine;
/// 下划线宽度
@property (nonatomic, assign) CGFloat underLineWidth;
//设置所有按钮居中（平分整个 segmentView 的宽度） //设置所有按钮居中（平分整个 segmentView 的宽度）
@property (nonatomic, assign) BOOL isEqualSpace; @property (nonatomic, assign) BOOL isEqualSpace;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/SegmentView/FUSSegmentControlView.m
...@@ -302,6 +302,10 @@ typedef enum :NSInteger{ ...@@ -302,6 +302,10 @@ typedef enum :NSInteger{
_underLine.width = self.width; _underLine.width = self.width;
} }
if (_underLineWidth > 0) {
_underLine.width = self.underLineWidth;
}
if(_lastBtn.tag != sender.tag){ if(_lastBtn.tag != sender.tag){
_lastBtn.selected = NO; _lastBtn.selected = NO;
_lastBtn.titleLabel.font = _itemFont; _lastBtn.titleLabel.font = _itemFont;
...@@ -801,6 +805,10 @@ typedef enum :NSInteger{ ...@@ -801,6 +805,10 @@ typedef enum :NSInteger{
if (self.lastBtn.tag < _itemBtns.count) { if (self.lastBtn.tag < _itemBtns.count) {
_underLine.width = ([(UIButton *)_itemBtns[self.lastBtn.tag] width]-4)/UNDERLINE_WIDTH_SCALE; _underLine.width = ([(UIButton *)_itemBtns[self.lastBtn.tag] width]-4)/UNDERLINE_WIDTH_SCALE;
if (_underLineWidth > 0) {
_underLine.width = self.underLineWidth;
}
}else{ }else{
FUSLogDebug(@"segmentView occur error"); FUSLogDebug(@"segmentView occur error");
} }
...@@ -810,6 +818,9 @@ typedef enum :NSInteger{ ...@@ -810,6 +818,9 @@ typedef enum :NSInteger{
_btnX = 0; _btnX = 0;
_space = 0; _space = 0;
_underLine.width = self.width; _underLine.width = self.width;
if (_underLineWidth > 0) {
_underLine.width = self.underLineWidth;
}
} }
}else{ }else{
_underLine.hidden = YES; _underLine.hidden = YES;
...@@ -1239,6 +1250,9 @@ typedef enum :NSInteger{ ...@@ -1239,6 +1250,9 @@ typedef enum :NSInteger{
_bgScrollView.hidden = NO; _bgScrollView.hidden = NO;
} }
_underLine.width = self.width/self.itemBtns.count; _underLine.width = self.width/self.itemBtns.count;
if (_underLineWidth > 0) {
_underLine.width = self.underLineWidth;
}
_underLine.x = 0; _underLine.x = 0;
} }
} }
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.h
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
+ (UIColor *)fus_listBGColor; + (UIColor *)fus_listBGColor;
+ (UIColor *)fus_listBGPressColor; + (UIColor *)fus_listBGPressColor;
/// 一般cell的分割线 dddddd
+ (UIColor *)fus_lineColor; + (UIColor *)fus_lineColor;
+(UIColor *)fus_separatorLineColor; +(UIColor *)fus_separatorLineColor;
......
FuSiLive/Assets.xcassets/BaoFang/DailyCheckIn/daily_check_inrotation_lightimg.imageset/Contents.json
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "daily_check_inrotation_lightimg@3x.png", "filename" : "20240708-204601.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
FuSiLive/Assets.xcassets/IMMessage/chat_im_message_bg_right.imageset/Contents.json
...@@ -5,18 +5,18 @@ ...@@ -5,18 +5,18 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "20240709-120654.png",
"idiom" : "universal", "idiom" : "universal",
"filename" : "消息背景2@2x.png",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "20240709-120649.png",
"idiom" : "universal", "idiom" : "universal",
"filename" : "消息背景2@3x.png",
"scale" : "3x" "scale" : "3x"
} }
], ],
"info" : { "info" : {
"version" : 1, "author" : "xcode",
"author" : "xcode" "version" : 1
} }
} }
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 @@ ...@@ -75,16 +75,15 @@
self.checkInSuccessAnimationImageView.animationRepeatCount = 1; self.checkInSuccessAnimationImageView.animationRepeatCount = 1;
self.checkInSuccessAnimationImageView.image = [UIImage imageNamed:@"CheckInSuccessAnimation_34"]; self.checkInSuccessAnimationImageView.image = [UIImage imageNamed:@"CheckInSuccessAnimation_34"];
// CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"]; CABasicAnimation *animation = [CABasicAnimation animationWithKeyPath:@"transform.rotation.z"];
// //默认是顺时针效果，若将fromValue和toValue的值互换，则为逆时针效果 //默认是顺时针效果，若将fromValue和toValue的值互换，则为逆时针效果
// animation.fromValue = [NSNumber numberWithFloat:0.f]; animation.fromValue = [NSNumber numberWithFloat:0.f];
// animation.toValue = [NSNumber numberWithFloat: M_PI *2]; animation.toValue = [NSNumber numberWithFloat: M_PI *2];
// animation.duration = 4; animation.duration = 4;
// animation.autoreverses = NO; animation.autoreverses = NO;
// animation.fillMode = kCAFillModeForwards; animation.fillMode = kCAFillModeForwards;
// animation.repeatCount = MAXFLOAT; //如果这里想设置成一直自旋转，可以设置为MAXFLOAT，否则设置具体的数值则代表执行多少次 animation.repeatCount = MAXFLOAT; //如果这里想设置成一直自旋转，可以设置为MAXFLOAT，否则设置具体的数值则代表执行多少次
// [self.rotationLightImageView.layer addAnimation:animation forKey:nil]; [self.rotationLightImageView.layer addAnimation:animation forKey:nil];
self.rotationLightImageView.hidden = YES;
} }
// 构造方法 // 构造方法
......
FuSiLive/Classes/BaoFang/Main/Model/FUSBaoFangAnchorModel.h
...@@ -177,4 +177,7 @@ typedef NS_ENUM(NSInteger,FUSBaoFangRecommendType) { ...@@ -177,4 +177,7 @@ typedef NS_ENUM(NSInteger,FUSBaoFangRecommendType) {
/// 插入的模型 /// 插入的模型
@property (nonatomic, strong) FUSBaoFangAnchorInsertModel *fus_insertModel; @property (nonatomic, strong) FUSBaoFangAnchorInsertModel *fus_insertModel;
/// 提供一个将主播列表的其他模块（如：新星主播模块）生成FUSBaoFangAnchorMicUserModel模型插入列表中的方法
+(NSMutableArray<FUSBaoFangAnchorMicUserModel *> *)fus_sortInsertModelWithDataDict:(NSDictionary *)dataDict;
@end @end
FuSiLive/Classes/BaoFang/Main/Model/FUSBaoFangAnchorModel.m
...@@ -49,6 +49,54 @@ ...@@ -49,6 +49,54 @@
@"micTakes" : FUSBaoFangAnchorMicUserModel.class}; @"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 { - (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];
} }
......
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangCacheOperate.m
...@@ -71,34 +71,49 @@ ...@@ -71,34 +71,49 @@
NSDictionary *dataDict = [FUSCustomizedInfosStore fus_readCommonInfosWithKey:STORE_HOME_VEST_ROOM_GET_LIST]; NSDictionary *dataDict = [FUSCustomizedInfosStore fus_readCommonInfosWithKey:STORE_HOME_VEST_ROOM_GET_LIST];
NSMutableArray *resList = [[NSMutableArray alloc] init]; NSMutableArray *resList = [[NSMutableArray alloc] init];
//拼接rooms resList = [FUSBaoFangAnchorModel fus_sortInsertModelWithDataDict:dataDict];
NSArray *dataList = dataDict[@"rooms"]; // //拼接rooms
if (dataList != nil && dataList.count > 0) { // NSArray *dataList = dataDict[@"rooms"];
for (NSDictionary *tempData in dataList) { // if (dataList != nil && dataList.count > 0) {
FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init]; // for (NSDictionary *tempData in dataList) {
[tempModel fus_setValueWithDict:tempData]; // FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
[resList appendObject:tempModel]; // [tempModel fus_setValueWithDict:tempData];
} // [resList appendObject:tempModel];
} // }
// 拼接插入模型 // }
//1=活动宣传版面。2=新星主播模块。3=FUSI主播应援模块。 // // 拼接插入模型
NSDictionary *insertItemTypeDict = @{@"activityInfo": @"1", @"novaInfo": @"2", @"supportInfo": @"3"}; // //1=活动宣传版面。2=新星主播模块。3=FUSI主播应援模块。
NSArray *insertItemSortList = @[@"activityInfo", @"novaInfo", @"supportInfo"]; // 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) { // NSMutableArray *otherInserItemList = [[NSMutableArray alloc] init];
NSDictionary *inserDict = dataDict[insertKey]; //
if (inserDict != nil && inserDict.allKeys.count > 0) { // // 挑选出需要插入的模型
// [insertItemSortList enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(NSString * _Nonnull insertKey, NSUInteger idx, BOOL * _Nonnull stop) {
FUSBaoFangAnchorInsertModel *insertModel = [[FUSBaoFangAnchorInsertModel alloc] init]; // NSDictionary *inserDict = dataDict[insertKey];
[insertModel fus_setValueWithDict:inserDict]; // if (inserDict != nil && inserDict.allKeys.count > 0) {
FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init]; //
tempModel.fus_itemType = [insertItemTypeDict[insertKey] intValue]; // FUSBaoFangAnchorInsertModel *insertModel = [[FUSBaoFangAnchorInsertModel alloc] init];
tempModel.fus_insertModel = insertModel; // [insertModel fus_setValueWithDict:inserDict];
if (insertModel.index <= resList.count) { // FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
[resList insertObject:tempModel atIndex:insertModel.index]; // 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); success(resList);
}else if (type == ReadCacheFromTypeServer) { }else if (type == ReadCacheFromTypeServer) {
......
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangHttpHelper.m
...@@ -825,34 +825,7 @@ ...@@ -825,34 +825,7 @@
[FUSHttpHelper postRequestBinaryWithUrl:URL_HOME_VEST_ROOM_GETLIST params:nil success:^(NSDictionary *dataDict, int code) { [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]; [FUSCustomizedInfosStore fus_addCommonInfosWithKey:STORE_HOME_VEST_ROOM_GET_LIST value:dataDict];
NSMutableArray *resList = [[NSMutableArray alloc] init]; NSMutableArray *resList = [[NSMutableArray alloc] init];
//拼接rooms resList = [FUSBaoFangAnchorModel fus_sortInsertModelWithDataDict:dataDict];
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];
}
}
}];
success(resList); success(resList);
} failure:^(NSDictionary *dataDict, int code) { } failure:^(NSDictionary *dataDict, int code) {
......
FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSCustomSettingCell.m
...@@ -86,6 +86,9 @@ ...@@ -86,6 +86,9 @@
if (_item.cellStyle != UITableViewCellStyleSubtitle) { if (_item.cellStyle != UITableViewCellStyleSubtitle) {
self.textLabel.centerY = CGRectGetMidY(self.contentView.bounds); self.textLabel.centerY = CGRectGetMidY(self.contentView.bounds);
self.textLabel.x = 50; self.textLabel.x = 50;
if (self.imageView.image == nil) {
self.textLabel.x = 16;
}
self.detailTextLabel.centerY = self.textLabel.centerY; self.detailTextLabel.centerY = self.textLabel.centerY;
} }
[self fus_fitRTLViews]; [self fus_fitRTLViews];
......
FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.m
...@@ -30,43 +30,43 @@ ...@@ -30,43 +30,43 @@
UIViewController *vc = nil; UIViewController *vc = nil;
// 测试原生客服 // 测试原生客服
// FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:![NSString isNull:uid] ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename]; 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; serviceChat.isServiceAccount = YES;
if (![NSString isNull:welcomeStr]) { if (![NSString isNull:welcomeStr]) {
serviceChat.welcomeStr = welcomeStr; serviceChat.welcomeStr = welcomeStr;
} }
vc = serviceChat; 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; // if ([FUSCacheDataShare shareStore].settingInitDataModel.kfConfig.model == 1) {
webVC.webUrlString = [NSString stringWithFormat:@"%@?lang=%@", webURL,FUSLocalizationHelper.fus_currentLanguage.languageID]; //
vc = webVC; // if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
} //
NSArray *viewControllers = self.viewControllers; // FUSSingleChatViewController *serviceChat = [[FUSSingleChatViewController alloc] initWithUID:uid ? uid : @(SERVEICE_UID).stringValue face:facePath nikename:nikename];
UIViewController *viewVC = [viewControllers lastObject]; // serviceChat.isServiceAccount = YES;
if ([viewVC isKindOfClass:[FUSSingleChatViewController class]]){ // if (![NSString isNull:welcomeStr]) {
return; // 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]; [self pushViewController:vc animated:animate];
} }
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ResponsibilityConfirm/FUSResponsibilityConfirmAlertView.m
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
self.okBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.okBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.okBtn.titleLabel.font = [UIFont fus_themeBoldFont:18]; self.okBtn.titleLabel.font = [UIFont fus_themeBoldFont:18];
[self.okBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal]; [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 setTitle:[NSString fus_localString:@"开始直播"] forState:UIControlStateNormal];
self.okBtn.layer.cornerRadius = 54 / 2.0f; self.okBtn.layer.cornerRadius = 54 / 2.0f;
self.okBtn.layer.masksToBounds = YES; self.okBtn.layer.masksToBounds = YES;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/AlertView/ShowbroadcastGuide/FUSShowBroadcastGuideAlertView.m
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
UIButton *okBtn = [UIButton buttonWithType:UIButtonTypeCustom]; UIButton *okBtn = [UIButton buttonWithType:UIButtonTypeCustom];
okBtn.layer.cornerRadius = 50 / 2.0f; okBtn.layer.cornerRadius = 50 / 2.0f;
okBtn.layer.masksToBounds = YES; okBtn.layer.masksToBounds = YES;
okBtn.backgroundColor = [UIColor fus_diamondBlue]; okBtn.backgroundColor = [UIColor fus_themeColor];
[okBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal]; [okBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[okBtn setTitle:[NSString fus_localString:@"确定"] forState:UIControlStateNormal]; [okBtn setTitle:[NSString fus_localString:@"确定"] forState:UIControlStateNormal];
[self.contentView addSubview:okBtn]; [self.contentView addSubview:okBtn];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/FUSHomePageViewController.m
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
if (FUSConfig.sharedInstanced.devConfigs.appStatus) { if (FUSConfig.sharedInstanced.devConfigs.appStatus) {
return; return;
} }
// [self fus_showDailyCheckInView:nil];
[FUSBaoFangHttpHelper fus_requestTodayTaskCheckInSuccess:^(FUSCheckInModel *model) { [FUSBaoFangHttpHelper fus_requestTodayTaskCheckInSuccess:^(FUSCheckInModel *model) {
if (model) { if (model) {
[self fus_showDailyCheckInView:model]; [self fus_showDailyCheckInView:model];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomeView.m
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
collectionViewLayout:[[UICollectionViewFlowLayout alloc]init]]; collectionViewLayout:[[UICollectionViewFlowLayout alloc]init]];
self.collectionView.scrollsToTop = YES; 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 + 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.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
self.collectionView.backgroundColor = [UIColor clearColor]; self.collectionView.backgroundColor = [UIColor clearColor];
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMessageView.m
...@@ -200,6 +200,7 @@ ...@@ -200,6 +200,7 @@
_segCtrlView.alignment = FUSSegmentControlAlignmentLeft; _segCtrlView.alignment = FUSSegmentControlAlignmentLeft;
// _segCtrlView.underLine = underLineView; // _segCtrlView.underLine = underLineView;
_segCtrlView.underLine.backgroundColor = [UIColor fus_textColorRich]; _segCtrlView.underLine.backgroundColor = [UIColor fus_textColorRich];
_segCtrlView.underLineWidth = 8;
_segCtrlView.isShowUnderLine = YES; _segCtrlView.isShowUnderLine = YES;
if (UIView.fus_screenW > 320) { if (UIView.fus_screenW > 320) {
_segCtrlView.space = 30; _segCtrlView.space = 30;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomeViewViewModel.m
...@@ -180,13 +180,14 @@ ...@@ -180,13 +180,14 @@
- (void)fus_reloadData{ - (void)fus_reloadData{
if (self.anchorListType == FUSHomeViewAnchorListTypeNormal) { if (self.anchorListType == FUSHomeViewAnchorListTypeNormal) {
if (self.homeLanguageGetList == nil || self.homeLanguageGetList.count <= 0) { // 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]; [self fus_loadHomeLanguageListWithAnchorList:YES readFrom:ReadCacheFromTypeServer];
}else { }else {
[self fus_loadvestRoomGetlistAutoCall:YES readFrom:ReadCacheFromTypeServer];
}
}else {
[self fus_loadhomeVestFollowGetlistAutoCall:YES]; [self fus_loadhomeVestFollowGetlistAutoCall:YES];
} }
} }
......
FuSiLive/Classes/FusiVersionFeature/ViewController/Tabbar/FUSFloatTabbarView.m
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
_fansUnreadCount = 0; _fansUnreadCount = 0;
self.shouldBarCenterTransparency = NO; self.shouldBarCenterTransparency = NO;
self.barItemImageNameList = @[@"fus_tabbar_item_my_unselect", @"fus_tabbar_item_home_unselect", @"fus_tabbar_item_message_unselect"]; 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"]; self.barItemSelectedImageNameList = @[@"fus_tabbar_item_my_select", @"fus_tabbar_item_home_select", @"fus_tabbar_item_message_select"];
} }
...@@ -148,6 +148,11 @@ ...@@ -148,6 +148,11 @@
}else { }else {
tempBtn.selected = NO; 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 @@ ...@@ -73,6 +73,8 @@
self.emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, 400)]; self.emptyView = [[FUSEmptyView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, 400)];
self.emptyView.contentAligment = FUSEmptyViewAligmentCenter; self.emptyView.contentAligment = FUSEmptyViewAligmentCenter;
[self.emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"fireFly_zone_empty_fireCount"] title:[NSString fus_localString:@"当前还没用户上榜"] buttonTittle:nil]; [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.emptyView.backgroundColor = [UIColor clearColor];
[self.tableView mas_makeConstraints:^(MASConstraintMaker *make) { [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
......
FuSiLive/Classes/Setting/Controller/FUSSettingViewController.m
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
group1.groupHeaderTextFont = [UIFont fus_themeFont:12]; group1.groupHeaderTextFont = [UIFont fus_themeFont:12];
group1.itemsHeight = kThirdPartyAccountSettingItemHeight; group1.itemsHeight = kThirdPartyAccountSettingItemHeight;
group1.groupFooterTextBgColor = [UIColor colorWithHex:@"#2B3238" alpha:0.5]; group1.groupFooterTextBgColor = [UIColor fus_lineColor];
group1.groupFooterOriginY = 6; group1.groupFooterOriginY = 6;
group1.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2; group1.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
group1.groupFooterOriginX = 16; group1.groupFooterOriginX = 16;
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
group2.groupHeaderTextFont = [UIFont fus_themeFont:12]; group2.groupHeaderTextFont = [UIFont fus_themeFont:12];
group2.groupHeaderText = [NSString fus_localString:@"账号安全"]; group2.groupHeaderText = [NSString fus_localString:@"账号安全"];
group2.groupFooterTextBgColor = [UIColor colorWithHex:@"#2B3238" alpha:0.5]; group2.groupFooterTextBgColor = [UIColor fus_lineColor];
group2.groupFooterOriginY = 6; group2.groupFooterOriginY = 6;
group2.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2; group2.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
group2.groupFooterOriginX = 16; group2.groupFooterOriginX = 16;
...@@ -277,7 +277,7 @@ ...@@ -277,7 +277,7 @@
_liveRoomSettingGroup.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"]; _liveRoomSettingGroup.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"];
_liveRoomSettingGroup.groupHeaderTextFont = [UIFont fus_themeFont:12]; _liveRoomSettingGroup.groupHeaderTextFont = [UIFont fus_themeFont:12];
_liveRoomSettingGroup.groupFooterTextBgColor = [UIColor colorWithHex:@"#2B3238" alpha:0.5]; _liveRoomSettingGroup.groupFooterTextBgColor = [UIColor fus_lineColor];
_liveRoomSettingGroup.groupFooterOriginY = 6; _liveRoomSettingGroup.groupFooterOriginY = 6;
_liveRoomSettingGroup.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2; _liveRoomSettingGroup.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
_liveRoomSettingGroup.groupFooterOriginX = 16; _liveRoomSettingGroup.groupFooterOriginX = 16;
...@@ -366,7 +366,7 @@ ...@@ -366,7 +366,7 @@
_chatSettingGroup.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"]; _chatSettingGroup.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"];
_chatSettingGroup.groupHeaderTextFont = [UIFont fus_themeFont:12]; _chatSettingGroup.groupHeaderTextFont = [UIFont fus_themeFont:12];
_chatSettingGroup.groupFooterTextBgColor = [UIColor colorWithHex:@"#2B3238" alpha:0.5]; _chatSettingGroup.groupFooterTextBgColor = [UIColor fus_lineColor];
_chatSettingGroup.groupFooterOriginY = 6; _chatSettingGroup.groupFooterOriginY = 6;
_chatSettingGroup.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2; _chatSettingGroup.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
_chatSettingGroup.groupFooterOriginX = 16; _chatSettingGroup.groupFooterOriginX = 16;
...@@ -394,7 +394,7 @@ ...@@ -394,7 +394,7 @@
groupLanguage.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"]; groupLanguage.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"];
groupLanguage.groupHeaderTextFont = [UIFont fus_themeFont:12]; groupLanguage.groupHeaderTextFont = [UIFont fus_themeFont:12];
groupLanguage.groupFooterTextBgColor = [UIColor colorWithHex:@"#2B3238" alpha:0.5]; groupLanguage.groupFooterTextBgColor = [UIColor fus_lineColor];
groupLanguage.groupFooterOriginY = 6; groupLanguage.groupFooterOriginY = 6;
groupLanguage.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2; groupLanguage.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
groupLanguage.groupFooterOriginX = 16; groupLanguage.groupFooterOriginX = 16;
......
FuSiLive/Classes/SingleChat/Main/View/FUSChatCell/FUSChatTextCell.m
...@@ -198,7 +198,8 @@ ...@@ -198,7 +198,8 @@
labelLeftSpace += 5; labelLeftSpace += 5;
self.background.frame = CGRectMake(self.width - 15 - width , 8, width, height); self.background.frame = CGRectMake(self.width - 15 - width , 8, width, height);
// color = [UIColor colorWithHex:@"ff9518"]; // color = [UIColor colorWithHex:@"ff9518"];
color = [UIColor colorWithHex:@"2DD8C4"]; // color = [UIColor colorWithHex:@"2DD8C4"];
color = [UIColor fus_themeColor];
} }
self.background.backgroundColor = color; self.background.backgroundColor = color;
......
FuSiLive/Classes/SingleChat/Main/View/FUSChatTextInputView/FUSChatTextView.m
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
[_sendBtn addTarget:self action:@selector(onClickSendBtn:) forControlEvents:UIControlEventTouchUpInside]; [_sendBtn addTarget:self action:@selector(onClickSendBtn:) forControlEvents:UIControlEventTouchUpInside];
[_sendBtn setTitle:[NSString fus_localString:@"发送"] forState:UIControlStateNormal]; [_sendBtn setTitle:[NSString fus_localString:@"发送"] forState:UIControlStateNormal];
[_sendBtn setTitleColor:[UIColor colorWithHex:@"808080"] forState:UIControlStateDisabled]; [_sendBtn setTitleColor:[UIColor colorWithHex:@"808080"] forState:UIControlStateDisabled];
[_sendBtn setTitleColor:[UIColor colorWithHex:@"FFFFFF"] forState:UIControlStateNormal]; [_sendBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[self addSubview:_sendBtn]; [self addSubview:_sendBtn];
if (_textView.text.length) { if (_textView.text.length) {
......
FuSiLive/Classes/ZhaiXin/Main/View/FUSZhaiXinTableView.m
...@@ -254,6 +254,8 @@ ...@@ -254,6 +254,8 @@
if (_dataArray.count == 0) { 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, 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)]; 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]; [emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:[NSString fus_localString:@"您还没有收到私信"] buttonTittle:nil];
self.tableFooterView = emptyView; self.tableFooterView = emptyView;
} else { } else {
......
FuSiLive/Classes/Zone/Other/FUSMyZoneCellManager.m
...@@ -111,7 +111,7 @@ typedef NS_ENUM(NSUInteger, FUSMyZoneSectionType) { ...@@ -111,7 +111,7 @@ typedef NS_ENUM(NSUInteger, FUSMyZoneSectionType) {
if ([cellIdentifier isEqualToString:kFUSMyZoneFocusAndFansCellID]) { if ([cellIdentifier isEqualToString:kFUSMyZoneFocusAndFansCellID]) {
return 69.0f; return 69.0f;
} else if ([cellIdentifier isEqualToString:kFUSMyZoneInfoCellID]) { } else if ([cellIdentifier isEqualToString:kFUSMyZoneInfoCellID]) {
CGFloat height = 125; CGFloat height = 97;
return height; return height;
} else if ([cellIdentifier isEqualToString:kFUSMyZoneFireCountCellID]) { } else if ([cellIdentifier isEqualToString:kFUSMyZoneFireCountCellID]) {
return 65.0f; return 65.0f;
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneFireCountCell.m
...@@ -23,6 +23,15 @@ ...@@ -23,6 +23,15 @@
self.selectionStyle = UITableViewCellSelectionStyleNone; self.selectionStyle = UITableViewCellSelectionStyleNone;
self.receiveFireLabel.textColor = [UIColor fus_textColorRich]; 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 { - (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone {
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneInfoCell.m
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
_levelLabel.layer.masksToBounds = YES; _levelLabel.layer.masksToBounds = YES;
_focusLabel.text = [NSString fus_localString:@"追踪"]; _focusLabel.text = [NSString fus_localString:@"追踪"];
_fansLabel.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.textColor = [UIColor fus_textColorRich];
self.nickNameLabel.font = [UIFont fus_themeBoldFont:22]; self.nickNameLabel.font = [UIFont fus_themeBoldFont:22];
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneInfoCell.xib
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<autoresizingMask key="autoresizingMask"/> <autoresizingMask key="autoresizingMask"/>
<subviews> <subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yif-2n-DuE"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yif-2n-DuE">
<rect key="frame" x="54" y="53.5" width="27.5" height="16"/> <rect key="frame" x="54" y="25.5" width="27.5" height="16"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="16" id="YPT-qZ-Xte"/> <constraint firstAttribute="height" constant="16" id="YPT-qZ-Xte"/>
</constraints> </constraints>
...@@ -26,20 +26,20 @@ ...@@ -26,20 +26,20 @@
<state key="normal" title="20" backgroundImage="video_chat_userinfo_sex_secret_bg"/> <state key="normal" title="20" backgroundImage="video_chat_userinfo_sex_secret_bg"/>
</button> </button>
<imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="baofang_vchat_verified_img" translatesAutoresizingMaskIntoConstraints="NO" id="VBp-ED-tro"> <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="baofang_vchat_verified_img" translatesAutoresizingMaskIntoConstraints="NO" id="VBp-ED-tro">
<rect key="frame" x="87.5" y="53.5" width="53.5" height="15.5"/> <rect key="frame" x="87.5" y="25.5" width="53.5" height="15.5"/>
<constraints> <constraints>
<constraint firstAttribute="width" secondItem="VBp-ED-tro" secondAttribute="height" multiplier="38:11" id="wSM-y2-pQl"/> <constraint firstAttribute="width" secondItem="VBp-ED-tro" secondAttribute="height" multiplier="38:11" id="wSM-y2-pQl"/>
<constraint firstAttribute="height" constant="15.5" id="xgW-5n-vBi"/> <constraint firstAttribute="height" constant="15.5" id="xgW-5n-vBi"/>
</constraints> </constraints>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="nickName" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zR6-f6-N6I"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="nickName" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zR6-f6-N6I">
<rect key="frame" x="15" y="20" width="81" height="21"/> <rect key="frame" x="15" y="0.0" width="81" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/> <fontDescription key="fontDescription" type="system" pointSize="18"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Lv0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W2o-3M-oQx"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Lv0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="W2o-3M-oQx">
<rect key="frame" x="104" y="22.5" width="22.5" height="16"/> <rect key="frame" x="104" y="2.5" width="22.5" height="16"/>
<color key="backgroundColor" red="0.30196078430000001" green="0.30196078430000001" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/> <color key="backgroundColor" red="0.30196078430000001" green="0.30196078430000001" blue="0.30196078430000001" alpha="1" colorSpace="calibratedRGB"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="16" id="JBh-Rb-Qiu"/> <constraint firstAttribute="height" constant="16" id="JBh-Rb-Qiu"/>
...@@ -50,26 +50,26 @@ ...@@ -50,26 +50,26 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_none_vip" translatesAutoresizingMaskIntoConstraints="NO" id="taI-i1-CE8"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="vip_icon_none_vip" translatesAutoresizingMaskIntoConstraints="NO" id="taI-i1-CE8">
<rect key="frame" x="134.5" y="22.5" width="16" height="16"/> <rect key="frame" x="134.5" y="2.5" width="16" height="16"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="16" id="Ml7-gx-T7e"/> <constraint firstAttribute="height" constant="16" id="Ml7-gx-T7e"/>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="16" id="lPq-8U-Oe3"/> <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="16" id="lPq-8U-Oe3"/>
</constraints> </constraints>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="npl-JZ-Urd"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="npl-JZ-Urd">
<rect key="frame" x="15" y="54" width="31" height="14.5"/> <rect key="frame" x="15" y="26" width="31" height="14.5"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mHC-42-xJE" userLabel="idButton"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mHC-42-xJE" userLabel="idButton">
<rect key="frame" x="15" y="46.5" width="31" height="30"/> <rect key="frame" x="15" y="18.5" width="31" height="30"/>
<connections> <connections>
<action selector="clickIdBtnAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="1Ce-yz-XGg"/> <action selector="clickIdBtnAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="1Ce-yz-XGg"/>
</connections> </connections>
</button> </button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MP9-4C-psw"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MP9-4C-psw">
<rect key="frame" x="0.0" y="75.5" width="67" height="34"/> <rect key="frame" x="0.0" y="47.5" width="67" height="34"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jov-Py-LFb"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jov-Py-LFb">
<rect key="frame" x="15" y="1.5" width="13" height="31"/> <rect key="frame" x="15" y="1.5" width="13" height="31"/>
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
</constraints> </constraints>
</view> </view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c6T-X5-Rcg"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c6T-X5-Rcg">
<rect key="frame" x="74" y="75.5" width="67" height="34"/> <rect key="frame" x="74" y="47.5" width="67" height="34"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i2l-up-drR"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i2l-up-drR">
<rect key="frame" x="15" y="1.5" width="13" height="31"/> <rect key="frame" x="15" y="1.5" width="13" height="31"/>
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
</constraints> </constraints>
</view> </view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f9D-yI-ehB"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="f9D-yI-ehB">
<rect key="frame" x="124.5" y="12.5" width="36" height="36"/> <rect key="frame" x="124.5" y="-7.5" width="36" height="36"/>
<inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
<connections> <connections>
<action selector="fus_clickRichBtnAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="o4D-g0-X13"/> <action selector="fus_clickRichBtnAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="o4D-g0-X13"/>
...@@ -164,12 +164,12 @@ ...@@ -164,12 +164,12 @@
<constraint firstItem="f9D-yI-ehB" firstAttribute="top" secondItem="taI-i1-CE8" secondAttribute="top" constant="-10" id="d8l-0K-pxM"/> <constraint firstItem="f9D-yI-ehB" firstAttribute="top" secondItem="taI-i1-CE8" secondAttribute="top" constant="-10" id="d8l-0K-pxM"/>
<constraint firstItem="MP9-4C-psw" firstAttribute="top" secondItem="Yif-2n-DuE" secondAttribute="bottom" constant="6" id="dZj-8k-HjH"/> <constraint firstItem="MP9-4C-psw" firstAttribute="top" secondItem="Yif-2n-DuE" secondAttribute="bottom" constant="6" id="dZj-8k-HjH"/>
<constraint firstItem="W2o-3M-oQx" firstAttribute="leading" secondItem="zR6-f6-N6I" secondAttribute="trailing" constant="8" id="feC-nR-PJo"/> <constraint firstItem="W2o-3M-oQx" firstAttribute="leading" secondItem="zR6-f6-N6I" secondAttribute="trailing" constant="8" id="feC-nR-PJo"/>
<constraint firstItem="npl-JZ-Urd" firstAttribute="top" secondItem="zR6-f6-N6I" secondAttribute="bottom" constant="13" id="gBl-R3-Hq5"/> <constraint firstItem="npl-JZ-Urd" firstAttribute="top" secondItem="zR6-f6-N6I" secondAttribute="bottom" constant="5" id="gBl-R3-Hq5"/>
<constraint firstItem="W2o-3M-oQx" firstAttribute="centerY" secondItem="zR6-f6-N6I" secondAttribute="centerY" id="kQV-nT-JA5"/> <constraint firstItem="W2o-3M-oQx" firstAttribute="centerY" secondItem="zR6-f6-N6I" secondAttribute="centerY" id="kQV-nT-JA5"/>
<constraint firstItem="f9D-yI-ehB" firstAttribute="trailing" secondItem="taI-i1-CE8" secondAttribute="trailing" constant="10" id="lty-9j-RuO"/> <constraint firstItem="f9D-yI-ehB" firstAttribute="trailing" secondItem="taI-i1-CE8" secondAttribute="trailing" constant="10" id="lty-9j-RuO"/>
<constraint firstItem="c6T-X5-Rcg" firstAttribute="leading" secondItem="MP9-4C-psw" secondAttribute="trailing" constant="7" id="p9G-jM-HF1"/> <constraint firstItem="c6T-X5-Rcg" firstAttribute="leading" secondItem="MP9-4C-psw" secondAttribute="trailing" constant="7" id="p9G-jM-HF1"/>
<constraint firstItem="npl-JZ-Urd" firstAttribute="leading" secondItem="zR6-f6-N6I" secondAttribute="leading" id="tM9-f7-zLC"/> <constraint firstItem="npl-JZ-Urd" firstAttribute="leading" secondItem="zR6-f6-N6I" secondAttribute="leading" id="tM9-f7-zLC"/>
<constraint firstItem="zR6-f6-N6I" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="20" id="uht-dr-ICp"/> <constraint firstItem="zR6-f6-N6I" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="uht-dr-ICp"/>
</constraints> </constraints>
</tableViewCellContentView> </tableViewCellContentView>
<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"/>
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneMotoringCell.m
...@@ -54,9 +54,8 @@ ...@@ -54,9 +54,8 @@
self.motorImageView.hidden = NO; self.motorImageView.hidden = NO;
[self.motorImageView setWebImageWithSubURLString:zoneModel.motoring[@"resource"] placeholder:nil]; [self.motorImageView setWebImageWithSubURLString:zoneModel.motoring[@"resource"] placeholder:nil];
} }
if (isMyZone && zoneModel && zoneModel.motoringTotal) {
if (isMyZone && zoneModel.motoringTotal) { self.motorCountLabel.text = [NSString stringWithFormat:@"%ld",zoneModel.motoringTotal];
self.motorCountLabel.text = @(zoneModel.motoringTotal).description;
self.countLabelLeftConstraint.constant = 8; self.countLabelLeftConstraint.constant = 8;
self.motorCountLabel.hidden = NO; self.motorCountLabel.hidden = NO;
} else { } else {
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneSendJewelCountCell.m
...@@ -23,6 +23,15 @@ ...@@ -23,6 +23,15 @@
self.selectionStyle = UITableViewCellSelectionStyleNone; self.selectionStyle = UITableViewCellSelectionStyleNone;
self.sendJewelLabel.textColor = [UIColor fus_textColorRich]; 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 { - (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone {
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneSignTagAddressCell.m
...@@ -63,6 +63,15 @@ ...@@ -63,6 +63,15 @@
self.cityAndCountryLabel.textColor = [UIColor fus_textColorRich]; self.cityAndCountryLabel.textColor = [UIColor fus_textColorRich];
self.signLabel.textColor = [UIColor fus_textColorRich]; self.signLabel.textColor = [UIColor fus_textColorRich];
[self.recordOrPlayBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal]; [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 { - (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone {
...@@ -275,12 +284,13 @@ ...@@ -275,12 +284,13 @@
// 下面的空白区域 // 下面的空白区域
height += 25; height += 25;
if (!FUSConfig.sharedInstanced.devConfigs.appStatus //这个不知道什么适配，导致下面空白很多
&& ((![NSDictionary isNull:model.voiceChat] // if (!FUSConfig.sharedInstanced.devConfigs.appStatus
&& ![NSString isNull:model.voiceChat[@"url"]]) // && ((![NSDictionary isNull:model.voiceChat]
|| [model.uid isEqual:[FUSCacheDataShare shareStore].userDetailInfo.uid])) { // && ![NSString isNull:model.voiceChat[@"url"]])
height += (15 + 24); // || [model.uid isEqual:[FUSCacheDataShare shareStore].userDetailInfo.uid])) {
} // height += (15 + 24);
// }
return height; 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