no message

zhangxiaowen
1 parent 4ba95583
Showing 7 changed files with 36 additions and 17 deletions
CNLiveMineModule/Classes/Controller/CNLiveMineController.m
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateController.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoCell.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoModel.h
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoModel.m
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.m
CNLiveMineModule/Classes/View/CNLiveMineNavigationBar.m
@@ -57,8 +57,8 @@ static const CGFloat timeValue = 1.5;
                           @"name":@"常用工具",
                           @"style":@"2",
                           @"margin":@"10",
-                          @"titles": @[@"收货地址", @"补贴余额", @"我的收藏",@"发布记录",@"邀请好友",@"设置",@"路径工具",@"小家音响"],
-                          @"images":@[@"mine_address",@"mine_card",@"mine_like",@"mine_release",@"mine_invitation",@"mine_set",@"mine_tool_map",@"mine_home_box"]
+                          @"titles": @[@"收货地址", @"补贴余额", @"我的收藏",@"发布记录",@"邀请好友",@"设置",@"路径工具",@"小家音响",@"我的礼物"],
+                          @"images":@[@"mine_address",@"mine_card",@"mine_like",@"mine_release",@"mine_invitation",@"mine_set",@"mine_tool_map",@"mine_home_box",@"mine_home_box"]
                           },
                       @{
                           @"name":@"购买的商品",
@@ -276,7 +276,7 @@ static const CGFloat timeValue = 1.5;
         [self.textView resignFirstResponder];
         switch (self.model.dataType) {
-            case CNLiveUserInfoDataTypeHead://头像
+            case CNLiveUserInfoDataTypeHeader://头像
             {
                 [self updateHeaderActionSheetView];
             }
@@ -619,7 +619,7 @@ static const CGFloat timeValue = 1.5;
         _navigationBar.backgroundColor = [UIColor whiteColor];
         _navigationBar.delegate = self;
         switch (self.model.dataType) {
-            case CNLiveUserInfoDataTypeHead:
+            case CNLiveUserInfoDataTypeHeader:
             {
                 UIImage *xw_image = [self getImageWithImageName:@"mine_info_set" bundleName:@"CNLiveMineModule" targetClass:[CNLiveInfoUpdateController class]];
                 [_navigationBar.right setImage:xw_image forState:UIControlStateNormal];
@@ -650,7 +650,7 @@ static const CGFloat timeValue = 1.5;
         _contentView = [[UIView alloc] initWithFrame:CGRectMake(0, NavigationContentTop+margin, SCREEN_WIDTH, 50)];
         _contentView.backgroundColor = [UIColor whiteColor];
         switch (self.model.dataType) {
-            case CNLiveUserInfoDataTypeHead:
+            case CNLiveUserInfoDataTypeHeader:
             {
                 self.view.backgroundColor = [UIColor blackColor];
                 _contentView.backgroundColor = [UIColor blackColor];
@@ -41,7 +41,7 @@ static const NSInteger margin = 12;
 - (void)setImage:(UIImage *)image{
     _image = image;
-    if(self.model.dataType == CNLiveUserInfoDataTypeHead){
+    if(self.model.dataType == CNLiveUserInfoDataTypeHeader){
         _pic.image = image;
     }
 }
@@ -52,7 +52,7 @@ static const NSInteger margin = 12;
     _content.text = model.info;
-    if(model.dataType == CNLiveUserInfoDataTypeHead){
+    if(model.dataType == CNLiveUserInfoDataTypeHeader){
         _pic.backgroundColor = [UIColor whiteColor];
         _pic.contentMode = UIViewContentModeScaleToFill;
         _pic.layer.masksToBounds = YES;
@@ -18,7 +18,7 @@ typedef NS_ENUM(NSInteger, CNLiveUserInfoLayoutType) {
 typedef NS_ENUM(NSInteger, CNLiveUserInfoDataType) {
     CNLiveUserInfoDataTypeNickname          = 0,
-    CNLiveUserInfoDataTypeHead              = 1,
+    CNLiveUserInfoDataTypeHeader            = 1,
     CNLiveUserInfoDataTypeGender            = 2,
     CNLiveUserInfoDataTypeCode              = 3,
     CNLiveUserInfoDataTypeAddress           = 4,
@@ -26,7 +26,7 @@
 - (CNLiveUserInfoDataType)dataType{
     if([self.data isEqualToString:@"0"]){
-        return CNLiveUserInfoDataTypeHead;
+        return CNLiveUserInfoDataTypeHeader;
     }
     else if([self.data isEqualToString:@"1"]){
         return CNLiveUserInfoDataTypeNickname;
@@ -46,7 +46,7 @@ static const NSInteger margin = 20;
     NSDictionary *dic = [noti userInfo];
     CNLiveUserInfoDataType type = [[dic objectForKey:@"dataType"] integerValue];
     NSString *info = [dic objectForKey:@"info"];
-    if(type == CNLiveUserInfoDataTypeHead){
+    if(type == CNLiveUserInfoDataTypeHeader){
         UIImage *xw_image = [self getImageWithImageName:@"default_avatar_y" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
         [_header sd_setImageWithURL:[NSURL URLWithString:info] placeholderImage:xw_image];
@@ -236,7 +236,7 @@ static const NSInteger margin = 20;
         _name.numberOfLines = 1;
         _name.textColor = [UIColor whiteColor];
         _name.font = [UIFont systemFontOfSize:16];
-        _name.attributedText = [self createAttributedImageName:@"mine_code" string:@"张晓文" isFront:NO];
+        _name.attributedText = [self createAttributedImageName:@"mine_code" string:CNUserShareModel.nickname isFront:NO];
         UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(nameTapDidClicked:)];
         [_name addGestureRecognizer:tap];
@@ -13,6 +13,8 @@
 #import "CNUserInfoManager.h"
 #import "CNLiveCategory.h"
+#import "CNLiveUserInfoNotification.h"
+
 @interface CNLiveMineNavigationBar ()
 @property (nonatomic, strong) UIImageView *header;
 @property (nonatomic, strong) UILabel *name;
@@ -27,14 +29,34 @@ static const NSInteger margin = 10;
     if(self){
         self.userInteractionEnabled = YES;
         self.backgroundColor = [UIColor clearColor];
+        [CNLiveUserInfoNotification addUserInfoUpdateObserver:self selector:@selector(userInfoUpdateNotification:)];
         [self createSubViews];
+        [self xw_layoutSubviews];
     }
     return self;
 }
-
 - (void)dealloc {
     NSLog(@"CNLiveMineNavigationBar -- dealloc");
+    [CNLiveUserInfoNotification removeObserver:self];
+
+}
+
+// 实现方法
+- (void)userInfoUpdateNotification:(NSNotification *)noti{
+    //使用userInfo处理消息
+    NSDictionary *dic = [noti userInfo];
+    CNLiveUserInfoDataType type = [[dic objectForKey:@"dataType"] integerValue];
+    NSString *info = [dic objectForKey:@"info"];
+    if(type == CNLiveUserInfoDataTypeHeader){
+        UIImage *xw_image = [self getImageWithImageName:@"default_avatar_y" bundleName:@"CNLiveMineModule" targetClass:[self class]];
+        [_header sd_setImageWithURL:[NSURL URLWithString:info] placeholderImage:xw_image];
+
+    }else if(type == CNLiveUserInfoDataTypeNickname){
+        _name.text = info;
+
+    }
+    [self xw_layoutSubviews];
 }
 - (void)createSubViews {
@@ -42,11 +64,9 @@ static const NSInteger margin = 10;
     [self addSubview:self.name];
 }
-- (void)layoutSubviews{
-    [super layoutSubviews];
-    
+- (void)xw_layoutSubviews{
     NSDictionary *dic = @{NSFontAttributeName:[UIFont systemFontOfSize:14]};
-    CGFloat width = [@"张晓文" boundingRectWithSize:CGSizeMake(0, 0) options:NSStringDrawingUsesLineFragmentOrigin |  NSStringDrawingUsesFontLeading attributes:dic context:nil].size.width+margin;
+    CGFloat width = [CNUserShareModel.nickname boundingRectWithSize:CGSizeMake(0, 0) options:NSStringDrawingUsesLineFragmentOrigin |  NSStringDrawingUsesFontLeading attributes:dic context:nil].size.width+margin;
     if(width >= SCREEN_WIDTH){
         width = SCREEN_WIDTH-50;
     }
@@ -97,7 +117,6 @@ static const NSInteger margin = 10;
         _name.textColor = [UIColor whiteColor];
         _name.font = [UIFont systemFontOfSize:14];
         _name.text = CNUserShareModel.nickname;
-        _name.text = @"张晓文";
     }
     return _name;
 }