Skip to content

pidan / FuSiLive

Go to a project
Commit 29e06b39 by pierce
Options

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

parents c3513b70 2da22bdc
Inline Side-by-side
Showing with 181 additions and 113 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/common_navi_barItem_more_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "common_navi_barItem_more_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "common_navi_barItem_more_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/MenuPopListView/FUSMenuPopListTableViewCell.m
......@@ -36,7 +36,7 @@
cell 的Nib对象
*/
+ (UINib *)cellNib {
return [UINib nibWithNibName:NSStringFromClass([self class]) bundle:nil];
return [UINib nibWithNibName:NSStringFromClass([self class]) bundle:[FUSFoundationBundle bundle]];
}
- (void)awakeFromNib {
......@@ -44,7 +44,7 @@
//基本信息
self.backgroundColor = [UIColor clearColor];
_taskItemLabel.textColor = [UIColor whiteColor];
_taskItemLabel.textColor = [UIColor blackColor];
//选中的背景颜色
UIView *selectedView = [[UIView alloc] initWithFrame:self.bounds];
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Bundle/FUSFoundationBundle.h
......@@ -22,6 +22,9 @@ NS_ASSUME_NONNULL_BEGIN
+(UIImage *)fus_backWhiteImage;
/// 导航栏更多的按钮
+(UIImage *)fus_naviMoreIcon;
/// 默认头像
+ (UIImage *)fus_defaultIcon;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Bundle/FUSFoundationBundle.m
......@@ -71,6 +71,10 @@
return [self fus_ImageNamed:[FUSRTL RTLImageName:@"common_navigation_back_white"]];
}
+ (UIImage *)fus_naviMoreIcon{
return [self fus_ImageNamed:[FUSRTL RTLImageName:@"common_navi_barItem_more_icon"]];
}
+ (UIImage *)fus_defaultIcon {
return [self fus_ImageNamed:@"icon_boy_default"];
}
......
FuSiLive.xcodeproj/project.pbxproj
......@@ -20,7 +20,7 @@
00A19BA32C1C46C40036AE22 /* FUSHomeLanguageGetlistModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A19BA22C1C46C40036AE22 /* FUSHomeLanguageGetlistModel.m */; };
00A19BA62C1C73320036AE22 /* FUSHomeAnchorListSmallCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A19BA52C1C73320036AE22 /* FUSHomeAnchorListSmallCell.m */; };
00A29CC22C2570C7008B9072 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 00A29CC12C2570C7008B9072 /* Launch Screen.storyboard */; };
00A29CC42C257A65008B9072 /* fus_startSplash_logo_image.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A29CC32C257A65008B9072 /* fus_startSplash_logo_image.png */; };
00A29CC42C257A65008B9072 /* fus_startSplash_logo_image_1.png in Resources */ = {isa = PBXBuildFile; fileRef = 00A29CC32C257A65008B9072 /* fus_startSplash_logo_image_1.png */; };
00A29CC62C257FBD008B9072 /* startPageVideo.mp4 in Resources */ = {isa = PBXBuildFile; fileRef = 00A29CC52C257BF9008B9072 /* startPageVideo.mp4 */; };
00A29CC92C25836C008B9072 /* FUSStartPageSplashView.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A29CC82C25836C008B9072 /* FUSStartPageSplashView.m */; };
00A2D48F2C1AEFBF00A15ECA /* FUSLiveStateAnimationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 00A2D44F2C1AEFBF00A15ECA /* FUSLiveStateAnimationView.m */; };
......@@ -1422,7 +1422,7 @@
00A19BA42C1C73320036AE22 /* FUSHomeAnchorListSmallCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSHomeAnchorListSmallCell.h; sourceTree = "<group>"; };
00A19BA52C1C73320036AE22 /* FUSHomeAnchorListSmallCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSHomeAnchorListSmallCell.m; sourceTree = "<group>"; };
00A29CC12C2570C7008B9072 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
00A29CC32C257A65008B9072 /* fus_startSplash_logo_image.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fus_startSplash_logo_image.png; sourceTree = "<group>"; };
00A29CC32C257A65008B9072 /* fus_startSplash_logo_image_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = fus_startSplash_logo_image_1.png; sourceTree = "<group>"; };
00A29CC52C257BF9008B9072 /* startPageVideo.mp4 */ = {isa = PBXFileReference; lastKnownFileType = file; path = startPageVideo.mp4; sourceTree = "<group>"; };
00A29CC72C25836C008B9072 /* FUSStartPageSplashView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUSStartPageSplashView.h; sourceTree = "<group>"; };
00A29CC82C25836C008B9072 /* FUSStartPageSplashView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUSStartPageSplashView.m; sourceTree = "<group>"; };
......@@ -4625,7 +4625,7 @@
BEDC2CC92C09C53800505F76 /* AppDelegate+ShareSDK.m */,
BE05F46B2C203D0C006A8993 /* Assets.xcassets */,
BEDC668C2C09DAE700505F76 /* Firefly_start_page_cn_14900.png */,
00A29CC32C257A65008B9072 /* fus_startSplash_logo_image.png */,
00A29CC32C257A65008B9072 /* fus_startSplash_logo_image_1.png */,
BEDC65912C09DAE600505F76 /* Firefly_start_page_en_76400.png */,
BE093BD02C07587100A4D28E /* FuSiLivePrefixHeader.pch */,
BEDC668D2C09DAE700505F76 /* GoogleService-Info.plist */,
......@@ -8811,7 +8811,7 @@
BED0FBDF2C0C49CA0017B285 /* FUSEmotionCollectionViewCell.xib in Resources */,
BEDC6F0B2C09DAE800505F76 /* Firefly_Chinese.strings in Resources */,
BED0F9BD2C0C49C90017B285 /* FUSSingleLiveGradePopView.xib in Resources */,
00A29CC42C257A65008B9072 /* fus_startSplash_logo_image.png in Resources */,
00A29CC42C257A65008B9072 /* fus_startSplash_logo_image_1.png in Resources */,
BED0FB432C0C49CA0017B285 /* FUSNewsFeedDetailToolView.xib in Resources */,
BED0FA7F2C0C49C90017B285 /* FUSLinkMicSettingView.xib in Resources */,
BEDC6F4A2C09DAE900505F76 /* live_link_micro_request_10.png in Resources */,
......
FuSiLive/Assets.xcassets/fusiPart/common/fus_common_sex_female_white_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_common_sex_female_white_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_sex_female_white_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/fusiPart/common/fus_common_sex_male_white_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_common_sex_male_white_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_sex_male_white_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Classes/Common/Models/FUSUserInfosModel.h
......@@ -12,11 +12,14 @@
@interface FUSUserInfosModel : FUSBaseModel
@property(nonatomic, copy) NSString *activebonds;// 可提现的债券
/// 可提现萤火
@property(nonatomic, copy) NSString *activebonds;
@property(nonatomic, copy) NSString *addr; // 地址
@property(nonatomic, copy) NSString *age; // 年龄
@property(nonatomic, copy) NSString *birth; // 生日
@property(nonatomic, copy) NSString *bonds; // 累计萤火
@property(nonatomic, copy) NSString *bonds; // 萤火
/// 总累计萤火
@property(nonatomic, copy) NSString *allbonds;
@property(nonatomic, copy) NSString *constellation;// 星座
@property(nonatomic, copy) NSString *diamond; // 钻石
@property(nonatomic, copy) NSString *face; // 头像
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyHeaderView.m
......@@ -127,20 +127,20 @@
}];
self.ageBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.ageBtn.titleLabel.font = [UIFont fus_themeFont:12];
[self.ageBtn setTitleColor:[UIColor colorWithHex:@"#76C4FF"] forState:UIControlStateNormal];
[self.ageBtn setTitleColor:[UIColor colorWithHex:@"#FE96B0"] forState:UIControlStateSelected];
[self.ageBtn setImage:[UIImage imageNamed:@"fus_common_sex_male_icon"] forState:UIControlStateNormal];
[self.ageBtn setImage:[UIImage imageNamed:@"fus_common_sex_female_icon"] forState:UIControlStateSelected];
self.ageBtn.layer.cornerRadius = 18 / 2.0f;
self.ageBtn.layer.borderWidth = 1;
self.ageBtn.layer.borderColor = [UIColor colorWithHex:@"#87878A" alpha:0.32].CGColor;
self.ageBtn.titleLabel.font = [UIFont fus_themeFont:10];
[self.ageBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[self.ageBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected];
[self.ageBtn setImage:[UIImage imageNamed:@"fus_common_sex_male_white_icon"] forState:UIControlStateNormal];
[self.ageBtn setImage:[UIImage imageNamed:@"fus_common_sex_female_white_icon"] forState:UIControlStateSelected];
self.ageBtn.layer.cornerRadius = 14 / 2.0f;
// self.ageBtn.layer.borderWidth = 1;
// self.ageBtn.layer.borderColor = [UIColor colorWithHex:@"#87878A" alpha:0.32].CGColor;
[copyBgBtn addSubview:self.ageBtn];
[self.ageBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.offset(0);
make.left.equalTo(self.idLabel.mas_right).offset(6);
make.width.offset(40);
make.height.offset(18);
make.height.offset(14);
make.centerY.equalTo(self.idLabel.mas_centerY);
}];
......@@ -313,9 +313,11 @@
if ([model.sex integerValue] == 0) {
self.ageBtn.selected = YES;
[self.ageBtn setTitle:[NSString stringWithFormat:@" %@",model.age] forState:UIControlStateSelected];
[self.ageBtn setBackgroundColor:[UIColor colorWithHex:@"#FE96B0"]];
}else if ([model.sex integerValue] == 1){
self.ageBtn.selected = NO;
[self.ageBtn setTitle:[NSString stringWithFormat:@" %@",model.age] forState:UIControlStateNormal];
[self.ageBtn setBackgroundColor:[UIColor colorWithHex:@"#76C4FF"]];
}else {
self.ageBtn.hidden = YES;
}
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyView.m
......@@ -492,7 +492,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
switch (item.itemTag) {
case FUSMySettingItemTypeImAnchor:{
FUSImAnchorViewController *vc = [[FUSImAnchorViewController alloc] init];
vc.zoneModel = self.zoneModel;
// vc.zoneModel = self.zoneModel;
[[UINavigationController fus_topViewController].navigationController pushViewController:vc animated:YES];
}
break;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/cell/FUSHomeAnchorListSmallCell.m
......@@ -133,7 +133,7 @@
[self.tagView fus_refreshTagImagesWithModel:model];
FUSWeakSelf(weakSelf);
[self.bgImageView setBaoFangCoverWebImageWithSubURLString:model.face placeholder:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
[self.bgImageView setBaoFangCoverWebImageWithSubURLString:model.face placeholder:[UIImage fus_defaultIcon] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
// 防止下载到图片的时候，cell已经被重用了
if (![url.absoluteString containsString:model.face]) {
return;
......@@ -157,7 +157,7 @@
self.tagView.hidden = YES;
FUSWeakSelf(weakSelf);
[self.bgImageView setBaoFangCoverWebImageWithSubURLString:[FUSConfig.sharedInstanced.pathConfigs thumbImageUrl:model.fus_insertModel.cover] placeholder:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
[self.bgImageView setBaoFangCoverWebImageWithSubURLString:[FUSConfig.sharedInstanced.pathConfigs thumbImageUrl:model.fus_insertModel.cover] placeholder:[UIImage fus_defaultIcon] completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
// 防止下载到图片的时候，cell已经被重用了
if (![url.absoluteString containsString:model.face]) {
return;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/FUSImAnchorViewController.h
......@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
@interface FUSImAnchorViewController : FUSBaseViewController
/// 数据
@property (nonatomic, strong) FUSZoneInfosModel *zoneModel;
//@property (nonatomic, strong) FUSZoneInfosModel *zoneModel;
@end
......
FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/FUSImAnchorViewController.m
......@@ -99,7 +99,7 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
switch (type) {
case FUSImAnchorHeaderButtonTypeMyZone:{
FUSMyZoneViewController *myZoneVC = [[FUSMyZoneViewController alloc] init];
myZoneVC.zoneUid = weakself.zoneModel.uid;
myZoneVC.zoneUid = weakself.userInfosModel.uid;
myZoneVC.isFromLiveRoomChat = NO;
[weakself.navigationController pushViewController:myZoneVC animated:YES];
}
......@@ -235,7 +235,7 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
for (FUSCustomSettingItem *itemModel in sectionModel.items) {
switch (itemModel.itemTag) {
case FUSImAnchorItemTypeTotalFire:
itemModel.rightShowText = _zoneModel.bonds;
itemModel.rightShowText = _userInfosModel.allbonds;
break;
case FUSImAnchorItemTypeLiveTime:{
if (self.userInfosModel != nil && ![NSString isNull:self.userInfosModel.showTime]) {
......@@ -254,7 +254,7 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
}
[self.tableView reloadData];
[self.headerView fus_setupHeaderViewWithModel:self.zoneModel];
[self.headerView fus_setupHeaderViewWithModel:self.userInfosModel];
}
#pragma mark --- button did clicked
......
FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/View/FUSImAnchorHeaderView.h
......@@ -7,7 +7,7 @@
//
#import <UIKit/UIKit.h>
#import "FUSZoneInfosModel.h"
#import "FUSUserInfosModel.h"
NS_ASSUME_NONNULL_BEGIN
typedef enum :NSInteger{
......@@ -21,7 +21,7 @@ typedef enum :NSInteger{
@property (nonatomic, copy) void(^buttonDidClickedHander)(FUSImAnchorHeaderButtonType type);
- (void)fus_setupHeaderViewWithModel:(FUSZoneInfosModel *)model;
- (void)fus_setupHeaderViewWithModel:(FUSUserInfosModel *)model;
/// 返回控件高度
+(CGFloat)fus_viewHeight;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/View/FUSImAnchorHeaderView.m
......@@ -22,7 +22,7 @@
@property (nonatomic, strong) UIButton *withdrawBtn;
/// 数据
@property (nonatomic, strong) FUSZoneInfosModel *zoneModel;
@property (nonatomic, strong) FUSUserInfosModel *userinfoModel;
@end
......@@ -52,7 +52,7 @@
[topBgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(self.mas_safeAreaLayoutGuideTop);
make.left.right.offset(0);
make.height.offset(240);
make.height.offset(230);
}];
UIImageView *topBottomBgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"fus_my_setting_header_contentBottom_bg"]];
......@@ -88,21 +88,18 @@
make.left.top.bottom.equalTo(nickNameBgView);
}];
// self.vipMarkLabel = [[UILabel alloc] init];
// self.vipMarkLabel.font = [UIFont fus_themeBoldFont:9];
// self.vipMarkLabel.textColor = [UIColor fus_textColorRich];
// self.vipMarkLabel.text = @"V";
// self.vipMarkLabel.textAlignment = NSTextAlignmentCenter;
// self.vipMarkLabel.layer.cornerRadius = 14 / 2.0f;
// self.vipMarkLabel.layer.masksToBounds = YES;
// self.vipMarkLabel.backgroundColor = [UIColor fus_diamondBlue];
// [nickNameBgView addSubview:self.vipMarkLabel];
// [self.vipMarkLabel mas_makeConstraints:^(MASConstraintMaker *make) {
// make.right.equalTo(nickNameBgView);
// make.centerY.equalTo(nickNameBgView.mas_centerY);
// make.left.equalTo(self.nickNameLabel.mas_right).offset(6);
// make.size.mas_equalTo(CGSizeMake(14, 14));
// }];
self.levelLabel = [[UILabel alloc] init];
self.levelLabel.font = [UIFont fus_themeFont:10];
self.levelLabel.textColor = [UIColor whiteColor];
self.levelLabel.backgroundColor = [UIColor colorWithHex:@"#87878A" alpha:0.32];
self.levelLabel.layer.cornerRadius = 14 / 2.0f;
self.levelLabel.layer.masksToBounds = YES;
[nickNameBgView addSubview:self.levelLabel];
[self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) {;
make.centerY.equalTo(nickNameBgView.mas_centerY);
make.left.equalTo(self.nickNameLabel.mas_right).offset(4);
make.height.offset(14);
}];
self.vipMarkImgView = [[UIImageView alloc] init];
self.vipMarkImgView.contentMode = UIViewContentModeScaleAspectFit;
......@@ -110,50 +107,15 @@
[self.vipMarkImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(nickNameBgView);
make.centerY.equalTo(nickNameBgView.mas_centerY);
make.left.equalTo(self.nickNameLabel.mas_right).offset(6);
make.left.equalTo(self.levelLabel.mas_right).offset(5);
// make.size.mas_equalTo(CGSizeMake(14, 14));
make.height.offset(16);
}];
UIButton *sexBlankBgView = [UIButton buttonWithType:UIButtonTypeCustom];
[topBgView addSubview:sexBlankBgView];
[sexBlankBgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(nickNameBgView.mas_bottom).offset(4);
make.centerX.equalTo(topBgView);
make.height.offset(18);
}];
self.levelLabel = [[UILabel alloc] init];
self.levelLabel.font = [UIFont fus_themeFont:13];
self.levelLabel.textColor = [UIColor whiteColor];
self.levelLabel.backgroundColor = [UIColor colorWithHex:@"#87878A" alpha:0.32];
self.levelLabel.layer.cornerRadius = 18 / 2.0f;
self.levelLabel.layer.masksToBounds = YES;
[sexBlankBgView addSubview:self.levelLabel];
[self.levelLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.top.bottom.offset(0);
}];
self.ageBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.ageBtn.titleLabel.font = [UIFont fus_themeFont:12];
[self.ageBtn setTitleColor:[UIColor colorWithHex:@"#76C4FF"] forState:UIControlStateNormal];
[self.ageBtn setTitleColor:[UIColor colorWithHex:@"#FE96B0"] forState:UIControlStateSelected];
[self.ageBtn setImage:[UIImage imageNamed:@"fus_common_sex_male_icon"] forState:UIControlStateNormal];
[self.ageBtn setImage:[UIImage imageNamed:@"fus_common_sex_female_icon"] forState:UIControlStateSelected];
self.ageBtn.layer.cornerRadius = 18 / 2.0f;
self.ageBtn.layer.borderWidth = 1;
self.ageBtn.layer.borderColor = [UIColor colorWithHex:@"#87878A" alpha:0.32].CGColor;
[sexBlankBgView addSubview:self.ageBtn];
[self.ageBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.right.bottom.offset(0);
make.left.equalTo(self.levelLabel.mas_right).offset(6);
make.width.offset(40);
make.height.offset(14);
}];
UIButton *copyBgBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[topBgView addSubview:copyBgBtn];
[copyBgBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(sexBlankBgView.mas_bottom).offset(0);
make.top.equalTo(nickNameBgView.mas_bottom).offset(0);
make.height.offset(34);
make.centerX.equalTo(topBgView.mas_centerX);
}];
......@@ -167,12 +129,22 @@
make.centerY.equalTo(copyBgBtn.mas_centerY);
}];
UIImageView *copyImgView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"fus_my_setting_header_copy_icon"]];
[copyBgBtn addSubview:copyImgView];
[copyImgView mas_makeConstraints:^(MASConstraintMaker *make) {
self.ageBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.ageBtn.titleLabel.font = [UIFont fus_themeFont:10];
[self.ageBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[self.ageBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateSelected];
[self.ageBtn setImage:[UIImage imageNamed:@"fus_common_sex_male_white_icon"] forState:UIControlStateNormal];
[self.ageBtn setImage:[UIImage imageNamed:@"fus_common_sex_female_white_icon"] forState:UIControlStateSelected];
self.ageBtn.layer.cornerRadius = 14 / 2.0f;
// self.ageBtn.layer.borderWidth = 1;
// self.ageBtn.layer.borderColor = [UIColor colorWithHex:@"#87878A" alpha:0.32].CGColor;
[copyBgBtn addSubview:self.ageBtn];
[self.ageBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.equalTo(copyBgBtn.mas_right).offset(-10);
make.centerY.equalTo(copyBgBtn.mas_centerY);
make.left.equalTo(self.idLabel.mas_right).offset(4);
make.height.offset(14);
make.width.offset(40);
}];
......@@ -234,8 +206,6 @@
self.avatorBtn.tag = FUSImAnchorHeaderButtonTypeMyZone;
[self.avatorBtn addTarget:self action:@selector(fus_commondBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
sexBlankBgView.tag = FUSImAnchorHeaderButtonTypeMyZone;
[sexBlankBgView addTarget:self action:@selector(fus_commondBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
[copyBgBtn addTarget:self action:@selector(fus_copyBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
}
......@@ -248,18 +218,18 @@
}
-(void)fus_copyBtnDidClicked:(UIButton *)btn{
[UIPasteboard generalPasteboard].string = _zoneModel.uid;
[UIPasteboard generalPasteboard].string = _userinfoModel.uid;
[FUSDialogView fus_showDialog:FUSLocalizationHelper.localString(@"复制成功")];
}
#pragma mark --- method
- (void)fus_setupHeaderViewWithModel:(FUSZoneInfosModel *)model{
_zoneModel = model;
- (void)fus_setupHeaderViewWithModel:(FUSUserInfosModel *)model{
_userinfoModel = model;
// 头像
[self.avatorBtn setWebBackgroundImageWithSubURLString:model.face placeholder:[UIImage fus_defaultIcon]];
// 名称
NSString *name = [NSString isNull:model.markName] ? model.nickname : model.markName;
NSString *name = model.nickname;
self.nickNameLabel.text = name;
// id
self.idLabel.text = [NSString stringWithFormat:@"ID: %@",model.uid];
......@@ -270,9 +240,11 @@
if ([model.sex integerValue] == 0) {
self.ageBtn.selected = YES;
[self.ageBtn setTitle:[NSString stringWithFormat:@" %@",model.age] forState:UIControlStateSelected];
[self.ageBtn setBackgroundColor:[UIColor colorWithHex:@"#FE96B0"]];
}else if ([model.sex integerValue] == 1){
self.ageBtn.selected = NO;
[self.ageBtn setTitle:[NSString stringWithFormat:@" %@",model.age] forState:UIControlStateNormal];
[self.ageBtn setBackgroundColor:[UIColor colorWithHex:@"#76C4FF"]];
}else {
self.ageBtn.hidden = YES;
}
......@@ -281,12 +253,12 @@
make.width.offset(ageStringSzie.width + 9 + 10);
}];
self.fireNumLabel.text = model.bonds;
self.fireNumLabel.text = model.activebonds;
self.vipMarkImgView.image = [UIImage fus_imageWithLevel:[model.level integerValue]];
}
+ (CGFloat)fus_viewHeight{
return 346;
return 336;
}
@end
FuSiLive/Classes/InstantMessaging/Controller/FUSChatDetailViewController.m
......@@ -546,7 +546,7 @@
FUSButton *navRightBtn = [FUSButton buttonWithType:UIButtonTypeCustom];
navRightBtn.frame = CGRectMake(0, 0, 24, 24);
navRightBtn.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 0);
[navRightBtn setImage:[UIImage imageNamed:@"icon_more"] forState:UIControlStateNormal];
[navRightBtn setImage:[UIImage fus_naviMoreIcon] forState:UIControlStateNormal];
[navRightBtn addTarget:self action:@selector(fus_onClickNavRightBtn) forControlEvents:UIControlEventTouchUpInside];
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:navRightBtn];
......@@ -604,15 +604,15 @@
[_moreView fus_dismissAddMoreView];
FUSMenuPopItemModel *clear = [FUSMenuPopItemModel fus_modelWithIcon:[UIImage imageNamed:@"chat_im_more_clear"] title:FUSLocalizationHelper.localString(@"清空记录")];
FUSMenuPopItemModel *report = [FUSMenuPopItemModel fus_modelWithIcon:[UIImage imageNamed:@"chat_im_more_report"] title:FUSLocalizationHelper.localString(@"举报")];
FUSMenuPopItemModel *clear = [FUSMenuPopItemModel fus_modelWithIcon:[[UIImage imageNamed:@"chat_im_more_clear"] imageByTintColor:[UIColor fus_textColorRich]] title:FUSLocalizationHelper.localString(@"清空记录")];
FUSMenuPopItemModel *report = [FUSMenuPopItemModel fus_modelWithIcon:[[UIImage imageNamed:@"chat_im_more_report"] imageByTintColor:[UIColor fus_textColorRich]] title:FUSLocalizationHelper.localString(@"举报")];
BOOL hasBeenBlack = [[FUSIMUserService shareInstance] fus_selectIsInBlackListWithUid:_talkID];
FUSMenuPopItemModel *black = nil;
if (hasBeenBlack) {
black = [FUSMenuPopItemModel fus_modelWithIcon:[UIImage imageNamed:@"chat_im_cancel_black"] title:FUSLocalizationHelper.localString(@"取消拉黑")];
black = [FUSMenuPopItemModel fus_modelWithIcon:[[UIImage imageNamed:@"chat_im_cancel_black"] imageByTintColor:[UIColor fus_textColorRich]] title:FUSLocalizationHelper.localString(@"取消拉黑")];
} else {
black = [FUSMenuPopItemModel fus_modelWithIcon:[UIImage imageNamed:@"chat_im_more_black"] title:FUSLocalizationHelper.localString(@"拉黑")];
black = [FUSMenuPopItemModel fus_modelWithIcon:[[UIImage imageNamed:@"chat_im_more_black"] imageByTintColor:[UIColor fus_textColorRich]] title:FUSLocalizationHelper.localString(@"拉黑")];
}
_moreView = [[FUSMenuPopListView alloc] initWithFrame:self.view.bounds withDatas:@[clear,report,black]];
......
FuSiLive/Classes/Login/Controller/FUSLoginPhoneViewController.m
......@@ -74,6 +74,12 @@
self.titleLabel.textColor = [UIColor fus_textColorRich];
_areaBgView.backgroundColor = [UIColor fus_textInputBackgroundGrayColor];
_teleBgView.backgroundColor = [UIColor fus_textInputBackgroundGrayColor];
FUSAccountModel *lastAccount = [[FUSAccountStore shareStore] lastAccount];
// 如果以后已有登陆账号，则走登陆流程
if (lastAccount != nil && ![NSObject isNullWithString:lastAccount.account]) {
self.phoneTextField.text = lastAccount.account;
}
}
- (void)viewWillAppear:(BOOL)animated{
......
FuSiLive/Classes/Login/Controller/FUSStartPageViewController.m
......@@ -529,26 +529,34 @@
*/
- (IBAction)onClickPhoneLogin:(UIButton *)sender {
FUSAccountModel *lastAccount = [[FUSAccountStore shareStore] lastAccount];
// 如果以后已有登陆账号，则走登陆流程
if (lastAccount != nil && ![NSObject isNullWithString:lastAccount.account]) {
FUSLoginViewController *loginViewCtrl = [[FUSLoginViewController alloc]init];
__weak typeof(self) weakSelf = self;
loginViewCtrl.onClickBackHandle = ^{
[weakSelf showLoginFailViewWithType:0];
};
[self.navigationController pushViewController:loginViewCtrl animated:YES];
// FUSAccountModel *lastAccount = [[FUSAccountStore shareStore] lastAccount];
// // 如果以后已有登陆账号，则走登陆流程
// if (lastAccount != nil && ![NSObject isNullWithString:lastAccount.account]) {
//
// FUSLoginViewController *loginViewCtrl = [[FUSLoginViewController alloc]init];
// __weak typeof(self) weakSelf = self;
// loginViewCtrl.onClickBackHandle = ^{
// [weakSelf showLoginFailViewWithType:0];
// };
// [self.navigationController pushViewController:loginViewCtrl animated:YES];
//
// } else {
// // 如果之前没登陆过，走注册登陆流程
// FUSLoginPhoneViewController *loginVC = [[FUSLoginPhoneViewController alloc] init];
// __weak typeof(self) weakSelf = self;
// loginVC.onClickBackHandle = ^{
// [weakSelf showLoginFailViewWithType:0];
// };
// [self.navigationController pushViewController:loginVC animated:YES];
// }
} else {
// 如果之前没登陆过，走注册登陆流程
FUSLoginPhoneViewController *loginVC = [[FUSLoginPhoneViewController alloc] init];
__weak typeof(self) weakSelf = self;
loginVC.onClickBackHandle = ^{
[weakSelf showLoginFailViewWithType:0];
};
[self.navigationController pushViewController:loginVC animated:YES];
}
[self fus_hideLoginFailView];
}
......
FuSiLive/Classes/Login/View/FUSStartPageSplashView.m
......@@ -37,7 +37,7 @@
-(void)fus_createUI{
self.backgroundColor = [UIColor whiteColor];
NSString *imagePath = [[NSBundle mainBundle] pathForResource:@"fus_startSplash_logo_image_v1" ofType:@"png"];
NSString *imagePath = [[NSBundle mainBundle] pathForResource:@"fus_startSplash_logo_image_1" ofType:@"png"];
UIImage *image = [UIImage imageWithContentsOfFile:imagePath];
self.logoImgView = [[UIImageView alloc] initWithImage:image];
[self addSubview:self.logoImgView];
......
FuSiLive/Classes/ZhaiXin/Main/View/FUSNewSingleChatTableViewCell.m
......@@ -43,6 +43,8 @@
deleteBtnModel.buttonTitle = FUSLocalizationHelper.localString(@"删除");
[self fus_addRightSwipeButtonsWithSwipeButtonModelArray:@[deleteBtnModel]];
self.nameLevelLabel.textColor = [UIColor fus_textColorRich];
}
- (void)setModel:(FUSZhaiXinModel *)model
......
FuSiLive/Classes/ZhaiXin/Main/View/FUSSingleChatTableViewCell.m
......@@ -53,6 +53,8 @@
deleteBtnModel.buttonTitle = FUSLocalizationHelper.localString(@"删除");
[self fus_addRightSwipeButtonsWithSwipeButtonModelArray:@[deleteBtnModel]];
self.nameLabel.textColor = [UIColor fus_textColorRich];
}
- (void)setModel:(FUSZhaiXinModel *)model
......
FuSiLive/Launch Screen.storyboard
......@@ -22,7 +22,7 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fus_startSplash_logo_image.png" translatesAutoresizingMaskIntoConstraints="NO" id="gnB-ZF-qMi">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fus_startSplash_logo_image_1.png" translatesAutoresizingMaskIntoConstraints="NO" id="gnB-ZF-qMi">
<rect key="frame" x="10" y="219" width="373" height="278"/>
<constraints>
<constraint firstAttribute="width" secondItem="gnB-ZF-qMi" secondAttribute="height" multiplier="393:293" id="lQc-ZD-oa2"/>
......@@ -47,6 +47,6 @@
</scene>
</scenes>
<resources>
<image name="fus_startSplash_logo_image.png" width="1263" height="941"/>
<image name="fus_startSplash_logo_image_1.png" width="1263" height="941"/>
</resources>
</document>
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