Skip to content

pidan / FuSiLive

Go to a project
Commit e52f7917 by ludi
Options

修复一系列bug，准备本地化的工作

parent 0b92273b
Expand all
Inline Side-by-side
Showing with 248 additions and 110 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.h
......@@ -11,6 +11,7 @@
@interface UIColor (FUSTheme)
+ (UIColor *)fus_appBGColor;
+(UIColor *)fus_alertViewBlackBgColor;
+ (UIColor *)fus_appBGPressColor;
+ (UIColor *)fus_navBarColor;
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FuSiTheme/Theme/UIColor+FUSTheme.m
......@@ -15,6 +15,10 @@
return [UIColor whiteColor];
}
+(UIColor *)fus_alertViewBlackBgColor{
return [[UIColor colorWithHex:@"11121A"] colorWithAlphaComponent:0.88];
}
+ (UIColor *)fus_appBGPressColor {
return [UIColor colorWithHex:@"#EEEEEE"];
}
......
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangHttpHelper.h
......@@ -306,10 +306,15 @@ typedef enum : NSUInteger {
/// @param failure 1
+(void)fus_requestHomeVestFollowGetlistType:(NSInteger)type success:(void(^)(NSMutableArray<FUSBaoFangAnchorModel *> *modelList, FUSBaoFangAnchorModel *recommendModel))success failure:(void(^)(NSString *msg,int code))failure;
/// 获取用户数据交易提醒
/// 获取用户数据交易提醒 每次请求成功都会提醒更新，FUS_NOTIFICATION_USER_TRADE_REMIND_CHANGE，所以如果有添加这个observer，那么就不需要这里的返回数据了，避免二次刷新
/// @param success 1
/// @param failure 0
+(void)fus_requestUserTradeRemindGetSuccess:(void(^)(FUSUserTradeRemindModel *model))success failure:(void(^)(NSString *msg,int code))failure;
/// 用户交易提醒已读更新
/// @param type 类型 -1：全部 1：萤火 2：宝石 3：露水 4：邀请
/// @param success 1
/// @param failure 0
+(void)fus_requestUserTradeRemindReadWithType:(NSInteger)type success:(void (^)(void))success failure:(void (^)(NSString *, int))failure;
@end
FuSiLive/Classes/BaoFang/Main/Other/FUSBaoFangHttpHelper.m
......@@ -943,4 +943,17 @@
}];
}
// 用户交易提醒已读更新
+(void)fus_requestUserTradeRemindReadWithType:(NSInteger)type success:(void (^)(void))success failure:(void (^)(NSString *, int))failure{
NSDictionary *parms = @{@"type": @(type)};
[FUSHttpHelper postRequestBinaryWithUrl:URL_USER_TRADE_REMIND_READ params:parms success:^(NSDictionary * _Nullable dataDict, int code) {
success();
} failure:^(NSDictionary * _Nullable dataDict, int code) {
if (failure) {
failure(FAILURE_MESSAGE, code);
}
}];
}
@end
FuSiLive/Classes/BaoFang/OpenScreenPush/Other/FUSOpenScreenPushHelp.m
......@@ -23,6 +23,7 @@
#import "FUSRoomInfoModel.h"
#import "FUSMainViewControllerHelper.h"
#import "FUSAlertView.h"
#import "FUSControllerPushHelper.h"
#import <FirebaseAnalytics/FirebaseAnalytics.h>
......@@ -92,7 +93,7 @@ typedef NS_ENUM(NSUInteger,JumpType) {
break;
case JTVipCenter:
{
//TODO:VIP开通: added By Pidan
[currentController.navigationController fus_pushToBuyVIPControllerWithAnimate:YES];
}
break;
case JTInviteAward:
......
FuSiLive/Classes/Common/Other/FUSCommonCacheOperate.m
......@@ -675,7 +675,9 @@
// 直播间富豪进度条显示开关（0：关、1：开）
[[NSUserDefaults standardUserDefaults] setObject:dataDict[@"liveRichSwitch"] forKey:LIVE_LIVERICHSWITCH];
// 视讯评论、按钮控制开关（0：关、1：开）
[[NSUserDefaults standardUserDefaults] setObject:dataDict[@"videoCommentSwitch"] forKey:VIDEO_COMMENT_SWITCH];
// [[NSUserDefaults standardUserDefaults] setObject:dataDict[@"videoCommentSwitch"] forKey:VIDEO_COMMENT_SWITCH];
// ludy:现在统一不打开
[[NSUserDefaults standardUserDefaults] setObject:@"0" forKey:VIDEO_COMMENT_SWITCH];
NSNumber *livechatswitch = dataDict[@"livechatswitch"];
if (livechatswitch) {
......
FuSiLive/Classes/Foundation/Controller/FUSQuicklySettingGroup/FUSCustomSettingCell.m
......@@ -85,6 +85,7 @@
if (_item.cellStyle != UITableViewCellStyleSubtitle) {
self.textLabel.centerY = CGRectGetMidY(self.contentView.bounds);
self.textLabel.x = 50;
self.detailTextLabel.centerY = self.textLabel.centerY;
}
[self fus_fitRTLViews];
......
FuSiLive/Classes/Foundation/DataShare/FUSCacheDataShare.m
......@@ -175,7 +175,7 @@
// }
}
_userTradeRemindModel = userTradeRemindModel;
[[NSNotificationCenter defaultCenter] postNotificationName:FUS_USER_TRADE_REMIND_CHANGE_NOTIFICATION object:userTradeRemindModel];
[[NSNotificationCenter defaultCenter] postNotificationName:FUS_NOTIFICATION_USER_TRADE_REMIND_CHANGE object:userTradeRemindModel];
}
@end
FuSiLive/Classes/Foundation/DataShare/FUSNotificationCenter.h
......@@ -254,7 +254,7 @@
#define FUS_LINKMIC_DELE_SELF @"FUS_LINKMIC_DELE_SELF"
// 获取用户数据交易提醒
#define FUS_USER_TRADE_REMIND_CHANGE_NOTIFICATION @"FUS_USER_TRADE_REMIND_CHANGE_NOTIFICATION"
#define FUS_NOTIFICATION_USER_TRADE_REMIND_CHANGE @"FUS_NOTIFICATION_USER_TRADE_REMIND_CHANGE"
// 通知：我的页面红点改变
#define FUS_NOTIFICATION_MYZONE_ITEM_BADGEVALUE_CHANGE @"FUS_NOTIFICATION_MYZONE_ITEM_BADGEVALUE_CHANGE"
FuSiLive/Classes/Foundation/Http/FUSURLDictionary.h
......@@ -517,7 +517,8 @@
//#define URL_CRASH_WITHDRAW DNS_WEB(@"/Nesting/fireflyRmb/cashReality.html")
#define URL_CRASH_WITHDRAW DNS_WEB(@"/Nesting/fireflyRmb/new-cashReality.html")
#define URL_NEWSFEED_INPUT DNS_WEB(@"/Nesting/moving/news.html")
//#define URL_NEWSFEED_INPUT DNS_WEB(@"/Nesting/moving/news.html")
#define URL_NEWSFEED_INPUT DNS_WEB(@"/fusi/moving/news.html")
// 提现
#define URL_FACEBOOK_GETBACK DNS_WEB(@"/Nesting/getBack/index.html")
......@@ -1278,3 +1279,5 @@
#define URL_HOME_VEST_FOLLOW_GETLIST DNS_FUS_API(@"/home/vest/follow/getlist")
// 获取用户数据交易提醒
#define URL_USER_TRADE_REMIND_GET DNS_FUS_API(@"/user/trade/remind/get")
// 用户交易提醒已读更新
#define URL_USER_TRADE_REMIND_READ DNS_FUS_API(@"/user/trade/remind/read")
FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.h
......@@ -11,6 +11,9 @@ NS_ASSUME_NONNULL_BEGIN
@interface FUSControllerPushHelper : NSObject
/// 购买vip页面
+(UIViewController *)fus_getBuyVIPController;
@end
@interface UINavigationController (FUSPushHelper)
......@@ -27,6 +30,9 @@ NS_ASSUME_NONNULL_BEGIN
/// - animate: 动画
-(void)fus_pushToServiceControllerWithUID:(NSString * _Nullable )uid face:(NSString * _Nullable)facePath nikename:(NSString * _Nullable)nikename welcome:(NSString * _Nullable)welcomeStr animate:(BOOL)animate;
/// 推出购买vip页面
-(void)fus_pushToBuyVIPControllerWithAnimate:(BOOL)animate;
@end
NS_ASSUME_NONNULL_END
FuSiLive/Classes/FusiVersionFeature/Others/FUSControllerPushHelper.m
......@@ -10,6 +10,13 @@
@implementation FUSControllerPushHelper
+ (UIViewController *)fus_getBuyVIPController{
FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
wkwVC.shouldShowShareBtn = NO;
wkwVC.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.vipOpenAddress;
return wkwVC;
}
@end
@implementation UINavigationController (FUSPushHelper)
......@@ -60,7 +67,14 @@
if ([viewVC isKindOfClass:[FUSSingleChatViewController class]]){
return;
}
[self pushViewController:vc animated:YES];
[self pushViewController:vc animated:animate];
}
- (void)fus_pushToBuyVIPControllerWithAnimate:(BOOL)animate{
FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
wkwVC.shouldShowShareBtn = NO;
wkwVC.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.vipOpenAddress;
[self pushViewController:wkwVC animated:animate];
}
@end
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSHomeView.m
......@@ -107,7 +107,7 @@
collectionViewLayout:[[UICollectionViewFlowLayout alloc]init]];
self.collectionView.scrollsToTop = YES;
// self.collectionView.contentInset = UIEdgeInsetsMake(self.titleContainerView.height + 0, 0, UIView.fus_tabbarHeight, 0);
self.collectionView.contentInset = UIEdgeInsetsMake(self.titleContainerView.height + 0, 0, 0, 0);
self.collectionView.contentInset = UIEdgeInsetsMake(self.titleContainerView.height + 0, 0, UIView.fus_tabbarHeight, 0);
self.collectionView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
self.collectionView.backgroundColor = [UIColor clearColor];
......@@ -121,6 +121,11 @@
self.collectionView.mj_header = [FUSRefreshHeader headerWithRefreshingBlock:^{
[self.viewModel fus_reloadData];
}];
self.collectionView.mj_footer = [FUSRefreshAutoFooter footerWithRefreshingBlock:^{
}];
[self.collectionView.mj_footer endRefreshingWithNoMoreData];
}
-(void)fus_reagiestNotification{
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/View/FUSMessageView.m
......@@ -60,6 +60,9 @@
self.isUserCloseNotificationRemind = NO;
[self fus_reloadnotificationRemindTips];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_userTradeRemindChangeNotification:) name:FUS_NOTIFICATION_USER_TRADE_REMIND_CHANGE object:nil];
[self fus_loadUserTradeRemind];
}
return self;
}
......@@ -259,15 +262,20 @@
#pragma mark --- network
-(void)fus_loadUserTradeRemind{
FUSWeakSelf(weakself);
[FUSBaoFangHttpHelper fus_requestUserTradeRemindGetSuccess:^(FUSUserTradeRemindModel *model) {
weakself.tradeRemindModel = model;
[weakself fus_reloadMessageFunctionColumnUI];
// 托管给notification fus_userTradeRemindChangeNotification
} failure:^(NSString *msg, int code) {
}];
}
#pragma mark --- notificationcenter
-(void)fus_userTradeRemindChangeNotification:(NSNotification *)noti{
self.tradeRemindModel = [FUSCacheDataShare shareStore].userTradeRemindModel;
[self fus_reloadMessageFunctionColumnUI];
}
#pragma mark --- method
/// 重载关于切换页面需要跟跟着变的ui
-(void)fus_reloadAboutSwitchPageUI:(NSInteger)index{
......
FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomeViewViewModel.m
......@@ -216,6 +216,14 @@
}
}
[preDataList addObjectsFromArray:subDataList];
//test
// for (int i = 0; i < 20; i++) {
// FUSBaoFangAnchorModel *tempModel = [[FUSBaoFangAnchorModel alloc] init];
// tempModel.nickname = @"test";
// [preDataList addObject:tempModel];
// }
self.dataList = preDataList;
}
}else if (self.anchorListType == FUSHomeViewAnchorListTypeFollow) {
......
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/Model/FUSUserTradeRemindModel.h
......@@ -20,6 +20,10 @@ NS_ASSUME_NONNULL_BEGIN
/// 邀请变化提醒数量
@property (nonatomic, assign) NSInteger inviteRemindSum;
/// 用户交易提醒已读更新
/// - Parameter type: 类型 -1：全部 1：萤火 2：宝石 3：露水 4：邀请
-(void)fus_setUserTradeRemindReadWithType:(NSInteger)type;
@end
NS_ASSUME_NONNULL_END
FuSiLive/Classes/FusiVersionFeature/ViewController/NovaList/Model/FUSUserTradeRemindModel.m
......@@ -9,4 +9,21 @@
@implementation FUSUserTradeRemindModel
- (void)fus_setUserTradeRemindReadWithType:(NSInteger)type{
if (type == -1) {
self.bondsRemindSum = 0;
self.gemRemindSum = 0;
self.chipRemindSum = 0;
self.inviteRemindSum = 0;
}else if (type == 1) {
self.bondsRemindSum = 0;
}else if (type == 2) {
self.gemRemindSum = 0;
}else if (type == 3) {
self.chipRemindSum = 0;
}else if (type == 4){
self.inviteRemindSum = 0;
}
}
@end
FuSiLive/Classes/FusiVersionFeature/ViewController/Tabbar/FUSFloatTabbarView.m
......@@ -43,7 +43,7 @@
}
-(void)fus_setupNotification{
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_refreshZhaixinUnreadCount:) name:Tabbar_Unread_Count object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_refreshTradeRemindChange:) name:FUS_USER_TRADE_REMIND_CHANGE_NOTIFICATION object:nil];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_refreshTradeRemindChange:) name:FUS_NOTIFICATION_USER_TRADE_REMIND_CHANGE object:nil];
//我的
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(fus_refreshFansUnreadCount:) name:Tabbar_Unread_Count_Fans object:nil];
......
FuSiLive/Classes/InstantMessaging/Other/FUSIMChatService.h
......@@ -216,6 +216,9 @@
/// 设置所有的消息为已读
- (void)fus_setAllConversationsRead;
/// 设置所有用户交易提醒已读更新
-(void)fus_setAllTradeRemindRead;
/**
清理临时数组
*/
......
FuSiLive/Classes/InstantMessaging/Other/FUSIMChatService.m
......@@ -26,6 +26,7 @@
#import "FUSVideoProfileHelper.h"
#import "FUSChatUserInfoModel.h"
#import "FUSLoginCacheOperate.h"
#import "FUSBaoFangHttpHelper.h"
#import "FUSIMChatHttpHelper.h"
#import "FUSSingleChatDBOperate.h"
......@@ -414,6 +415,16 @@
[self fus_transformSdkListToTalkList:latestTalkList needCombinationOldTalkList:YES];
}
- (void)fus_setAllTradeRemindRead{
[FUSBaoFangHttpHelper fus_requestUserTradeRemindReadWithType:-1 success:^{
FUSUserTradeRemindModel *model = [FUSCacheDataShare shareStore].userTradeRemindModel;
[model fus_setUserTradeRemindReadWithType:-1];
[FUSCacheDataShare shareStore].userTradeRemindModel = model;
} failure:^(NSString *, int) {
}];
}
- (void)fus_cleanChatTempData
{
// 重置临时数据
......
FuSiLive/Classes/InstantMessaging/View/Cell/FUSIMGiftViewCell.m
......@@ -19,9 +19,12 @@
- (void)awakeFromNib {
[super awakeFromNib];
_selectedBgView.layer.borderWidth = 1.0f;
_selectedBgView.layer.borderColor = [UIColor colorWithHex:@"#00F088"].CGColor;
_selectedBgView.layer.borderColor = [UIColor fus_diamondBlue].CGColor;
_selectedBgView.layer.cornerRadius = 8;
_costBtn.imageView.contentMode = UIViewContentModeScaleAspectFit;
// Initialization code
self.giftNameLabel.textColor = [UIColor fus_textColorLight];
}
// 设置 cell
- (void)fus_setupWithGiftModel:(FUSChatGiftDataModel *)giftModel
......@@ -50,6 +53,7 @@
case 3:
{
[_costBtn setImage:[UIImage imageNamed:@"common_assets_diamond_23x23"] forState:UIControlStateNormal];
[_costBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
break;
}
default:
......@@ -148,6 +152,7 @@
case 3:
{
[_costBtn setImage:[UIImage imageNamed:@"common_assets_diamond_23x23"] forState:UIControlStateNormal];
[_costBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
break;
}
default:
......@@ -251,6 +256,7 @@
case 3:
{
[_costBtn setImage:[UIImage imageNamed:@"common_assets_diamond_23x23"] forState:UIControlStateNormal];
[_costBtn setTitleColor:[UIColor fus_diamondBlue] forState:UIControlStateNormal];
break;
}
default:
......
FuSiLive/Classes/InstantMessaging/View/ToolViews/VideoChat/FunctionViews/FUSVideoChatGiftView.m
......@@ -121,7 +121,7 @@ if (@available(iOS 11.0, *)) {height = 290 + UIView.fus_SafeBottom;}\
_bgView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, UIView.fus_screenW, GIFT_VIEW_HEIGHT())];
}
_bgView.backgroundColor = [UIColor.fus_appBGColor colorWithAlphaComponent:0.88];
_bgView.backgroundColor = [UIColor fus_alertViewBlackBgColor];
[self addSubview:_bgView];
//
// UIVisualEffectView *effectView = [[UIVisualEffectView alloc]initWithEffect:[UIBlurEffect effectWithStyle:UIBlurEffectStyleDark]];
......@@ -509,8 +509,8 @@ if (@available(iOS 11.0, *)) {height = 290 + UIView.fus_SafeBottom;}\
NSRange bondsRange = [thirdStr rangeOfString:bonds];
NSRange hotnumRange = [thirdStr rangeOfString:chatGiftDataModel.hotnum];
NSMutableAttributedString *attributedStr = [[NSMutableAttributedString alloc] initWithString:thirdStr];
[attributedStr addAttribute:NSForegroundColorAttributeName value:[UIColor colorWithHex:@"#808080"] range:NSMakeRange(0, thirdStr.length)];
[attributedStr setAttributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"58DBD7"]} range:bondsRange];
[attributedStr addAttribute:NSForegroundColorAttributeName value:[UIColor fus_textColorVeryLight] range:NSMakeRange(0, thirdStr.length)];
[attributedStr setAttributes:@{NSForegroundColorAttributeName:[UIColor fus_fireGreen]} range:bondsRange];
[attributedStr setAttributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"58DBD7"]} range:hotnumRange];
return attributedStr;
} else {
......
FuSiLive/Classes/Login/View/FUSBoundAgentInfoView.m
......@@ -66,7 +66,9 @@
_tipsTitleLbael.text = FUSLocalizationHelper.localString(@"输入朋友的邀请码");
[_confirmBtn setTitle:FUSLocalizationHelper.localString(@"确定") forState:UIControlStateNormal];
[_cancelBtn setTitle:FUSLocalizationHelper.localString(@"不用了") forState:UIControlStateNormal];
[_cancelBtn setTitle:FUSLocalizationHelper.versionLocalString(@"取消") forState:UIControlStateNormal];
_cancelBtn.layer.cornerRadius = 46 / 2.0f;
_cancelBtn.layer.masksToBounds = YES;
NSAttributedString *holderAttr = [[NSAttributedString alloc] initWithString:FUSLocalizationHelper.localString(@"输入邀请码（选填）") attributes:@{NSForegroundColorAttributeName:[UIColor colorWithHex:@"#BEBEBE"]}];
_agentIdTextfield.attributedPlaceholder = holderAttr;
......
FuSiLive/Classes/Login/View/FUSBoundAgentInfoView.xib
......@@ -3,7 +3,7 @@
<device id="retina6_5" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22685"/>
<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>
......@@ -60,7 +60,7 @@
<constraint firstAttribute="height" constant="46" id="Syg-hW-KhA"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<state key="normal" title="不用了">
<state key="normal" title="取消">
<color key="titleColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
......
FuSiLive/Classes/NewLive/Main/View/FunctionView/FUSLiveFunctionView.m
......@@ -31,6 +31,7 @@
#import "FUSLiveScrollView.h"
#import "FUSLiveAlertNotificationView.h"
#import "FUSLiveWecomeEnterView.h"
#import "FUSControllerPushHelper.h"
#import "FUSPhoneAuthViewController.h"
#import "FUSMyZoneViewController.h"
......@@ -3234,7 +3235,7 @@ FUSLinkMicUserListDelegate
if (code == -40000) {
[FUSAlertView showAlertWithTitle:msg message:nil cancelButtonTitle:FUSLocalizationHelper.localString(@"取消") otherButtonTitles:@[FUSLocalizationHelper.localString(@"去开通")] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
//TODO:VIP开通: added By Pidan
[self.viewController.navigationController fus_pushToBuyVIPControllerWithAnimate:YES];
}
}];
......@@ -3576,7 +3577,7 @@ FUSLinkMicUserListDelegate
[FUSAlertView showAlertWithTitle:msg message:nil cancelButtonTitle:FUSLocalizationHelper.localString(@"取消") otherButtonTitles:@[FUSLocalizationHelper.localString(@"了解VIP")] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
//TODO:VIP开通: added By Pidan
[self.viewController.navigationController fus_pushToBuyVIPControllerWithAnimate:YES];
}
}];
} else {
......@@ -3630,7 +3631,7 @@ FUSLinkMicUserListDelegate
[FUSAlertView showAlertWithTitle:msg message:nil cancelButtonTitle:FUSLocalizationHelper.localString(@"取消") otherButtonTitles:@[FUSLocalizationHelper.localString(@"了解VIP")] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
//TODO:VIP开通: added By Pidan
[self.viewController.navigationController fus_pushToBuyVIPControllerWithAnimate:YES];
}
}];
} else {
......
FuSiLive/Classes/NewsFeed/Controller/FUSNewsFeedDetailViewController.m
......@@ -585,14 +585,14 @@
self.titleView.backgroundColor = UIColor.fus_appBGColor;
[self.view addSubview:self.titleView];
self.fireFlyLogoImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, UIView.fus_StatusBarHeight, 80, 50)];
self.fireFlyLogoImageView.image = [UIImage imageNamed:@"newsfeed_publish_nav_title"];
self.fireFlyLogoImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, UIView.fus_StatusBarHeight, 50, 30)];
self.fireFlyLogoImageView.image = [UIImage fus_naviLogoIcon];
self.fireFlyLogoImageView.contentMode = UIViewContentModeScaleAspectFit;
[self.titleView addSubview:self.fireFlyLogoImageView];
self.fireFlyLogoImageView.center = CGPointMake(self.titleView.width / 2, UIView.fus_StatusBarHeight + 25);
self.nicknameLabel = [[UILabel alloc] initWithFrame:CGRectMake(0, UIView.fus_StatusBarHeight, UIView.fus_screenW - 150, 50)];
self.nicknameLabel.textColor = [UIColor whiteColor];
self.nicknameLabel.textColor = [UIColor fus_textColorRich];
self.nicknameLabel.font = [UIFont fus_themeFont:15];
self.nicknameLabel.textAlignment = NSTextAlignmentCenter;
self.nicknameLabel.center = self.fireFlyLogoImageView.center;
......@@ -608,13 +608,13 @@
UIButton *btn = [UIButton buttonWithType:UIButtonTypeCustom];
btn.frame = CGRectMake(0, UIView.fus_StatusBarHeight, 50, 44);
[btn addTarget:self action:@selector(fus_showToolView) forControlEvents:UIControlEventTouchUpInside];
[btn setImage:[UIImage imageNamed:@"icon_more"] forState:UIControlStateNormal];
[btn setImage:[UIImage fus_naviMoreIcon] forState:UIControlStateNormal];
btn.centerY = self.fireFlyLogoImageView.centerY;
btn.x = self.titleView.width - btn.width;
[self.titleView addSubview:btn];
FUSButton *backButton = [[FUSButton alloc]initWithFrame:CGRectMake(0, UIView.fus_StatusBarHeight, 50, 44)];
UIImage *backImage = [UIImage imageNamed:[FUSRTL RTLImageName:@"common_navigation_back_white"]];
UIImage *backImage = [UIImage fus_backImage];
[backButton setImage:backImage forState:UIControlStateNormal];
[backButton addTarget:self action:@selector(clickBackBtnAction) forControlEvents:UIControlEventTouchUpInside];
backButton.centerY = self.fireFlyLogoImageView.centerY;
......
FuSiLive/Classes/NewsFeed/RichEditor/Controller/FUSPublishNewsFeedViewController.m
......@@ -23,6 +23,7 @@
#import "FUSTextView.h"
#import "UISwitch+FUSRTL.h"
#import "FUSResponsibilityConfirmAlertView.h"
#import "FUSControllerPushHelper.h"
// font 18 textview显示一行的consize的高度就 38
#define INPUTTEXTVIEW_H 38
......@@ -443,7 +444,7 @@ FUSImagePickerViewControllerDelegate>
if (code == -6020) { //你還未開通VIP，無法設置此價格
[FUSAlertView showAlertWithTitle:msg message:nil cancelButtonTitle:FUSLocalizationHelper.localString(@"取消") otherButtonTitles:@[FUSLocalizationHelper.localString(@"去开通")] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
//TODO:VIP开通: added By Pidan
[self.navigationController fus_pushToBuyVIPControllerWithAnimate:YES];
}
}];
}else if(code == -6021){ //你在線等級太低，無法設置此價格
......
FuSiLive/Classes/NewsFeed/RichEditor/View/FUSNewsFeedDetailToolView.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="20037" 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="20020"/>
<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>
......@@ -22,7 +22,7 @@
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mTX-9S-VPf">
<rect key="frame" x="0.0" y="0.0" width="364" height="48"/>
<color key="backgroundColor" red="0.098039215686274508" green="0.098039215686274508" blue="0.13725490196078433" alpha="0.89823935688405798" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="20"/>
<state key="normal" title="取消">
<color key="titleColor" red="0.34509803921568627" green="0.85882352941176465" blue="0.84313725490196079" alpha="1" colorSpace="calibratedRGB"/>
......@@ -55,7 +55,7 @@
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="20"/>
<state key="normal" title="删除">
<color key="titleColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="calibratedRGB"/>
</state>
<state key="highlighted">
<color key="titleColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
......@@ -156,7 +156,7 @@
</constraints>
</view>
</subviews>
<color key="backgroundColor" red="0.098039215686274508" green="0.098039215686274508" blue="0.13725490196078433" alpha="0.89594655797101452" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="sZZ-6A-2gq" firstAttribute="leading" secondItem="aIG-Ch-IV9" secondAttribute="leading" id="2Ue-Uu-xNB"/>
<constraint firstItem="OYo-U4-EF2" firstAttribute="leading" secondItem="aIG-Ch-IV9" secondAttribute="leading" id="Auw-oG-b1X"/>
......
FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedDetaiIBottomView.m
......@@ -38,7 +38,9 @@
self.autoresizingMask = NO;
self.frame = frame;
if (self) {
self.inputTextField.backgroundColor = [UIColor fus_textInputBackgroundGrayColor];
self.inputTextField.textColor = [UIColor fus_textColorRich];
_emojiBtn.imageView.contentMode = UIViewContentModeScaleAspectFit;
_inputBGview.layer.cornerRadius = 8;
_inputBGview.clipsToBounds = YES;
......@@ -66,7 +68,7 @@
[self.likeBtn setImage:[UIImage imageNamed:@"news_feed_big_like_highlight"] forState:UIControlStateNormal];
[self.likeBtn setTitleColor:[UIColor colorWithHex:@"#3CAFF3"] forState:UIControlStateNormal];
} else {
[self.likeBtn setImage:[UIImage imageNamed:@"news_feed_big_like_white"] forState:UIControlStateNormal];
[self.likeBtn setImage:[[UIImage imageNamed:@"news_feed_big_like_white"] imageByTintColor:[UIColor fus_textColorLight]] forState:UIControlStateNormal];
[self.likeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
}
......
FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedDetaiIBottomView.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" 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="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<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>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" interfaceStyle="light" id="iN0-l3-epB" customClass="FUSNewsFeedDetaiIBottomView">
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="FUSNewsFeedDetaiIBottomView">
<rect key="frame" x="0.0" y="0.0" width="364" height="76"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KdM-kO-zED">
<rect key="frame" x="288" y="0.0" width="76" height="76"/>
<rect key="frame" x="308" y="20" width="56" height="56"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" secondItem="KdM-kO-zED" secondAttribute="height" multiplier="5:5" id="5JW-qm-R2I"/>
</constraints>
<state key="normal" image="newsfeed_icon_bottom_share"/>
<state key="normal" image="fus_home_navi_share_icon"/>
<connections>
<action selector="onClickShareBtn:" destination="iN0-l3-epB" eventType="touchUpInside" id="RxD-cD-gHO"/>
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wi8-TL-uct">
<rect key="frame" x="10" y="8.5" width="184" height="59.5"/>
<rect key="frame" x="10" y="28.5" width="229.5" height="39.5"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="M4B-Qg-YCU">
<rect key="frame" x="8" y="0.0" width="141" height="59.5"/>
<rect key="frame" x="8" y="0.0" width="186.5" height="39.5"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<textInputTraits key="textInputTraits"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="N0O-eE-Gh0">
<rect key="frame" x="8" y="0.0" width="141" height="59.5"/>
<rect key="frame" x="8" y="0.0" width="186.5" height="39.5"/>
<connections>
<action selector="onClickCommentBtn:" destination="iN0-l3-epB" eventType="touchUpInside" id="vKB-35-I0p"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GOP-S0-Mig">
<rect key="frame" x="149" y="0.0" width="35" height="59.5"/>
<rect key="frame" x="194.5" y="0.0" width="35" height="39.5"/>
<constraints>
<constraint firstAttribute="width" constant="35" id="K3O-1v-T7S"/>
</constraints>
......@@ -53,7 +53,7 @@
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.14117647058823529" green="0.14117647058823529" blue="0.1803921568627451" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="GOP-S0-Mig" firstAttribute="top" secondItem="Wi8-TL-uct" secondAttribute="top" id="00J-dX-vSj"/>
<constraint firstItem="GOP-S0-Mig" firstAttribute="leading" secondItem="M4B-Qg-YCU" secondAttribute="trailing" id="4Tj-kh-ONt"/>
......@@ -69,7 +69,7 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="btb-v4-u3n">
<rect key="frame" x="204" y="5" width="84" height="66"/>
<rect key="frame" x="249.5" y="25" width="58.5" height="46"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" secondItem="btb-v4-u3n" secondAttribute="height" multiplier="51:40" id="3UN-j0-7g2"/>
......@@ -82,7 +82,7 @@
</connections>
</button>
<view alpha="0.10000000000000001" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6Vl-ca-Sl2">
<rect key="frame" x="0.0" y="0.0" width="364" height="0.5"/>
<rect key="frame" x="0.0" y="20" width="364" height="0.5"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="0.5" id="uyC-SJ-45h"/>
......@@ -119,8 +119,8 @@
</view>
</objects>
<resources>
<image name="fus_home_navi_share_icon" width="18.5" height="16.5"/>
<image name="news_feed_big_like_black" width="24" height="24"/>
<image name="newsfeed_icon_bottom_emotion" width="26" height="26"/>
<image name="newsfeed_icon_bottom_share" width="24" height="24"/>
</resources>
</document>
FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedReplyInputView.m
......@@ -11,6 +11,7 @@
#import "FUSDefine.h"
#import "TZImagePickerController.h"
#import "WGUploadFileTool.h"
#import "FUSControllerPushHelper.h"
#import "FUSIMInputToolbar.h"
......@@ -65,6 +66,8 @@
[self.inputTextView addGestureRecognizer:tapGesture];
self.inputTextView.placeHolderWithContainerTop = YES;
self.inputTextView.placeholder = FUSLocalizationHelper.localString(@"有爱评论~");
self.inputTextView.backgroundColor = [UIColor fus_textInputBackgroundGrayColor];
self.inputTextView.layer.cornerRadius = 4;
[_sendBtn setTitle:FUSLocalizationHelper.localString(@"发送") forState:UIControlStateNormal];
}
return self;
......@@ -204,7 +207,7 @@
[FUSAlertView showAlertWithTitle:[NSString stringWithFormat:FUSLocalizationHelper.localString(@"你还没有达到VIP%ld，无法使用此功能"),level] message:nil cancelButtonTitle:FUSLocalizationHelper.localString(@"取消") otherButtonTitles:@[FUSLocalizationHelper.localString(@"去了解")] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
[self.inputTextView resignFirstResponder];
//TODO:VIP开通: added By Pidan
[self.viewController.navigationController fus_pushToBuyVIPControllerWithAnimate:YES];
}
}];
return;
......
FuSiLive/Classes/NewsFeed/Views/FUSNewsFeedReplyInputView.xib
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17506" 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="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
<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>
......@@ -15,7 +15,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="725-NH-wu3">
<rect key="frame" x="10" y="13" width="200" height="33"/>
<rect key="frame" x="10" y="28" width="200" height="33"/>
<constraints>
<constraint firstAttribute="height" constant="33" id="gbW-Cf-nRQ"/>
</constraints>
......@@ -24,7 +24,7 @@
<nil key="highlightedColor"/>
</label>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" bounces="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="jQf-ae-Adr" customClass="FUSTextView">
<rect key="frame" x="5" y="13" width="205" height="30"/>
<rect key="frame" x="5" y="28" width="205" height="30"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="iGl-Zd-KT0"/>
......@@ -34,14 +34,14 @@
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
</textView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2zt-xa-RgN">
<rect key="frame" x="218" y="0.0" width="40" height="45"/>
<rect key="frame" x="218" y="20" width="40" height="45"/>
<state key="normal" image="tupian"/>
<connections>
<action selector="onClickPhotoBtn:" destination="iN0-l3-epB" eventType="touchUpInside" id="405-ZJ-PW1"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="i1K-14-Qk6">
<rect key="frame" x="258" y="0.0" width="40" height="45"/>
<rect key="frame" x="258" y="20" width="40" height="45"/>
<constraints>
<constraint firstAttribute="width" constant="40" id="mwb-5W-Npq"/>
</constraints>
......@@ -51,14 +51,14 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ab3-9i-T9S">
<rect key="frame" x="298" y="0.0" width="58" height="45"/>
<rect key="frame" x="298" y="20" width="58" height="45"/>
<constraints>
<constraint firstAttribute="height" constant="45" id="80D-nP-R9T"/>
<constraint firstAttribute="width" constant="58" id="NtX-bY-A55"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<state key="normal" title="发送">
<color key="titleColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.56470588235294117" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="titleColor" red="0.13333333333333333" green="0.13333333333333333" blue="0.13333333333333333" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
<connections>
<action selector="onClickSendBtn:" destination="iN0-l3-epB" eventType="touchUpInside" id="ALT-uJ-ikl"/>
......@@ -66,10 +66,10 @@
</button>
</subviews>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<color key="backgroundColor" red="0.14117647058823529" green="0.14117647058823529" blue="0.1803921568627451" alpha="1" colorSpace="calibratedRGB"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="2zt-xa-RgN" firstAttribute="leading" secondItem="jQf-ae-Adr" secondAttribute="trailing" constant="8" symbolic="YES" id="0fn-Fb-DMM"/>
<constraint firstItem="jQf-ae-Adr" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="13" id="1u7-6V-zVO"/>
<constraint firstItem="jQf-ae-Adr" firstAttribute="top" secondItem="vUN-kp-3ea" secondAttribute="top" constant="8" id="1u7-6V-zVO"/>
<constraint firstItem="ab3-9i-T9S" firstAttribute="top" secondItem="i1K-14-Qk6" secondAttribute="top" id="4sv-Gq-j3I"/>
<constraint firstItem="jQf-ae-Adr" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="5" id="4uZ-kP-lAs"/>
<constraint firstItem="725-NH-wu3" firstAttribute="top" secondItem="jQf-ae-Adr" secondAttribute="top" id="9PV-hY-PnK"/>
......
FuSiLive/Classes/NewsFeed/Views/NewsFeedDetailHeaderView/FUSNewsFeedDetailHeaderView.m
......@@ -370,7 +370,7 @@
if (!_nicknameLabel) {
_nicknameLabel = [[UILabel alloc] init];
_nicknameLabel.font = [UIFont fus_themeFont:13];
_nicknameLabel.textColor = [UIColor colorWithWhite:1 alpha:0.6];
_nicknameLabel.textColor = [UIColor fus_textColorRich];
}
return _nicknameLabel;
}
......@@ -387,7 +387,7 @@
if (!_updateTimeLabel) {
_updateTimeLabel = [[UILabel alloc] init];
_updateTimeLabel.font = [UIFont fus_themeFont:9];
_updateTimeLabel.textColor = [UIColor colorWithWhite:1 alpha:0.3];
_updateTimeLabel.textColor = [UIColor fus_textColorMedium];
}
return _updateTimeLabel;
}
......@@ -417,7 +417,7 @@
if (!_titleLabel) {
_titleLabel = [[UILabel alloc] init];
_titleLabel.font = [UIFont fus_themeBoldFont:19];
_titleLabel.textColor = [UIColor whiteColor];
_titleLabel.textColor = [UIColor fus_textColorRich];
_titleLabel.numberOfLines = 0;
}
return _titleLabel;
......
FuSiLive/Classes/Payment/Controller/FUSExchangeDiamondViewController.m
......@@ -24,6 +24,7 @@
@property (weak, nonatomic) IBOutlet NSLayoutConstraint *tableHeightCons;
@property (weak, nonatomic) IBOutlet UIImageView *headerBgImgView;
@property (weak, nonatomic) IBOutlet UIImageView *fireIconImageView;
//@property (weak, nonatomic) IBOutlet UILabel *bondLabel;
@property (weak, nonatomic) IBOutlet UILabel *diamondLabel;
......@@ -93,6 +94,8 @@
self.title = FUSLocalizationHelper.localString(@"兑换宝石");
[self fus_enableNavigationBackWithPopFunction:popViewController withAnimated:YES];
self.fireIconImageView.image = [UIImage fus_largeFireIcon];
_tableView.dataSource = self;
_tableView.delegate = self;
_tableView.showsVerticalScrollIndicator = NO;
......
FuSiLive/Classes/Payment/Controller/FUSExchangeDiamondViewController.xib
......@@ -10,6 +10,7 @@
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FUSExchangeDiamondViewController">
<connections>
<outlet property="diamondLabel" destination="2i0-3C-TMh" id="Yeg-hG-0d8"/>
<outlet property="fireIconImageView" destination="D4b-jC-PY1" id="fBs-Gg-fTA"/>
<outlet property="headerBgImgView" destination="4dQ-V4-2vS" id="VGK-0g-IlP"/>
<outlet property="tableView" destination="faM-Ff-o5o" id="ydW-Fl-QtF"/>
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
......
FuSiLive/Classes/Payment/Controller/FUSRechargeViewController.m
......@@ -257,16 +257,17 @@
UIButton *serviceBtn = [UIButton buttonWithType:UIButtonTypeCustom];
serviceBtn.frame = CGRectMake(0, 0, 40, 40);
[serviceBtn addTarget:self action:@selector(fus_enterServiceRoom) forControlEvents:UIControlEventTouchUpInside];
NSMutableArray *array = [NSMutableArray array];
for (int i = 0; i < 20; i++) {
UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"zhaixin_icon_service_%d",i]];
if (!image) {
break;
}
[array addObject:image];
}
UIImage *image = [UIImage animatedImageWithImages:array duration:1];
[serviceBtn setImage:image forState:UIControlStateNormal];
// NSMutableArray *array = [NSMutableArray array];
// for (int i = 0; i < 20; i++) {
// UIImage *image = [UIImage imageNamed:[NSString stringWithFormat:@"zhaixin_icon_service_%d",i]];
// if (!image) {
// break;
// }
// [array addObject:image];
// }
// UIImage *image = [UIImage animatedImageWithImages:array duration:1];
// [serviceBtn setImage:image forState:UIControlStateNormal];
[serviceBtn setImage:[UIImage imageNamed:@"fus_common_navi_service_btn"] forState:UIControlStateNormal];
UIBarButtonItem *serviceBarItem = [[UIBarButtonItem alloc] initWithCustomView:serviceBtn];
UIButton *recordBtn = [UIButton buttonWithType:UIButtonTypeCustom];
......
FuSiLive/Classes/Setting/Controller/FUSSettingViewController.m
......@@ -38,6 +38,7 @@
#import "FUSLocalizationHelper.h"
#import "FUSVideoProfileHelper.h"
#import "FUSLiveHelper.h"
#import "FUSControllerPushHelper.h"
#import "FUSSettingHttpRequest.h"
#import "FUSZoneHttpRequest.h"
......@@ -830,7 +831,7 @@
[FUSAlertView showAlertWithTitle:nil message:msg cancelButtonTitle:FUSLocalizationHelper.localString(@"取消") otherButtonTitles:@[sureStr] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex != 0) {
//TODO:VIP开通: added By Pidan
[self.navigationController fus_pushToBuyVIPControllerWithAnimate:YES];
}
self.tableView.userInteractionEnabled = YES;
}];
......
FuSiLive/Classes/Setting/View/FUSChatSettingHeaderView.m
......@@ -18,6 +18,7 @@
#import "FUSDefine.h"
#import "FUSSettingHttpRequest.h"
#import "FUSIMChatService.h"
#import "FUSControllerPushHelper.h"
@interface FUSChatSettingHeaderView () <UICollectionViewDelegateFlowLayout, UICollectionViewDataSource>
......@@ -407,7 +408,7 @@
// 你還未開通VIP，無法設置此價格
[FUSAlertView showAlertWithTitle:errorMsg message:nil cancelButtonTitle:FUSLocalizationHelper.localString(@"取消") otherButtonTitles:@[FUSLocalizationHelper.localString(@"去开通")] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
//TODO:VIP开通: added By Pidan
[self.viewController.navigationController fus_pushToBuyVIPControllerWithAnimate:YES];
}
}];
} else if (code == -3023) {
......
FuSiLive/Classes/Setting/View/FUSSettingMicTakeDivideView.swift
......@@ -56,7 +56,7 @@ class FUSSettingMicTakeDivideView: UIView, UIPickerViewDelegate, UIPickerViewDat
height = height + safeAreaInsets.bottom
}
let view = UIView(frame: CGRect(x: 0, y: self.height, width: self.width, height: height))
view.backgroundColor = UIColor.init(hex: "#191923", alpha: 0.9)
view.backgroundColor = UIColor.fus_appBG()
return view
}()
......@@ -64,7 +64,7 @@ class FUSSettingMicTakeDivideView: UIView, UIPickerViewDelegate, UIPickerViewDat
lazy var lineView: UIView = { () -> UIView in
let view = UIView(frame: CGRect(x: 7, y: 56, width: self.width - 14, height: 0.5))
view.backgroundColor = UIColor.init(hex: "#FFFFFF", alpha: 0.1)
view.backgroundColor = UIColor.fus_line()
return view
}()
......@@ -168,7 +168,7 @@ class FUSSettingMicTakeDivideView: UIView, UIPickerViewDelegate, UIPickerViewDat
func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView {
let label = UILabel()
label.textColor = UIColor.white
label.textColor = UIColor.fus_textColorRich()
label.font = UIFont.systemFont(ofSize: 25)
label.textAlignment = NSTextAlignment.center
label.text = self.fus_itemString(index: row)
......
FuSiLive/Classes/ZhaiXin/Official/Controller/FUSOfficialViewController.m
......@@ -28,6 +28,7 @@
#import "FUSSettingViewController.h"
#import "FUSMotoringWareHouseViewController.h"
#import "FUSChatTableView.h"
#import "FUSControllerPushHelper.h"
#import <MJRefresh.h>
......@@ -534,7 +535,7 @@
break;
case 7: // 跳转VIP中心
{
//TODO:VIP开通: added By Pidan
[self.navigationController fus_pushToBuyVIPControllerWithAnimate:YES];
}
break;
case 8: // 跳转聊天界面
......@@ -566,6 +567,7 @@
break;
case 11:{
FUSZoneTaskCenterViewController *taskVC = [[FUSZoneTaskCenterViewController alloc] init];
taskVC.startWithRewardType = 4;
[self.navigationController pushViewController:taskVC animated:YES];
}
break;
......
FuSiLive/Classes/ZhaiXin/Recommend/View/FUSZhaiXinSettingPopView.m
......@@ -138,6 +138,7 @@
[FUSAlertView showAlertWithTitle:FUSLocalizationHelper.localString(@"是否将所有私信设为已读？") message:nil cancelButtonTitle:FUSLocalizationHelper.localString(@"取消") otherButtonTitles:@[FUSLocalizationHelper.localString(@"确定")] clickBlock:^(NSInteger buttonIndex) {
if (buttonIndex == 1) {
[[FUSIMChatService shareInstance] fus_setAllConversationsRead];
[[FUSIMChatService shareInstance] fus_setAllTradeRemindRead];
}
}];
};
......
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.h
......@@ -14,6 +14,9 @@ NS_ASSUME_NONNULL_BEGIN
//@property (nonatomic, copy) TaskDataBlock taskDataBlock;
/// 点击了1.新手任务。2.每日任务。3.主播任务。4.奖励领取
@property (nonatomic, assign) int startWithRewardType;
@end
NS_ASSUME_NONNULL_END
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneTaskCenterViewController.m
......@@ -67,9 +67,6 @@ static NSString *const reuseIdentifyCell = @"cell";
// 提示标语
@property (nonatomic, strong) UILabel *promptLabel;
/// 点击了1.新手任务。2.每日任务。3.主播任务。4.奖励领取
@property (nonatomic, assign) int startWithRewardType;
@end
@implementation FUSZoneTaskCenterViewController
......
FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneViewController.m
......@@ -32,6 +32,7 @@
#import "FUSWKMultiWebViewController.h"
#import "FUSDewWebViewcontroller.h"
#import "FUSSingleChatViewController.h"
#import "FUSControllerPushHelper.h"
#import "FUSZoneCanSendNewsFeedTipView.h"
......@@ -346,7 +347,7 @@
_vipItem = [FUSCustomSettingItem fus_itemWithIcon:@"fireFly_zone_vip" title:FUSLocalizationHelper.localString(@"VIP中心") type:(CustomSettingItemTypeShowTextAndArrow)];
_vipItem.itemClick = ^(FUSCustomSettingItem *item) {
[FUSTalkingData fus_trackEvent:EVENT_ME_VIP];
//TODO:VIP开通: added By Pidan
[weakSelf.navigationController fus_pushToBuyVIPControllerWithAnimate:YES];
};
_carItem = [FUSCustomSettingItem fus_itemWithIcon:@"fireFly_my_zone_car" title:FUSLocalizationHelper.localString(@"座驾") type:(CustomSettingItemTypeShowImageAndArrow)];
......
FuSiLive/Classes/Zone/Other/FUSMyZoneCellManager.m
......@@ -224,7 +224,12 @@ typedef NS_ENUM(NSUInteger, FUSMyZoneSectionType) {
};
infoCell.didClickVIPBtnBlock = ^{
//TODO:VIP开通: added By Pidan
if (weakSelf.delegate && [weakSelf.delegate respondsToSelector:@selector(fus_cellManager:pushToController:)]) {
FUSWKWebViewController *wkwVC = [[FUSWKWebViewController alloc] init];
wkwVC.shouldShowShareBtn = NO;
wkwVC.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.fusiConfig.vipOpenAddress;
[weakSelf.delegate fus_cellManager:weakSelf pushToController:wkwVC];
}
};
}
......
FuSiLive/Classes/Zone/View/FireFlyView/View/Cell/MyZoneCell/FUSMyZoneInfoCell.m
......@@ -16,7 +16,7 @@
// 等级
@property (weak, nonatomic) IBOutlet UILabel *levelLabel;
@property (strong, nonatomic) IBOutlet NSLayoutConstraint *levelLabelLeftConstraint;
// 性别，年龄
@property (weak, nonatomic) IBOutlet UIButton *sexAndAgeButton;
......@@ -103,29 +103,30 @@
}
// FUSLevelDataModel *levelModel = [[FUSCacheDataShare shareStore].levelModelDict objectForKey:zoneModel.level];
if (isMyZone) {
if (zoneModel.level.integerValue > 0) {
_richImageView.hidden = NO;
self.levelLabelLeftConstraint.constant = 8;
_richImageView.image = [UIImage fus_imageWithLevel:zoneModel.level.integerValue];
// [_richImageView setWebImageWithSubURLString:levelModel.icon placeholder:nil completion:nil];
}else {
_richImageView.hidden = YES;
_richImageView.image = nil;
self.levelLabelLeftConstraint.constant = -28;
}
}else {
if ([zoneModel.privilege[@"richPower"] integerValue] == 1 && zoneModel.level.integerValue > 0) {
_richImageView.hidden = NO;
_richImageView.image = [UIImage fus_imageWithLevel:zoneModel.level.integerValue];
// [_richImageView setWebImageWithSubURLString:levelModel.icon placeholder:nil completion:nil];
self.levelLabelLeftConstraint.constant = 8;
}else if ([zoneModel.privilege[@"richPower"] integerValue] == 0) {
_richImageView.hidden = YES;
_richImageView.image = nil;
self.levelLabelLeftConstraint.constant = -28;
}
}
_richImageView.image = [UIImage fus_imageWithLevel:zoneModel.level.integerValue];
// if (isMyZone) {
// if (zoneModel.level.integerValue > 0) {
// _richImageView.hidden = NO;
// self.levelLabelLeftConstraint.constant = 8;
// _richImageView.image = [UIImage fus_imageWithLevel:zoneModel.level.integerValue];
//// [_richImageView setWebImageWithSubURLString:levelModel.icon placeholder:nil completion:nil];
// }else {
// _richImageView.hidden = YES;
// _richImageView.image = nil;
// self.levelLabelLeftConstraint.constant = -28;
// }
// }else {
// if ([zoneModel.privilege[@"richPower"] integerValue] == 1 && zoneModel.level.integerValue > 0) {
// _richImageView.hidden = NO;
// _richImageView.image = [UIImage fus_imageWithLevel:zoneModel.level.integerValue];
//// [_richImageView setWebImageWithSubURLString:levelModel.icon placeholder:nil completion:nil];
// self.levelLabelLeftConstraint.constant = 8;
// }else if ([zoneModel.privilege[@"richPower"] integerValue] == 0) {
// _richImageView.hidden = YES;
// _richImageView.image = nil;
// self.levelLabelLeftConstraint.constant = -28;
// }
// }
// if (![NSDictionary isNull:zoneModel.chatWith] && [zoneModel.chatWith[@"videoAuthState"] integerValue] == 2) {
// self.verifiedImageView.hidden = NO;
......@@ -136,7 +137,6 @@
}
- (void)cleanCell {
_richImageView.hidden = YES;
_levelLabel.text = @"0";
[_sexAndAgeButton setTitle:@"0" forState:UIControlStateNormal];
[_sexAndAgeButton setImage:nil forState:UIControlStateNormal];
......
FuSiLive/FUSAPPConfigs/FUSFuSiWebViewEventHelper.m
......@@ -34,6 +34,7 @@
#import "FUSThirdPartyLoginHelper.h"
#import "FUSFuSiWebViewEventHelper.h"
#import "FUSLoginHelper.h"
#import "FUSControllerPushHelper.h"
#import "FUSSettingHttpRequest.h"
#import "EventTrackParams.h"
......@@ -491,7 +492,7 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey";
break;
case FUSJsWebCidJumpToPayInfoVIPPage: {
//TODO:VIP开通: added By Pidan
[[UIViewController fus_topViewController].navigationController fus_pushToBuyVIPControllerWithAnimate:YES];
break;
}
......@@ -1018,7 +1019,7 @@ static NSString *FUSWebRightBtnExtraInfoKey = @"FUSWebRightBtnExtraInfoKey";
break;
case FUSJVipCenter:
{
//TODO:VIP开通: added By Pidan
[[UIViewController fus_topViewController].navigationController fus_pushToBuyVIPControllerWithAnimate:YES];
}
break;
case FUSJInviteAward:
......
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