no message

zhangxiaowen
1 parent 5f02f0e9
Showing 8 changed files with 60 additions and 94 deletions
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateController.h
CNLiveMineModule/Classes/UserInfo/CNLiveInfoUpdateController.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoCell.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoController.m
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoModel.h
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoNotification.h
CNLiveMineModule/Classes/UserInfo/CNLiveUserInfoNotification.m
CNLiveMineModule/Classes/View/CNLiveMineHeaderView.m
@@ -6,20 +6,12 @@
 //  Copyright (c) 2019 153993236@qq.com. All rights reserved.
 //
-#import <UIKit/UIKit.h>
-#import "CNLiveUserInfoModel.h"
 #import "CNCommonViewController.h"
 NS_ASSUME_NONNULL_BEGIN
-@class CNLiveInfoUpdateController;
-
-@protocol CNLiveInfoUpdateDelegate <NSObject>
-- (void)updateSuccess:(CNLiveUserInfoDataType)dataType info:(NSString *)info;
-
-@end
+@class CNLiveUserInfoModel;
 @interface CNLiveInfoUpdateController : CNCommonViewController
-@property (nonatomic, weak) id<CNLiveInfoUpdateDelegate> delegate;
 /**
  *  @abstract 对象方法 初始化方法
@@ -29,7 +29,7 @@
 #import "CNLiveGoldWhereaboutsView.h"
 #import "CNLiveCategory.h"
-#import "CNLiveUserInfoModel.h"
+//#import "CNLiveUserInfoModel.h"
 #import "CNLiveUserInfoNotification.h"
 #import "CNLiveUserInfoNavigationBar.h"
@@ -594,10 +594,8 @@ static const CGFloat timeValue = 1.5;
 #pragma mark - 更新提示
 - (void)showSucceed:(NSString *)info{
-    // 跟新本地数据
-    if (self.delegate && [self.delegate respondsToSelector:@selector(updateSuccess:info:)]) {
-          [self.delegate updateSuccess:self.model.dataType info:info];
-    }
+    [CNLiveUserInfoNotification postUserInfoUpdateNotificationType:self.model.dataType info:info];
+
     [[IMAPlatform sharedInstance].host asyncProfile];
     [QMUITips hideAllToastInView:self.view animated:YES];
     self.navigationBar.right.userInteractionEnabled = YES;
@@ -606,6 +604,7 @@ static const CGFloat timeValue = 1.5;
         [QMUITips hideAllToastInView:self.view animated:YES];
         [self goBack];
     });
+    
 }
 - (void)showError:(NSString *)text{
     self.navigationBar.right.userInteractionEnabled = YES;
@@ -668,7 +667,7 @@ static const CGFloat timeValue = 1.5;
                 [_contentView addSubview:self.textField];
                 self.textField.placeholder = @"请输入昵称";
-                self.textField.text = self.model.content;
+                self.textField.text = self.model.info;
             }
                 break;
             case CNLiveUserInfoDataTypeAddress:
@@ -678,7 +677,7 @@ static const CGFloat timeValue = 1.5;
                 [_contentView addSubview:self.textField];
                 self.textField.placeholder = @"请输入你所在的地区";
-                self.textField.text = self.model.content;
+                self.textField.text = self.model.info;
             }
                 break;
             case CNLiveUserInfoDataTypeGender:
@@ -697,7 +696,7 @@ static const CGFloat timeValue = 1.5;
                 _contentView.frame = CGRectMake(0, NavigationContentTop+margin, SCREEN_WIDTH, 120);
                 [_contentView addSubview:self.textView];
-                self.textView.text = self.model.content;
+                self.textView.text = self.model.info;
                 self.textNum.text = [NSString stringWithFormat:@"%lu",MAX(0,MAX_LIMIT_NUMS - self.textView.text.length)];
                 [_contentView addSubview:self.textNum];
@@ -50,7 +50,7 @@ static const NSInteger margin = 12;
     _model = model;
     _title.text = model.title;
-    _content.text = model.content;
+    _content.text = model.info;
     if(model.dataType == CNLiveUserInfoDataTypeHead){
         _pic.backgroundColor = [UIColor whiteColor];
@@ -58,15 +58,15 @@ static const NSInteger margin = 12;
         _pic.layer.masksToBounds = YES;
         _pic.layer.cornerRadius = 5.0;
         UIImage *xw_image = [self getImageWithImageName:@"default_avatar_f" bundleName:@"CNLiveMineModule" targetClass:[self class]];
-        [_pic sd_setImageWithURL:[NSURL URLWithString:model.content] placeholderImage:xw_image];
+        [_pic sd_setImageWithURL:[NSURL URLWithString:model.info] placeholderImage:xw_image];
     }else if (model.dataType == CNLiveUserInfoDataTypeNickname){
     }else if (model.dataType == CNLiveUserInfoDataTypeGender){
-        if([model.content isEqualToString:@"m"]){
+        if([model.info isEqualToString:@"m"]){
             _content.text = @"男";
-        }else if([model.content isEqualToString:@"f"]){
+        }else if([model.info isEqualToString:@"f"]){
             _content.text = @"女";
         }else{
             _content.text = @"未知";
@@ -19,7 +19,7 @@
 #import "CNLiveUserInfoNotification.h"
 #import "CNLiveUserInfoNavigationBar.h"
-@interface CNLiveUserInfoController ()<UITableViewDelegate, UITableViewDataSource, CNLiveInfoUpdateDelegate, CNLiveUserInfoNavigationBarDelegate>{
+@interface CNLiveUserInfoController ()<UITableViewDelegate, UITableViewDataSource, CNLiveUserInfoNavigationBarDelegate>{
     UIImage *_image;
 }
 @property (nonatomic, strong) CNLiveUserInfoNavigationBar *navigationBar;
@@ -36,7 +36,7 @@
                           @"layout":@"2",
                           @"data":@"0",
                           @"title":@"头像",
-                          @"content":CNUserShareModel.faceUrl,
+                          @"info":CNUserShareModel.faceUrl,
                           @"height":@"81",
                           @"lineHeight":@"0.5"
                           },
@@ -44,7 +44,7 @@
                           @"layout":@"1",
                           @"data":@"1",
                           @"title":@"昵称",
-                          @"content":CNUserShareModel.nickname,
+                          @"info":CNUserShareModel.nickname,
                           @"height":@"51",
                           @"lineHeight":@"0.5"
                           },
@@ -52,7 +52,7 @@
                           @"layout":@"1",
                           @"data":@"2",
                           @"title":@"性别",
-                          @"content":CNUserShareModel.gender,
+                          @"info":CNUserShareModel.gender,
                           @"height":@"60",
                           @"lineHeight":@"10"
                           },
@@ -60,7 +60,7 @@
                           @"layout":@"2",
                           @"data":@"3",
                           @"title":@"二维码",
-                          @"content":@"二维码",
+                          @"info":@"二维码",
                           @"height":@"51",
                           @"lineHeight":@"0.5"
                           },
@@ -68,7 +68,7 @@
                           @"layout":@"1",
                           @"data":@"4",
                           @"title":@"地区",
-                          @"content":CNUserShareModel.location,
+                          @"info":CNUserShareModel.location,
                           @"height":@"60",
                           @"lineHeight":@"10"
                           },
@@ -76,7 +76,7 @@
                           @"layout":@"1",
                           @"data":@"5",
                           @"title":@"个性签名",
-                          @"content":CNUserShareModel.signature?CNUserShareModel.signature:@"懒到没签名!",
+                          @"info":CNUserShareModel.signature?CNUserShareModel.signature:@"懒到没签名!",
                           @"height":@"51",
                           @"lineHeight":@"0.5"
                           }
@@ -104,14 +104,15 @@
     else {
         self.automaticallyAdjustsScrollViewInsets = NO;
     }
+    [CNLiveUserInfoNotification addUserInfoUpdateObserver:self selector:@selector(userInfoUpdateNotification:)];
+
     [self createSubViews];
     [self loadData];
 }
 - (void)dealloc {
-    
-    
+    [CNLiveUserInfoNotification removeObserver:self];
 }
 - (void)createSubViews {
@@ -144,73 +145,45 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
     CNLiveUserInfoModel *model = self.data[indexPath.row];
     switch (model.dataType) {
-        case CNLiveUserInfoDataTypeHead:
-        {
-            CNLiveInfoUpdateController *vc = [[CNLiveInfoUpdateController alloc]initWithModel:model];
-            vc.delegate = self;
-            [self.navigationController pushViewController:vc animated:YES];
-        }
-            break;
-        case CNLiveUserInfoDataTypeNickname:
-        {
-            CNLiveInfoUpdateController *vc = [[CNLiveInfoUpdateController alloc]initWithModel:model];
-            vc.delegate = self;
-            [self.navigationController pushViewController:vc animated:YES];
-        }
-            break;
-        case CNLiveUserInfoDataTypeGender:
-        {
-            CNLiveInfoUpdateController *vc = [[CNLiveInfoUpdateController alloc]initWithModel:model];
-            vc.delegate = self;
-            [self.navigationController pushViewController:vc animated:YES];
-        }
-            break;
         case CNLiveUserInfoDataTypeCode:
         {
             id<CNLiveQrCodeServiceProtocol> service = [[BeeHive shareInstance] createService:@protocol(CNLiveQrCodeServiceProtocol)];
             [service pushToMyQrCodeController:NO];
         }
             break;
-        case CNLiveUserInfoDataTypeAddress:
-        {
-            CNLiveInfoUpdateController *vc = [[CNLiveInfoUpdateController alloc]initWithModel:model];
-            vc.delegate = self;
-            [self.navigationController pushViewController:vc animated:YES];
-        }
-            break;
-        case CNLiveUserInfoDataTypeIntroduction:
+        default:
         {
             CNLiveInfoUpdateController *vc = [[CNLiveInfoUpdateController alloc]initWithModel:model];
-            vc.delegate = self;
             [self.navigationController pushViewController:vc animated:YES];
         }
             break;
-            
-        default:
-            break;
     }
 }
-#pragma mark - CNLiveInfoUpdateDelegate
-- (void)updateSuccess:(CNLiveUserInfoDataType)dataType info:(NSString *)info{
-    [self updateDataType:dataType info:info];
+
+#pragma mark - CNLiveUserInfoNavigationBarDelegate
+- (void)navigationBar:(CNLiveUserInfoNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
+    if ([actionEvents isEqualToString:@"1"]) {
+        [self goBack];
+    }
 }
-// 更新cell展示信息
-- (void)updateDataType:(CNLiveUserInfoDataType)dataType info:(NSString *)info{
+#pragma mark - 监听
+// 更新用户信息
+- (void)userInfoUpdateNotification:(NSNotification *)noti{
+    //使用userInfo处理消息
+    NSDictionary *dic = [noti userInfo];
+    CNLiveUserInfoDataType dataType = [[dic objectForKey:@"type"] integerValue];
+    NSString *info = [dic objectForKey:@"info"];
+    
+    // 更新cell展示信息
     for(CNLiveUserInfoModel *model in self.data){
         if(dataType == model.dataType){
-            model.content = info;
+            model.info = info;
             break;
         }
     }
     [self.tableView reloadData];
-}
-#pragma mark - CNLiveUserInfoNavigationBarDelegate
-- (void)navigationBar:(CNLiveUserInfoNavigationBar *)navigationBar actionEvents:(NSString *)actionEvents{
-    if ([actionEvents isEqualToString:@"1"]) {
-        [self goBack];
-    }
 }
 #pragma mark - 懒加载
@@ -29,7 +29,7 @@ typedef NS_ENUM(NSInteger, CNLiveUserInfoDataType) {
 @interface CNLiveUserInfoModel : NSObject
 @property (nonatomic, copy) NSString *title;
-@property (nonatomic, copy) NSString *content;
+@property (nonatomic, copy) NSString *info;
 @property (nonatomic, copy) NSString *layout;
 @property (nonatomic, copy) NSString *data;
@@ -10,6 +10,7 @@
 #import "CNLiveUserInfoModel.h"
 NS_ASSUME_NONNULL_BEGIN
+extern NSString * const kCNLiveUserInfoUpdateNotification;
 @interface CNLiveUserInfoNotification : NSObject
 + (void)postUserInfoUpdateNotificationType:(CNLiveUserInfoDataType)type info:(id)info;
@@ -9,7 +9,8 @@
 #import "CNLiveUserInfoNotification.h"
 @implementation CNLiveUserInfoNotification
-static NSString * const kCNLiveUserInfoUpdateNotification = @"CNLiveUserInfoUpdateNotification";
+
+NSString * const kCNLiveUserInfoUpdateNotification = @"CNLiveUserInfoUpdateNotification";
 + (void)postUserInfoUpdateNotificationType:(CNLiveUserInfoDataType)type info:(id)info{
     NSDictionary *dic = @{@"type":@(type),@"info":info};
@@ -13,6 +13,7 @@
 #import "CNLiveCategory.h"
 #import "CNUserInfoManager.h"
+#import "CNLiveUserInfoNotification.h"
 @interface CNLiveMineHeaderView ()
 @property (nonatomic, strong) UIImageView *bgView;
@@ -34,7 +35,7 @@ static const NSInteger margin = 20;
     if(self){
         self.userInteractionEnabled = YES;
         self.backgroundColor = [UIColor colorWithRed:244.0/255.0 green:244.0/255.0 blue:244.0/255.0 alpha:1.0];
-//        [XWUserInfoNotification addUserInfoUpdateObserver:self selector:@selector(userInfoUpdateNotification:)];
+        [CNLiveUserInfoNotification addUserInfoUpdateObserver:self selector:@selector(userInfoUpdateNotification:)];
         [self createSubViews];
     }
     return self;
@@ -42,26 +43,25 @@ static const NSInteger margin = 20;
 // 实现方法
 - (void)userInfoUpdateNotification:(NSNotification *)noti{
     //使用userInfo处理消息
-//    NSDictionary *dic = [noti userInfo];
-//    XWUserInfoDataType type = [[dic objectForKey:@"type"] integerValue];
-//    if(type == XWUserInfoDataTypeHead){
-//        UIImage *info = [dic objectForKey:@"info"];
-//        _header.image = info;
-//
-//    }else if(type == XWUserInfoDataTypeNickname){
-//        NSString *info = [dic objectForKey:@"info"];
-//        _name.attributedText = [self createAttributedImageName:@"mine_code" string:info isFront:NO];
-//
-//    }else if(type == XWUserInfoDataTypeAddress){
-//        NSString *info = [dic objectForKey:@"info"];
-//        _address.attributedText = [self createAttributedImageName:@"mine_location" string:info isFront:YES];
-//
-//    }
+    NSDictionary *dic = [noti userInfo];
+    CNLiveUserInfoDataType type = [[dic objectForKey:@"type"] integerValue];
+    NSString *info = [dic objectForKey:@"info"];
+    if(type == CNLiveUserInfoDataTypeHead){
+        UIImage *xw_image = [self getImageWithImageName:@"default_avatar_y" bundleName:@"CNLiveMineModule" targetClass:[CNLiveMineHeaderView class]];
+        [_header sd_setImageWithURL:[NSURL URLWithString:info] placeholderImage:xw_image];
+
+    }else if(type == CNLiveUserInfoDataTypeNickname){
+        _name.attributedText = [self createAttributedImageName:@"mine_code" string:info isFront:NO];
+
+    }else if(type == CNLiveUserInfoDataTypeAddress){
+        _address.attributedText = [self createAttributedImageName:@"mine_location" string:info isFront:YES];
+
+    }
 }
 - (void)dealloc {
     NSLog(@"CNLiveMineHeaderView -- dealloc");
-//    [XWUserInfoNotification removeObserver:self];
+    [CNLiveUserInfoNotification removeObserver:self];
 }