Skip to content

pidan / FuSiLive

Go to a project
Commit 96e710f7 by ludi
Options

完成启动页修改，修复首页闪屏问题

parent 9b5a4249
Expand all
Inline Side-by-side
Showing with 546 additions and 234 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Tools/Others/FUSEnumSet.h
...@@ -16,5 +16,13 @@ typedef enum : NSUInteger { ...@@ -16,5 +16,13 @@ typedef enum : NSUInteger {
ReadServerBegin = 3, // 从服务器开始: 服务器 ReadServerBegin = 3, // 从服务器开始: 服务器
} ReadCacheOrder; } ReadCacheOrder;
/// 读取方式
typedef enum : NSUInteger{
/// 从本地保存的数据读取
ReadCacheFromTypeLocal = 1,
/// 从服务器读取
ReadCacheFromTypeServer,
} ReadCacheFromType;
#endif /* FUSEnumSet_h */ #endif /* FUSEnumSet_h */
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/WebView/FUSWKWebViewController.m
...@@ -296,9 +296,9 @@ ...@@ -296,9 +296,9 @@
// [self.navigationController pushViewController:serviceChat animated:YES]; // [self.navigationController pushViewController:serviceChat animated:YES];
//} //}
// //
//- (void)fus_hideCloseBtn { - (void)fus_hideCloseBtn {
// self.closeBtn.hidden = YES; self.closeBtn.hidden = YES;
//} }
// //
//// 分享 Action //// 分享 Action
//- (void)onClickShareBtn:(UIButton *)sender //- (void)onClickShareBtn:(UIButton *)sender
......
FuSiLive/AppDelegate.m
...@@ -443,9 +443,9 @@ static dispatch_queue_t get_status_queue() { ...@@ -443,9 +443,9 @@ static dispatch_queue_t get_status_queue() {
UIPasteboard *pasteboard = [UIPasteboard generalPasteboard]; UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
NSString *pastStr = pasteboard.string; NSString *pastStr = pasteboard.string;
if (TEST_CODE) { // if (TEST_CODE) {
[FUSDialogView fus_showDialog:@"getAgentBindTypeSuccess"]; // [FUSDialogView fus_showDialog:@"getAgentBindTypeSuccess"];
} // }
NSString *icid = @""; NSString *icid = @"";
if ([pastStr hasPrefix:@"iosFFL"]) { if ([pastStr hasPrefix:@"iosFFL"]) {
......
FuSiLive/Assets.xcassets/Zone/zone_account_backgroud.imageset/Contents.json deleted 100644 → 0
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "宝石@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "宝石@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangCacheOperate.h
...@@ -23,4 +23,20 @@ ...@@ -23,4 +23,20 @@
*/ */
+ (void)fus_getLikeBaoFangWithPage:(NSInteger)page pageSize:(NSInteger)pageSize success:(void (^)(NSArray *likeBaoFangModelArray, NSInteger page))success failure:(void (^)(NSString *msg, int code))failure; + (void)fus_getLikeBaoFangWithPage:(NSInteger)page pageSize:(NSInteger)pageSize success:(void (^)(NSArray *likeBaoFangModelArray, NSInteger page))success failure:(void (^)(NSString *msg, int code))failure;
/// Fusi-首页语言分类配置
/// @param type 缓存类型
/// @param success 1
/// @param failure 0
+ (void)fus_homeLanguageGetlist:(ReadCacheFromType)type
success:(void(^)(NSArray<FUSHomeLanguageGetlistModel *> *languageList))success
failure:(void(^)(NSString *msg,int code))failure;
/// 获取直播房间列表
/// @param type 缓存类型
/// @param success 1
/// @param failure 0
+ (void)fus_homeVestRoomGetlist:(ReadCacheFromType)type
success:(void(^)(NSArray<FUSBaoFangAnchorModel *> *modelList))success
failure:(void(^)(NSString *msg,int code))failure;
@end @end
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangCacheOperate.m
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#import "FUSBaoFangSingleModel.h" #import "FUSBaoFangSingleModel.h"
#import "FUSDBHelper.h" #import "FUSDBHelper.h"
#import "FUSBaoFangHttpParamsModel.h" #import "FUSBaoFangHttpParamsModel.h"
#import "FUSCustomizedInfosStore.h"
@implementation FUSBaoFangCacheOperate @implementation FUSBaoFangCacheOperate
/** /**
...@@ -43,4 +44,67 @@ ...@@ -43,4 +44,67 @@
} failure:failure]; } failure:failure];
} }
+ (void)fus_homeLanguageGetlist:(ReadCacheFromType)type success:(void (^)(NSArray<FUSHomeLanguageGetlistModel *> *))success failure:(void (^)(NSString *, int))failure{
if (type == ReadCacheFromTypeLocal) {
NSDictionary *dataDict = [FUSCustomizedInfosStore fus_readCommonInfosWithKey:STORE_HOME_LANGUAGE_GET_LIST];
NSMutableArray *resList = [[NSMutableArray alloc] init];
NSArray *dataList = dataDict[@"languageList"];
if (dataList != nil && dataList.count > 0) {
for (NSDictionary *tempData in dataList) {
FUSHomeLanguageGetlistModel *tempModel = [[FUSHomeLanguageGetlistModel alloc] init];
[tempModel fus_setValueWithDict:tempData];
[resList appendObject:tempModel];
}
}
success(resList);
}else if (type == ReadCacheFromTypeServer) {
[FUSBaoFangHttpHelper fus_homeLanguageGetlistSuccess:success failure:failure];
}
}
+ (void)fus_homeVestRoomGetlist:(ReadCacheFromType)type success:(void (^)(NSArray<FUSBaoFangAnchorModel *> *))success failure:(void (^)(NSString *, int))failure{
if (type == ReadCacheFromTypeLocal) {
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];
}
}
}];
success(resList);
}else if (type == ReadCacheFromTypeServer) {
[FUSBaoFangHttpHelper fus_homeVestRoomGetlistSuccess:success failure:failure];
}
}
@end @end
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangHttpHelper.m
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
#import "FUSLiveChatDataSourceHelper.h" #import "FUSLiveChatDataSourceHelper.h"
#import "FUSEventTrack.h" #import "FUSEventTrack.h"
#import "FUSCustomizedInfosStore.h"
@implementation FUSBaoFangHttpHelper @implementation FUSBaoFangHttpHelper
...@@ -800,6 +802,7 @@ ...@@ -800,6 +802,7 @@
/// Fusi-首页语言分类配置 /// Fusi-首页语言分类配置
+(void)fus_homeLanguageGetlistSuccess:(void(^)(NSArray<FUSHomeLanguageGetlistModel *> *languageList))success failure:(void(^)(NSString *msg,int code))failure{ +(void)fus_homeLanguageGetlistSuccess:(void(^)(NSArray<FUSHomeLanguageGetlistModel *> *languageList))success failure:(void(^)(NSString *msg,int code))failure{
[FUSHttpHelper postRequestBinaryWithUrl:URL_HOME_LANGUAGE_GETLIST params:nil success:^(NSDictionary *dataDict, int code) { [FUSHttpHelper postRequestBinaryWithUrl:URL_HOME_LANGUAGE_GETLIST params:nil success:^(NSDictionary *dataDict, int code) {
[FUSCustomizedInfosStore fus_addCommonInfosWithKey:STORE_HOME_LANGUAGE_GET_LIST value:dataDict];
NSMutableArray *resList = [[NSMutableArray alloc] init]; NSMutableArray *resList = [[NSMutableArray alloc] init];
NSArray *dataList = dataDict[@"languageList"]; NSArray *dataList = dataDict[@"languageList"];
if (dataList != nil && dataList.count > 0) { if (dataList != nil && dataList.count > 0) {
...@@ -820,6 +823,7 @@ ...@@ -820,6 +823,7 @@
+(void)fus_homeVestRoomGetlistSuccess:(void(^)(NSArray<FUSBaoFangAnchorModel *> *modelList))success failure:(void(^)(NSString *msg,int code))failure{ +(void)fus_homeVestRoomGetlistSuccess:(void(^)(NSArray<FUSBaoFangAnchorModel *> *modelList))success failure:(void(^)(NSString *msg,int code))failure{
[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];
NSMutableArray *resList = [[NSMutableArray alloc] init]; NSMutableArray *resList = [[NSMutableArray alloc] init];
//拼接rooms //拼接rooms
NSArray *dataList = dataDict[@"rooms"]; NSArray *dataList = dataDict[@"rooms"];
......
FuSiLive/Classes/BaoFang/Main/View/Cell/SmallCell/FUSBaoFangHomeFocusCollectionViewSmallCell.m
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
if (!_nikeNameLabel) { if (!_nikeNameLabel) {
_nikeNameLabel = [[UILabel alloc] init]; _nikeNameLabel = [[UILabel alloc] init];
_nikeNameLabel.font = [UIFont fus_themeFont:15]; _nikeNameLabel.font = [UIFont fus_themeFont:15];
_nikeNameLabel.textColor = [UIColor whiteColor]; _nikeNameLabel.textColor = [UIColor fus_textColorRich];
[_nikeNameLabel sizeToFitScreen]; [_nikeNameLabel sizeToFitScreen];
} }
return _nikeNameLabel; return _nikeNameLabel;
......
FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSCustomSettingItem.m
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
item.type = type; item.type = type;
item.cellStyle = UITableViewCellStyleValue1; item.cellStyle = UITableViewCellStyleValue1;
item.font = [UIFont systemFontOfSize:16 weight:UIFontWeightLight]; item.font = [UIFont systemFontOfSize:16 weight:UIFontWeightLight];
item.titleColor = [UIColor colorWithHex:@"#CCCCCC"]; item.titleColor = [UIColor fus_textColorRich];
item.rightShowTextFont = [UIFont systemFontOfSize:16 weight:UIFontWeightLight]; item.rightShowTextFont = [UIFont systemFontOfSize:16 weight:UIFontWeightLight];
item.rightShowTextColor = [UIColor colorWithHex:@"#808080"]; item.rightShowTextColor = [UIColor colorWithHex:@"#808080"];
......
FuSiLive/Classes/Foundation/DataStores/FUSCustomizedInfosStore.h
...@@ -56,6 +56,10 @@ ...@@ -56,6 +56,10 @@
#define RESOURCE_COMMON_INFO_DATA @"resourceCommonInfoData" #define RESOURCE_COMMON_INFO_DATA @"resourceCommonInfoData"
// 直播间文字链信息 // 直播间文字链信息
#define LIVE_CHARACTER_HYPERLINK_INFO @"characterHyperlinkInfo" #define LIVE_CHARACTER_HYPERLINK_INFO @"characterHyperlinkInfo"
// Fusi-首页语言分类配置
#define STORE_HOME_LANGUAGE_GET_LIST @"STORE_HOME_LANGUAGE_GET_LIST"
// 获取直播房间列表
#define STORE_HOME_VEST_ROOM_GET_LIST @"STORE_HOME_VEST_ROOM_GET_LIST"
@interface FUSCustomizedInfosStore : NSObject @interface FUSCustomizedInfosStore : NSObject
......
FuSiLive/Classes/Foundation/Http/FUSURLDictionary.h
...@@ -1101,6 +1101,12 @@ ...@@ -1101,6 +1101,12 @@
// 测试服首页包房的地址 // 测试服首页包房的地址
#define URL_WEB_TEST_BAOFANG_ACTIVE_URL @"http://test.ybact.yazhaiyabo.com/active2021/activityCenter/index.html" #define URL_WEB_TEST_BAOFANG_ACTIVE_URL @"http://test.ybact.yazhaiyabo.com/active2021/activityCenter/index.html"
// 账号管理
#define URL_WEB_ACCOUNT_MANAGER DNS_WEB(@"/Nesting/logOff/index.html")
// 首页-榜单
#define URL_WEB_HOME_RANK DNS_WEB(@"/allRank/index.html")
// ================================= FuSi 新接口 ================================= // ================================= FuSi 新接口 =================================
#pragma mark - 登录注册相关 #pragma mark - 登录注册相关
// 校验密码 // 校验密码
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomeView.m
...@@ -56,6 +56,8 @@ ...@@ -56,6 +56,8 @@
[self fus_setup]; [self fus_setup];
[self fus_createUI]; [self fus_createUI];
self.languageSegmentView.otherNamesList = self.viewModel.otherLanguageNamesList;
self.languageSegmentView.selectName = self.viewModel.selectLanguageName;
[self.collectionView.mj_header beginRefreshing]; [self.collectionView.mj_header beginRefreshing];
} }
return self; return self;
...@@ -112,7 +114,6 @@ ...@@ -112,7 +114,6 @@
self.collectionView.mj_header = [FUSRefreshHeader headerWithRefreshingBlock:^{ self.collectionView.mj_header = [FUSRefreshHeader headerWithRefreshingBlock:^{
[self.viewModel fus_reloadData]; [self.viewModel fus_reloadData];
}]; }];
self.collectionView.mj_header.backgroundColor = [UIColor fus_appSubColor];
} }
- (void)layoutSubviews{ - (void)layoutSubviews{
...@@ -121,6 +122,12 @@ ...@@ -121,6 +122,12 @@
self.collectionView.frame = self.bounds; self.collectionView.frame = self.bounds;
} }
- (void)fus_tabbarDidClicked:(BOOL)isRefresh{
if (isRefresh) {
[self.collectionView.mj_header beginRefreshing];
}
}
#pragma mark --- method #pragma mark --- method
-(void)fus_enterRoom:(FUSBaoFangAnchorModel *)model index:(NSInteger)index{ -(void)fus_enterRoom:(FUSBaoFangAnchorModel *)model index:(NSInteger)index{
[FUSBaoFangViewHelper fus_clickBaofangItemAtIndex:model type:FUSAnchorHotData controllerType:FUSBaoFangControllerTypeMainLive index:index onLiveRooms:self.viewModel.onlyLiveRoomList]; [FUSBaoFangViewHelper fus_clickBaofangItemAtIndex:model type:FUSAnchorHotData controllerType:FUSBaoFangControllerTypeMainLive index:index onLiveRooms:self.viewModel.onlyLiveRoomList];
...@@ -133,7 +140,6 @@ ...@@ -133,7 +140,6 @@
- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
FUSHomeAnchorListSmallCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"FUSHomeAnchorListSmallCell" forIndexPath:indexPath]; FUSHomeAnchorListSmallCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"FUSHomeAnchorListSmallCell" forIndexPath:indexPath];
cell.contentView.backgroundColor = [UIColor yellowColor];
cell.model = self.viewModel.dataList[indexPath.row]; cell.model = self.viewModel.dataList[indexPath.row];
return cell; return cell;
...@@ -245,6 +251,18 @@ ...@@ -245,6 +251,18 @@
}]; }];
} }
break; break;
case FUSHomeNaviViewClickTypeRank:{
FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
// wkwVC.shouldShowShareBtn = NO;
// wkwVC.needShowReload = YES;
// wkwVC.from = FUSFromInvitShare;
// wkwVC.shouldIncludeIdentifyInfo = YES;
wkwVC.needHideWebTitleBar = YES;
//TODO: 暂时写死榜单的，等阿甘回来再说,URL_WEB_HOME_RANK这个定义里有地址
wkwVC.webUrlString = @"https://ceshi.yabolive.tv/fusi/allRank/index.html";
[self.parentController.navigationController pushViewController:wkwVC animated:YES];
}
break;
default: default:
break; break;
} }
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMessageView.m
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
-(void)fus_createMessageColumn{ -(void)fus_createMessageColumn{
//分页控制 //分页控制
_segCtrlView = [[FUSSegmentControlView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, 38) withItems:@[FUSLocalizationHelper.versionLocalString(@"私信"),FUSLocalizationHelper.versionLocalString(@"亲密")]]; _segCtrlView = [[FUSSegmentControlView alloc] initWithFrame:CGRectMake(8, 0, UIView.fus_screenW - 16, 38) withItems:@[FUSLocalizationHelper.versionLocalString(@"私信"),FUSLocalizationHelper.versionLocalString(@"亲密")]];
// [_segCtrlView fus_setUnderLineSelectedImage:[UIImage imageNamed:@"common_icon_segment_selected"]]; // [_segCtrlView fus_setUnderLineSelectedImage:[UIImage imageNamed:@"common_icon_segment_selected"]];
_segCtrlView.itemSelectedFont = [UIFont fus_themeBoldFont:18]; _segCtrlView.itemSelectedFont = [UIFont fus_themeBoldFont:18];
_segCtrlView.itemFont = [UIFont fus_themeBoldFont:18]; _segCtrlView.itemFont = [UIFont fus_themeBoldFont:18];
...@@ -175,11 +175,11 @@ ...@@ -175,11 +175,11 @@
} }
[self addSubview:_segCtrlView]; [self addSubview:_segCtrlView];
[_segCtrlView mas_makeConstraints:^(MASConstraintMaker *make) { [_segCtrlView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.offset(0); make.left.right.inset(16);
make.top.equalTo(self.headerStackView.mas_bottom); make.top.equalTo(self.headerStackView.mas_bottom);
make.height.offset(38); make.height.offset(38);
}]; }];
[_segCtrlView fus_setSelectedItem:0 autoCallBack:NO]; [_segCtrlView fus_setSegmentSlidePositionType:FUSSegmentControlSlideToLeft];
WEAKSELF; WEAKSELF;
_segCtrlView.selectItemBlock = ^(NSInteger index, NSString *itemText) { _segCtrlView.selectItemBlock = ^(NSInteger index, NSString *itemText) {
...@@ -258,7 +258,7 @@ ...@@ -258,7 +258,7 @@
if ( scrollView == self.scrollView ) { if ( scrollView == self.scrollView ) {
NSInteger index = (NSInteger)(scrollView.contentOffset.x/scrollView.width + 0.5); NSInteger index = (NSInteger)(scrollView.contentOffset.x/scrollView.width + 0.5);
if (index >= 0 && index < self.segCtrlView.currentItemTitles.count) { if (index >= 0 && index < self.segCtrlView.itemTitles.count) {
[self.segCtrlView fus_setSelectedItem:index autoCallBack:NO]; [self.segCtrlView fus_setSelectedItem:index autoCallBack:NO];
} }
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyHeaderView.m
...@@ -174,6 +174,7 @@ ...@@ -174,6 +174,7 @@
}]; }];
UIImageView *topBottomBgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"fus_my_setting_header_contentBottom_bg"]]; UIImageView *topBottomBgImageView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"fus_my_setting_header_contentBottom_bg"]];
topBottomBgImageView.userInteractionEnabled = YES;
[topBgView addSubview:topBottomBgImageView]; [topBgView addSubview:topBottomBgImageView];
[topBottomBgImageView mas_makeConstraints:^(MASConstraintMaker *make) { [topBottomBgImageView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.bottom.offset(0); make.left.right.bottom.offset(0);
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomeViewViewModel.h
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
// //
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#import "FUSHomeLanguageGetlistModel.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
...@@ -34,6 +35,13 @@ typedef enum :NSInteger{ ...@@ -34,6 +35,13 @@ typedef enum :NSInteger{
@interface FUSHomeViewViewModel : NSObject @interface FUSHomeViewViewModel : NSObject
// 语言列表
/// 当前选中的语言名称
@property (nonatomic, strong) NSString *selectLanguageName;
/// 其他语言名称
@property (nonatomic, strong) NSMutableArray<NSString *> *otherLanguageNamesList;
// 主播列表
/// 数据请求返回的数据（直播、动态入口、banner、动态四种数据合并的列表） /// 数据请求返回的数据（直播、动态入口、banner、动态四种数据合并的列表）
@property (nonatomic, strong) NSMutableArray<FUSBaoFangAnchorModel *> * _Nullable dataList; @property (nonatomic, strong) NSMutableArray<FUSBaoFangAnchorModel *> * _Nullable dataList;
/// 只有直播间的数据列表，用来上下滚动直播间的 /// 只有直播间的数据列表，用来上下滚动直播间的
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomeViewViewModel.m
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
// //
#import "FUSHomeViewViewModel.h" #import "FUSHomeViewViewModel.h"
#import "FUSBaoFangHttpHelper.h" #import "FUSBaoFangCacheOperate.h"
#import "FUSDefine.h" #import "FUSDefine.h"
...@@ -36,16 +36,17 @@ ...@@ -36,16 +36,17 @@
self = [super init]; self = [super init];
if (self) { if (self) {
self.isFirstLoad = YES; self.isFirstLoad = YES;
[self fus_loadHomeLanguageListWithAnchorList:YES readFrom:ReadCacheFromTypeLocal];
[self fus_loadhomeVestFollowGetlistAutoCall:NO]; [self fus_loadhomeVestFollowGetlistAutoCall:NO];
} }
return self; return self;
} }
#pragma mark --- net work #pragma mark --- net work
/// 请求语言列表
-(void)fus_loadHomeLanguageListWithAnchorList:(BOOL)shouldLoadAnchorList{ -(void)fus_loadHomeLanguageListWithAnchorList:(BOOL)shouldLoadAnchorList readFrom:(ReadCacheFromType)readFrom{
[FUSBaoFangHttpHelper fus_homeLanguageGetlistSuccess:^(NSArray<FUSHomeLanguageGetlistModel *> *languageList) { [FUSBaoFangCacheOperate fus_homeLanguageGetlist:readFrom success:^(NSArray<FUSHomeLanguageGetlistModel *> *languageList) {
self.homeLanguageGetList = languageList; self.homeLanguageGetList = languageList;
if (self.isFirstLoad && self.homeLanguageGetList.count > 0) { if (self.isFirstLoad && self.homeLanguageGetList.count > 0) {
...@@ -96,7 +97,7 @@ ...@@ -96,7 +97,7 @@
[self fus_updateSelectLanguageModel]; [self fus_updateSelectLanguageModel];
if (shouldLoadAnchorList) { if (shouldLoadAnchorList) {
[self fus_loadvestRoomGetlistAutoCall:YES]; [self fus_loadvestRoomGetlistAutoCall:YES readFrom:readFrom];
} }
} failure:^(NSString *msg, int code) { } failure:^(NSString *msg, int code) {
...@@ -111,9 +112,10 @@ ...@@ -111,9 +112,10 @@
}]; }];
} }
/// 请求主播列表
-(void)fus_loadvestRoomGetlistAutoCall:(BOOL)autoCall{ -(void)fus_loadvestRoomGetlistAutoCall:(BOOL)autoCall readFrom:(ReadCacheFromType)readFrom{
[FUSBaoFangHttpHelper fus_homeVestRoomGetlistSuccess:^(NSArray<FUSBaoFangAnchorModel *> *modelList) {
[FUSBaoFangCacheOperate fus_homeVestRoomGetlist:readFrom success:^(NSArray<FUSBaoFangAnchorModel *> *modelList) {
self.anchorOriginalList = modelList; self.anchorOriginalList = modelList;
[self.onlyLiveRoomList removeAllObjects]; [self.onlyLiveRoomList removeAllObjects];
...@@ -135,6 +137,7 @@ ...@@ -135,6 +137,7 @@
}]; }];
} }
///请求推荐列表
-(void)fus_loadhomeVestFollowGetlistAutoCall:(BOOL)autoCall{ -(void)fus_loadhomeVestFollowGetlistAutoCall:(BOOL)autoCall{
[FUSBaoFangHttpHelper fus_requestHomeVestFollowGetlistType:0 success:^(NSMutableArray<FUSBaoFangAnchorModel *> *modelList, FUSBaoFangAnchorModel *recommendModel) { [FUSBaoFangHttpHelper fus_requestHomeVestFollowGetlistType:0 success:^(NSMutableArray<FUSBaoFangAnchorModel *> *modelList, FUSBaoFangAnchorModel *recommendModel) {
...@@ -165,9 +168,9 @@ ...@@ -165,9 +168,9 @@
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]; [self fus_loadHomeLanguageListWithAnchorList:YES readFrom:ReadCacheFromTypeServer];
}else { }else {
[self fus_loadvestRoomGetlistAutoCall:YES]; [self fus_loadvestRoomGetlistAutoCall:YES readFrom:ReadCacheFromTypeServer];
} }
}else { }else {
[self fus_loadhomeVestFollowGetlistAutoCall:YES]; [self fus_loadhomeVestFollowGetlistAutoCall:YES];
...@@ -229,19 +232,20 @@ ...@@ -229,19 +232,20 @@
//存储一下 //存储一下
[[NSUserDefaults standardUserDefaults] setValue:self.selectLanguageModel == nil ? @"" : self.selectLanguageModel.language forKey:HOME_LANGUAGE_GET_LIST_SELECT_KEY]; [[NSUserDefaults standardUserDefaults] setValue:self.selectLanguageModel == nil ? @"" : self.selectLanguageModel.language forKey:HOME_LANGUAGE_GET_LIST_SELECT_KEY];
NSMutableArray *titleNamesList = [[NSMutableArray alloc] init]; [self.otherLanguageNamesList removeAllObjects];
[self.showingOtherLanguagelist removeAllObjects]; [self.showingOtherLanguagelist removeAllObjects];
for (FUSHomeLanguageGetlistModel *tempModel in self.homeLanguageGetList) { for (FUSHomeLanguageGetlistModel *tempModel in self.homeLanguageGetList) {
if (![tempModel.language isEqualToString:self.selectLanguageModel.language]) { if (![tempModel.language isEqualToString:self.selectLanguageModel.language]) {
[titleNamesList appendObject:tempModel.content]; [self.otherLanguageNamesList appendObject:tempModel.content];
[self.showingOtherLanguagelist addObject:tempModel]; [self.showingOtherLanguagelist addObject:tempModel];
} }
} }
self.selectLanguageName = self.selectLanguageModel == nil ? @"" : self.selectLanguageModel.content;
if (self.delegate && [self.delegate respondsToSelector:@selector(fus_homeViewViewModelLanguageListDidUpdate:others:)]) { if (self.delegate && [self.delegate respondsToSelector:@selector(fus_homeViewViewModelLanguageListDidUpdate:others:)]) {
[self.delegate fus_homeViewViewModelLanguageListDidUpdate:self.selectLanguageModel == nil ? @"" : self.selectLanguageModel.content others:titleNamesList]; [self.delegate fus_homeViewViewModelLanguageListDidUpdate:self.selectLanguageName others:self.otherLanguageNamesList];
} }
} }
...@@ -277,5 +281,11 @@ ...@@ -277,5 +281,11 @@
} }
return _onlyLiveRoomList; return _onlyLiveRoomList;
} }
- (NSMutableArray<NSString *> *)otherLanguageNamesList{
if (!_otherLanguageNamesList) {
_otherLanguageNamesList = [[NSMutableArray alloc] init];
}
return _otherLanguageNamesList;
}
@end @end
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/cell/FUSHomeAnchorCollectionViewSmallCell.h
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#import "FUSBaofangStreamPlayerView.h" #import "FUSBaofangStreamPlayerView.h"
//TODO: 用来抄以前的逻辑的，抄完就删除
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
@interface FUSHomeAnchorCollectionViewSmallCell : FUSBaofangBaseHomeLiveCell @interface FUSHomeAnchorCollectionViewSmallCell : FUSBaofangBaseHomeLiveCell
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/cell/FUSHomeAnchorListSmallCell.m
...@@ -80,6 +80,8 @@ ...@@ -80,6 +80,8 @@
self.tagView.itemSpace = 4; self.tagView.itemSpace = 4;
[self.contentView addSubview:self.tagView]; [self.contentView addSubview:self.tagView];
self.hotNumBtn.hidden = YES;
self.locationBtn.hidden = YES;
} }
- (UIView *)playerSuperView { - (UIView *)playerSuperView {
...@@ -130,16 +132,46 @@ ...@@ -130,16 +132,46 @@
self.tagView.hidden = NO; self.tagView.hidden = NO;
[self.tagView fus_refreshTagImagesWithModel:model]; [self.tagView fus_refreshTagImagesWithModel:model];
[self.bgImageView setWebImageWithSubURLString:model.face placeholder:[UIImage imageNamed:@"icon_baofang_default"]]; FUSWeakSelf(weakSelf);
[self.bgImageView setBaoFangCoverWebImageWithSubURLString:[FUSConfig.sharedInstanced.pathConfigs thumbImageUrl:model.face] placeholder:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
// 防止下载到图片的时候，cell已经被重用了
if (![url.absoluteString containsString:model.face]) {
return;
}
if (from != YYImageCacheTypeMemory) {
[UIView animateWithDuration:.1 animations:^{
weakSelf.bgImageView.alpha = 0;
}];
[UIView animateWithDuration:0.5 animations:^{
weakSelf.bgImageView.alpha = 1;
}];
}
}];
}else if (model.fus_itemType == 1 || model.fus_itemType == 2 || model.fus_itemType == 3){ }else if (model.fus_itemType == 1 || model.fus_itemType == 2 || model.fus_itemType == 3){
// 不是正常主播的卡片
self.nickNameLabel.hidden = YES; self.nickNameLabel.hidden = YES;
self.locationBtn.hidden = YES; self.locationBtn.hidden = YES;
self.hotNumBtn.hidden = YES; self.hotNumBtn.hidden = YES;
self.tagView.hidden = YES; self.tagView.hidden = YES;
[self.bgImageView setWebImageWithSubURLString:model.fus_insertModel.cover placeholder:[UIImage imageNamed:@"icon_baofang_default"]]; 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) {
// 防止下载到图片的时候，cell已经被重用了
if (![url.absoluteString containsString:model.face]) {
return;
}
if (from != YYImageCacheTypeMemory) {
[UIView animateWithDuration:.1 animations:^{
weakSelf.bgImageView.alpha = 0;
}];
[UIView animateWithDuration:0.5 animations:^{
weakSelf.bgImageView.alpha = 1;
}];
}
}];
} }
} }
......
FuSiLive/Classes/Login/Controller/FUSStartPageViewController.m
...@@ -55,13 +55,15 @@ ...@@ -55,13 +55,15 @@
#import <AuthenticationServices/AuthenticationServices.h> #import <AuthenticationServices/AuthenticationServices.h>
#import "FUSVideoPlayer.h" #import "FUSVideoPlayer.h"
#import "FUSStartPageSplashView.h"
#define BG_VIEW_STAYDURATION 5 #define BG_VIEW_STAYDURATION 5
@interface FUSStartPageViewController () <CLLocationManagerDelegate,ASAuthorizationControllerDelegate,ASAuthorizationControllerPresentationContextProviding> @interface FUSStartPageViewController () <CLLocationManagerDelegate,ASAuthorizationControllerDelegate,ASAuthorizationControllerPresentationContextProviding>
@property (strong, nonatomic) IBOutlet UIImageView *bgImageView; @property (strong, nonatomic) IBOutlet UIImageView *bgImageView;
@property (nonatomic, strong) UIImageView *splashImageView; @property (nonatomic, strong) FUSStartPageSplashView *startSplashView;
// AVPlayerLayer // AVPlayerLayer
...@@ -360,11 +362,9 @@ ...@@ -360,11 +362,9 @@
// 设置默认视图底色 // 设置默认视图底色
self.view.backgroundColor = [UIColor whiteColor]; self.view.backgroundColor = [UIColor whiteColor];
if (!_splashImageView) { if (!_startSplashView) {
// 背景图 _startSplashView = [[FUSStartPageSplashView alloc] initWithFrame:UIView.fus_screenFrame];
_splashImageView = [[UIImageView alloc] initWithFrame:UIView.fus_screenFrame]; [self.view addSubview:_startSplashView];
_splashImageView.contentMode = UIViewContentModeScaleAspectFill;
[self.view addSubview:_splashImageView];
} }
NSString *splashUrl = [[NSUserDefaults standardUserDefaults] objectForKey:SPLASH_IMAGE_URL]; NSString *splashUrl = [[NSUserDefaults standardUserDefaults] objectForKey:SPLASH_IMAGE_URL];
...@@ -373,14 +373,14 @@ ...@@ -373,14 +373,14 @@
if (FUSConfig.sharedInstanced.devConfigs.appStatus if (FUSConfig.sharedInstanced.devConfigs.appStatus
|| [NSString isNull:splashUrl] || [NSString isNull:splashUrl]
|| !isAutoLogin) { || !isAutoLogin) {
_splashImageView.image = [UIImage imageNamed:@"fireflyshow_start_page_image_v6000"]; // _splashImageView.image = [UIImage imageNamed:@"fireflyshow_start_page_image_v6000"];
_waitTime = 0; _waitTime = 0;
} else { } else {
UIImage *splashImage = [[YYWebImageManager sharedManager].cache getImageForKey:[FUSConfig.sharedInstanced.pathConfigs downloadPath:splashUrl]]; UIImage *splashImage = [[YYWebImageManager sharedManager].cache getImageForKey:[FUSConfig.sharedInstanced.pathConfigs downloadPath:splashUrl]];
if (splashImage) { if (splashImage) {
_waitTime = BG_VIEW_STAYDURATION; _waitTime = BG_VIEW_STAYDURATION;
_splashImageView.image = splashImage; [self.startSplashView fus_setImage:splashImage];
self.skipBtn.hidden = NO; self.skipBtn.hidden = NO;
[NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fus_onClickSkip) object:nil]; [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fus_onClickSkip) object:nil];
...@@ -388,7 +388,7 @@ ...@@ -388,7 +388,7 @@
[[NSRunLoop mainRunLoop] addTimer:self.skipTimer forMode:NSDefaultRunLoopMode]; [[NSRunLoop mainRunLoop] addTimer:self.skipTimer forMode:NSDefaultRunLoopMode];
} else { } else {
_waitTime = 0; _waitTime = 0;
[_splashImageView setWebImageWithSubURLString:splashUrl placeholder:[UIImage imageNamed:@"fireflyshow_start_page_image_v6000"] completion:nil]; [self.startSplashView fus_setWebImageURL:splashUrl];
} }
} }
...@@ -441,7 +441,7 @@ ...@@ -441,7 +441,7 @@
if (!self.protocolYYLabel) { if (!self.protocolYYLabel) {
self.protocolYYLabel = [YYLabel new]; self.protocolYYLabel = [YYLabel new];
[self.view insertSubview:self.protocolYYLabel belowSubview:_splashImageView]; [self.view insertSubview:self.protocolYYLabel belowSubview:_startSplashView];
} }
YYTextLayout *layout = [YYTextLayout layoutWithContainerSize:CGSizeMake(UIView.fus_screenW - 30, MAXFLOAT) text:protocolAttriStr]; YYTextLayout *layout = [YYTextLayout layoutWithContainerSize:CGSizeMake(UIView.fus_screenW - 30, MAXFLOAT) text:protocolAttriStr];
...@@ -476,7 +476,7 @@ ...@@ -476,7 +476,7 @@
self.videoPlayer.isReplayWhenfinish = YES; self.videoPlayer.isReplayWhenfinish = YES;
self.videoPlayer.cancelBecomeActiveNotification = YES; self.videoPlayer.cancelBecomeActiveNotification = YES;
self.videoPlayer.cancelResignActiveNotification = YES; self.videoPlayer.cancelResignActiveNotification = YES;
self.videoPlayer.videoGravity = FUSVideoGravityResizeAspectFill; self.videoPlayer.videoGravity = FUSVideoGravityResizeAspectTop;
[self.videoPlayer fus_playVideoWithURL:url]; [self.videoPlayer fus_playVideoWithURL:url];
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(logoViewTap)]; UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(logoViewTap)];
...@@ -660,10 +660,10 @@ ...@@ -660,10 +660,10 @@
__weak typeof(self) weakSelf = self; __weak typeof(self) weakSelf = self;
[self showLoginViewFinished:^{ [self showLoginViewFinished:^{
[UIView animateWithDuration:1 animations:^{ [UIView animateWithDuration:1 animations:^{
weakSelf.splashImageView.alpha = 0; weakSelf.startSplashView.alpha = 0;
weakSelf.skipBtn.hidden = YES; weakSelf.skipBtn.hidden = YES;
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
[weakSelf.splashImageView removeFromSuperview]; [weakSelf.startSplashView removeFromSuperview];
if (weakSelf.model) { if (weakSelf.model) {
[weakSelf fus_showUpdateViewWith:weakSelf.model]; [weakSelf fus_showUpdateViewWith:weakSelf.model];
...@@ -698,9 +698,9 @@ ...@@ -698,9 +698,9 @@
} }
[UIView animateWithDuration:1 animations:^{ [UIView animateWithDuration:1 animations:^{
weakSelf.splashImageView.alpha = 0; weakSelf.startSplashView.alpha = 0;
} completion:^(BOOL finished) { } completion:^(BOOL finished) {
[weakSelf.splashImageView removeFromSuperview]; [weakSelf.startSplashView removeFromSuperview];
if (weakSelf.model) { if (weakSelf.model) {
[weakSelf fus_showUpdateViewWith:_model]; [weakSelf fus_showUpdateViewWith:_model];
......
FuSiLive/Classes/Login/View/FUSStartPageSplashView.h 0 → 100644
//
// FUSStartPageSplashView.h
// FuSiLive
//
// Created by aaa on 2024/6/21.
//
#import <UIKit/UIKit.h>
NS_ASSUME_NONNULL_BEGIN
@interface FUSStartPageSplashView : UIView
-(void)fus_setWebImageURL:(NSString *)urlStr;
-(void)fus_setImage:(UIImage *)image;
@end
NS_ASSUME_NONNULL_END
FuSiLive/Classes/Login/View/FUSStartPageSplashView.m 0 → 100644
//
// FUSStartPageSplashView.m
// FuSiLive
//
// Created by aaa on 2024/6/21.
//
#import "FUSStartPageSplashView.h"
#import <Masonry/Masonry.h>
@interface FUSStartPageSplashView ()
@property (nonatomic, strong) UIImageView *logoImgView;
@property (nonatomic, strong) UILabel *descLabel;
@property (nonatomic, strong) UIImageView *networkImgView;
@end
@implementation FUSStartPageSplashView
- (instancetype)init
{
self = [super init];
if (self) {
[self fus_createUI];
}
return self;
}
- (instancetype)initWithFrame:(CGRect)frame
{
self = [super initWithFrame:frame];
if (self) {
[self fus_createUI];
}
return self;
}
-(void)fus_createUI{
self.backgroundColor = [UIColor whiteColor];
NSString *imagePath = [[NSBundle mainBundle] pathForResource:@"fus_startSplash_logo_image_v1" ofType:@"png"];
UIImage *image = [UIImage imageWithContentsOfFile:imagePath];
self.logoImgView = [[UIImageView alloc] initWithImage:image];
[self addSubview:self.logoImgView];
[self.logoImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.right.left.inset(10);
make.centerY.offset(-80);
make.width.equalTo(self.logoImgView.mas_height).multipliedBy(393/293.f);
}];
self.descLabel = [[UILabel alloc] init];
self.descLabel.font = [UIFont systemFontOfSize:17];
self.descLabel.textColor = [UIColor blackColor];
self.descLabel.textAlignment = NSTextAlignmentRight;
self.descLabel.text = @"FusiClub.com";
[self addSubview:self.descLabel];
[self.descLabel mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.inset(24);
make.bottom.offset(-20);
}];
self.networkImgView = [[UIImageView alloc] init];
self.networkImgView.hidden = YES;
[self addSubview:self.networkImgView];
[self.networkImgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self);
}];
}
- (void)fus_setWebImageURL:(NSString *)urlStr{
FUSWeakSelf(weakself);
[self.networkImgView setWebImageWithSubURLString:urlStr placeholder:nil completion:^(UIImage * _Nullable image, NSURL * _Nonnull url, YYWebImageFromType from, YYWebImageStage stage, NSError * _Nullable error) {
if (image != nil && error == nil) {
weakself.descLabel.hidden = YES;
weakself.logoImgView.hidden = YES;
}
}];
}
- (void)fus_setImage:(UIImage *)image{
if (!image) {
return;
}
self.networkImgView.image = image;
self.descLabel.hidden = YES;
self.logoImgView.hidden = YES;
}
@end
FuSiLive/Classes/Payment/Controller/FUSExchangeDiamondViewController.m
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
@interface FUSExchangeDiamondViewController () <UITableViewDataSource, UITableViewDelegate> @interface FUSExchangeDiamondViewController () <UITableViewDataSource, UITableViewDelegate>
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *tableHeightCons; @property (weak, nonatomic) IBOutlet NSLayoutConstraint *tableHeightCons;
@property (weak, nonatomic) IBOutlet UIImageView *headerBgImgView;
//@property (weak, nonatomic) IBOutlet UILabel *bondLabel; //@property (weak, nonatomic) IBOutlet UILabel *bondLabel;
@property (weak, nonatomic) IBOutlet UILabel *diamondLabel; @property (weak, nonatomic) IBOutlet UILabel *diamondLabel;
...@@ -51,6 +52,20 @@ ...@@ -51,6 +52,20 @@
// 计算TableView高度 // 计算TableView高度
[self calculateTableViewHeight]; [self calculateTableViewHeight];
//fusi 特殊化
UIView *headerBgLayerView = [[UIView alloc] init];
headerBgLayerView.backgroundColor = [UIColor whiteColor];
headerBgLayerView.layer.cornerRadius = 12;
headerBgLayerView.layer.shadowColor = [UIColor fus_shadowColor].CGColor;
headerBgLayerView.layer.shadowOpacity = 0.3;
headerBgLayerView.layer.shadowOffset = CGSizeMake(0, 2);
// headerBgLayerView.layer.shadowRadius = 12;
[self.headerBgImgView insertSubview:headerBgLayerView atIndex:0];
[headerBgLayerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.inset(18);
make.top.bottom.inset(10);
}];
} }
- (void)viewWillAppear:(BOOL)animated - (void)viewWillAppear:(BOOL)animated
......
FuSiLive/Classes/Payment/Controller/FUSExchangeDiamondViewController.xib
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait"> <device id="retina4_7" orientation="portrait" appearance="light"/>
<adaptation id="fullscreen"/>
</device>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies> </dependencies>
<objects> <objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FUSExchangeDiamondViewController"> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FUSExchangeDiamondViewController">
<connections> <connections>
<outlet property="diamondLabel" destination="2i0-3C-TMh" id="Yeg-hG-0d8"/> <outlet property="diamondLabel" destination="2i0-3C-TMh" id="Yeg-hG-0d8"/>
<outlet property="headerBgImgView" destination="4dQ-V4-2vS" id="VGK-0g-IlP"/>
<outlet property="tableView" destination="faM-Ff-o5o" id="ydW-Fl-QtF"/> <outlet property="tableView" destination="faM-Ff-o5o" id="ydW-Fl-QtF"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/> <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
</connections> </connections>
...@@ -24,7 +23,7 @@ ...@@ -24,7 +23,7 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="E4W-JR-rXx"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="E4W-JR-rXx">
<rect key="frame" x="0.0" y="0.0" width="375" height="160"/> <rect key="frame" x="0.0" y="0.0" width="375" height="160"/>
<subviews> <subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fire_exchange_diamond_header_bg" translatesAutoresizingMaskIntoConstraints="NO" id="4dQ-V4-2vS"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4dQ-V4-2vS">
<rect key="frame" x="0.0" y="0.0" width="375" height="160"/> <rect key="frame" x="0.0" y="0.0" width="375" height="160"/>
</imageView> </imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zone_withdraw" translatesAutoresizingMaskIntoConstraints="NO" id="D4b-jC-PY1"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zone_withdraw" translatesAutoresizingMaskIntoConstraints="NO" id="D4b-jC-PY1">
...@@ -69,7 +68,6 @@ ...@@ -69,7 +68,6 @@
</view> </view>
</objects> </objects>
<resources> <resources>
<image name="fire_exchange_diamond_header_bg" width="375" height="160"/>
<image name="zone_withdraw" width="40" height="40"/> <image name="zone_withdraw" width="40" height="40"/>
</resources> </resources>
</document> </document>
FuSiLive/Classes/Payment/Controller/FUSRechargeViewController.m
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
@property (weak, nonatomic) IBOutlet UIView *normalView; @property (weak, nonatomic) IBOutlet UIView *normalView;
@property (nonatomic, copy) NSArray *dataSource; @property (nonatomic, copy) NSArray *dataSource;
@property (weak, nonatomic) IBOutlet UIImageView *rechargeHeaderBgImgView;
// 充值点首充信息 // 充值点首充信息
@property (nonatomic, copy) NSDictionary *rechargeInfoDicts; @property (nonatomic, copy) NSDictionary *rechargeInfoDicts;
...@@ -243,7 +244,8 @@ ...@@ -243,7 +244,8 @@
[FUSPaymentHttpHelper fus_doStartRechargePageStatisticsWithSuccess:nil failure:nil]; [FUSPaymentHttpHelper fus_doStartRechargePageStatisticsWithSuccess:nil failure:nil];
FUSButton *backButton = [[FUSButton alloc]initWithFrame:CGRectMake(0, 0, 44, 44)]; FUSButton *backButton = [[FUSButton alloc]initWithFrame:CGRectMake(0, 0, 44, 44)];
UIImage *backImage = [UIImage imageNamed:[FUSRTL RTLImageName:@"common_navigation_back_white"]]; // UIImage *backImage = [UIImage imageNamed:[FUSRTL RTLImageName:@"common_navigation_back_white"]];
UIImage *backImage = [UIImage imageNamed:@"fus_common_navigation_back_black"];
[backButton setImage:backImage forState:UIControlStateNormal]; [backButton setImage:backImage forState:UIControlStateNormal];
backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
...@@ -303,6 +305,23 @@ ...@@ -303,6 +305,23 @@
[FUSTalkingData fus_trackEvent:EVENT_RECHARGE_OFFICIAL_PAGE label:@"" parameters:@{@"fireflyid":[FUSCacheDataShare shareStore].userDetailInfo.uid, [FUSTalkingData fus_trackEvent:EVENT_RECHARGE_OFFICIAL_PAGE label:@"" parameters:@{@"fireflyid":[FUSCacheDataShare shareStore].userDetailInfo.uid,
@"PKG":FUSConfig.sharedInstanced.appConfigs.appPKG, @"PKG":FUSConfig.sharedInstanced.appConfigs.appPKG,
@"from":from}]; @"from":from}];
//fusi特殊处理
[self.exchangeBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[self.exchangeBtn setImage:[[UIImage imageNamed:@"zone_account_exchange_diamond"] imageByTintColor:[UIColor fus_textColorRich]] forState:UIControlStateNormal];
UIView *headerBgLayerView = [[UIView alloc] init];
headerBgLayerView.backgroundColor = [UIColor whiteColor];
headerBgLayerView.layer.cornerRadius = 12;
headerBgLayerView.layer.shadowColor = [UIColor fus_shadowColor].CGColor;
headerBgLayerView.layer.shadowOpacity = 0.3;
headerBgLayerView.layer.shadowOffset = CGSizeMake(0, 2);
// headerBgLayerView.layer.shadowRadius = 12;
[self.rechargeHeaderBgImgView insertSubview:headerBgLayerView atIndex:0];
[headerBgLayerView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.right.inset(18);
make.top.bottom.inset(10);
}];
} }
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated {
......
FuSiLive/Classes/Payment/View/FUSRechargeTableViewCell.m
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
[self.diamondButton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, 0)]; [self.diamondButton setContentEdgeInsets:UIEdgeInsetsMake(0, 10, 0, 0)];
self.firstChargeRewardLabel.text = FUSLocalizationHelper.localString(@"First time"); self.firstChargeRewardLabel.text = FUSLocalizationHelper.localString(@"First time");
[self.diamondButton setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
} }
- (void)setModel:(FUSPaymentRechargeModel *)model - (void)setModel:(FUSPaymentRechargeModel *)model
......
FuSiLive/Classes/Setting/Controller/FUSSettingViewController.m
...@@ -213,7 +213,17 @@ ...@@ -213,7 +213,17 @@
[weakSelf.navigationController pushViewController:[[FUSBlackListViewController alloc] init] animated:YES]; [weakSelf.navigationController pushViewController:[[FUSBlackListViewController alloc] init] animated:YES];
}; };
group2.items = @[_item2,_item3,_item4,blackItem]; FUSCustomSettingItem *accManagerItem = [FUSCustomSettingItem fus_itemWithTitle:FUSLocalizationHelper.localString(@"账号管理") type:CustomSettingItemTypeArrow];
accManagerItem.itemClick = ^(FUSCustomSettingItem *item){
FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
// wkwVC.needShowReload = YES;
// wkwVC.shouldIncludeIdentifyInfo = YES;
// wkwVC.needHideWebTitleBar = YES;
wkwVC.webUrlString = URL_WEB_ACCOUNT_MANAGER;
[weakSelf.navigationController pushViewController:wkwVC animated:YES];
};
group2.items = @[_item2,_item3,_item4,blackItem,accManagerItem];
[self.allGroups addObject:group2]; [self.allGroups addObject:group2];
// 第五组 // 第五组
...@@ -281,29 +291,30 @@ ...@@ -281,29 +291,30 @@
[self.allGroups addObject:_liveRoomSettingGroup]; [self.allGroups addObject:_liveRoomSettingGroup];
if (!FUSConfig.sharedInstanced.devConfigs.appStatus) { #warning ludi:这里大仙说渔歌那边让他去掉，那我也先隐藏
FUSCustomSettingItem *chatItem = [FUSCustomSettingItem fus_itemWithTitle:FUSLocalizationHelper.localString(@"通话设置") type:CustomSettingItemTypeArrow]; // if (!FUSConfig.sharedInstanced.devConfigs.appStatus) {
chatItem.itemClick = ^(FUSCustomSettingItem *item) { // FUSCustomSettingItem *chatItem = [FUSCustomSettingItem fus_itemWithTitle:FUSLocalizationHelper.localString(@"通话设置") type:CustomSettingItemTypeArrow];
FUSChatSettingViewController *chatSetting = [[FUSChatSettingViewController alloc] init]; // chatItem.itemClick = ^(FUSCustomSettingItem *item) {
[weakSelf.navigationController pushViewController:chatSetting animated:YES]; // FUSChatSettingViewController *chatSetting = [[FUSChatSettingViewController alloc] init];
}; // [weakSelf.navigationController pushViewController:chatSetting animated:YES];
// };
FUSCustomSettingGroup *vChatGroup = [FUSCustomSettingGroup fus_settingGroup]; //
// FUSCustomSettingGroup *vChatGroup = [FUSCustomSettingGroup fus_settingGroup];
vChatGroup.groupHeaderHeight = 40; //
vChatGroup.groupHeaderOriginY = 10; // vChatGroup.groupHeaderHeight = 40;
vChatGroup.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"]; // vChatGroup.groupHeaderOriginY = 10;
vChatGroup.groupHeaderTextFont = [UIFont fus_themeFont:12]; // vChatGroup.groupHeaderTextColor = [UIColor colorWithHex:@"#4D4D4D"];
vChatGroup.groupHeaderText = FUSLocalizationHelper.localString(@"约会设置"); // vChatGroup.groupHeaderTextFont = [UIFont fus_themeFont:12];
// vChatGroup.groupHeaderText = FUSLocalizationHelper.localString(@"约会设置");
vChatGroup.groupFooterTextBgColor = [UIColor colorWithHex:@"#2B3238" alpha:0.5]; //
vChatGroup.groupFooterOriginY = 6; // vChatGroup.groupFooterTextBgColor = [UIColor colorWithHex:@"#2B3238" alpha:0.5];
vChatGroup.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2; // vChatGroup.groupFooterOriginY = 6;
vChatGroup.groupFooterOriginX = 16; // vChatGroup.groupFooterHeight = 0.5 + group1.groupFooterOriginY * 2;
vChatGroup.items = @[chatItem]; // vChatGroup.groupFooterOriginX = 16;
// vChatGroup.items = @[chatItem];
[self.allGroups addObject:vChatGroup]; //
} // [self.allGroups addObject:vChatGroup];
// }
_privateChatItem = [FUSCustomSettingItem fus_itemWithTitle:FUSLocalizationHelper.localString(@"自动匹配") type:CustomSettingItemTypeSwitch]; _privateChatItem = [FUSCustomSettingItem fus_itemWithTitle:FUSLocalizationHelper.localString(@"自动匹配") type:CustomSettingItemTypeSwitch];
...@@ -510,6 +521,7 @@ ...@@ -510,6 +521,7 @@
// 第七组 // 第七组
_item14 = [FUSCustomSettingItem fus_itemWithTitle:nil type:CustomSettingItemTypeCenterShowText]; _item14 = [FUSCustomSettingItem fus_itemWithTitle:nil type:CustomSettingItemTypeCenterShowText];
_item14.centerShowText = FUSLocalizationHelper.localString(@"退出登录"); _item14.centerShowText = FUSLocalizationHelper.localString(@"退出登录");
_item14.centerShowTextColor = [UIColor fus_textColorRich];
_item14.itemClick = ^(FUSCustomSettingItem *item) { _item14.itemClick = ^(FUSCustomSettingItem *item) {
[FUSAlertView showAlertWithTitle:FUSLocalizationHelper.localString(@"退出后还可使用本帐号登录，但将收不到私信及主播动态") message:nil cancelButtonTitle:FUSLocalizationHelper.localString(@"取消") otherButtonTitles:@[FUSLocalizationHelper.localString(@"退出")] clickBlock:^(NSInteger buttonIndex) { [FUSAlertView showAlertWithTitle:FUSLocalizationHelper.localString(@"退出后还可使用本帐号登录，但将收不到私信及主播动态") message:nil cancelButtonTitle:FUSLocalizationHelper.localString(@"取消") otherButtonTitles:@[FUSLocalizationHelper.localString(@"退出")] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) { if (buttonIndex == 1) {
...@@ -527,7 +539,7 @@ ...@@ -527,7 +539,7 @@
group7.itemsHeight = kCenterShowTextSettingItemHeight; group7.itemsHeight = kCenterShowTextSettingItemHeight;
group7.items = @[_item14]; group7.items = @[_item14];
group7.itemsBgColor = [UIColor colorWithHex:@"#18181F"]; // group7.itemsBgColor = [UIColor colorWithHex:@"#18181F"];
[self.allGroups addObject:group7]; [self.allGroups addObject:group7];
} }
......
FuSiLive/Classes/ZhaiXin/IntimatesFriends/View/FUSIntimateFriendCell.m
...@@ -73,6 +73,8 @@ ...@@ -73,6 +73,8 @@
[self fus_addRightSwipeButtonsWithSwipeButtonModelArray:@[blackBtnModel]]; [self fus_addRightSwipeButtonsWithSwipeButtonModelArray:@[blackBtnModel]];
self.userStateImageView.animationDuration = 1; self.userStateImageView.animationDuration = 1;
self.nameLevelLabel.textColor = [UIColor fus_textColorRich];
} }
- (void)setModel:(FUSIntimatesFriendModel *)model { - (void)setModel:(FUSIntimatesFriendModel *)model {
......
FuSiLive/Classes/ZhaiXin/IntimatesFriends/View/FUSIntimateFriendTableView.m
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
self.isLoading = NO; self.isLoading = NO;
} failure:^(NSString *msg) { } failure:^(NSString *msg) {
self.isLoading = NO; self.isLoading = NO;
[FUSDialogView fus_showDialog:msg]; // [FUSDialogView fus_showDialog:msg];
}]; }];
} }
......
FuSiLive/Classes/ZhaiXin/Main/Controller/FUSIMZhaiXinViewController.m
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
{ {
CGFloat bgHeight = 155; CGFloat bgHeight = 155;
self.backgroudImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenW / 375.0f * bgHeight)]; self.backgroudImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenW / 375.0f * bgHeight)];
self.backgroudImageView.image = [UIImage imageNamed:@"baofang_bg_image"]; // self.backgroudImageView.image = [UIImage imageNamed:@"baofang_bg_image"];
[self.view addSubview:self.backgroudImageView]; [self.view addSubview:self.backgroudImageView];
__weak typeof(self) weakself = self; __weak typeof(self) weakself = self;
...@@ -123,9 +123,9 @@ ...@@ -123,9 +123,9 @@
FUSButton *backButton = [FUSButton buttonWithType:UIButtonTypeCustom]; FUSButton *backButton = [FUSButton buttonWithType:UIButtonTypeCustom];
backButton.hidden = YES; backButton.hidden = YES;
backButton.frame = CGRectMake(0, 0, self.navView.height, self.navView.height); backButton.frame = CGRectMake(0, 0, self.navView.height, self.navView.height);
UIImage *backImage = [UIImage imageNamed:[FUSRTL RTLImageName:@"common_navigation_back_white"]]; UIImage *backImage = [UIImage imageNamed:@"fus_common_navigation_back_black"];
[backButton setImage:backImage forState:UIControlStateNormal]; [backButton setImage:backImage forState:UIControlStateNormal];
backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft; // backButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
[backButton addTarget:self action:@selector(onClickNavBackBtn) forControlEvents:UIControlEventTouchUpInside]; [backButton addTarget:self action:@selector(onClickNavBackBtn) forControlEvents:UIControlEventTouchUpInside];
_settingBtn = [UIButton buttonWithType:UIButtonTypeCustom]; _settingBtn = [UIButton buttonWithType:UIButtonTypeCustom];
...@@ -205,6 +205,13 @@ ...@@ -205,6 +205,13 @@
_segCtrlView = [[FUSSegmentControlView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW*0.5, 38) withItems:_itemNames]; _segCtrlView = [[FUSSegmentControlView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW*0.5, 38) withItems:_itemNames];
[_segCtrlView fus_setUnderLineSelectedImage:[UIImage imageNamed:@"common_icon_segment_selected"]]; [_segCtrlView fus_setUnderLineSelectedImage:[UIImage imageNamed:@"common_icon_segment_selected"]];
_segCtrlView.itemSelectedFont = [UIFont fus_themeBoldFont:21]; _segCtrlView.itemSelectedFont = [UIFont fus_themeBoldFont:21];
[_segCtrlView fus_setItemTitleColor:[UIColor fus_textColorLight] forState:UIControlStateNormal];
[_segCtrlView fus_setItemTitleColor:[UIColor fus_textColorRich] forState:UIControlStateSelected];
if (_itemNames.count == 1) {
_segCtrlView.isShowUnderLine = NO;
}else {
_segCtrlView.isShowUnderLine = YES;
}
if (UIView.fus_screenW > 320) { if (UIView.fus_screenW > 320) {
_segCtrlView.space = 30; _segCtrlView.space = 30;
}else{ }else{
......
FuSiLive/Classes/ZhaiXin/Main/Other/FUSZhaiXinDBOperate.m
...@@ -128,6 +128,9 @@ ...@@ -128,6 +128,9 @@
if ([zhaiXinModel.typeId hasPrefix:OFFICIAL_MESSAGE]) continue; if ([zhaiXinModel.typeId hasPrefix:OFFICIAL_MESSAGE]) continue;
} }
// 暂时不要分享信息
if (([zhaiXinModel.typeId isEqualToString:NEWS_FEED_MESSAGE])) continue;
// 添加到模型数组 // 添加到模型数组
[zhaiXinModelArray addObject:zhaiXinModel]; [zhaiXinModelArray addObject:zhaiXinModel];
......
FuSiLive/Classes/ZhaiXin/Main/View/FUSZhaiXinTableView.m
...@@ -277,7 +277,8 @@ ...@@ -277,7 +277,8 @@
[_dataArray setArray:[FUSZhaiXinDBOperate fus_selectZhaiXinInfosTable]]; [_dataArray setArray:[FUSZhaiXinDBOperate fus_selectZhaiXinInfosTable]];
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)];
[emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:FUSLocalizationHelper.localString(@"您还没有收到私信") buttonTittle:nil]; [emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"com_icon_hot_no_data_empty"] title:FUSLocalizationHelper.localString(@"您还没有收到私信") buttonTittle:nil];
self.tableFooterView = emptyView; self.tableFooterView = emptyView;
} else { } else {
......
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSMyZoneViewController.m
...@@ -137,6 +137,7 @@ ...@@ -137,6 +137,7 @@
// 判断是否为自己的空间 // 判断是否为自己的空间
_isMyZone = ([_zoneUid isEqualToString:[[[FUSCacheDataShare shareStore] userDetailInfo] uid]]) ? YES : NO; _isMyZone = ([_zoneUid isEqualToString:[[[FUSCacheDataShare shareStore] userDetailInfo] uid]]) ? YES : NO;
_nickName.textColor = [UIColor fus_textColorRich];
[self fus_initUI]; [self fus_initUI];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_focusUserSucceed:) name:VIDEO_CHAT_ZONE_FOCUS object:nil]; [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_focusUserSucceed:) name:VIDEO_CHAT_ZONE_FOCUS object:nil];
...@@ -168,8 +169,9 @@ ...@@ -168,8 +169,9 @@
_topViewHeightConstraint.constant = 64; _topViewHeightConstraint.constant = 64;
} }
UIImage *backImage = [UIImage imageNamed:[FUSRTL RTLImageName:@"common_navigation_back_white"]]; UIImage *backImage = [UIImage imageNamed:[FUSRTL RTLImageName:@"fus_common_navigation_back_black"]];
[self.backBtn setImage:backImage forState:UIControlStateNormal]; [self.backBtn setImage:backImage forState:UIControlStateNormal];
[self.rightBtn setImage:nil forState:UIControlStateNormal];
} }
- (void)fus_initTableView { - (void)fus_initTableView {
...@@ -178,7 +180,7 @@ ...@@ -178,7 +180,7 @@
self.tableView = [[FUSMyZoneTableView alloc] initWithFrame:self.scollView.bounds style:UITableViewStylePlain rootVC:self]; self.tableView = [[FUSMyZoneTableView alloc] initWithFrame:self.scollView.bounds style:UITableViewStylePlain rootVC:self];
self.tableView.isMyZone = self.isMyZone; self.tableView.isMyZone = self.isMyZone;
self.tableView.clipsToBounds = NO; self.tableView.clipsToBounds = NO;
[self.scollView addSubview:self.bgImageView]; // [self.scollView addSubview:self.bgImageView];
[self.scollView addSubview:self.tableView]; [self.scollView addSubview:self.tableView];
self.tableView.scrollEnabled = NO; self.tableView.scrollEnabled = NO;
...@@ -698,9 +700,9 @@ ...@@ -698,9 +700,9 @@
- (void)fus_setTopView { - (void)fus_setTopView {
if (_isMyZone) { if (_isMyZone) {
_nickName.text = _zoneModel.nickname; _nickName.text = _zoneModel.nickname;
[_rightBtn setImage:[UIImage imageNamed:@"fireFly_my_zone_edit"] forState:UIControlStateNormal]; [_rightBtn setImage:[[UIImage imageNamed:@"fireFly_my_zone_edit"] imageByTintColor:[UIColor fus_textColorRich]] forState:UIControlStateNormal];
}else { }else {
[_rightBtn setImage:[UIImage imageNamed:@"icon_more"] forState:UIControlStateNormal]; [_rightBtn setImage:[[UIImage imageNamed:@"icon_more"] imageByTintColor:[UIColor fus_textColorRich]] forState:UIControlStateNormal];
if ([NSString isNull:_zoneModel.markName]) { if ([NSString isNull:_zoneModel.markName]) {
_nickName.text = _zoneModel.nickname; _nickName.text = _zoneModel.nickname;
}else { }else {
...@@ -898,17 +900,17 @@ ...@@ -898,17 +900,17 @@
return _canBeCallAnimationImgArr; return _canBeCallAnimationImgArr;
} }
- (UIImageView *)bgImageView { //- (UIImageView *)bgImageView {
if (!_bgImageView) { // if (!_bgImageView) {
UIImage *image = [[UIImage imageNamed:@"user_zone_bg_img"] fusrtl_imageFlippedForRightToLeftLayoutDirection]; // UIImage *image = [[UIImage imageNamed:@"user_zone_bg_img"] fusrtl_imageFlippedForRightToLeftLayoutDirection];
_bgImageView = [[UIImageView alloc] initWithImage:image]; // _bgImageView = [[UIImageView alloc] initWithImage:image];
_bgImageView.width = UIView.fus_screenW; // _bgImageView.width = UIView.fus_screenW;
_bgImageView.height = _bgImageView.width / image.size.width * image.size.height; // _bgImageView.height = _bgImageView.width / image.size.width * image.size.height;
_bgImageView.y = self.tableView.headerView.height; // _bgImageView.y = self.tableView.headerView.height;
_bgImageView.contentMode = UIViewContentModeScaleToFill; // _bgImageView.contentMode = UIViewContentModeScaleToFill;
} // }
//
return _bgImageView; // return _bgImageView;
} //}
@end @end
FuSiLive/Classes/Zone/View/FUSFollowTableViewCell.m
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
if (!_nickNameLabel) { if (!_nickNameLabel) {
_nickNameLabel = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(self.headerView.frame) + 8, 0, 0, 0)]; _nickNameLabel = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(self.headerView.frame) + 8, 0, 0, 0)];
_nickNameLabel.centerY = self.centerY; _nickNameLabel.centerY = self.centerY;
_nickNameLabel.textColor = [UIColor colorWithHex:@"#CCCCCC"]; _nickNameLabel.textColor = [UIColor fus_textColorRich];
_nickNameLabel.font = [UIFont fus_themeFont:15]; _nickNameLabel.font = [UIFont fus_themeFont:15];
} }
return _nickNameLabel; return _nickNameLabel;
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneFireCountCell.m
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
[super awakeFromNib]; [super awakeFromNib];
_receiveFireLabel.text = FUSLocalizationHelper.localString(@"收获萤火"); _receiveFireLabel.text = FUSLocalizationHelper.localString(@"收获萤火");
self.selectionStyle = UITableViewCellSelectionStyleNone; self.selectionStyle = UITableViewCellSelectionStyleNone;
self.receiveFireLabel.textColor = [UIColor fus_textColorRich];
} }
- (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,14 @@ ...@@ -46,6 +46,14 @@
_levelLabel.layer.masksToBounds = YES; _levelLabel.layer.masksToBounds = YES;
_focusLabel.text = FUSLocalizationHelper.localString(@"关注"); _focusLabel.text = FUSLocalizationHelper.localString(@"关注");
_fansLabel.text = FUSLocalizationHelper.localString(@"粉丝"); _fansLabel.text = FUSLocalizationHelper.localString(@"粉丝");
self.nickNameLabel.textColor = [UIColor fus_textColorRich];
self.nickNameLabel.font = [UIFont fus_themeBoldFont:22];
self.idLabel.textColor = [UIColor fus_textColorRich];
self.levelLabel.backgroundColor = [UIColor colorWithHex:@"#D6D6D7"];
self.levelLabel.textColor = [UIColor whiteColor];
self.fansNumLabel.textColor = [UIColor fus_textColorRich];
self.focusNumLabel.textColor = [UIColor fus_textColorRich];
} }
- (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone { - (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone {
...@@ -59,9 +67,9 @@ ...@@ -59,9 +67,9 @@
[super fus_setupCellWithModel:zoneModel isMyZone:isMyZone]; [super fus_setupCellWithModel:zoneModel isMyZone:isMyZone];
[self cleanCell]; [self cleanCell];
if ([NSString isNull:zoneModel.lev]) { if ([NSString isNull:zoneModel.lev]) {
_levelLabel.text = @"Lv0"; _levelLabel.text = @"0";
}else { }else {
_levelLabel.text = [NSString stringWithFormat:@"Lv%@",zoneModel.lev]; _levelLabel.text = [NSString stringWithFormat:@"%@",zoneModel.lev];
} }
if (zoneModel.sex.integerValue == 0) {//女 if (zoneModel.sex.integerValue == 0) {//女
...@@ -128,7 +136,7 @@ ...@@ -128,7 +136,7 @@
- (void)cleanCell { - (void)cleanCell {
_richImageView.hidden = YES; _richImageView.hidden = YES;
_levelLabel.text = @"Lv0"; _levelLabel.text = @"0";
[_sexAndAgeButton setTitle:@"0" forState:UIControlStateNormal]; [_sexAndAgeButton setTitle:@"0" forState:UIControlStateNormal];
[_sexAndAgeButton setImage:nil forState:UIControlStateNormal]; [_sexAndAgeButton setImage:nil forState:UIControlStateNormal];
[_sexAndAgeButton setBackgroundImage:nil forState:UIControlStateNormal]; [_sexAndAgeButton setBackgroundImage:nil forState:UIControlStateNormal];
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneInfoCell.xib
...@@ -39,24 +39,24 @@ ...@@ -39,24 +39,24 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="9dH-kC-IW1"> <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="9dH-kC-IW1">
<rect key="frame" x="106" y="22.5" width="28" height="16"/> <rect key="frame" x="100" y="22.5" width="28" height="16"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="16" id="SEY-Vh-cAs"/> <constraint firstAttribute="height" constant="16" id="SEY-Vh-cAs"/>
<constraint firstAttribute="width" constant="28" id="w6w-g5-fsR"/> <constraint firstAttribute="width" constant="28" id="w6w-g5-fsR"/>
</constraints> </constraints>
</imageView> </imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Nv-7x-6lv" userLabel="richButton"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4Nv-7x-6lv" userLabel="richButton">
<rect key="frame" x="106" y="22.5" width="28" height="16"/> <rect key="frame" x="100" y="22.5" width="28" height="16"/>
<connections> <connections>
<action selector="fus_clickRichBtnAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="BuP-ta-Vnt"/> <action selector="fus_clickRichBtnAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="BuP-ta-Vnt"/>
</connections> </connections>
</button> </button>
<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="144" y="22.5" width="32" height="16"/> <rect key="frame" x="132" y="22.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"/>
<constraint firstAttribute="width" secondItem="W2o-3M-oQx" secondAttribute="height" multiplier="2:1" id="TgE-xt-DZp"/> <constraint firstAttribute="width" secondItem="W2o-3M-oQx" secondAttribute="height" multiplier="1.4:1" id="TgE-xt-DZp"/>
</constraints> </constraints>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="10"/> <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="10"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
...@@ -152,13 +152,13 @@ ...@@ -152,13 +152,13 @@
<constraint firstItem="Yif-2n-DuE" firstAttribute="leading" secondItem="npl-JZ-Urd" secondAttribute="trailing" constant="8" id="8cD-O6-hLw"/> <constraint firstItem="Yif-2n-DuE" firstAttribute="leading" secondItem="npl-JZ-Urd" secondAttribute="trailing" constant="8" id="8cD-O6-hLw"/>
<constraint firstItem="VBp-ED-tro" firstAttribute="leading" secondItem="Yif-2n-DuE" secondAttribute="trailing" constant="6" id="8hn-3i-Qq5"/> <constraint firstItem="VBp-ED-tro" firstAttribute="leading" secondItem="Yif-2n-DuE" secondAttribute="trailing" constant="6" id="8hn-3i-Qq5"/>
<constraint firstItem="Yif-2n-DuE" firstAttribute="centerY" secondItem="npl-JZ-Urd" secondAttribute="centerY" id="Af2-9D-TfF"/> <constraint firstItem="Yif-2n-DuE" firstAttribute="centerY" secondItem="npl-JZ-Urd" secondAttribute="centerY" id="Af2-9D-TfF"/>
<constraint firstItem="9dH-kC-IW1" firstAttribute="leading" secondItem="zR6-f6-N6I" secondAttribute="trailing" constant="10" id="DOi-Sc-RFY"/> <constraint firstItem="9dH-kC-IW1" firstAttribute="leading" secondItem="zR6-f6-N6I" secondAttribute="trailing" constant="4" id="DOi-Sc-RFY"/>
<constraint firstItem="VBp-ED-tro" firstAttribute="centerY" secondItem="Yif-2n-DuE" secondAttribute="centerY" id="Ezr-V1-rnl"/> <constraint firstItem="VBp-ED-tro" firstAttribute="centerY" secondItem="Yif-2n-DuE" secondAttribute="centerY" id="Ezr-V1-rnl"/>
<constraint firstItem="4Nv-7x-6lv" firstAttribute="top" secondItem="9dH-kC-IW1" secondAttribute="top" id="Fms-X7-1im"/> <constraint firstItem="4Nv-7x-6lv" firstAttribute="top" secondItem="9dH-kC-IW1" secondAttribute="top" id="Fms-X7-1im"/>
<constraint firstItem="MP9-4C-psw" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Q3S-zD-qPI"/> <constraint firstItem="MP9-4C-psw" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Q3S-zD-qPI"/>
<constraint firstItem="zR6-f6-N6I" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Rp2-11-nYI"/> <constraint firstItem="zR6-f6-N6I" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Rp2-11-nYI"/>
<constraint firstItem="mHC-42-xJE" firstAttribute="leading" secondItem="npl-JZ-Urd" secondAttribute="leading" id="RtL-3F-fA5"/> <constraint firstItem="mHC-42-xJE" firstAttribute="leading" secondItem="npl-JZ-Urd" secondAttribute="leading" id="RtL-3F-fA5"/>
<constraint firstItem="W2o-3M-oQx" firstAttribute="leading" secondItem="9dH-kC-IW1" secondAttribute="trailing" constant="10" id="Z1v-dO-Qi1"/> <constraint firstItem="W2o-3M-oQx" firstAttribute="leading" secondItem="9dH-kC-IW1" secondAttribute="trailing" constant="4" id="Z1v-dO-Qi1"/>
<constraint firstItem="9dH-kC-IW1" firstAttribute="centerY" secondItem="zR6-f6-N6I" secondAttribute="centerY" id="ZHM-ix-W6l"/> <constraint firstItem="9dH-kC-IW1" firstAttribute="centerY" secondItem="zR6-f6-N6I" secondAttribute="centerY" id="ZHM-ix-W6l"/>
<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="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="13" id="gBl-R3-Hq5"/>
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneMotoringCell.m
...@@ -40,6 +40,9 @@ ...@@ -40,6 +40,9 @@
[super awakeFromNib]; [super awakeFromNib];
self.motoTitleLabel.text = FUSLocalizationHelper.localString(@"座驾"); self.motoTitleLabel.text = FUSLocalizationHelper.localString(@"座驾");
self.rightArrowImageView.image = [[UIImage imageNamed:@"fireFly_my_zone_right_arrow"] fusrtl_imageFlippedForRightToLeftLayoutDirection]; self.rightArrowImageView.image = [[UIImage imageNamed:@"fireFly_my_zone_right_arrow"] fusrtl_imageFlippedForRightToLeftLayoutDirection];
self.motoTitleLabel.textColor = [UIColor fus_textColorRich];
self.motorCountLabel.textColor = [UIColor fus_textColorRich];
} }
- (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone { - (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone {
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneSendJewelCountCell.m
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
[super awakeFromNib]; [super awakeFromNib];
_sendJewelLabel.text = FUSLocalizationHelper.localString(@"赠出宝石"); _sendJewelLabel.text = FUSLocalizationHelper.localString(@"赠出宝石");
self.selectionStyle = UITableViewCellSelectionStyleNone; self.selectionStyle = UITableViewCellSelectionStyleNone;
self.sendJewelLabel.textColor = [UIColor fus_textColorRich];
} }
- (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
...@@ -59,6 +59,10 @@ ...@@ -59,6 +59,10 @@
self.selectionStyle = UITableViewCellSelectionStyleNone; self.selectionStyle = UITableViewCellSelectionStyleNone;
self.recordOrPlayBtn.layer.cornerRadius = self.recordOrPlayBtn.height / 2.0f; self.recordOrPlayBtn.layer.cornerRadius = self.recordOrPlayBtn.height / 2.0f;
self.recordOrPlayBtn.layer.masksToBounds = YES; self.recordOrPlayBtn.layer.masksToBounds = YES;
self.cityAndCountryLabel.textColor = [UIColor fus_textColorRich];
self.signLabel.textColor = [UIColor fus_textColorRich];
[self.recordOrPlayBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
} }
- (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone { - (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone {
...@@ -184,7 +188,8 @@ ...@@ -184,7 +188,8 @@
UILabel *label = [[UILabel alloc] init]; UILabel *label = [[UILabel alloc] init];
label.font = [UIFont fus_themeFont:10]; label.font = [UIFont fus_themeFont:10];
label.textColor = [UIColor colorWithHex:@"cccccc"]; // label.textColor = [UIColor colorWithHex:@"cccccc"];
label.textColor = [UIColor fus_textColorRich];
label.textAlignment = NSTextAlignmentCenter; label.textAlignment = NSTextAlignmentCenter;
label.text = string; label.text = string;
[label sizeToFit]; [label sizeToFit];
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneVideoCreditCell.m
...@@ -45,6 +45,9 @@ ...@@ -45,6 +45,9 @@
} else { } else {
self.rightArrowImageView.image = [[UIImage imageNamed:@"fireFly_my_zone_right_arrow"] fusrtl_imageFlippedForRightToLeftLayoutDirection]; self.rightArrowImageView.image = [[UIImage imageNamed:@"fireFly_my_zone_right_arrow"] fusrtl_imageFlippedForRightToLeftLayoutDirection];
} }
self.videoCreditLabel.textColor = [UIColor fus_textColorRich];
self.connectionRateLabel.textColor = [UIColor fus_textColorRich];
} }
- (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone { - (void)fus_setupCellWithModel:(FUSZoneInfosModel *)zoneModel isMyZone:(BOOL)isMyZone {
...@@ -69,11 +72,14 @@ ...@@ -69,11 +72,14 @@
_videoCreditDetailLabel.text = @" - "; _videoCreditDetailLabel.text = @" - ";
} else { } else {
if ([zoneModel.chatWith[@"succRatio"] floatValue] < 60) { if ([zoneModel.chatWith[@"succRatio"] floatValue] < 60) {
_videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"7D7D7D"]; // _videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"7D7D7D"];
_videoCreditDetailLabel.textColor = [UIColor fus_textColorRich];
} else if ([zoneModel.chatWith[@"succRatio"] floatValue] >= 60 && [zoneModel.chatWith[@"succRatio"] floatValue] < 90) { } else if ([zoneModel.chatWith[@"succRatio"] floatValue] >= 60 && [zoneModel.chatWith[@"succRatio"] floatValue] < 90) {
_videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"4FB7F2"]; // _videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"4FB7F2"];
_videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"#925EEB"];
} else { } else {
_videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"58DBD7"]; // _videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"58DBD7"];
_videoCreditDetailLabel.textColor = [UIColor colorWithHex:@"925EEB"];
} }
_videoCreditDetailLabel.text = [NSString stringWithFormat:@"%@%%",[NSString stringWithFormat:@"%.1f",[zoneModel.chatWith[@"succRatio"] floatValue]]]; _videoCreditDetailLabel.text = [NSString stringWithFormat:@"%@%%",[NSString stringWithFormat:@"%.1f",[zoneModel.chatWith[@"succRatio"] floatValue]]];
} }
......
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneHeaderView.m
...@@ -65,7 +65,8 @@ ...@@ -65,7 +65,8 @@
[_top3ClickBtn setImage:[UIImage imageNamed:@"fireFly_my_zone_receive_fireCount_top3"] forState:UIControlStateNormal]; [_top3ClickBtn setImage:[UIImage imageNamed:@"fireFly_my_zone_receive_fireCount_top3"] forState:UIControlStateNormal];
CGRect rect = self.bottomCornorView.bounds; CGRect rect = self.bottomCornorView.bounds;
self.bottomCornorView.backgroundColor = [UIColor colorWithHex:@"11121a"]; // self.bottomCornorView.backgroundColor = [UIColor colorWithHex:@"11121a"];
self.bottomCornorView.backgroundColor = [UIColor whiteColor];
rect.size.width = frame.size.width; rect.size.width = frame.size.width;
CGFloat cornerRadii = rect.size.height; CGFloat cornerRadii = rect.size.height;
......
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneNewsFeedListView.m
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
- (void)fus_initSegmentView { - (void)fus_initSegmentView {
UIView *segmentView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, 70)]; UIView *segmentView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, 70)];
self.segmentControlView = [[FUSSegmentControlView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, 40) withItems:@[FUSLocalizationHelper.localString(@"分享n"),FUSLocalizationHelper.localString(@"相册"),FUSLocalizationHelper.localString(@"点赞")]]; self.segmentControlView = [[FUSSegmentControlView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, 40) withItems:@[FUSLocalizationHelper.localString(@"分享"),FUSLocalizationHelper.localString(@"相册"),FUSLocalizationHelper.localString(@"点赞")]];
self.segmentControlView.alignment = FUSSegmentControlAlignmentCenter; self.segmentControlView.alignment = FUSSegmentControlAlignmentCenter;
self.segmentControlView.isEqualSpace = YES; self.segmentControlView.isEqualSpace = YES;
[self.segmentControlView fus_setUnderLineSelectedImage:[UIImage imageNamed:@"common_icon_segment_selected"]]; [self.segmentControlView fus_setUnderLineSelectedImage:[UIImage imageNamed:@"common_icon_segment_selected"]];
......
FuSiLive/Info.plist
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<string>audio</string> <string>audio</string>
</array> </array>
<key>UILaunchStoryboardName</key> <key>UILaunchStoryboardName</key>
<string>LaunchScreen-Chinese</string> <string>Launch Screen.storyboard</string>
<key>UIRequiredDeviceCapabilities</key> <key>UIRequiredDeviceCapabilities</key>
<array> <array>
<string>armv7</string> <string>armv7</string>
......
FuSiLive/Launch Screen.storyboard 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina6_12" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="FusiClub.com" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
<rect key="frame" x="24" y="811.66666666666663" width="345" height="20.333333333333371"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<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_v1.png" translatesAutoresizingMaskIntoConstraints="NO" id="gnB-ZF-qMi">
<rect key="frame" x="10" y="219.33333333333334" width="373" height="278.33333333333326"/>
<constraints>
<constraint firstAttribute="width" secondItem="gnB-ZF-qMi" secondAttribute="height" multiplier="393:293" id="lQc-ZD-oa2"/>
</constraints>
</imageView>
</subviews>
<viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
<constraint firstItem="Bcu-3y-fUS" firstAttribute="trailing" secondItem="gnB-ZF-qMi" secondAttribute="trailing" constant="10" id="E1d-Wh-Gxb"/>
<constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="24" id="SfN-ll-jLj"/>
<constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
<constraint firstItem="gnB-ZF-qMi" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="10" id="tiE-pg-OM4"/>
<constraint firstItem="gnB-ZF-qMi" firstAttribute="centerY" secondItem="Bcu-3y-fUS" secondAttribute="centerY" constant="-80" id="tr3-E6-XYB"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
<resources>
<image name="fus_startSplash_logo_image_v1.png" width="1263" height="941"/>
</resources>
</document>
FuSiLive/LaunchScreen-Chinese.storyboard deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina5_5" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController storyboardIdentifier="LaunchScreen-Chinese" useStoryboardIdentifierAsRestorationIdentifier="YES" id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Xyk-WN-L9h"/>
<viewControllerLayoutGuide type="bottom" id="6Vx-5Y-jfx"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fireflyshow_start_page_image_v6000.png" translatesAutoresizingMaskIntoConstraints="NO" id="ncg-TY-ykR">
<rect key="frame" x="0.0" y="0.0" width="414" height="736"/>
</imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="ncg-TY-ykR" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="013-aa-W3X"/>
<constraint firstAttribute="bottom" secondItem="ncg-TY-ykR" secondAttribute="bottom" id="F79-hr-weY"/>
<constraint firstItem="ncg-TY-ykR" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="Jqp-Hu-tBd"/>
<constraint firstAttribute="trailing" secondItem="ncg-TY-ykR" secondAttribute="trailing" id="aae-Dc-YeL"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="52" y="374.66266866566718"/>
</scene>
</scenes>
<resources>
<image name="fireflyshow_start_page_image_v6000.png" width="828" height="1792"/>
</resources>
</document>
FuSiLive/LaunchScreen-English.storyboard deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController storyboardIdentifier="LaunchScreen-English" useStoryboardIdentifierAsRestorationIdentifier="YES" id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="1ZS-qu-vfp"/>
<viewControllerLayoutGuide type="bottom" id="E4q-i0-kuS"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="fireflyshow_start_page_image_v6000.png" translatesAutoresizingMaskIntoConstraints="NO" id="JuJ-qz-2Fg">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
</imageView>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="JuJ-qz-2Fg" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="4bY-X2-zDG"/>
<constraint firstAttribute="trailing" secondItem="JuJ-qz-2Fg" secondAttribute="trailing" id="UY9-cS-aLc"/>
<constraint firstAttribute="bottom" secondItem="JuJ-qz-2Fg" secondAttribute="bottom" id="tX6-7a-dk0"/>
<constraint firstItem="JuJ-qz-2Fg" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="ySL-b9-5FM"/>
</constraints>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
<resources>
<image name="fireflyshow_start_page_image_v6000.png" width="828" height="1792"/>
</resources>
</document>
FuSiLive/Resources/LocalizationString/InfoPlist.strings
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"CFBundleDisplayName" = "FuSi Live"; "CFBundleDisplayName" = "FuSi Live";
"UILaunchStoryboardName" = "LaunchScreen-English"; //"UILaunchStoryboardName" = "LaunchScreen-English";
"NSCameraUsageDescription" = "FuSi Live would like to Access the Camera. You can start LIVE or create videos"; "NSCameraUsageDescription" = "FuSi Live would like to Access the Camera. You can start LIVE or create videos";
......
FuSiLive/Resources/LocalizationString/ar.lproj/InfoPlist.strings
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"CFBundleDisplayName" = "FuSi Live"; "CFBundleDisplayName" = "FuSi Live";
"UILaunchStoryboardName" = "LaunchScreen-English"; //"UILaunchStoryboardName" = "LaunchScreen-English";
"NSCameraUsageDescription" = "يرغب FuSi Show بالوصول إلى الكاميرا الخاصة بك، ثم يمكنك أن تقم البث أو تصوير الفيديو"; "NSCameraUsageDescription" = "يرغب FuSi Show بالوصول إلى الكاميرا الخاصة بك، ثم يمكنك أن تقم البث أو تصوير الفيديو";
......
FuSiLive/Resources/LocalizationString/en.lproj/InfoPlist.strings
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"CFBundleDisplayName" = "FuSi Live"; "CFBundleDisplayName" = "FuSi Live";
"UILaunchStoryboardName" = "LaunchScreen-English"; //"UILaunchStoryboardName" = "LaunchScreen-English";
"NSCameraUsageDescription" = "FuSi Live would like to Access the Camera. You can start LIVE or create videos"; "NSCameraUsageDescription" = "FuSi Live would like to Access the Camera. You can start LIVE or create videos";
......
FuSiLive/Resources/LocalizationString/id.lproj/InfoPlist.strings
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"CFBundleDisplayName" = "FuSi Live"; "CFBundleDisplayName" = "FuSi Live";
"UILaunchStoryboardName" = "LaunchScreen-English"; //"UILaunchStoryboardName" = "LaunchScreen-English";
"NSCameraUsageDescription" = "FuSi Live memerlukan Akses ke Kamera. Anda dapat memulai Siaran Langsung atau membuat video"; "NSCameraUsageDescription" = "FuSi Live memerlukan Akses ke Kamera. Anda dapat memulai Siaran Langsung atau membuat video";
......
FuSiLive/Resources/LocalizationString/ja.lproj/InfoPlist.strings
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"CFBundleDisplayName" = "FuSi Live"; "CFBundleDisplayName" = "FuSi Live";
"UILaunchStoryboardName" = "LaunchScreen-English"; //"UILaunchStoryboardName" = "LaunchScreen-English";
"NSCameraUsageDescription" = "「FuSi Live」がカメラへのアクセスを要求しています生放送を開始したりビデオを作成することができるようになります"; "NSCameraUsageDescription" = "「FuSi Live」がカメラへのアクセスを要求しています生放送を開始したりビデオを作成することができるようになります";
......
FuSiLive/Resources/LocalizationString/th.lproj/InfoPlist.strings
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"CFBundleDisplayName" = "FuSi Live"; "CFBundleDisplayName" = "FuSi Live";
"UILaunchStoryboardName" = "LaunchScreen-English"; //"UILaunchStoryboardName" = "LaunchScreen-English";
"NSCameraUsageDescription" = "FuSi Live ต้องการเข้าถึงกล้องถ่ายรูป คุณสามารถเริ่มต้น ไลฟ์ หรือสร้างวิดีโอ"; "NSCameraUsageDescription" = "FuSi Live ต้องการเข้าถึงกล้องถ่ายรูป คุณสามารถเริ่มต้น ไลฟ์ หรือสร้างวิดีโอ";
......
FuSiLive/Resources/LocalizationString/vi.lproj/InfoPlist.strings
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"CFBundleDisplayName" = "FuSi Live"; "CFBundleDisplayName" = "FuSi Live";
"UILaunchStoryboardName" = "LaunchScreen-English"; //"UILaunchStoryboardName" = "LaunchScreen-English";
"NSCameraUsageDescription" = "Để bắt đầu phát trực tiếp, bạn cần truy cập vào máy ảnh của mình"; "NSCameraUsageDescription" = "Để bắt đầu phát trực tiếp, bạn cần truy cập vào máy ảnh của mình";
......
FuSiLive/Resources/LocalizationString/zh-Hans.lproj/InfoPlist.strings
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"CFBundleDisplayName" = "螢火蟲直播"; "CFBundleDisplayName" = "螢火蟲直播";
"UILaunchStoryboardName" = "LaunchScreen-Chinese"; //"UILaunchStoryboardName" = "LaunchScreen-Chinese";
"NSCameraUsageDescription" = "開啟直播，需要訪問您的相機哦"; "NSCameraUsageDescription" = "開啟直播，需要訪問您的相機哦";
......
FuSiLive/Resources/LocalizationString/zh-Hant.lproj/InfoPlist.strings
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"CFBundleDisplayName" = "螢火蟲直播"; "CFBundleDisplayName" = "螢火蟲直播";
"UILaunchStoryboardName" = "LaunchScreen-Chinese"; //"UILaunchStoryboardName" = "LaunchScreen-Chinese";
"NSCameraUsageDescription" = "開啟直播，需要訪問您的相機哦"; "NSCameraUsageDescription" = "開啟直播，需要訪問您的相機哦";
......
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