Skip to content

pidan / FuSiLive

Go to a project
Commit fa0e0a07 by pierce
Options

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

parents 468db400 2ed8ea6a
Inline Side-by-side
Showing with 94 additions and 114 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/ActionSheet/SLActionSheet.m
...@@ -400,8 +400,8 @@ ...@@ -400,8 +400,8 @@
if (idx >0 && otherButtonTitles.count > 1) { if (idx >0 && otherButtonTitles.count > 1) {
[_sheet addSubview:line_otherBtn]; [_sheet addSubview:line_otherBtn];
[line_otherBtn addConstraint:NSLayoutAttributeLeft equalTo:otherBtn offset:0]; [line_otherBtn addConstraint:NSLayoutAttributeLeft equalTo:otherBtn offset:16];
[line_otherBtn addConstraint:NSLayoutAttributeRight equalTo:otherBtn offset:0]; [line_otherBtn addConstraint:NSLayoutAttributeRight equalTo:otherBtn offset:-16];
[line_otherBtn addConstraint:NSLayoutAttributeTop equalTo:otherBtn toAttribute:NSLayoutAttributeBottom offset:0]; [line_otherBtn addConstraint:NSLayoutAttributeTop equalTo:otherBtn toAttribute:NSLayoutAttributeBottom offset:0];
[line_otherBtn addConstraint:NSLayoutAttributeHeight equalTo:0 offset:margin_btnTobtn]; [line_otherBtn addConstraint:NSLayoutAttributeHeight equalTo:0 offset:margin_btnTobtn];
} }
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.h
...@@ -42,14 +42,14 @@ ...@@ -42,14 +42,14 @@
/// 黑色字体 000000 /// 黑色字体 000000
+(UIColor *)fus_textColorDeep; +(UIColor *)fus_textColorDeep;
/// 黑色字体 222222
+(UIColor *)fus_textColorRich;
/// 黑色字体 282828 /// 黑色字体 282828
+ (UIColor *)fus_textColorRich2; +(UIColor *)fus_textColorRich;
/// 灰色字体 666666 /// 灰色字体 666666
+(UIColor *)fus_textColorMedium; +(UIColor *)fus_textColorMedium;
/// 黑色字体 808080 /// 黑色字体 808080
+(UIColor *)fus_textColorLight; +(UIColor *)fus_textColorLight;
/// 黑色字体 999999
+(UIColor *)fus_textColorLight2;
/// 通用字体颜色，反色 fffff /// 通用字体颜色，反色 fffff
+(UIColor *)fus_textColorVeryLight; +(UIColor *)fus_textColorVeryLight;
/// 输入框背景色，灰色 /// 输入框背景色，灰色
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.m
...@@ -87,14 +87,14 @@ ...@@ -87,14 +87,14 @@
return [UIColor colorWithHex:@"#000000"]; return [UIColor colorWithHex:@"#000000"];
} }
+ (UIColor *)fus_textColorRich{ + (UIColor *)fus_textColorRich{
return [UIColor colorWithHex:@"#222222"];
}
+ (UIColor *)fus_textColorRich2{
return [UIColor colorWithHex:@"#282828"]; return [UIColor colorWithHex:@"#282828"];
} }
+ (UIColor *)fus_textColorLight{ + (UIColor *)fus_textColorLight{
return [UIColor colorWithHex:@"#808080"]; return [UIColor colorWithHex:@"#808080"];
} }
+ (UIColor *)fus_textColorLight2{
return [UIColor colorWithHex:@"#999999"];
}
+ (UIColor *)fus_textColorVeryLight{ + (UIColor *)fus_textColorVeryLight{
return [UIColor colorWithHex:@"#FFFFFF"]; return [UIColor colorWithHex:@"#FFFFFF"];
} }
......
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangCacheOperate.h
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
/// @param success 1 /// @param success 1
/// @param failure 0 /// @param failure 0
+ (void)fus_homeVestRoomGetlist:(ReadCacheFromType)type + (void)fus_homeVestRoomGetlist:(ReadCacheFromType)type
language:(NSString *)language
success:(void(^)(NSArray<FUSBaoFangAnchorModel *> *modelList))success success:(void(^)(NSArray<FUSBaoFangAnchorModel *> *modelList))success
failure:(void(^)(NSString *msg,int code))failure; failure:(void(^)(NSString *msg,int code))failure;
......
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangCacheOperate.m
...@@ -66,60 +66,25 @@ ...@@ -66,60 +66,25 @@
} }
} }
+ (void)fus_homeVestRoomGetlist:(ReadCacheFromType)type success:(void (^)(NSArray<FUSBaoFangAnchorModel *> *))success failure:(void (^)(NSString *, int))failure{ + (void)fus_homeVestRoomGetlist:(ReadCacheFromType)type language:(NSString *)language success:(void (^)(NSArray<FUSBaoFangAnchorModel *> *))success failure:(void (^)(NSString *, int))failure{
if (type == ReadCacheFromTypeLocal) { if (type == ReadCacheFromTypeLocal) {
NSDictionary *dataDict = [FUSCustomizedInfosStore fus_readCommonInfosWithKey:STORE_HOME_VEST_ROOM_GET_LIST]; NSDictionary *storeDataDict = [FUSCustomizedInfosStore fus_readCommonInfosWithKey:STORE_HOME_VEST_ROOM_GET_LIST];
NSMutableArray *resList = [[NSMutableArray alloc] init]; NSDictionary *dataDict = nil;
resList = [FUSBaoFangAnchorModel fus_sortInsertModelWithDataDict:dataDict]; if ([NSString isNull:language]) {
// //拼接rooms dataDict = storeDataDict[STORE_HOME_VEST_ROOM_GET_LIST];
// NSArray *dataList = dataDict[@"rooms"]; }else {
// if (dataList != nil && dataList.count > 0) { dataDict = storeDataDict[language];
// for (NSDictionary *tempData in dataList) { }
// FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
// [tempModel fus_setValueWithDict:tempData]; //排序
// [resList appendObject:tempModel]; NSMutableArray *resList = [FUSBaoFangAnchorModel fus_sortInsertModelWithDataDict:dataDict];
// }
// }
// // 拼接插入模型
// //1=活动宣传版面。2=新星主播模块。3=FUSI主播应援模块。
// NSDictionary *insertItemTypeDict = @{@"activityInfo": @"1", @"novaInfo": @"2", @"supportInfo": @"3"};
// NSArray *insertItemSortList = @[@"activityInfo", @"novaInfo", @"supportInfo"];
// NSMutableArray *otherInserItemList = [[NSMutableArray alloc] init];
//
// // 挑选出需要插入的模型
// [insertItemSortList enumerateObjectsWithOptions:NSEnumerationReverse usingBlock:^(NSString * _Nonnull insertKey, NSUInteger idx, BOOL * _Nonnull stop) {
// NSDictionary *inserDict = dataDict[insertKey];
// if (inserDict != nil && inserDict.allKeys.count > 0) {
//
// FUSBaoFangAnchorInsertModel *insertModel = [[FUSBaoFangAnchorInsertModel alloc] init];
// [insertModel fus_setValueWithDict:inserDict];
// FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
// tempModel.fus_itemType = [insertItemTypeDict[insertKey] intValue];
// tempModel.fus_insertModel = insertModel;
// [otherInserItemList addObject:tempModel];
//// if (insertModel.index <= resList.count) {
//// [resList insertObject:tempModel atIndex:insertModel.index];
//// }
// }
// }];
// // 先将插入顺序从小到大排列，这样小的先插入，就不会影响最终大的排序
// [otherInserItemList sortUsingComparator:^NSComparisonResult(FUSBaoFangAnchorModel * obj1, FUSBaoFangAnchorModel * obj2) {
// return obj1.fus_insertModel.index > obj2.fus_insertModel.index;
// }];
// // 按照index插入
// for (FUSBaoFangAnchorModel *tempModel in otherInserItemList) {
// if (tempModel.fus_insertModel.index > resList.count) {
// continue;
// }
// [resList insertObject:tempModel atIndex:tempModel.fus_insertModel.index];
// }
success(resList); success(resList);
}else if (type == ReadCacheFromTypeServer) { }else if (type == ReadCacheFromTypeServer) {
[FUSBaoFangHttpHelper fus_homeVestRoomGetlistSuccess:success failure:failure]; [FUSBaoFangHttpHelper fus_homeVestRoomGetlistWithLanguage:language success:success failure:failure];
} }
} }
......
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangHttpHelper.h
...@@ -223,10 +223,11 @@ typedef enum : NSUInteger { ...@@ -223,10 +223,11 @@ typedef enum : NSUInteger {
/// @param failure 1 /// @param failure 1
+(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;
/// 获取直播房间列表 /// Fusi-获取直播房间列表
/// @param language 语言
/// @param success 1 /// @param success 1
/// @param failure 1 /// @param failure 0
+(void)fus_homeVestRoomGetlistSuccess:(void(^)(NSArray<FUSBaoFangAnchorModel *> *modelList))success failure:(void(^)(NSString *msg,int code))failure; +(void)fus_homeVestRoomGetlistWithLanguage:(NSString *)language success:(void(^)(NSArray<FUSBaoFangAnchorModel *> *modelList))success failure:(void(^)(NSString *msg,int code))failure;
/// 新星列表 /// 新星列表
/// @param page 页吗 /// @param page 页吗
......
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangHttpHelper.m
...@@ -631,12 +631,31 @@ ...@@ -631,12 +631,31 @@
}]; }];
} }
/// 获取直播房间列表 /// 获取直播房间列表
+(void)fus_homeVestRoomGetlistSuccess:(void(^)(NSArray<FUSBaoFangAnchorModel *> *modelList))success failure:(void(^)(NSString *msg,int code))failure{ +(void)fus_homeVestRoomGetlistWithLanguage:(NSString *)language success:(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) { NSMutableDictionary *parm = [[NSMutableDictionary alloc] init];
[FUSCustomizedInfosStore fus_addCommonInfosWithKey:STORE_HOME_VEST_ROOM_GET_LIST value:dataDict]; if (![NSString isNull:language]) {
NSMutableArray *resList = [[NSMutableArray alloc] init]; [parm setValue:language forKey:@"language"];
resList = [FUSBaoFangAnchorModel fus_sortInsertModelWithDataDict:dataDict]; }
[FUSHttpHelper postRequestBinaryWithUrl:URL_HOME_VEST_ROOM_GETLIST params:parm success:^(NSDictionary *dataDict, int code) {
//存储
//先取出原来的
NSDictionary *storeDict = [FUSCustomizedInfosStore fus_readCommonInfosWithKey:STORE_HOME_VEST_ROOM_GET_LIST];
NSMutableDictionary *writeStoreDict = [[NSMutableDictionary alloc] init];
if (!storeDict) {
writeStoreDict = [[NSMutableDictionary alloc] initWithDictionary:storeDict];
}
if ([NSString isNull:language]) {
// 如果未传入语言，则按照默认的存
[writeStoreDict setValue:dataDict forKey:STORE_HOME_VEST_ROOM_GET_LIST];
}else {
[writeStoreDict setValue:dataDict forKey:language];
}
[FUSCustomizedInfosStore fus_addCommonInfosWithKey:STORE_HOME_VEST_ROOM_GET_LIST value:writeStoreDict];
// 得到结果并且排序
NSMutableArray *resList = [FUSBaoFangAnchorModel fus_sortInsertModelWithDataDict:dataDict];
success(resList); success(resList);
} failure:^(NSDictionary *dataDict, int code) { } failure:^(NSDictionary *dataDict, int code) {
......
FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSCustomSettingCell.m
...@@ -93,6 +93,11 @@ ...@@ -93,6 +93,11 @@
} }
[self fus_fitRTLViews]; [self fus_fitRTLViews];
[self fus_updateMask]; [self fus_updateMask];
// 调整分割线边距
CGFloat separatorInsetLeft = 16.0; // 左边距
CGFloat separatorInsetRight = 16.0; // 右边距
self.separatorInset = UIEdgeInsetsMake(0, separatorInsetLeft, 0, separatorInsetRight);
} }
- (void)fus_updateMask { - (void)fus_updateMask {
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/Model/FUSHomeLanguageGetlistModel.m
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
- (void)fus_writeSelectModelToLocal{ - (void)fus_writeSelectModelToLocal{
if (self.fus_dataDict != nil && self.fus_dataDict.allKeys > 0) { if (self.fus_dataDict != nil && self.fus_dataDict.allKeys > 0) {
[[NSUserDefaults standardUserDefaults] setValue:self.fus_dataDict forKey:HOME_LANGUAGE_GET_LIST_SELECT_KEY]; [[NSUserDefaults standardUserDefaults] setValue:self.fus_dataDict forKey:HOME_LANGUAGE_GET_LIST_SELECT_KEY];
[[NSUserDefaults standardUserDefaults] synchronize];
}else{ }else{
FUSLogInfo(@"----FUSHomeLanguageGetlistModel存储失败！！"); FUSLogInfo(@"----FUSHomeLanguageGetlistModel存储失败！！");
} }
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomeView.m
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
[self.viewModel fus_trySwitchToCacheList:FUSHomeViewAnchorListTypeNormal]; [self.viewModel fus_trySwitchToCacheList:FUSHomeViewAnchorListTypeNormal];
if (isLastSelected == NO) { if (isLastSelected == NO) {
//上一次是普通，然后点了追踪，发现没追踪，则先还原回普通，再弹出这个 //上一次是普通，然后点了追踪，发现没追踪，则先还原回普通，再弹出这个
if (self.viewModel.recommendModel != nil) { if (self.viewModel.recommendModel != nil && ![NSString isNull:self.viewModel.recommendModel.roomId]) {
FUSWeakSelf(weakself); FUSWeakSelf(weakself);
[FUSShowBroadcastGuideAlertView fus_showOn:self.parentController.view broadcast:self.viewModel.recommendModel clickHandler:^(NSInteger clickType) { [FUSShowBroadcastGuideAlertView fus_showOn:self.parentController.view broadcast:self.viewModel.recommendModel clickHandler:^(NSInteger clickType) {
if (clickType == 1) { if (clickType == 1) {
...@@ -358,6 +358,7 @@ ...@@ -358,6 +358,7 @@
- (void)fus_homeLanguageSegmentViewDidClicked:(NSInteger)index{ - (void)fus_homeLanguageSegmentViewDidClicked:(NSInteger)index{
// 点击语言 // 点击语言
[self.viewModel fus_selectLanguage:index]; [self.viewModel fus_selectLanguage:index];
[self.collectionView.mj_header beginRefreshing];
} }
#pragma mark --- scrollview delegate #pragma mark --- scrollview delegate
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomeViewViewModel.h
...@@ -39,7 +39,7 @@ typedef enum :NSInteger{ ...@@ -39,7 +39,7 @@ typedef enum :NSInteger{
@interface FUSHomeViewViewModel : NSObject @interface FUSHomeViewViewModel : NSObject
// 语言列表 // 语言列表,仅名称，给外部使用
/// 当前选中的语言名称 /// 当前选中的语言名称
@property (nonatomic, strong) NSString *selectLanguageName; @property (nonatomic, strong) NSString *selectLanguageName;
/// 其他语言名称 /// 其他语言名称
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomeViewViewModel.m
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
self.isFirstLoad = YES; self.isFirstLoad = YES;
self.loadingCount = 0; self.loadingCount = 0;
self.isLoading = NO; self.isLoading = NO;
self.selectLanguageModel = [FUSHomeLanguageGetlistModel fus_readSelectModel];
[self fus_loadHomeLanguageListWithAnchorList:YES readFrom:ReadCacheFromTypeLocal]; [self fus_loadHomeLanguageListWithAnchorList:YES readFrom:ReadCacheFromTypeLocal];
[self fus_loadhomeVestFollowGetlistAutoCall:NO]; [self fus_loadhomeVestFollowGetlistAutoCall:NO];
} }
...@@ -64,25 +65,12 @@ ...@@ -64,25 +65,12 @@
self.loadingCount--; self.loadingCount--;
self.homeLanguageGetList = languageList; self.homeLanguageGetList = languageList;
if (self.isFirstLoad && self.homeLanguageGetList.count > 0) {
// 第一次加载，直接使用，而不是作更新复选
self.isFirstLoad = NO;
// 先取出存储 if (readFrom == ReadCacheFromTypeServer) {
NSString *languageKey = [[NSUserDefaults standardUserDefaults] objectForKey:HOME_LANGUAGE_GET_LIST_SELECT_KEY]; self.isFirstLoad = NO;
if (languageKey != nil && languageKey.length > 0) {
for (FUSHomeLanguageGetlistModel *tempModel in self.homeLanguageGetList) {
if ([tempModel.language isEqualToString:languageKey]) {
self.selectLanguageModel = tempModel;
break;
}
}
}else {
// 如果没有选择第一个
self.selectLanguageModel = [self.homeLanguageGetList firstObject];
} }
}else {
// 如果不是第一次加载了，那么复选一下 // 请求/取出成功有数据
if (self.homeLanguageGetList.count > 0) { if (self.homeLanguageGetList.count > 0) {
if (self.selectLanguageModel == nil) { if (self.selectLanguageModel == nil) {
...@@ -107,7 +95,6 @@ ...@@ -107,7 +95,6 @@
// 如果请求成功了，然后列表仍然什么都没有，那么代表服务器清空数据了，这边也清空 // 如果请求成功了，然后列表仍然什么都没有，那么代表服务器清空数据了，这边也清空
self.selectLanguageModel = nil; self.selectLanguageModel = nil;
} }
}
[self fus_updateSelectLanguageModel]; [self fus_updateSelectLanguageModel];
...@@ -130,7 +117,7 @@ ...@@ -130,7 +117,7 @@
/// 请求主播列表 /// 请求主播列表
-(void)fus_loadvestRoomGetlistAutoCall:(BOOL)autoCall readFrom:(ReadCacheFromType)readFrom{ -(void)fus_loadvestRoomGetlistAutoCall:(BOOL)autoCall readFrom:(ReadCacheFromType)readFrom{
self.loadingCount++; self.loadingCount++;
[FUSBaoFangCacheOperate fus_homeVestRoomGetlist:readFrom success:^(NSArray<FUSBaoFangAnchorModel *> *modelList) { [FUSBaoFangCacheOperate fus_homeVestRoomGetlist:readFrom language:self.selectLanguageModel ? self.selectLanguageModel.language : @"" success:^(NSArray<FUSBaoFangAnchorModel *> *modelList) {
self.loadingCount--; self.loadingCount--;
self.anchorOriginalList = modelList; self.anchorOriginalList = modelList;
...@@ -180,14 +167,13 @@ ...@@ -180,14 +167,13 @@
- (void)fus_reloadData{ - (void)fus_reloadData{
if (self.anchorListType == FUSHomeViewAnchorListTypeNormal) { if (self.anchorListType == FUSHomeViewAnchorListTypeNormal) {
// if (self.homeLanguageGetList == nil || self.homeLanguageGetList.count <= 0) { if (self.homeLanguageGetList == nil || self.homeLanguageGetList.count <= 0 || self.isFirstLoad) {
// // 只有第一次reload才刷新一下，列表不会经常变的
// [self fus_loadHomeLanguageListWithAnchorList:YES readFrom:ReadCacheFromTypeServer];
// }else {
// [self fus_loadvestRoomGetlistAutoCall:YES readFrom:ReadCacheFromTypeServer];
// }
[self fus_loadHomeLanguageListWithAnchorList:YES readFrom:ReadCacheFromTypeServer]; [self fus_loadHomeLanguageListWithAnchorList:YES readFrom:ReadCacheFromTypeServer];
}else { }else {
[self fus_loadvestRoomGetlistAutoCall:YES readFrom:ReadCacheFromTypeServer];
}
}else {
[self fus_loadhomeVestFollowGetlistAutoCall:YES]; [self fus_loadhomeVestFollowGetlistAutoCall:YES];
} }
} }
...@@ -254,7 +240,7 @@ ...@@ -254,7 +240,7 @@
-(void)fus_updateSelectLanguageModel{ -(void)fus_updateSelectLanguageModel{
//存储一下 //存储一下
[[NSUserDefaults standardUserDefaults] setValue:self.selectLanguageModel == nil ? @"" : self.selectLanguageModel.language forKey:HOME_LANGUAGE_GET_LIST_SELECT_KEY]; [self.selectLanguageModel fus_writeSelectModelToLocal];
[self.otherLanguageNamesList removeAllObjects]; [self.otherLanguageNamesList removeAllObjects];
[self.showingOtherLanguagelist removeAllObjects]; [self.showingOtherLanguagelist removeAllObjects];
...@@ -281,9 +267,9 @@ ...@@ -281,9 +267,9 @@
self.selectLanguageModel = self.showingOtherLanguagelist[index]; self.selectLanguageModel = self.showingOtherLanguagelist[index];
[self fus_updateSelectLanguageModel]; [self fus_updateSelectLanguageModel];
if (self.anchorListType == FUSHomeViewAnchorListTypeNormal) { // if (self.anchorListType == FUSHomeViewAnchorListTypeNormal) {
[self fus_sortDataListAutoCall:YES]; // [self fus_sortDataListAutoCall:YES];
} // }
} }
#pragma mark --- setter #pragma mark --- setter
......
FuSiLive/Classes/Login/Controller/FUSMessageRegisterViewController.xib
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
<fontDescription key="fontDescription" type="system" pointSize="15"/> <fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/> <textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/>
</textField> </textField>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DU9-J4-Tsl" userLabel="imgHorLine2"> <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DU9-J4-Tsl" userLabel="imgHorLine2">
<rect key="frame" x="0.0" y="49.333333333333343" width="319" height="0.6666666666666643"/> <rect key="frame" x="0.0" y="49.333333333333343" width="319" height="0.6666666666666643"/>
<color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints> <constraints>
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
<fontDescription key="fontDescription" type="system" pointSize="15"/> <fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/> <textInputTraits key="textInputTraits" keyboardType="numberPad" returnKeyType="done"/>
</textField> </textField>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="o73-Mk-vXR" userLabel="imgHorLine2"> <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="o73-Mk-vXR" userLabel="imgHorLine2">
<rect key="frame" x="0.0" y="49.333333333333343" width="319" height="0.6666666666666643"/> <rect key="frame" x="0.0" y="49.333333333333343" width="319" height="0.6666666666666643"/>
<color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints> <constraints>
...@@ -300,7 +300,7 @@ ...@@ -300,7 +300,7 @@
<rect key="frame" x="295" y="642" width="20" height="20"/> <rect key="frame" x="295" y="642" width="20" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="Button" image="button:5Se-iM-LEc:image"/> <state key="normal" title="Button" image="button:5Se-iM-LEc:image"/>
<state key="selected" image="7362D1E7-D970-4735-9C16-A2B26E4AA218"/> <state key="selected" image="E2DCFD04-3A1B-4627-A683-98DF65B2BD55"/>
<connections> <connections>
<action selector="onSelected:" destination="-1" eventType="touchUpInside" id="w7C-eD-fQk"/> <action selector="onSelected:" destination="-1" eventType="touchUpInside" id="w7C-eD-fQk"/>
</connections> </connections>
...@@ -321,7 +321,7 @@ ...@@ -321,7 +321,7 @@
<fontDescription key="fontDescription" type="system" pointSize="15"/> <fontDescription key="fontDescription" type="system" pointSize="15"/>
<textInputTraits key="textInputTraits" keyboardType="emailAddress" returnKeyType="done" secureTextEntry="YES"/> <textInputTraits key="textInputTraits" keyboardType="emailAddress" returnKeyType="done" secureTextEntry="YES"/>
</textField> </textField>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="j8R-HH-C7c" userLabel="imgHorLine2"> <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="j8R-HH-C7c" userLabel="imgHorLine2">
<rect key="frame" x="0.0" y="49.333333333333314" width="319" height="0.6666666666666643"/> <rect key="frame" x="0.0" y="49.333333333333314" width="319" height="0.6666666666666643"/>
<color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="backgroundColor" red="0.86666666670000003" green="0.86666666670000003" blue="0.86666666670000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints> <constraints>
...@@ -473,7 +473,7 @@ ...@@ -473,7 +473,7 @@
</view> </view>
</objects> </objects>
<resources> <resources>
<image name="7362D1E7-D970-4735-9C16-A2B26E4AA218" width="45" height="46"> <image name="E2DCFD04-3A1B-4627-A683-98DF65B2BD55" width="45" height="46">
<mutableData key="keyedArchiveRepresentation"> <mutableData key="keyedArchiveRepresentation">
YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T YnBsaXN0MDDUAQIDBAUGBwpYJHZlcnNpb25ZJGFyY2hpdmVyVCR0b3BYJG9iamVjdHMSAAGGoF8QD05T
S2V5ZWRBcmNoaXZlctEICVRyb290gAGtCwwXHBMhJicuMTQ6PVUkbnVsbNUNDg8QERITFBUWViRjbGFz S2V5ZWRBcmNoaXZlctEICVRyb290gAGtCwwXHBMhJicuMTQ6PVUkbnVsbNUNDg8QERITFBUWViRjbGFz
......
FuSiLive/Classes/NewsFeed/RichEditor/Controller/FUSPublishNewsFeedViewController.m
...@@ -110,8 +110,8 @@ FUSImagePickerViewControllerDelegate> ...@@ -110,8 +110,8 @@ FUSImagePickerViewControllerDelegate>
- (void)configNavigation{ - (void)configNavigation{
UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 80, 50)]; UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 35, 50)];
imageView.image = [UIImage imageNamed:@"newsfeed_publish_nav_title"]; imageView.image = [UIImage fus_naviLogoIcon];
imageView.contentMode = UIViewContentModeScaleAspectFit; imageView.contentMode = UIViewContentModeScaleAspectFit;
self.navigationItem.titleView = imageView; self.navigationItem.titleView = imageView;
......
FuSiLive/Classes/ZhaiXin/Main/Controller/FUSIMZhaiXinViewController.m
...@@ -104,8 +104,8 @@ ...@@ -104,8 +104,8 @@
[FUSIMChatService shareInstance].chatDelegate = nil; [FUSIMChatService shareInstance].chatDelegate = nil;
// // 设置状态栏为白色 // // 设置状态栏为白色
[[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO]; // [[UIApplication sharedApplication] setStatusBarStyle:UIStatusBarStyleLightContent animated:NO];
[self setNeedsStatusBarAppearanceUpdate]; // [self setNeedsStatusBarAppearanceUpdate];
} }
- (void)initNavBarViews - (void)initNavBarViews
......
FuSiLive/Classes/ZhaiXin/Main/View/FUSNewSingleChatTableViewCell.m
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
[self fus_addRightSwipeButtonsWithSwipeButtonModelArray:@[deleteBtnModel]]; [self fus_addRightSwipeButtonsWithSwipeButtonModelArray:@[deleteBtnModel]];
self.nameLevelLabel.textColor = [UIColor fus_textColorRich]; self.nameLevelLabel.textColor = [UIColor fus_textColorRich];
self.contentLabel.textColor = [UIColor fus_textColorLight2];
} }
- (void)setModel:(FUSZhaiXinModel *)model - (void)setModel:(FUSZhaiXinModel *)model
......
FuSiLive/Classes/ZhaiXin/Recommend/View/FUSZhaiXinSettingPopView.m
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
chatSettingGroup.items = @[messageSoundItem, meesageShockItem, _strangerMessageItem,clearAllUnreadItem]; chatSettingGroup.items = @[messageSoundItem, meesageShockItem, _strangerMessageItem,clearAllUnreadItem];
chatSettingGroup.itemsBgColor = [UIColor clearColor]; chatSettingGroup.itemsBgColor = [UIColor clearColor];
[self.tableView.allGroups addObject:chatSettingGroup]; [self.tableView.allGroups addObject:chatSettingGroup];
self.tableView.separatorColor = [UIColor fus_separatorLineColor]; self.tableView.separatorColor = [UIColor fus_lineColor];
[self.tableView reloadData]; [self.tableView reloadData];
} }
......
FuSiLive/Classes/Zone/View/FUSSelectDateView.m
...@@ -94,7 +94,7 @@ typedef void(^ClickBlock)(int type, NSString *dateStr); ...@@ -94,7 +94,7 @@ typedef void(^ClickBlock)(int type, NSString *dateStr);
[cancelButton setTitle:[NSString fus_localString:@"取消"] forState:UIControlStateNormal]; [cancelButton setTitle:[NSString fus_localString:@"取消"] forState:UIControlStateNormal];
[cancelButton sizeToFit]; [cancelButton sizeToFit];
cancelButton.height = TOOLBAR_HEIGHT; cancelButton.height = TOOLBAR_HEIGHT;
[cancelButton setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal]; [cancelButton setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[cancelButton addTarget:self action:@selector(onCancelButtonAction:) forControlEvents:UIControlEventTouchUpInside]; [cancelButton addTarget:self action:@selector(onCancelButtonAction:) forControlEvents:UIControlEventTouchUpInside];
[toolBar addSubview:cancelButton]; [toolBar addSubview:cancelButton];
...@@ -106,7 +106,7 @@ typedef void(^ClickBlock)(int type, NSString *dateStr); ...@@ -106,7 +106,7 @@ typedef void(^ClickBlock)(int type, NSString *dateStr);
[enterButton sizeToFit]; [enterButton sizeToFit];
enterButton.height = TOOLBAR_HEIGHT; enterButton.height = TOOLBAR_HEIGHT;
enterButton.x = UIView.fus_screenW - enterButton.width - 10; enterButton.x = UIView.fus_screenW - enterButton.width - 10;
[enterButton setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal]; [enterButton setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[enterButton addTarget:self action:@selector(onEnterButtonAction:) forControlEvents:UIControlEventTouchUpInside]; [enterButton addTarget:self action:@selector(onEnterButtonAction:) forControlEvents:UIControlEventTouchUpInside];
[toolBar addSubview:enterButton]; [toolBar addSubview:enterButton];
......
FuSiLive/Classes/Zone/View/FUSZoneEditPickerView.m
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
cancelBtn.height = TOOLBAR_HEIGHT; cancelBtn.height = TOOLBAR_HEIGHT;
cancelBtn.x = FUSRTL.isRTL ? UIView.fus_screenW - cancelBtn.width - 10 : 10; cancelBtn.x = FUSRTL.isRTL ? UIView.fus_screenW - cancelBtn.width - 10 : 10;
[toolBar addSubview:cancelBtn]; [toolBar addSubview:cancelBtn];
[cancelBtn setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal]; [cancelBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[cancelBtn addTarget:self action:@selector(onTapCancelBtnAction:) forControlEvents:UIControlEventTouchUpInside]; [cancelBtn addTarget:self action:@selector(onTapCancelBtnAction:) forControlEvents:UIControlEventTouchUpInside];
CGFloat certainX = FUSRTL.isRTL ? 10 : UIView.fus_screenW - 70; CGFloat certainX = FUSRTL.isRTL ? 10 : UIView.fus_screenW - 70;
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
certainBtn.height = TOOLBAR_HEIGHT; certainBtn.height = TOOLBAR_HEIGHT;
certainBtn.x = FUSRTL.isRTL ? 10 : UIView.fus_screenW - certainBtn.width - 10; certainBtn.x = FUSRTL.isRTL ? 10 : UIView.fus_screenW - certainBtn.width - 10;
[toolBar addSubview:certainBtn]; [toolBar addSubview:certainBtn];
[certainBtn setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal]; [certainBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[certainBtn addTarget:self action:@selector(onTapCertainBtnAction:) forControlEvents:UIControlEventTouchUpInside]; [certainBtn addTarget:self action:@selector(onTapCertainBtnAction:) forControlEvents:UIControlEventTouchUpInside];
_titleLb = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(cancelBtn.frame), 0, certainBtn.x - CGRectGetMaxX(cancelBtn.frame), toolBar.height)]; _titleLb = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(cancelBtn.frame), 0, certainBtn.x - CGRectGetMaxX(cancelBtn.frame), toolBar.height)];
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/FUSSendJewelRankCell.m
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
_faceImageView.layer.cornerRadius = _faceImageView.height / 2; _faceImageView.layer.cornerRadius = _faceImageView.height / 2;
_faceImageView.layer.masksToBounds = YES; _faceImageView.layer.masksToBounds = YES;
self.rankLabel.textColor = [UIColor fus_textColorRich2]; self.rankLabel.textColor = [UIColor fus_textColorRich];
self.nickNameLabel.textColor = [UIColor fus_textColorRich2]; self.nickNameLabel.textColor = [UIColor fus_textColorRich];
self.backgroundColor = UIColor.fus_appBGColor; self.backgroundColor = UIColor.fus_appBGColor;
self.selectedBackgroundView = [[UIView alloc] init]; self.selectedBackgroundView = [[UIView alloc] init];
......
FuSiLive/Classes/Zone/View/FireFlyView/View/FUSMyZoneBottomView.m
...@@ -80,10 +80,10 @@ ...@@ -80,10 +80,10 @@
[self.audioChatBtn setTitle:[NSString fus_localString:@"声讯"] forState:UIControlStateNormal]; [self.audioChatBtn setTitle:[NSString fus_localString:@"声讯"] forState:UIControlStateNormal];
[self.videoChatBtn setTitle:[NSString fus_localString:@"视讯"] forState:UIControlStateNormal]; [self.videoChatBtn setTitle:[NSString fus_localString:@"视讯"] forState:UIControlStateNormal];
[self.focusBtn setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal]; [self.focusBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[self.chatBtn setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal]; [self.chatBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[self.audioChatBtn setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal]; [self.audioChatBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[self.videoChatBtn setTitleColor:[UIColor fus_textColorRich2] forState:UIControlStateNormal]; [self.videoChatBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[self updateBottomViewsInfos]; [self updateBottomViewsInfos];
} }
......
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