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

FuSiLive/Assets.xcassets/fusiPart/tabbar/fus_tabbar_item_message_unselect.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "fus_tabbar_item_message_unselect@2x.png",
+      "filename" : "fus_tabbar_item_message_select@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "fus_tabbar_item_message_unselect@3x.png",
+      "filename" : "fus_tabbar_item_message_select@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

FuSiLive/Assets.xcassets/fusiPart/tabbar/fus_tabbar_item_message_white.imageset/Contents.json

+{
+  "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
+  }
+}

FuSiLive/Assets.xcassets/fusiPart/tabbar/fus_tabbar_item_my_white.imageset/Contents.json

+{
+  "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
+  }
+}

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/FUSHomePageViewController.m

@@ -72,7 +72,7 @@
     
     self.tabbarView = [[FUSFloatTabbarView alloc] init];
     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.delegate = self;
     [self.view addSubview:self.tabbarView];
@@ -94,6 +94,12 @@
         [self.scrollView scrollRectToVisible:scFrame animated: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 @@
         }
         
         [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{

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomePageViewModel.h

@@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 #pragma mark --- data
 @property (nonatomic, strong) NSArray *barItemImageNameList;
+@property (nonatomic, strong) NSArray *barItemImageNameWhiteList;
 @property (nonatomic, strong) NSArray *barItemSelectedImageNameList;
 
 @property (nonatomic, strong) NSArray<FUSHomePageBaseView *> *contentViewList;

FuSiLive/Classes/FusiVersionFeature/ViewController/HomePage/ViewModel/FUSHomePageViewModel.m

@@ -25,6 +25,7 @@
     _currentIndex = 1;
     
     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.contentViewList = [[NSMutableArray alloc] initWithArray:@[[[FUSMyView alloc] init], [[FUSHomeView alloc] init], [[FUSMessageView alloc] init]]];
 }

FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/FUSImAnchorViewController.m

@@ -10,6 +10,8 @@
 #import "FUSImAnchorHeaderView.h"
 #import "FUSSettingTableView.h"
 #import "FUSCacheDataShare.h"
+#import "FUSMyZoneViewController.h"
+#import "FUSNewsFeedHelper.h"
 
 typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
     FUSImAnchorItemTypeLiveTask = 1,
@@ -89,10 +91,24 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
     FUSWeakSelf(weakself);
     [self.publishBtn addTarget:self action:@selector(fus_publishBtnDidClicked:) forControlEvents:UIControlEventTouchUpInside];
     [self.returnBtn addTarget:self action:@selector(fus_popViewController) forControlEvents:UIControlEventTouchUpInside];
-    self.headerView.withdrawBtnClickedHandler = ^{
-        FUSWKWebViewController *vc = [[FUSWKWebViewController alloc] init];
-        vc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.withdrawAddress;
-        [weakself.navigationController pushViewController:vc animated:YES];
+    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];
+                vc.webUrlString = [FUSCacheDataShare shareStore].settingInitDataModel.withdrawAddress;
+                [weakself.navigationController pushViewController:vc animated:YES];
+            }
+                break;
+            default:
+                break;
+        }
     };
 }
 
@@ -249,7 +265,11 @@ typedef NS_ENUM(NSInteger, FUSImAnchorItemType){
     }
 }
 -(void)fus_publishBtnDidClicked:(UIButton *)btn{
-    
+    btn.enabled = NO;
+    FUSNewsFeedPublishType type = FUSNewsFeedPublishTypeAll;
+    [FUSNewsFeedHelper fus_publishNewsFeedWithType:type complete:^{
+        btn.enabled = YES;
+    }];
 }
 
 -(void)fus_popViewController{

FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/View/FUSImAnchorHeaderView.h

@@ -10,10 +10,16 @@
 #import "FUSZoneInfosModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
+typedef enum :NSInteger{
+    /// 个人空间
+    FUSImAnchorHeaderButtonTypeMyZone = 0,
+    /// 可提现
+    FUSImAnchorHeaderButtonTypeWithDraw,
+}FUSImAnchorHeaderButtonType;
 
 @interface FUSImAnchorHeaderView : UIView
 
-@property (nonatomic, copy) void(^withdrawBtnClickedHandler)(void);
+@property (nonatomic, copy) void(^buttonDidClickedHander)(FUSImAnchorHeaderButtonType type);
 
 - (void)fus_setupHeaderViewWithModel:(FUSZoneInfosModel *)model;
 

FuSiLive/Classes/FusiVersionFeature/ViewController/ImAnchor/View/FUSImAnchorHeaderView.m

@@ -115,7 +115,7 @@
         make.height.offset(16);
     }];
     
-    UIView *sexBlankBgView = [[UIView alloc] init];
+    UIButton *sexBlankBgView = [UIButton buttonWithType:UIButtonTypeCustom];
     [topBgView addSubview:sexBlankBgView];
     [sexBlankBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(nickNameBgView.mas_bottom).offset(4);
@@ -222,20 +222,33 @@
     
     // 单独独立一个透明button出来好操控空间，不然等下gcp又说要特定区域能点
     self.withdrawBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    self.withdrawBtn.tag = FUSImAnchorHeaderButtonTypeWithDraw;
     [bottomBgImageView addSubview:self.withdrawBtn];
     [self.withdrawBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         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
--(void)fus_withdrawBtnDidClicked:(UIButton *)btn{
-    if (self.withdrawBtnClickedHandler) {
-        self.withdrawBtnClickedHandler();
+-(void)fus_commondBtnDidClicked:(UIButton *)btn{
+    if (self.buttonDidClickedHander) {
+        self.buttonDidClickedHander(btn.tag);
     }
 }
 
+-(void)fus_copyBtnDidClicked:(UIButton *)btn{
+    [UIPasteboard generalPasteboard].string = _zoneModel.uid;
+    [FUSDialogView fus_showDialog:FUSLocalizationHelper.localString(@"复制成功")];
+}
+
 #pragma mark --- method
 - (void)fus_setupHeaderViewWithModel:(FUSZoneInfosModel *)model{
     _zoneModel = model;

FuSiLive/Classes/Zone/Controller/FireFlyMyZone/FUSZoneUserInfoEditViewController.swift

@@ -31,6 +31,8 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
     @IBOutlet var nickNameTextField: FUSTextField!
     /// 首次修改你昵称的提示label
     @IBOutlet var nickNameTipLabel: UILabel!
+    /// 覆盖在修改昵称输入框上的改名
+    let nickNameBtn = UIButton(type: .custom)
     
     /// 性别本地化
     @IBOutlet var genderLocalLabel: UILabel!
@@ -205,8 +207,9 @@ class FUSZoneUserInfoEditViewController: FUSBaseViewController, UITextViewDelega
                                       attributes: [NSAttributedString.Key.foregroundColor:UIColor.init(hex: "CCCCCC") as Any,
                                                    NSAttributedString.Key.font:UIFont.systemFont(ofSize: 15)])
     
-        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_nickNameTextFieldDidEndEdit(_:)), for: .editingDidEnd)
+//        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_careerTextFieldDidChanged(_:)), for: .editingChanged)