修改聊天解析消息展示连击礼物的Bug和不展示自己加入房间消息

张旭
1 parent 66da9870
Showing 4 changed files with 70 additions and 200 deletions
LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.h
LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.m
LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
@@ -52,7 +52,7 @@
     // 20170327 20170328
  
  
-    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170629" name:@"20170328" portrait:@"http://b.hiphotos.baidu.com/zhidao/wh%3D450%2C600/sign=f0c5c08030d3d539c16807c70fb7c566/8ad4b31c8701a18bbef9f231982f07082838feba.jpg"];
+    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170628" name:@"20170628" portrait:@"http://b.hiphotos.baidu.com/zhidao/wh%3D450%2C600/sign=f0c5c08030d3d539c16807c70fb7c566/8ad4b31c8701a18bbef9f231982f07082838feba.jpg"];
  
  
     [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
@@ -7,8 +7,9 @@
 //
  
 #import "BaseView.h"
+#import "GiftModel.h"
 @class LiveBaseView;
-@class GiftModel;
+
  
 @protocol GiftSelectDelegate <NSObject>
  
@@ -24,5 +25,7 @@
  
 - (void)addGiftAnimationWithModel:(GiftModel *_Nonnull)model;
  
-- (NSInteger)recGiftIndexFromGiftName:(NSString *)giftName;
+- (GiftStyle)giftStyleWithTag:(NSInteger)tag;
+
+- (NSInteger)recGiftIndexFromGiftName:(NSString *_Nonnull)giftName;
 @end
@@ -7,7 +7,6 @@
 //
  
 #import "GiftListView.h"
-#import "GiftModel.h"
 #import "LiveBaseView.h"
 #import "AnimQueueManager.h"
 #import "GiftPayButton.h"
@@ -171,6 +170,7 @@
     GiftModel *model = self.giftArray[tag];
     model.sender = [CNLiveChatManager sharedCNLiveChatManager].currentUserInfo.name;
     model.icon = [CNLiveChatManager sharedCNLiveChatManager].currentUserInfo.portraitUri;
+    model.giftStyle = [self giftStyleWithTag:tag];
 #warning 测试时 price 用假值 model.giftNumber赋值会导致不能本地连击以后再说
     model.price = @"0";
 //    model.giftNumber = 3;
@@ -181,17 +181,36 @@
 //应该加验证发送礼物消息成功后 再展示动画
 - (void)addGiftAnimationWithModel:(GiftModel *_Nonnull)model
 {
+    GiftModel *tempMdl = self.giftArray[model.index];
+    model.giftImageName = tempMdl.giftImageName;
+    
     dispatch_async(dispatch_get_main_queue(), ^{
         if (model.giftStyle == GiftStyleCombo) {
  
-            [self.animQueueManager addAnimationWithModel:self.giftArray[model.index] animContentView:(UIView *)self.liveBaseView.presentView];
+            [self.animQueueManager addAnimationWithModel:model animContentView:(UIView *)self.liveBaseView.presentView];
         }else
         {
-            [self.animQueueManager addAnimationWithModel:self.giftArray[model.index] animContentView:self.liveBaseView];
+            [self.animQueueManager addAnimationWithModel:model animContentView:self.liveBaseView];
         }
     });
 }
  
+- (GiftStyle)giftStyleWithTag:(NSInteger)tag
+{
+    GiftStyle style;
+    
+    if (tag == 0) {
+        style = GiftStylePorsch;
+    }else if (tag == 1){
+        style = GiftStyleFighter;
+    }else if (tag == 2){
+        style = GiftStylePlane;
+    }else{
+        style = GiftStyleCombo;
+    }
+    return style;
+}
+
 - (NSString *)giftNameWithImageName:(NSString *)imageName
 {
     NSString *giftName = @"";
@@ -104,36 +104,17 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     [CNLiveChatManager sharedCNLiveChatManager].delegate = self;
     [[CNLiveChatManager sharedCNLiveChatManager] joinChatRoom:roomId messageCount:-1 success:^(NSString *targetId) {
  
-        NSDictionary *dic = @{chatType:joinType,chatMessage:@{}};
-        
-        weakself
-        NSString *message = [Tools dictionaryToJson:dic];
-        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_CHATROOM targetId:_roomId success:^(CNLiveChatMessage *message) {
-            strongself
-            
-            
-            //将消息显示到列表中
-            chatMsgModel *model = [[chatMsgModel alloc] init];
-            model.name = message.userInfo.name;
-            model.content = [NSString stringWithFormat:@"%@进入了房间",message.userInfo.name];
-            model.ID = message.targetId;
-            model.icon = message.userInfo.portraitUri;
-            model.cellWidth = self.chatTableView.width - 20;
-            model.uId = message.userInfo.userId;
-            [self.chatMsgArray addObject:model];
-            [self.chatTableView reloadData];
-            NSInteger section = [self.chatTableView numberOfSections];
-            if (section < 1) return;
-            NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
-            if (row < 1) return;
-            NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
-            [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
-            [self.chatTableView reloadData];
-            
-        } error:^(CNLiveChatErrorCode errors, NSString *messageId, NSString *targetId) {
-            NSLog(@"%@",messageId);
-        }];
-        
+        if ([[UserInformationModel manager].uid isEqualToString:roomId]) {
+        }else{
+            NSDictionary *dic = @{chatType:joinType,chatMessage:@{}};
+            NSString *message = [Tools dictionaryToJson:dic];
+            [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_CHATROOM targetId:_roomId success:^(CNLiveChatMessage *message) {
+                NSLog(@"sendMessage Success %@",message.messageContent);
+                
+            } error:^(CNLiveChatErrorCode errors, NSString *messageId, NSString *targetId) {
+                NSLog(@"%@",messageId);
+            }];
+        }
         NSLog(@"连接聊天室成功success  %@",targetId);
     } error:^(CNLiveChatErrorCode errors, NSString *targetId) {
         NSLog(@"error");
@@ -231,39 +212,18 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         NSString *message = [Tools dictionaryToJson:dic];
         [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_CHATROOM targetId:_roomId success:^(CNLiveChatMessage *message) {
             strongself
+
             NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
             NSDictionary *msg = [JSONDic objectForKey:chatMessage];
-            
-            //将消息显示到列表中
-            chatMsgModel *model = [[chatMsgModel alloc] init];
-            model.name = message.userInfo.name;
-            model.content = [msg objectForKey:msgContent];
-            model.ID = message.targetId;
-            model.icon = message.userInfo.portraitUri;
-            model.cellWidth = self.chatTableView.width - 20;
-            model.uId = message.userInfo.userId;
-            [self.chatMsgArray addObject:model];
-            [self.chatTableView reloadData];
-            NSInteger section = [self.chatTableView numberOfSections];
-            if (section < 1) return;
-            NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
-            if (row < 1) return;
-            NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
-            [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
-            [self.chatTableView reloadData];
-            
+            [self addChatMsgWithMessage:message content:[msg objectForKey:msgContent]];
             NSInteger isBarrage = [[[JSONDic objectForKey:chatMessage] objectForKey:msgBarrage] integerValue];
-            
             if (isBarrage) {//此条消息飘弹幕
-                
                 chatMsgModel *barrageModel = [[chatMsgModel alloc] init];
                 barrageModel.name = message.userInfo.name;
                 barrageModel.content = [msg objectForKey:msgContent];
                 barrageModel.icon = message.userInfo.portraitUri;
-
                 [self.chatManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];
-           }
-
+            }
         } error:^(CNLiveChatErrorCode errors, NSString *messageId, NSString *targetId) {
             NSLog(@"%@",messageId);
         }];
@@ -411,25 +371,26 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
  
 - (void)addChatMsgWithMessage:(CNLiveChatMessage *)message content:(NSString *)content
 {
-    //将消息显示到列表中
-    chatMsgModel *model = [[chatMsgModel alloc] init];
-    model.name = message.userInfo.name;
-    model.content = content;
-    model.ID = message.targetId;
-    model.icon = message.userInfo.portraitUri;
-    model.cellWidth = self.chatTableView.width - 20;
-    model.uId = message.userInfo.userId;
-    [self.chatMsgArray addObject:model];
-    [self.chatTableView reloadData];
-    
-    NSInteger section = [self.chatTableView numberOfSections];
-    if (section < 1) return;
-    NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
-    if (row < 1) return;
-    NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
-    [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
-    [self.chatTableView reloadData];
-
+    dispatch_async(dispatch_get_main_queue(), ^{
+        //将消息显示到列表中
+        chatMsgModel *model = [[chatMsgModel alloc] init];
+        model.name = message.userInfo.name;
+        model.content = content;
+        model.ID = message.targetId;
+        model.icon = message.userInfo.portraitUri;
+        model.cellWidth = self.chatTableView.width - 20;
+        model.uId = message.userInfo.userId;
+        [self.chatMsgArray addObject:model];
+        [self.chatTableView reloadData];
+        
+        NSInteger section = [self.chatTableView numberOfSections];
+        if (section < 1) return;
+        NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
+        if (row < 1) return;
+        NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
+        [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
+        [self.chatTableView reloadData];
+    });
 }
  
 #pragma mark - buttonClick触摸屏幕关闭方法
@@ -499,10 +460,8 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 {
     if (![model.sender isEqualToString:@""]) {
         if ([[CNLiveChatManager sharedCNLiveChatManager] getConnectionStatus] == CNLive_ConnectionStatus_Connected) {
-            
             weakself
             [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:[self giftModelToJSON:model] type:CNLive_ConversationType_CHATROOM targetId:_roomId success:^(CNLiveChatMessage *message) {
-                
                 NSLog(@"send Msg success: %@",message.messageContent);
                 strongself
                 NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
@@ -510,24 +469,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
  
                 [self.giftListView addGiftAnimationWithModel:model];
  
-                CNLiveChatUserInfo *userInfo = message.userInfo;
-                //将消息显示到列表中
-                chatMsgModel *model1 = [[chatMsgModel alloc] init];
-                model1.name = message.userInfo.name;
-                model1.content = [NSString stringWithFormat:@" 送了一个 %@",msgDic[@"giftName"]];
-                model1.ID = message.targetId;
-                model1.icon = userInfo.portraitUri;
-                model1.cellWidth = self.chatTableView.width - 20;
-                model1.uId = userInfo.userId;
-                [self.chatMsgArray addObject:model1];
-                [self.chatTableView reloadData];
-                NSInteger section = [self.chatTableView numberOfSections];
-                if (section < 1) return;
-                NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
-                if (row < 1) return;
-                NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
-                [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
-                [self.chatTableView reloadData];
+                [self addChatMsgWithMessage:message content:[NSString stringWithFormat:@" 送了一个 %@",msgDic[@"giftName"]]];
  
             } error:^(CNLiveChatErrorCode errors, NSString *messageId, NSString *targetId) {
                 NSLog(@"error");
@@ -590,122 +532,28 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
                 giftModel.sender = message.userInfo.name;
                 giftModel.giftName = [msgDic objectForKey:msgGiftName];
                 giftModel.icon = message.userInfo.portraitUri;
-                giftModel.giftStyle = GiftStyleCombo;
+                NSInteger index = [self.giftListView recGiftIndexFromGiftName:[msgDic objectForKey:msgGiftName]];
+                giftModel.index = index;
+                giftModel.price = [msgDic objectForKey:msgGiftPrice];
+                giftModel.giftStyle = [self.giftListView giftStyleWithTag:index];
  
-                giftModel.index = [self.giftListView recGiftIndexFromGiftName:[msgDic objectForKey:msgGiftName]];
                 [self.giftListView addGiftAnimationWithModel:giftModel];
-                
                 [self addChatMsgWithMessage:message content:[NSString stringWithFormat:@" 送了一个 %@",msgDic[@"giftName"]]];
-//                //将消息显示到列表中
-//                chatMsgModel *model = [[chatMsgModel alloc] init];
-//                model.name = message.userInfo.name;
-//                model.content = [NSString stringWithFormat:@" 送了一个 %@",msgDic[@"giftName"]];
-//                model.ID = message.targetId;
-//                model.icon = message.userInfo.portraitUri;
-//                model.cellWidth = self.chatTableView.width - 20;
-//                model.uId = message.userInfo.userId;
-//                [self.chatMsgArray addObject:model];
-//                [self.chatTableView reloadData];
-//                
-//                NSInteger section = [self.chatTableView numberOfSections];
-//                if (section < 1) return;
-//                NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
-//                if (row < 1) return;
-//                NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
-//                [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
-//                [self.chatTableView reloadData];
+                
             }else if ([type isEqualToString:joinType]){
                 [self addChatMsgWithMessage:message content:[NSString stringWithFormat:@"%@进入了房间",message.userInfo.name]];
-//                //将消息显示到列表中
-//                chatMsgModel *model = [[chatMsgModel alloc] init];
-//                model.name = message.userInfo.name;
-//                model.content = [NSString stringWithFormat:@"%@进入了房间",message.userInfo.name];
-//                model.ID = message.targetId;
-//                model.icon = message.userInfo.portraitUri;
-//                model.cellWidth = self.chatTableView.width - 20;
-//                model.uId = message.userInfo.userId;
-//                [self.chatMsgArray addObject:model];
-//                [self.chatTableView reloadData];
-//                NSInteger section = [self.chatTableView numberOfSections];
-//                if (section < 1) return;
-//                NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
-//                if (row < 1) return;
-//                NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
-//                [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
-//                [self.chatTableView reloadData];
+
             }else if ([type isEqualToString:chatRoomType]){
-                [self addChatMsgWithMessage:message content: [NSString stringWithFormat:@" 送了一个 %@",msgDic[@"giftName"]]];
-//                //将消息显示到列表中
-//                chatMsgModel *model = [[chatMsgModel alloc] init];
-//                model.name = message.userInfo.name;
-//                model.content = [NSString stringWithFormat:@" 送了一个 %@",msgDic[@"giftName"]];
-//                model.ID = message.targetId;
-//                model.icon = message.userInfo.portraitUri;
-//                model.cellWidth = self.chatTableView.width - 20;
-//                model.uId = message.userInfo.userId;
-//                [self.chatMsgArray addObject:model];
-//                [self.chatTableView reloadData];
-//                
-//                NSInteger section = [self.chatTableView numberOfSections];
-//                if (section < 1) return;
-//                NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
-//                if (row < 1) return;
-//                NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
-//                [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
-//                [self.chatTableView reloadData];
-                
+                [self addChatMsgWithMessage:message content: [msgDic objectForKey:msgContent]];
                 NSInteger isBarrage = [[[JSONDic objectForKey:chatMessage] objectForKey:msgBarrage] integerValue];
-                
                 if (isBarrage) {//此条消息飘弹幕
-                    
                     chatMsgModel *barrageModel = [[chatMsgModel alloc] init];
                     barrageModel.name = message.userInfo.name;
                     barrageModel.content = [msgDic objectForKey:msgContent];
                     barrageModel.icon = message.userInfo.portraitUri;
                     [self.chatManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];
                 }
-
             }
-            
-//            
-//            GiftModel *giftModel = [[GiftModel alloc] init];
-//            giftModel.sender = message.userInfo.name;
-//            giftModel.giftName = [msgDic objectForKey:msgGiftName];
-//            giftModel.icon = message.userInfo.portraitUri;
-//            giftModel.giftStyle = GiftStyleCombo;
-//            
-//            giftModel.index = [self.giftListView recGiftIndexFromGiftName:[msgDic objectForKey:msgGiftName]];
-//            [self.giftListView addGiftAnimationWithModel:giftModel];
-//            
-//            //将消息显示到列表中
-//            chatMsgModel *model = [[chatMsgModel alloc] init];
-//            model.name = message.userInfo.name;
-//            model.content = [NSString stringWithFormat:@" 送了一个 %@",msgDic[@"giftName"]];
-//            model.ID = message.targetId;
-//            model.icon = message.userInfo.portraitUri;
-//            model.cellWidth = self.chatTableView.width - 20;
-//            model.uId = message.userInfo.userId;
-//            [self.chatMsgArray addObject:model];
-//            [self.chatTableView reloadData];
-//            
-//            NSInteger section = [self.chatTableView numberOfSections];
-//            if (section < 1) return;
-//            NSInteger row = [self.chatTableView numberOfRowsInSection:section - 1];
-//            if (row < 1) return;
-//            NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
-//            [self.chatTableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
-//            [self.chatTableView reloadData];
-//            
-//            NSInteger isBarrage = [[[JSONDic objectForKey:chatMessage] objectForKey:msgBarrage] integerValue];
-//            
-//            if (isBarrage) {//此条消息飘弹幕
-//                
-//                chatMsgModel *barrageModel = [[chatMsgModel alloc] init];
-//                barrageModel.name = message.userInfo.name;
-//                barrageModel.content = [msgDic objectForKey:msgContent];
-//                barrageModel.icon = message.userInfo.portraitUri;
-//                [self.chatManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];
-//            }
         }
             break;
         case CNLive_ConversationType_PRIVATE: