Skip to content

pidan / FuSiLive

Go to a project
Commit 330c3447 by pierce
Options

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

# Conflicts:
#	FuSiLive.xcodeproj/project.pbxproj
parents df50dc90 feb3a5ec
Expand all
Inline Side-by-side
Showing with 379 additions and 130 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/common_diamond_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "common_diamond_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "common_diamond_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/Asset.xcassets/fus_common_navi_title_logo.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_common_navi_title_logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_navi_title_logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/AlertView/FUSAlertView.m
......@@ -420,6 +420,7 @@ static FUSAlertView *sharedAlertView = nil;
self.titleLabel.attributedText = tempTitle;
self.detailLabel.attributedText = tempMsg;
self.cancelBtn.titleLabel.text = @"";
[self.cancelBtn setTitle:cancelTitle forState:UIControlStateNormal];
[self.cancelBtn sizeToFit];
_maxBtnWidth = _cancelBtn.width;
......@@ -565,6 +566,7 @@ static FUSAlertView *sharedAlertView = nil;
self.titleLabel.text = title;
self.detailLabel.text = message;
self.cancelBtn.titleLabel.text = @"";
[self.cancelBtn setTitle:cancelTitle forState:UIControlStateNormal];
[self.cancelBtn sizeToFit];
_maxBtnWidth = _cancelBtn.width;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/EmptyView/FUSEmptyView.m
......@@ -48,7 +48,7 @@
_imageScale = 0.5;
_bgImageView = [[UIImageView alloc] initWithFrame:self.bounds];
_bgImageView.contentMode = UIViewContentModeScaleAspectFit;
_bgImageView.image = [UIImage imageNamed:@"common_empty_bg_img"];
_bgImageView.image = [UIImage fus_emptyImg];
_bgImageView.hidden = YES;
[self addSubview:_bgImageView];
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Bundle/FUSFoundationBundle.h
......@@ -55,12 +55,18 @@ NS_ASSUME_NONNULL_BEGIN
/// 萤火图片
+ (UIImage *)fus_fireIcon;
/// 钻石图片
+(UIImage *)fus_diamonIcon;
/// 帮助图标
+ (UIImage *)fus_helpIcon;
/// 记录图标
+ (UIImage *)fus_recordIcon;
/// 导航栏logo标题
+(UIImage *)fus_naviLogoIcon;
/// 客服动画
+ (NSArray<UIImage *> *)fus_service;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Bundle/FUSFoundationBundle.m
......@@ -124,9 +124,14 @@
return [self fus_ImageNamed:@"common_fire_icon"];
}
/// 钻石图片
+(UIImage *)fus_diamonIcon{
return [self fus_ImageNamed:@"common_diamond_icon"];
}
+ (nullable UIImage *)fus_imageWithLevel:(NSInteger)level {
if (level <= 0) {
return nil;
return [self fus_ImageNamed:@"vip_icon_none_vip"];
} else if (level <= 30) {
return [self fus_ImageNamed:@"vip_icon_normal"];
} else {
......@@ -146,6 +151,10 @@
return image;
}
+ (UIImage *)fus_naviLogoIcon{
return [self fus_ImageNamed:@"fus_common_navi_title_logo"];
}
/// 弹窗背景图
+ (NSArray<UIImage *> *)fus_service {
return [self fus_animationImages:@"com_service_icon_" mainBundle:NO needCache:YES];
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.h
......@@ -53,6 +53,10 @@
/// 弹窗背景颜色
+(UIColor *)fus_alertViewBackgroundColor;
/// 取消按钮的背景灰色
+(UIColor *)fus_cancelBtnBcakgroundGrayColor;
/// 某些按钮的图标颜色，这个前期没有写入，可能很多地方不跟随这个
+(UIColor *)fus_buttonIconColor;
/// 阴影颜色
+(UIColor *)fus_shadowColor;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.m
......@@ -98,6 +98,12 @@
+ (UIColor *)fus_alertViewBackgroundColor{
return [UIColor colorWithHex:@"#000000" alpha:0.6];
}
+ (UIColor *)fus_cancelBtnBcakgroundGrayColor{
return [UIColor colorWithHex:@"#E5E5E5"];
}
+ (UIColor *)fus_buttonIconColor{
return [UIColor fus_textColorRich];
}
+ (UIColor *)fus_shadowColor{
return [UIColor colorWithHex:@"#8F8F8F"];
}
......
FuSiLive/Assets.xcassets/IMMessage/ZhaiXin_Cell_My_Service.imageset/Contents.json
......@@ -5,18 +5,18 @@
"scale" : "1x"
},
{
"filename" : "客服消息@2x.png",
"idiom" : "universal",
"filename" : "消息聊天-在线客服icon@2x.png",
"scale" : "2x"
},
{
"filename" : "客服消息@3x.png",
"idiom" : "universal",
"filename" : "消息聊天-在线客服icon@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
FuSiLive/Assets.xcassets/IMMessage/ZhaiXin_Cell_Notification.imageset/Contents.json
......@@ -5,18 +5,18 @@
"scale" : "1x"
},
{
"filename" : "官方图标@2x.png",
"idiom" : "universal",
"filename" : "fireflynotice@2x.png",
"scale" : "2x"
},
{
"filename" : "官方图标@3x.png",
"idiom" : "universal",
"filename" : "fireflynotice@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
FuSiLive/Assets.xcassets/IMMessage/ZhaiXin_Cell_Single_Live_Record.imageset/Contents.json
......@@ -5,18 +5,18 @@
"scale" : "1x"
},
{
"filename" : "私房童话设置@2x.png",
"idiom" : "universal",
"filename" : "消息聊天-单播视频记录icon@2x.png",
"scale" : "2x"
},
{
"filename" : "私房童话设置@3x.png",
"idiom" : "universal",
"filename" : "消息聊天-单播视频记录icon@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
\ No newline at end of file
}
FuSiLive/Assets.xcassets/fusiPart/common/fus_common_navi_title_logo.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_common_navi_title_logo@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_common_navi_title_logo@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/fusiPart/login/register_invite_code_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "register_invite_code_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/fusiPart/login/register_password_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "register_password_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Assets.xcassets/fusiPart/login/register_register_icon.imageset/Contents.json 0 → 100644
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "register_register_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSBaseSettingTableViewController.m
......@@ -26,7 +26,7 @@
- (UITableView *)tableView
{
if (!_tableView) {
_tableView = [[FUSSettingTableView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH - UIView.fus_StatusBarAndNavgationBarHeight) style:UITableViewStylePlain];
_tableView = [[FUSSettingTableView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, UIView.fus_screenH - UIView.fus_StatusBarAndNavgationBarHeight) style:UITableViewStyleGrouped];
// 如果系统版本高于iOS 11.0.0
if (@available(iOS 11.0, *)) {
_tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
......
FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSCustomSettingItem.h
......@@ -82,7 +82,7 @@ typedef NS_ENUM(NSInteger, CustomSettingItemType) {
*/
@property (nonatomic, copy) NSString *rightShowImageUrl;
/**
* 右边的图片对象(UIImage *)
* 右边的图片对象(UIImage *) 必须设置rightShowImageFrame才能生效
*/
@property (nonatomic, strong) UIImage *rightShowImage;
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/FUSHomePageViewController.m
......@@ -28,6 +28,8 @@
@property (nonatomic, assign) BOOL scrollViewDidDrag;
@property (nonatomic, assign) BOOL firstLoad;
/// 记录home页面的tabar是否因为滑动而需要隐藏
@property (nonatomic, assign) BOOL homeTabbarShouldScrollToHide;
@end
......@@ -37,6 +39,7 @@
[super viewDidLoad];
// Do any additional setup after loading the view.
self.hiddenNavigationBar = YES;
self.homeTabbarShouldScrollToHide = NO;
self.firstLoad = YES;
[self fus_createTabbarView];
......@@ -175,6 +178,17 @@
- (void)fus_homeView:(UIView *)view didUpdateCollectionCntentMaxHeightWithFloor:(CGFloat)maxHeight{
self.tabbarView.shouldBarCenterTransparency = maxHeight > (UIView.fus_screenH - [FUSFloatTabbarView fus_barHeight]);
}
- (void)fus_homeScrollview:(UIScrollView *)view shouldHideNavigationBar:(BOOL)hidden{
[self fus_shouldHideTabBar:hidden];
}
-(void)fus_shouldHideTabBar:(BOOL)hidden{
self.homeTabbarShouldScrollToHide = hidden;
[UIView animateWithDuration:0.3 animations:^{
self.tabbarView.y = hidden ? UIView.fus_screenH : UIView.fus_screenH - self.tabbarView.height;
} completion:^(BOOL finished) {
}];
}
#pragma mark --- FUSFloatTabbarViewDelegate
- (void)fus_floatTabbarView:(FUSFloatTabbarView *)tabbarView didClick:(NSInteger)index lastClick:(NSInteger)lastIndex{
......@@ -191,6 +205,12 @@
[self.contentViewList[index] fus_viewWillShow];
[self.contentViewList[lastIndex] fus_viewDidDisappear];
if (index == 1 && self.homeTabbarShouldScrollToHide) {
self.tabbarView.y = UIView.fus_screenH;
}else {
self.tabbarView.y = UIView.fus_screenH - self.tabbarView.height;
}
}
}
......@@ -206,6 +226,12 @@
[self.contentViewList[index] fus_viewWillShow];
if (lastIndex != index) {
[self.contentViewList[lastIndex] fus_viewDidDisappear];
if (index == 1 && self.homeTabbarShouldScrollToHide) {
self.tabbarView.y = UIView.fus_screenH;
}else {
self.tabbarView.y = UIView.fus_screenH - self.tabbarView.height;
}
}
}
}
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomePageBaseView.h
......@@ -14,9 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
@optional
/// 提醒显示navi,tabbar(现在仅仅支持home)
-(void)fus_scrollview:(UIScrollView *)view shouldHideNavigationBar:(BOOL)hidden;
/// 提醒隐藏navi,tabbr(现在仅仅支持home)
-(void)fus_scrollview:(UIScrollView *)view shouldShowNavigationBar:(BOOL)hidden;
-(void)fus_homeScrollview:(UIScrollView *)view shouldHideNavigationBar:(BOOL)hidden;
/// 返回collection或者tableview的内容最大高度，向下取整,用于决定外面的tabbar透明还是非透明，过高就透明
/// - Parameters:
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomeView.m
......@@ -234,7 +234,8 @@
- sectionInset.right
- (self.columnsCount - 1) * self.columnMargin) / self.columnsCount;
return floor(width);
// return floor(width);
return width;
}
......@@ -274,28 +275,7 @@
break;
case FUSHomeNaviViewClickTypeStartLive:{
NSString *isFirstStarLiveProtocolShow = [NSUserDefaults fus_readCurrentUserObjectWithKey:UDKEY_ACCOUNT_FIRST_STAR_LIVE_SHOW_PROTOCOL];
if (isFirstStarLiveProtocolShow == nil || isFirstStarLiveProtocolShow.length <= 0) {
[FUSResponsibilityConfirmAlertView fus_showOn:self.parentController.view type:0 clickHandler:^(NSInteger clickType) {
if (clickType == 0) {
// 未勾选完所有就点确定
[FUSAlertView showAlertWithTitle:nil message:[NSString fus_versionLocalString:@"您需要勾選所有確認事項後 開啟直播"] cancelButtonTitle:nil otherButtonTitles:@[[NSString fus_versionLocalString:@"確認"]] clickBlock:^(NSInteger buttonIndex) {
}];
}else if (clickType == 1) {
// 勾选完点确定
[NSUserDefaults fus_setCurrentUserObjectKey:UDKEY_ACCOUNT_FIRST_STAR_LIVE_SHOW_PROTOCOL value:@"1"];
[FUSLiveHelper fus_pushLive];
}else if (clickType == 2) {
// 点击直播公约
}
}];
}else {
[FUSLiveHelper fus_pushLive];
}
[FUSLiveHelper fus_pushLive];
}
break;
case FUSHomeNaviViewClickTypeSearch:{
......@@ -388,13 +368,13 @@
withStartContentOffSetY:_newContentOffsetY
pullUp:
^{//上拉
if (self.fus_baseDelegate && [self.fus_baseDelegate respondsToSelector:@selector(fus_scrollview:shouldHideNavigationBar:)]) {
[self.fus_baseDelegate fus_scrollview:scrollView shouldHideNavigationBar:YES];
if (self.fus_baseDelegate && [self.fus_baseDelegate respondsToSelector:@selector(fus_homeScrollview:shouldHideNavigationBar:)]) {
[self.fus_baseDelegate fus_homeScrollview:scrollView shouldHideNavigationBar:YES];
}
[self fus_shouldHideNavigationbBar:YES];
} pullDown:^{//下拉
if (self.fus_baseDelegate && [self.fus_baseDelegate respondsToSelector:@selector(fus_scrollview:shouldShowNavigationBar:)]) {
[self.fus_baseDelegate fus_scrollview:scrollView shouldShowNavigationBar:YES];
if (self.fus_baseDelegate && [self.fus_baseDelegate respondsToSelector:@selector(fus_homeScrollview:shouldHideNavigationBar:)]) {
[self.fus_baseDelegate fus_homeScrollview:scrollView shouldHideNavigationBar:NO];
}
[self fus_shouldHideNavigationbBar:NO];
} endDrag:^{//拉到尾（提前大概一页半的距离）
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMessageView.m
......@@ -17,6 +17,7 @@
#import "FUSBaoFangHttpHelper.h"
#import "FUSControllerPushHelper.h"
#import "FUSZhaiXinSettingPopView.h"
#import "FuSiLive-Swift.h"
// 导入通知框架
#import <UserNotifications/UserNotifications.h>
......@@ -25,6 +26,7 @@
@property (nonatomic, strong) UIView *naviView;
@property (nonatomic, strong) UIButton *serviceBtn;
@property (nonatomic, strong) UIButton *settingBtn;
@property (nonatomic, strong) UIButton *searchBtn;
@property (nonatomic, strong) UIStackView *headerStackView;
@property (nonatomic, strong) UIView *notificationRemindView;
......@@ -41,6 +43,9 @@
/// 四个红点的提醒
@property (nonatomic, strong) FUSUserTradeRemindModel *tradeRemindModel;
/// 当前选择segment的标签页
@property (nonatomic, assign) NSInteger currentSelectIndex;
@end
@implementation FUSMessageView
......@@ -49,6 +54,7 @@
{
self = [super init];
if (self) {
self.currentSelectIndex = 0;
[self fus_createUI];
[self fus_createMessageColumn];
......@@ -100,6 +106,14 @@
make.width.equalTo(self.settingBtn.mas_height);
}];
self.searchBtn = [UIButton buttonWithType:UIButtonTypeCustom];
[self.searchBtn setImage:[UIImage imageNamed:@"fus_home_navi_search_icon"] forState:UIControlStateNormal];
[self.naviView addSubview:self.searchBtn];
[self.searchBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(self.serviceBtn);
}];
self.searchBtn.hidden = YES;
self.headerStackView = [[UIStackView alloc] init];
self.headerStackView.axis = UILayoutConstraintAxisVertical;
self.headerStackView.distribution = UIStackViewDistributionEqualSpacing;
......@@ -169,6 +183,7 @@
[notificationOpenBtn addTarget:self action:@selector(fus_notificationOpenBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
[self.serviceBtn addTarget:self action:@selector(fus_serviceBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
[self.settingBtn addTarget:self action:@selector(fus_settingBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
[self.searchBtn addTarget:self action:@selector(fus_searchBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
}
-(void)fus_createMessageColumn{
......@@ -201,6 +216,7 @@
CGRect scFrame = weakSelf.scrollView.frame;
scFrame.origin.x = weakSelf.scrollView.width * index;
[weakSelf.scrollView scrollRectToVisible:scFrame animated:NO];
[weakSelf fus_reloadAboutSwitchPageUI:index];
};
//滑动部分
......@@ -253,16 +269,15 @@
}
#pragma mark --- method
/// 重载关于切换页面需要跟跟着变的ui
-(void)fus_reloadAboutSwitchPageUI:(NSInteger)index{
self.currentSelectIndex = index;
self.serviceBtn.hidden = (index == 1);
self.searchBtn.hidden = (index == 0);
}
-(void)fus_reloadMessageFunctionColumnUI{
self.functionColumnView.model = self.tradeRemindModel;
// FUSUserTradeRemindModel *model = [[FUSUserTradeRemindModel alloc] init];
// model.gemRemindSum = 2;
// model.chipRemindSum = 20;
// model.bondsRemindSum = 99999999999;
// model.inviteRemindSum = 1;
// self.functionColumnView.model = model;
}
-(void)fus_reloadnotificationRemindTips{
......@@ -314,6 +329,15 @@
}
#pragma mark --- button did clicked
-(void)fus_searchBtnDidClicked:(UIButton *)btn{
FUSSearchViewController *searchVC = [[FUSSearchViewController alloc] init];
searchVC.searchType = FUSSearchVcTypePeopleNetwork;
[self.parentController.navigationController pushViewController:searchVC animated:YES];
[searchVC fus_clickJump:^{
}];
}
-(void)fus_serviceBtnDidClicked:(UIButton *)btn{
[self.parentController.navigationController fus_pushToServiceControllerWithAnimate:YES];
}
......@@ -337,6 +361,7 @@
NSInteger index = (NSInteger)(scrollView.contentOffset.x/scrollView.width + 0.5);
if (index >= 0 && index < self.segCtrlView.itemTitles.count) {
[self.segCtrlView fus_setSelectedItem:index autoCallBack:NO];
[self fus_reloadAboutSwitchPageUI:index];
}
}
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMyView.m
......@@ -190,6 +190,7 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
case FUSMySettingItemTypeImAnchor:
itemModel.rightShowTextColor = [UIColor fus_fireGreen];
itemModel.rightShowImage = [UIImage fus_fireIcon];
itemModel.rightShowImageFrame = CGRectMake(0, 0, 22, 22);
break;
case FUSMySettingItemTypeSetIntitationCode:
itemModel.rightShowTextFont = [UIFont fus_themeFont:17];
......@@ -203,7 +204,8 @@ typedef NS_ENUM(NSInteger, FUSMySettingItemType){
break;
case FUSMySettingItemTypeGiveAwayDiamond:
itemModel.rightShowTextColor = [UIColor fus_diamondBlue];
itemModel.rightShowImage = [UIImage imageNamed:@"fus_my_setting_header_jew_icon"];
itemModel.rightShowImage = [UIImage imageNamed:@"fus_my_setting_item_jew_icon"];
itemModel.rightShowImageFrame = CGRectMake(0, 0, 22, 22);
break;
case FUSMySettingItemTypeBackpack:
itemModel.rightShowText = @"座駕";
......
FuSiLive/Classes/InstantMessaging/View/FUSChatIntimacyV2View.m
......@@ -146,7 +146,8 @@
}else if (progress > 1){
progress = 1;
}
[self.progressTintView mas_updateConstraints:^(MASConstraintMaker *make) {
[self.progressTintView mas_remakeConstraints:^(MASConstraintMaker *make) {
make.left.top.bottom.offset(0);
make.width.equalTo(self.progressBgView.mas_width).multipliedBy(progress);
}];
}
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FUSSingleLiveEndedPopView.m
......@@ -149,7 +149,7 @@
if (!_bottomView) {
CGFloat height = UIView.fus_screenW / 375.0f * 231.0f;
_bottomView = [[UIView alloc] initWithFrame:CGRectMake(0, UIView.fus_screenH - height, UIView.fus_screenW, height)];
_bottomView.backgroundColor = [UIColor colorWithHex:@"#191923" alpha:0.9];
_bottomView.backgroundColor = [UIColor fus_appBGColor];
}
return _bottomView;
......@@ -160,7 +160,7 @@
_titleLabel = [[UILabel alloc] init];
_titleLabel.text = FUSLocalizationHelper.localString(@"通话已结束");
_titleLabel.font = [UIFont fus_themeFont:15];
_titleLabel.textColor = [UIColor colorWithHex:@"999999"];
_titleLabel.textColor = [UIColor fus_textColorRich];
_titleLabel.textAlignment = NSTextAlignmentCenter;
[_titleLabel sizeToFit];
}
......@@ -181,7 +181,7 @@
- (UILabel *)timeLabel {
if (!_timeLabel) {
_timeLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW / 2.0f, 20)];
_timeLabel.textColor = [UIColor whiteColor];
_timeLabel.textColor = [UIColor fus_textColorRich];
_timeLabel.font = [UIFont fus_themeFont:20];
_timeLabel.textAlignment = NSTextAlignmentCenter;
}
......@@ -192,7 +192,7 @@
- (UILabel *)timeLocalLabel {
if (!_timeLocalLabel) {
_timeLocalLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW / 2.0f, 15)];
_timeLocalLabel.textColor = [UIColor colorWithHex:@"cccccc"];
_timeLocalLabel.textColor = [UIColor fus_textColorMedium];
_timeLocalLabel.font = [UIFont fus_themeFont:12];
_timeLocalLabel.text = FUSLocalizationHelper.localString(@"通话时长");
_timeLocalLabel.textAlignment = NSTextAlignmentCenter;
......@@ -206,8 +206,8 @@
if (!_fireBtn) {
_fireBtn = [UIButton buttonWithType:UIButtonTypeCustom];
_fireBtn.frame = CGRectMake(0, 0, UIView.fus_screenW / 2.0f, 20);
[_fireBtn setImage:[UIImage imageNamed:@"fireFly_zone_fire"] forState:UIControlStateNormal];
[_fireBtn setTitleColor:[UIColor colorWithHex:@"#00F088"] forState:UIControlStateNormal];
[_fireBtn setImage:[UIImage fus_fireIcon] forState:UIControlStateNormal];
[_fireBtn setTitleColor:[UIColor fus_fireGreen] forState:UIControlStateNormal];
_fireBtn.titleLabel.font = [UIFont fus_themeFont:20];
}
......@@ -217,7 +217,7 @@
- (UILabel *)fireLocalLabel {
if (!_fireLocalLabel) {
_fireLocalLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW / 2.0f, 15)];
_fireLocalLabel.textColor = [UIColor colorWithHex:@"cccccc"];
_fireLocalLabel.textColor = [UIColor fus_textColorMedium];
_fireLocalLabel.font = [UIFont fus_themeFont:12];
_fireLocalLabel.text = FUSLocalizationHelper.localString(@"收获萤火");
_fireLocalLabel.textAlignment = NSTextAlignmentCenter;
......
FuSiLive/Classes/Login/Controller/FUSForgetPasswordViewController.m
......@@ -614,6 +614,7 @@
NSString *countryName = [_countryInfoDict objectForKey:FUSCountryLocaleNameKey];
NSString *countryCode = [_countryInfoDict objectForKey:FUSCountryCodeKey];
_countryCode = countryCode;
self.countryDetailLabel.text = countryName;
......@@ -629,7 +630,7 @@
self.countryInfoDict = nil;
self.countryDetailLabel.text = [NSString fus_versionLocalString:@"未知国家"];
self.countryDetailLabel.textAlignment = NSTextAlignmentRight;
_countryCode = nil;
}
// if (!self.countryInfoDict) {
......
FuSiLive/Classes/Login/Controller/FUSSetUserInfoViewController.m
......@@ -98,6 +98,7 @@
_nickLabel.text = FUSLocalizationHelper.localString(@"昵称：");
_nicknameTextField.placeholder = FUSLocalizationHelper.localString(@"设定您的昵称");
_nicknameTextField.textColor = [UIColor fus_textColorRich];
_sexLabel.text = FUSLocalizationHelper.localString(@"性别：");
[_girlButton setTitle:FUSLocalizationHelper.localString(@"女") forState:UIControlStateNormal];
[_boyButton setTitle:FUSLocalizationHelper.localString(@"男") forState:UIControlStateNormal];
......@@ -116,8 +117,8 @@
_nicknameTextField.delegate = self;
// [_nicknameTextField setValue:[UIColor colorWithHex:@"#333333"] forKeyPath:@"_placeholderLabel.textColor"];
NSAttributedString *attrString = [[NSAttributedString alloc] initWithString:FUSLocalizationHelper.localString(@"设定您的昵称") attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"#333333"], NSFontAttributeName:_nicknameTextField.font}];
_nicknameTextField.attributedPlaceholder = attrString;
// NSAttributedString *attrString = [[NSAttributedString alloc] initWithString:FUSLocalizationHelper.localString(@"设定您的昵称") attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"#333333"], NSFontAttributeName:_nicknameTextField.font}];
// _nicknameTextField.attributedPlaceholder = attrString;
// 设置默认性别
_selSex = -1;
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/ShareToChat/FUSLiveShareToChatView.m
......@@ -277,7 +277,7 @@
FUSLiveShareToChatModel *userModel = [[FUSLiveShareToChatModel alloc] init];
userModel.uid = model.uid;
userModel.face = model.faceimg;
userModel.nickname = model.nickName;
userModel.nickname = model.nickname;
userModel.level = model.level;
userModel.privilege = model.privilege;
userModel.selected = YES;
......
FuSiLive/Classes/NewLive/Main/View/Push/FUSLiveStartView.m
......@@ -9,6 +9,7 @@
#import "FUSLiveStartView.h"
#import "FUSVideoStartSetTitleView.h"
#import "FUSVideoStartBeautySetView.h"
#import "FUSResponsibilityConfirmAlertView.h"
#import "FUSUserDefaultsStore.h"
......@@ -128,9 +129,10 @@
};
self.setScopeView.clickStartLiveBtnActionHandler = ^(FUSVideoStartShareType shareType, FUSLiveRoomScopeType scopeType) {
if (weakSelf.startLiveHandler) {
weakSelf.startLiveHandler(weakSelf.currentTitle, shareType, scopeType);
}
// if (weakSelf.startLiveHandler) {
// weakSelf.startLiveHandler(weakSelf.currentTitle, shareType, scopeType);
// }
[weakSelf clickStartLiveActionWithShareType:shareType scopeType:scopeType];
};
[self.scrollView addSubview:self.setScopeView];
......@@ -185,6 +187,36 @@
}
#pragma mark - UI Actions
-(void)clickStartLiveActionWithShareType:(FUSVideoStartShareType)shareType scopeType:(FUSLiveRoomScopeType)scopeType{
NSString *isFirstStarLiveProtocolShow = [NSUserDefaults fus_readCurrentUserObjectWithKey:UDKEY_ACCOUNT_FIRST_STAR_LIVE_SHOW_PROTOCOL];
if (isFirstStarLiveProtocolShow == nil || isFirstStarLiveProtocolShow.length <= 0) {
FUSWeakSelf(weakSelf);
[FUSResponsibilityConfirmAlertView fus_showOn:self type:0 clickHandler:^(NSInteger clickType) {
if (clickType == 0) {
// 未勾选完所有就点确定
[FUSAlertView showAlertWithTitle:nil message:[NSString fus_versionLocalString:@"您需要勾選所有確認事項後 開啟直播"] cancelButtonTitle:nil otherButtonTitles:@[[NSString fus_versionLocalString:@"確認"]] clickBlock:^(NSInteger buttonIndex) {
}];
}else if (clickType == 1) {
// 勾选完点确定
[NSUserDefaults fus_setCurrentUserObjectKey:UDKEY_ACCOUNT_FIRST_STAR_LIVE_SHOW_PROTOCOL value:@"1"];
if (weakSelf.startLiveHandler) {
weakSelf.startLiveHandler(weakSelf.currentTitle, shareType, scopeType);
}
}else if (clickType == 2) {
// 点击直播公约
}
}];
}else {
if (self.startLiveHandler) {
self.startLiveHandler(self.currentTitle, shareType, scopeType);
}
}
}
- (IBAction)clickCloseBtnAction:(UIButton *)sender {
[FUSLiveHelper fus_quitLiveWithCompletion:^{
......
FuSiLive/Classes/NewsFeed/RichEditor/Controller/WGBaseRichEditorViewController.m
......@@ -119,8 +119,9 @@ WKScriptMessageHandler
- (void)configNavigation{
UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 80, 50)];
imageView.image = [UIImage imageNamed:@"newsfeed_publish_nav_title"];
UIImageView *imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 60, 35)];
// imageView.image = [UIImage imageNamed:@"newsfeed_publish_nav_title"];
imageView.image = [UIImage fus_naviLogoIcon];
imageView.contentMode = UIViewContentModeScaleAspectFit;
self.navigationItem.titleView = imageView;
......@@ -340,7 +341,7 @@ WKScriptMessageHandler
_addressBtn = [UIButton buttonWithType:UIButtonTypeCustom];
_addressBtn.frame = CGRectMake(22, 0, _addressBgView.width - _addressSwitch.width - 50, _addressBgView.height);
[_addressBtn setTitle:FUSLocalizationHelper.localString(@"定位") forState:UIControlStateNormal];
[_addressBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[_addressBtn setTitleColor:[UIColor fus_textColorMedium] forState:UIControlStateNormal];
_addressBtn.titleLabel.font = [UIFont systemFontOfSize:15];
[_addressBgView addSubview:_addressBtn];
_addressBtn.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;
......@@ -799,7 +800,7 @@ WKScriptMessageHandler
searchVC.fromType = FUSSearchFromAtSomeOne;
searchVC.modalPresentationStyle = UIModalPresentationCustom;
searchVC.didSelectedModelBlock = ^(FUSMainSearchModel *model) {
[weakSelf.webView insertAtSomeOneName:model.nickName uid:model.uid index:_atSomeOneArr.count Callback:^(id _Nullable obj, NSError * _Nullable error) {
[weakSelf.webView insertAtSomeOneName:model.nickname uid:model.uid index:_atSomeOneArr.count Callback:^(id _Nullable obj, NSError * _Nullable error) {
[weakSelf.webView contentBecomeFirstResponder];
[self fus_checkInputContent];
}];
......
FuSiLive/Classes/NewsFeed/RichEditor/View/WGEditorToolBar.m
......@@ -42,7 +42,7 @@
- (UIButton *)keyboardItem{
if (!_keyboardItem) {
_keyboardItem = [UIButton buttonWithType:UIButtonTypeCustom];
[_keyboardItem setImage:[UIImage imageNamed:@"jianpanshang"] forState:UIControlStateNormal];
[_keyboardItem setImage:[[UIImage imageNamed:@"jianpanshang"] imageByTintColor:[UIColor fus_buttonIconColor]] forState:UIControlStateNormal];
[_keyboardItem addTarget:self action:@selector(clickToolBarBtn:) forControlEvents:UIControlEventTouchUpInside];
}
return _keyboardItem;
......@@ -52,8 +52,8 @@
if (!_emojiItem) {
_emojiItem = [UIButton buttonWithType:UIButtonTypeCustom];
_emojiItem.tag = 9;
[_emojiItem setImage:[UIImage imageNamed:@"emoji"] forState:UIControlStateNormal];
[_emojiItem setImage:[UIImage imageNamed:@"jianpanshang"] forState:UIControlStateSelected];
[_emojiItem setImage:[[UIImage imageNamed:@"emoji"] imageByTintColor:[UIColor fus_buttonIconColor]] forState:UIControlStateNormal];
[_emojiItem setImage:[[UIImage imageNamed:@"jianpanshang"] imageByTintColor:[UIColor fus_buttonIconColor]] forState:UIControlStateSelected];
[_emojiItem addTarget:self action:@selector(clickToolBarBtn:) forControlEvents:UIControlEventTouchUpInside];
}
return _emojiItem;
......@@ -62,7 +62,7 @@
- (UIButton *)atSomeOneItem{
if (!_atSomeOneItem) {
_atSomeOneItem = [UIButton buttonWithType:UIButtonTypeCustom];
[_atSomeOneItem setImage:[UIImage imageNamed:@"atSomeOne"] forState:UIControlStateNormal];
[_atSomeOneItem setImage:[[UIImage imageNamed:@"atSomeOne"] imageByTintColor:[UIColor fus_buttonIconColor]] forState:UIControlStateNormal];
[_atSomeOneItem addTarget:self action:@selector(clickToolBarBtn:) forControlEvents:UIControlEventTouchUpInside];
_atSomeOneItem.tag = 10;
}
......@@ -72,7 +72,7 @@
- (UIButton *)photoItem{
if (!_photoItem) {
_photoItem = [UIButton buttonWithType:UIButtonTypeCustom];
[_photoItem setImage:[UIImage imageNamed:@"tupian"] forState:UIControlStateNormal];
[_photoItem setImage:[[UIImage imageNamed:@"tupian"] imageByTintColor:[UIColor fus_buttonIconColor]] forState:UIControlStateNormal];
_photoItem.tag = 1;
[_photoItem addTarget:self action:@selector(clickToolBarBtn:) forControlEvents:UIControlEventTouchUpInside];
......@@ -82,7 +82,7 @@
- (UIButton *)linkItem{
if (!_linkItem) {
_linkItem = [UIButton buttonWithType:UIButtonTypeCustom];
[_linkItem setImage:[UIImage imageNamed:@"lianjie"] forState:UIControlStateNormal];
[_linkItem setImage:[[UIImage imageNamed:@"lianjie"] imageByTintColor:[UIColor fus_buttonIconColor]] forState:UIControlStateNormal];
_linkItem.tag = 8;
[_linkItem addTarget:self action:@selector(clickToolBarBtn:) forControlEvents:UIControlEventTouchUpInside];
}
......@@ -91,7 +91,7 @@
- (UIButton *)videoItem{
if (!_videoItem) {
_videoItem = [UIButton buttonWithType:UIButtonTypeCustom];
[_videoItem setImage:[UIImage imageNamed:@"icon_video"] forState:UIControlStateNormal];
[_videoItem setImage:[[UIImage imageNamed:@"icon_video"] imageByTintColor:[UIColor fus_buttonIconColor]] forState:UIControlStateNormal];
_videoItem.tag = 2;
[_videoItem addTarget:self action:@selector(clickToolBarBtn:) forControlEvents:UIControlEventTouchUpInside];
}
......@@ -100,7 +100,7 @@
- (UIButton *)audioItem{
if (!_audioItem) {
_audioItem = [UIButton buttonWithType:UIButtonTypeCustom];
[_audioItem setImage:[UIImage imageNamed:@"icon_audio"] forState:UIControlStateNormal];
[_audioItem setImage:[[UIImage imageNamed:@"icon_audio"] imageByTintColor:[UIColor fus_buttonIconColor]] forState:UIControlStateNormal];
_audioItem.tag = 3;
[_audioItem addTarget:self action:@selector(clickToolBarBtn:) forControlEvents:UIControlEventTouchUpInside];
}
......@@ -110,7 +110,7 @@
if (!_fontItem) {
_fontItem = [UIButton buttonWithType:UIButtonTypeCustom];
[_fontItem setImage:[UIImage imageNamed:@"ziti"] forState:UIControlStateNormal];
[_fontItem setImage:[UIImage imageNamed:@"ziti_hover"] forState:UIControlStateSelected];
[_fontItem setImage:[[UIImage imageNamed:@"ziti_hover"] imageByTintColor:[UIColor fus_buttonIconColor]] forState:UIControlStateSelected];
_fontItem.tag = 4;
[_fontItem addTarget:self action:@selector(clickToolBarBtn:) forControlEvents:UIControlEventTouchUpInside];
}
......@@ -119,7 +119,7 @@
- (UIButton *)undoItem{
if (!_undoItem) {
_undoItem = [UIButton buttonWithType:UIButtonTypeCustom];
[_undoItem setImage:[UIImage imageNamed:@"chexiao"] forState:UIControlStateNormal];
[_undoItem setImage:[[UIImage imageNamed:@"chexiao"] imageByTintColor:[UIColor fus_buttonIconColor]] forState:UIControlStateNormal];
_undoItem.tag = 5;
[_undoItem addTarget:self action:@selector(clickToolBarBtn:) forControlEvents:UIControlEventTouchUpInside];
}
......@@ -128,7 +128,7 @@
- (UIButton *)redoItem{
if (!_redoItem) {
_redoItem = [UIButton buttonWithType:UIButtonTypeCustom];
[_redoItem setImage:[UIImage imageNamed:@"chongzuo"] forState:UIControlStateNormal];
[_redoItem setImage:[[UIImage imageNamed:@"chongzuo"] imageByTintColor:[UIColor fus_buttonIconColor]] forState:UIControlStateNormal];
_redoItem.tag = 6;
[_redoItem addTarget:self action:@selector(clickToolBarBtn:) forControlEvents:UIControlEventTouchUpInside];
}
......@@ -137,7 +137,7 @@
- (UIButton *)settingItem{
if (!_settingItem) {
_settingItem = [UIButton buttonWithType:UIButtonTypeCustom];
[_settingItem setImage:[UIImage imageNamed:@"icon_shezhi"] forState:UIControlStateNormal];
[_settingItem setImage:[[UIImage imageNamed:@"icon_shezhi"] imageByTintColor:[UIColor fus_buttonIconColor]] forState:UIControlStateNormal];
_settingItem.tag = 7;
[_settingItem addTarget:self action:@selector(clickToolBarBtn:) forControlEvents:UIControlEventTouchUpInside];
}
......@@ -202,7 +202,7 @@
if (self == [super initWithFrame:frame]) {
self.backgroundColor = [UIColor colorWithHex:@"#191921"];
self.backgroundColor = [UIColor fus_appBGColor];
// [self.masonryViewArray addObject:self.keyboardItem];
[self.masonryViewArray addObject:self.emojiItem];
......
FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedItemCell.m
......@@ -879,6 +879,7 @@
- (UIImageView *)richImageView {
if (!_richImageView) {
_richImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 30, 12)];
_richImageView.contentMode = UIViewContentModeScaleAspectFit;
}
return _richImageView;
}
......
FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedUnlockAlert.m
......@@ -23,8 +23,8 @@
@property (strong, nonatomic) IBOutlet UILabel *titleLabel;
@property (strong, nonatomic) IBOutlet UILabel *priceLabel;
@property (strong, nonatomic) IBOutlet UILabel *unlockUserLabel;
@property (strong, nonatomic) IBOutlet UIButton *cancelBtn;
@property (strong, nonatomic) IBOutlet UIButton *sureBtn;
@property (strong, nonatomic) IBOutlet FUSStyleButton *cancelBtn;
@property (strong, nonatomic) IBOutlet FUSStyleButton *sureBtn;
// 动态model
@property (nonatomic, strong) FUSNewsFeedListModel *model;
......@@ -117,6 +117,9 @@
- (void)customInit {
self.cancelBtn.style = FUSButtonStyleBlue;
self.cancelBtn.backgroundColor = [UIColor fus_cancelBtnBcakgroundGrayColor];
self.sureBtn.style = FUSButtonStyleBlue;
[self.cancelBtn setTitle:FUSLocalizationHelper.localString(@"取消") forState:UIControlStateNormal];
[self.sureBtn setTitle:FUSLocalizationHelper.localString(@"确定") forState:UIControlStateNormal];
self.faceImageView.layer.cornerRadius = self.faceImageView.height / 2.0f;
......@@ -144,7 +147,7 @@
self.richImageView.hidden = YES;
self.richImageWidthConstraint.constant = 5;
}
self.nickNameLabel.textColor = [UIColor whiteColor];
self.nickNameLabel.textColor = [UIColor fus_textColorRich];
self.titleLabel.text = FUSLocalizationHelper.localString(@"将此内容进行了定价");
......@@ -152,7 +155,7 @@
NSString *title = [NSString stringWithFormat:FUSLocalizationHelper.localString(@"确认支付%@%@解锁此内容？"),model.price,currency];
NSMutableAttributedString *att = [[NSMutableAttributedString alloc] initWithString:title];
[att addAttributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"#E6E6E6"],NSFontAttributeName:[UIFont fus_themeFont:13]} range:NSMakeRange(0, title.length)];
[att addAttributes:@{NSForegroundColorAttributeName:[UIColor fus_textColorMedium],NSFontAttributeName:[UIFont fus_themeFont:13]} range:NSMakeRange(0, title.length)];
NSRange priceRange = [title rangeOfString:model.price];
......
FuSiLive/Classes/Payment/Controller/FUSExchangeDiamondViewController.xib
......@@ -26,8 +26,8 @@
<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"/>
</imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="zone_withdraw" translatesAutoresizingMaskIntoConstraints="NO" id="D4b-jC-PY1">
<rect key="frame" x="167.5" y="40" width="40" height="40"/>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_large_fire_icon" translatesAutoresizingMaskIntoConstraints="NO" id="D4b-jC-PY1">
<rect key="frame" x="176.5" y="52" width="22" height="28"/>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2i0-3C-TMh">
<rect key="frame" x="179.5" y="85" width="16" height="30"/>
......@@ -68,6 +68,6 @@
</view>
</objects>
<resources>
<image name="zone_withdraw" width="40" height="40"/>
<image name="common_large_fire_icon" width="22" height="28"/>
</resources>
</document>
FuSiLive/Classes/Search/Model/FUSMainSearchModel.h
......@@ -14,6 +14,8 @@
@property (nonatomic, copy) NSString *level;
@property (nonatomic, copy) NSString *face;
@property (nonatomic, copy) NSString *lev;
@property (nonatomic, copy) NSString *nickname;
/// 昵称，后台N,n不分，导致要写这个兼容
@property (nonatomic, copy) NSString *nickName;
@property (nonatomic, copy) NSString *markname;
@property (nonatomic, copy) NSString *uid;
......
FuSiLive/Classes/Search/Model/FUSMainSearchModel.m
......@@ -10,4 +10,18 @@
@implementation FUSMainSearchModel
- (NSString *)nickname{
if ([NSString isNull:_nickname]) {
_nickname = _nickName;
}
return _nickname;
}
- (NSString *)nickName{
if ([NSString isNull:_nickName]) {
_nickName = _nickname;
}
return _nickName;
}
@end
FuSiLive/Classes/Search/View/FUSMainSearchTableViewCell.m
......@@ -78,7 +78,7 @@
NSString *name = @"";
if ([NSString isNull:model.markname]) {
name = model.nickName;
name = model.nickname;
} else {
name = model.markname;
}
......
FuSiLive/Classes/Search/View/FUSSearchTableViewCell.swift
......@@ -148,7 +148,7 @@ class FUSSearchTableViewCell: UITableViewCell {
}
}
anchorName.text = searchModel?.nickName
anchorName.text = searchModel?.nickname
}
}
......
FuSiLive/Classes/Setting/View/FUSNetworkCheckCaptureView.m
......@@ -15,7 +15,7 @@
@property (strong, nonatomic) IBOutlet UIView *contentView;
@property (strong, nonatomic) IBOutlet UIImageView *imageView;
@property (strong, nonatomic) IBOutlet UIButton *reportBtn;
@property (strong, nonatomic) IBOutlet FUSStyleButton *reportBtn;
// 截图
@property (nonatomic, strong) UIImage *captureImage;
......@@ -44,10 +44,13 @@
self = [[[NSBundle mainBundle] loadNibNamed:NSStringFromClass(self.class) owner:self options:nil] firstObject];
self.frame = frame;
self.reportBtn.style = FUSButtonStyleBlue;
[self.reportBtn setTitle:FUSLocalizationHelper.localString(@"将结果反馈给客服") forState:UIControlStateNormal];
self.imageView.layer.cornerRadius = 12;
self.imageView.layer.masksToBounds = YES;
self.imageView.layer.borderColor = [UIColor fus_shadowColor].CGColor;
self.imageView.layer.borderWidth = 1;
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapToClose)];
[self addGestureRecognizer:tap];
......
FuSiLive/Classes/Setting/View/FUSNetworkCheckCaptureView.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="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" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<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>
......@@ -17,8 +17,14 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="15t-Q5-jt4">
<rect key="frame" x="72" y="282" width="270" height="332"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_alert_bg_img" translatesAutoresizingMaskIntoConstraints="NO" id="wGt-Ez-Q2d">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wGt-Ez-Q2d">
<rect key="frame" x="-10" y="-10" width="290" height="352"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="12"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="av8-3v-khu">
<rect key="frame" x="43" y="32" width="184" height="212"/>
......@@ -30,12 +36,12 @@
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EDs-d0-xLS">
<rect key="frame" x="0.0" y="281.5" width="270" height="0.5"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="0.10000000000000001" colorSpace="custom" customColorSpace="calibratedRGB"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="0.5" id="vpf-8C-8Ua"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5uy-Yb-A5Y">
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5uy-Yb-A5Y" customClass="FUSStyleButton">
<rect key="frame" x="0.0" y="282" width="270" height="50"/>
<fontDescription key="fontDescription" name="PingFangSC-Semibold" family="PingFang SC" pointSize="17"/>
<state key="normal" title="將結果反饋給客服">
......@@ -80,7 +86,4 @@
<point key="canvasLocation" x="-278.26086956521743" y="134.59821428571428"/>
</view>
</objects>
<resources>
<image name="common_alert_bg_img" width="120.5" height="118.5"/>
</resources>
</document>
FuSiLive/Classes/Setting/View/FUSSettingNetworkCherkAlert.m
......@@ -49,14 +49,14 @@
self.frame = frame;
self.tipLabel.text = FUSLocalizationHelper.localString(@"请依次检测以下网络");
self.network1Btn.style = FUSButtonStyleBlueBorder;
self.network1Btn.style = FUSButtonStyleBlue;
[self.network1Btn setTitle:FUSLocalizationHelper.localString(@"网络1") forState:UIControlStateNormal];
[self.network1Btn setImage:[UIImage imageNamed:@"setting_network"] forState:UIControlStateNormal];
self.network1Btn.titleEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 0);
self.network1Btn.titleEdgeInsets = UIEdgeInsetsMake(0, 20, 0, 0);
self.network2Btn.style = FUSButtonStyleBlueBorder;
self.network2Btn.style = FUSButtonStyleBlue;
[self.network2Btn setTitle:FUSLocalizationHelper.localString(@"网络2") forState:UIControlStateNormal];
self.network2Btn.titleEdgeInsets = UIEdgeInsetsMake(0, 10, 0, 0);
self.network2Btn.titleEdgeInsets = UIEdgeInsetsMake(0, 20, 0, 0);
[self.network2Btn setImage:[UIImage imageNamed:@"setting_network"] forState:UIControlStateNormal];
UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapToClose)];
......
FuSiLive/Classes/Setting/View/FUSSettingNetworkCherkAlert.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="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" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
<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>
......@@ -17,13 +17,19 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Z5I-HG-ezk">
<rect key="frame" x="72" y="296" width="270" height="304"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="common_alert_bg_img" translatesAutoresizingMaskIntoConstraints="NO" id="eyX-32-zec">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="eyX-32-zec">
<rect key="frame" x="-10" y="-10" width="290" height="324"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="12"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请依次检测以下网路" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="apb-FP-yNY">
<rect key="frame" x="20" y="50" width="230" height="21"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vb9-x5-MO8" customClass="FUSStyleButton">
......@@ -85,7 +91,6 @@
</view>
</objects>
<resources>
<image name="common_alert_bg_img" width="120.5" height="118.5"/>
<image name="setting_network" width="16.5" height="16.5"/>
</resources>
</document>
FuSiLive/Classes/ZhaiXin/Main/View/FUSSingleChatTableViewCell.m
......@@ -81,7 +81,9 @@
_model.unread = [NSString stringWithFormat:@"%ld",[FUSSingleChatDBOperate selectUnreadCountFromSingleChatTableWithFid:_model.uid]];
if ([_model.uid isEqualToString:IM_SERVEICE_UID]) {
if ([_model.uid isEqualToString:IM_SERVEICE_UID] ||
[_model.uid isEqualToString:IM_SERVEICE_UID1] ||
[_model.uid isEqualToString:IM_SERVEICE_UID2]) {
// self.contentView.backgroundColor = [UIColor colorWithHex:@"#1F1F1F"];
......@@ -111,7 +113,7 @@
_nameLabel.text = [NSString stringWithFormat:@"%@%@",FUSConfig.sharedInstanced.appConfigs.appName,FUSLocalizationHelper.localString(@"伴聊")];
[_headPicImageView setImage:[UIImage imageNamed:@"chat_im_yabao_accompany"]];
} else if ([_model.typeId hasPrefix:SINGLE_LIVE_RECORD]) {
_nameLabel.text = FUSLocalizationHelper.localString(@"约会信用通话记录");
_nameLabel.text = [NSString fus_versionLocalString:@"私房通话记录"];
_model.unread = [[NSUserDefaults standardUserDefaults] objectForKey:FUSBO_SINGLE_LIVE_RECORD_COUNT([FUSCacheDataShare shareStore].userDetailInfo.uid)];
[_headPicImageView setImage:[UIImage imageNamed:@"ZhaiXin_Cell_Single_Live_Record"]];
} else if ([_model.typeId hasPrefix:NEWS_FEED_MESSAGE]){
......
FuSiLive/Classes/Zone/Controller/FUSFollowViewController.m
......@@ -107,7 +107,7 @@
if ([NSArray isNull:_dataSource]) {
if (weakSelf.emptyView == nil) {
weakSelf.emptyView = [[FUSEmptyView alloc] initWithFrame:weakSelf.tableView.bounds];
[weakSelf.emptyView fus_setEmptyViewIcon:[UIImage imageNamed:@"fireFly_my_zone_fans_no_data"] title:FUSLocalizationHelper.localString(@"暂时没有粉丝哦") buttonTittle:nil];
[weakSelf.emptyView fus_setEmptyViewIcon:[UIImage fus_emptyImg] title:FUSLocalizationHelper.localString(@"暂时没有粉丝哦") buttonTittle:nil];
}
[weakSelf.tableView addSubview:weakSelf.emptyView];
}
......
FuSiLive/Classes/Zone/View/FUSZoneEditPickerView.m
......@@ -261,7 +261,7 @@
// toolbar工具条
UIView *toolBar = [[UIView alloc]initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, TOOLBAR_HEIGHT)];
toolBar.backgroundColor = [UIColor colorWithHex:@"#191923"];
toolBar.backgroundColor = [UIColor fus_appBGColor];
[_bgView addSubview:toolBar];
CGFloat cancelX = FUSRTL.isRTL ? UIView.fus_screenW - 70 : 10;
......@@ -288,7 +288,7 @@
_titleLb = [[UILabel alloc] initWithFrame:CGRectMake(CGRectGetMaxX(cancelBtn.frame), 0, certainBtn.x - CGRectGetMaxX(cancelBtn.frame), toolBar.height)];
_titleLb.font = [UIFont systemFontOfSize:17 weight:UIFontWeightMedium];
_titleLb.textColor = [UIColor colorWithHex:@"#CCCCCC"];
_titleLb.textColor = [UIColor fus_textColorRich];
_titleLb.textAlignment = NSTextAlignmentCenter;
[toolBar addSubview:_titleLb];
......@@ -363,7 +363,7 @@
[titleBtn.titleLabel setFont:[UIFont fus_themeFont:18]];
}
titleBtn.titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
[titleBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
[titleBtn setTitleColor:[UIColor fus_textColorRich] forState:UIControlStateNormal];
[titleBtn setImage:nil forState:UIControlStateNormal];
switch (_editType) {
......@@ -523,7 +523,7 @@
_pickerView.dataSource = self;
_pickerView.tag = 101;
[_pickerView selectRow:_defaultSelectRow inComponent:0 animated:YES];
_pickerView.backgroundColor = [UIColor colorWithHex:@"#191923"];
_pickerView.backgroundColor = [UIColor fus_appBGColor];
}
return _pickerView;
}
......
FuSiLive/Classes/Zone/View/TaskCenter/FUSTaskCenterTableViewCell.m
......@@ -111,10 +111,6 @@ static NSString *const reuseIdentifyNoTaskCell = @"FUSMissionCenterNoTaskCell";
return invitationCell;
} else {
if (_currentModel.type.intValue == 0) {
NSLog(@"32g4e3h43h34");
}
if (_currentModel.parent > 0) {
if (indexPath.row == 0) {
FUSTaskCenterHeaderTableViewCell *headerCell = [tableView dequeueReusableCellWithIdentifier:reuseIdentifyHeaderCell forIndexPath:indexPath];
......
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