Commit 8c7b3839 by ludi

添加了我是主播的点击事件,修改tabbar的显示逻辑

parent a0fa1f53
Showing with 112 additions and 13 deletions
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
"scale" : "1x" "scale" : "1x"
}, },
{ {
"filename" : "fus_tabbar_item_message_unselect@2x.png", "filename" : "fus_tabbar_item_message_select@2x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "2x" "scale" : "2x"
}, },
{ {
"filename" : "fus_tabbar_item_message_unselect@3x.png", "filename" : "fus_tabbar_item_message_select@3x.png",
"idiom" : "universal", "idiom" : "universal",
"scale" : "3x" "scale" : "3x"
} }
......
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_tabbar_item_message_unselect@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_tabbar_item_message_unselect@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "fus_tabbar_item_my_unselect@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "fus_tabbar_item_my_unselect@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
self.tabbarView = [[FUSFloatTabbarView alloc] init]; self.tabbarView = [[FUSFloatTabbarView alloc] init];
self.tabbarView.frame = CGRectMake(0, UIView.fus_screenH - tabbarH, UIView.fus_screenW, tabbarH); self.tabbarView.frame = CGRectMake(0, UIView.fus_screenH - tabbarH, UIView.fus_screenW, tabbarH);
[self.tabbarView fus_setNormalItemImageNames:self.viewModel.barItemImageNameList]; [self.tabbarView fus_setNormalItemImageNames:self.viewModel.barItemImageNameWhiteList];
[self.tabbarView fus_setSelectedItemImageNames:self.viewModel.barItemSelectedImageNameList]; [self.tabbarView fus_setSelectedItemImageNames:self.viewModel.barItemSelectedImageNameList];
self.tabbarView.delegate = self; self.tabbarView.delegate = self;
[self.view addSubview:self.tabbarView]; [self.view addSubview:self.tabbarView];
...@@ -94,6 +94,12 @@ ...@@ -94,6 +94,12 @@
[self.scrollView scrollRectToVisible:scFrame animated:NO]; [self.scrollView scrollRectToVisible:scFrame animated:NO];
[self.viewModel fus_turnToPageView:index needReload:NO]; [self.viewModel fus_turnToPageView:index needReload:NO];
if (index == 1) {
[tabbarView fus_setNormalItemImageNames:self.viewModel.barItemImageNameWhiteList];
}else {
[tabbarView fus_setNormalItemImageNames:self.viewModel.barItemImageNameList];
}
} }
} }
...@@ -107,6 +113,11 @@ ...@@ -107,6 +113,11 @@
} }
[self.viewModel fus_turnToPageView:index needReload:NO]; [self.viewModel fus_turnToPageView:index needReload:NO];
if (index == 1) {
[self.tabbarView fus_setNormalItemImageNames:self.viewModel.barItemImageNameWhiteList];
}else {
[self.tabbarView fus_setNormalItemImageNames:self.viewModel.barItemImageNameList];
}
} }
} }
- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView{ - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView{
......
...@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN ...@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
#pragma mark --- data #pragma mark --- data
@property (nonatomic, strong) NSArray *barItemImageNameList; @property (nonatomic, strong) NSArray *barItemImageNameList;
@property (nonatomic, strong) NSArray *barItemImageNameWhiteList;
@property (nonatomic, strong) NSArray *barItemSelectedImageNameList; @property (nonatomic, strong) NSArray *barItemSelectedImageNameList;
@property (nonatomic, strong) NSArray<FUSHomePageBaseView *> *contentViewList; @property (nonatomic, strong) NSArray<FUSHomePageBaseView *> *contentViewList;
......
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
_currentIndex = 1; _currentIndex = 1;
self.barItemImageNameList = @[@"fus_tabbar_item_my_unselect", @"fus_tabbar_item_home_unselect", @"fus_tabbar_item_message_unselect"]; self.barItemImageNameList = @[@"fus_tabbar_item_my_unselect", @"fus_tabbar_item_home_unselect", @"fus_tabbar_item_message_unselect"];
self.barItemImageNameWhiteList = @[@"fus_tabbar_item_my_white", @"fus_tabbar_item_home_unselect", @"fus_tabbar_item_message_white"];
self.barItemSelectedImageNameList = @[@"fus_tabbar_item_my_select", @"fus_tabbar_item_home_select", @"fus_tabbar_item_message_select"]; self.barItemSelectedImageNameList = @[@"fus_tabbar_item_my_select", @"fus_tabbar_item_home_select", @"fus_tabbar_item_message_select"];
self.contentViewList = [[NSMutableArray alloc] initWithArray:@[[[FUSMyView alloc] init], [[FUSHomeView alloc] init], [[FUSMessageView alloc] init]]]; self.contentViewList = [[NSMutableArray alloc] initWithArray:@[[[FUSMyView alloc] init], [[FUSHomeView alloc] init], [[FUSMessageView alloc] init]]];
} }
......
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#import "FUSImAnchorHeaderView.h" #import "FUSImAnchorHeaderView.h"
#import "FUSSettingTableView.h" #import "FUSSettingTableView.h"
#import "FUSCacheDataShare.h" #import "FUSCacheDataShare.h"
#import "FUSMyZoneViewController.h"
#import "FUSNewsFeedHelper.h"
typedef NS_ENUM(NSInteger, FUSImAnchorItemType){ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
FUSImAnchorItemTypeLiveTask = 1, FUSImAnchorItemTypeLiveTask = 1,
...@@ -89,10 +91,24 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){ ...@@ -89,10 +91,24 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
FUSWeakSelf(weakself); FUSWeakSelf(weakself);
[self.publishBtn addTarget:self action:@selector(fus_publishBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside]; [self.publishBtn addTarget:self action:@selector(fus_publishBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
[self.returnBtn addTarget:self action:@selector(fus_popViewController) forControlEvents:UIControlEventTouchUpInside]; [self.returnBtn addTarget:self action:@selector(fus_popViewController) forControlEvents:UIControlEventTouchUpInside];
self.headerView.withdrawBtnClickedHandler = ^{ self.headerView.buttonDidClickedHander = ^(FUSImAnchorHeaderButtonType type) {
switch (type) {
case FUSImAnchorHeaderButtonTypeMyZone:{
FUSMyZoneViewController *myZoneVC = [[FUSMyZoneViewController alloc] init];
myZoneVC.zoneUid = weakself.zoneModel.uid;
myZoneVC.isFromLiveRoomChat = NO;
[weakself.navigationController pushViewController:myZoneVC animated:YES];
}
break;
case FUSImAnchorHeaderButtonTypeWithDraw:{
FUSWKWebViewController *vc = [[FUSWKWebViewController alloc] init]; FUSWKWebViewController *vc = [[FUSWKWebViewController alloc] init];
vc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.withdrawAddress; vc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.withdrawAddress;
[weakself.navigationController pushViewController:vc animated:YES]; [weakself.navigationController pushViewController:vc animated:YES];
}
break;
default:
break;
}
}; };
} }
...@@ -249,7 +265,11 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){ ...@@ -249,7 +265,11 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
} }
} }
-(void)fus_publishBtnDidClicked:(UIButton *)btn{ -(void)fus_publishBtnDidClicked:(UIButton *)btn{
btn.enabled = NO;
FUSNewsFeedPublishType type = FUSNewsFeedPublishTypeAll;
[FUSNewsFeedHelper fus_publishNewsFeedWithType:type complete:^{
btn.enabled = YES;
}];
} }
-(void)fus_popViewController{ -(void)fus_popViewController{
......
...@@ -10,10 +10,16 @@ ...@@ -10,10 +10,16 @@
#import "FUSZoneInfosModel.h" #import "FUSZoneInfosModel.h"
NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_BEGIN
typedef enum :NSInteger{
/// 个人空间
FUSImAnchorHeaderButtonTypeMyZone = 0,
/// 可提现
FUSImAnchorHeaderButtonTypeWithDraw,
}FUSImAnchorHeaderButtonType;
@interface FUSImAnchorHeaderView : UIView @interface FUSImAnchorHeaderView : UIView
@property (nonatomic, copy) void(^withdrawBtnClickedHandler)(void); @property (nonatomic, copy) void(^buttonDidClickedHander)(FUSImAnchorHeaderButtonType type);
- (void)fus_setupHeaderViewWithModel:(FUSZoneInfosModel *)model; - (void)fus_setupHeaderViewWithModel:(FUSZoneInfosModel *)model;
......
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
make.height.offset(16); make.height.offset(16);
}]; }];
UIView *sexBlankBgView = [[UIView alloc] init]; UIButton *sexBlankBgView = [UIButton buttonWithType:UIButtonTypeCustom];
[topBgView addSubview:sexBlankBgView]; [topBgView addSubview:sexBlankBgView];
[sexBlankBgView mas_makeConstraints:^(MASConstraintMaker *make) { [sexBlankBgView mas_makeConstraints:^(MASConstraintMaker *make) {
make.top.equalTo(nickNameBgView.mas_bottom).offset(4); make.top.equalTo(nickNameBgView.mas_bottom).offset(4);
...@@ -222,20 +222,33 @@ ...@@ -222,20 +222,33 @@
// 单独独立一个透明button出来好操控空间,不然等下gcp又说要特定区域能点 // 单独独立一个透明button出来好操控空间,不然等下gcp又说要特定区域能点
self.withdrawBtn = [UIButton buttonWithType:UIButtonTypeCustom]; self.withdrawBtn = [UIButton buttonWithType:UIButtonTypeCustom];
self.withdrawBtn.tag = FUSImAnchorHeaderButtonTypeWithDraw;
[bottomBgImageView addSubview:self.withdrawBtn]; [bottomBgImageView addSubview:self.withdrawBtn];
[self.withdrawBtn mas_makeConstraints:^(MASConstraintMaker *make) { [self.withdrawBtn mas_makeConstraints:^(MASConstraintMaker *make) {
make.edges.equalTo(bottomBgImageView); make.edges.equalTo(bottomBgImageView);
}]; }];
[self.withdrawBtn addTarget:self action:@selector(fus_withdrawBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside]; [self.withdrawBtn addTarget:self action:@selector(fus_commondBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
self.avatorBtn.tag = FUSImAnchorHeaderButtonTypeMyZone;
[self.avatorBtn addTarget:self action:@selector(fus_commondBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
sexBlankBgView.tag = FUSImAnchorHeaderButtonTypeMyZone;
[sexBlankBgView addTarget:self action:@selector(fus_commondBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
[copyBgBtn addTarget:self action:@selector(fus_copyBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
} }
#pragma mark --- button did clicked #pragma mark --- button did clicked
-(void)fus_withdrawBtnDidClicked:(UIButton *)btn{ -(void)fus_commondBtnDidClicked:(UIButton *)btn{
if (self.withdrawBtnClickedHandler) { if (self.buttonDidClickedHander) {
self.withdrawBtnClickedHandler(); self.buttonDidClickedHander(btn.tag);
} }
} }
-(void)fus_copyBtnDidClicked:(UIButton *)btn{
[UIPasteboard generalPasteboard].string = _zoneModel.uid;
[FUSDialogView fus_showDialog:FUSLocalizationHelper.localString(@"复制成功")];
}
#pragma mark --- method #pragma mark --- method
- (void)fus_setupHeaderViewWithModel:(FUSZoneInfosModel *)model{ - (void)fus_setupHeaderViewWithModel:(FUSZoneInfosModel *)model{
_zoneModel = model; _zoneModel = model;
......
...@@ -31,6 +31,8 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega ...@@ -31,6 +31,8 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
@IBOutlet var nickNameTextField: FUSTextField! @IBOutlet var nickNameTextField: FUSTextField!
/// 首次修改你昵称的提示label /// 首次修改你昵称的提示label
@IBOutlet var nickNameTipLabel: UILabel! @IBOutlet var nickNameTipLabel: UILabel!
/// 覆盖在修改昵称输入框上的改名
let nickNameBtn = UIButton(type: .custom)
/// 性别本地化 /// 性别本地化
@IBOutlet var genderLocalLabel: UILabel! @IBOutlet var genderLocalLabel: UILabel!
...@@ -205,8 +207,9 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega ...@@ -205,8 +207,9 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
attributes: [NSAttributedString.Key.foregroundColor:UIColor.init(hex: "CCCCCC") as Any, attributes: [NSAttributedString.Key.foregroundColor:UIColor.init(hex: "CCCCCC") as Any,
NSAttributedString.Key.font:UIFont.systemFont(ofSize: 15)]) NSAttributedString.Key.font:UIFont.systemFont(ofSize: 15)])
self.nickNameTextField.addTarget(self, action:#selector(fus_nickNameTextFieldDidEndEdit(_:)), for: .editingDidEnd) // self.nickNameTextField.addTarget(self, action:#selector(fus_nickNameTextFieldDidEndEdit(_:)), for: .editingDidEnd)
self.nickNameTextField.addTarget(self, action:#selector(fus_nickNameTextFieldDidChanged(_:)), for: .editingChanged) // self.nickNameTextField.addTarget(self, action:#selector(fus_nickNameTextFieldDidChanged(_:)), for: .editingChanged)
self.nickNameTextField.addSubview(self.nickNameBtn)
self.careerTextField.addTarget(self, action:#selector(fus_careerTextFieldDidEndEdit(_:)), for: .editingDidEnd) self.careerTextField.addTarget(self, action:#selector(fus_careerTextFieldDidEndEdit(_:)), for: .editingDidEnd)
self.careerTextField.addTarget(self, action:#selector(fus_careerTextFieldDidChanged(_:)), for: .editingChanged) self.careerTextField.addTarget(self, action:#selector(fus_careerTextFieldDidChanged(_:)), for: .editingChanged)
......
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