私聊页面

张旭
1 parent f325df79
Showing 17 changed files with 544 additions and 241 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/AnimationBaseView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/BarrageManager/BarrageManager.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/BarrageManager/BarrageManager.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatBarrageManager/ChatBarrageView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatMsgModel/chatMsgModel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatMsgModel/chatMsgModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PriChatCell.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PriChatCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PrivateView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PrivateView.m
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/close.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/close.imageset/close.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/defaultUserIcon.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/priToolBg.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/priToolBg.imageset/priToolBg.png
@@ -127,7 +127,6 @@
 		D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029CF21E6EAE2E0027CD92 /* Foundation+Log.m */; };
 		D2029D0A1E6EAE2E0027CD92 /* ZXServerUrl.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029CFE1E6EAE2E0027CD92 /* ZXServerUrl.m */; };
 		D2029D161E6EB00D0027CD92 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029D151E6EB00D0027CD92 /* AppDelegate.m */; };
-		D207BE9E1E84BD68006A0CE8 /* BarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D207BE9D1E84BD68006A0CE8 /* BarrageManager.m */; };
 		D207BEA11E84C1EC006A0CE8 /* AnimationBaseView.m in Sources */ = {isa = PBXBuildFile; fileRef = D207BEA01E84C1EC006A0CE8 /* AnimationBaseView.m */; };
 		D217A24A1E7B76C7003B44CB /* PresentView.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A2471E7B76C7003B44CB /* PresentView.m */; };
 		D217A24B1E7B76C7003B44CB /* PresentViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D217A2491E7B76C7003B44CB /* PresentViewCell.m */; };
@@ -179,6 +178,7 @@
 		D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB01E6EC05F003A77C8 /* TempViewController.m */; };
 		D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB31E6EC154003A77C8 /* HomeViewController.m */; };
 		D2888DB71E6EC1B8003A77C8 /* LVCMyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */; };
+		D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */ = {isa = PBXBuildFile; fileRef = D29E81EC1E88DC5B008C9906 /* PriChatCell.m */; };
 		D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A803071E80BD6F009D6F1C /* TopToolView.m */; };
 		D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2501E8247D400ED084E /* ChatBarrageManager.m */; };
 		D2B7B2541E824B2D00ED084E /* ChatBarrageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */; };
@@ -476,8 +476,6 @@
 		D2029CFF1E6EAE2E0027CD92 /* UtilKits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UtilKits.h; sourceTree = "<group>"; };
 		D2029D121E6EAF8D0027CD92 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
 		D2029D151E6EB00D0027CD92 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
-		D207BE9C1E84BD68006A0CE8 /* BarrageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BarrageManager.h; sourceTree = "<group>"; };
-		D207BE9D1E84BD68006A0CE8 /* BarrageManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BarrageManager.m; sourceTree = "<group>"; };
 		D207BE9F1E84C1EC006A0CE8 /* AnimationBaseView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnimationBaseView.h; sourceTree = "<group>"; };
 		D207BEA01E84C1EC006A0CE8 /* AnimationBaseView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnimationBaseView.m; sourceTree = "<group>"; };
 		D217A2451E7B76C7003B44CB /* PresentModelAble.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PresentModelAble.h; sourceTree = "<group>"; };
@@ -566,6 +564,8 @@
 		D2888DB31E6EC154003A77C8 /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
 		D2888DB51E6EC1B8003A77C8 /* LVCMyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMyViewController.h; sourceTree = "<group>"; };
 		D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMyViewController.m; sourceTree = "<group>"; };
+		D29E81EB1E88DC5B008C9906 /* PriChatCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriChatCell.h; sourceTree = "<group>"; };
+		D29E81EC1E88DC5B008C9906 /* PriChatCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PriChatCell.m; sourceTree = "<group>"; };
 		D2A803061E80BD6F009D6F1C /* TopToolView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TopToolView.h; sourceTree = "<group>"; };
 		D2A803071E80BD6F009D6F1C /* TopToolView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TopToolView.m; sourceTree = "<group>"; };
 		D2B7B24F1E8247D400ED084E /* ChatBarrageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrageManager.h; sourceTree = "<group>"; };
@@ -654,14 +654,6 @@
 			path = ../ChatView;
 			sourceTree = "<group>";
 		};
-		812E504D1E769995004F5FCD /* CNLiveSDK */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = CNLiveSDK;
-			path = LiveVideoCloud/Classes/CNLiveSDK;
-			sourceTree = SOURCE_ROOT;
-		};
 		812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
 			isa = PBXGroup;
 			children = (
@@ -1263,15 +1255,6 @@
 			path = AppDelegate;
 			sourceTree = "<group>";
 		};
-		D207BE9B1E84BD3E006A0CE8 /* BarrageManager */ = {
-			isa = PBXGroup;
-			children = (
-				D207BE9C1E84BD68006A0CE8 /* BarrageManager.h */,
-				D207BE9D1E84BD68006A0CE8 /* BarrageManager.m */,
-			);
-			path = BarrageManager;
-			sourceTree = "<group>";
-		};
 		D217A2441E7B76C7003B44CB /* Present */ = {
 			isa = PBXGroup;
 			children = (
@@ -1298,7 +1281,6 @@
 		D22830F61E77C26C00627701 /* Chat */ = {
 			isa = PBXGroup;
 			children = (
-				D207BE9B1E84BD3E006A0CE8 /* BarrageManager */,
 				D2B7B24E1E8247B500ED084E /* ChatBarrageManager */,
 				D236968F1E7FC83800E4BF71 /* ChatMsgModel */,
 				D22830F71E77C27A00627701 /* ChatViews */,
@@ -1365,6 +1347,8 @@
 			children = (
 				D24571611E83C40B00AA85D6 /* PrivateView.h */,
 				D24571621E83C40B00AA85D6 /* PrivateView.m */,
+				D29E81EB1E88DC5B008C9906 /* PriChatCell.h */,
+				D29E81EC1E88DC5B008C9906 /* PriChatCell.m */,
 			);
 			path = PrivateView;
 			sourceTree = "<group>";
@@ -1816,6 +1800,7 @@
 				810B65061E779B1F00133E15 /* View+MASAdditions.m in Sources */,
 				D2029D161E6EB00D0027CD92 /* AppDelegate.m in Sources */,
 				D2029CB71E6EADE10027CD92 /* NSData+ImageContentType.m in Sources */,
+				D29E81ED1E88DC5B008C9906 /* PriChatCell.m in Sources */,
 				D2029CD01E6EADE10027CD92 /* SearchPresenter.m in Sources */,
 				D2888DB71E6EC1B8003A77C8 /* LVCMyViewController.m in Sources */,
 				D2029CBE1E6EADE10027CD92 /* SDWebImagePrefetcher.m in Sources */,
@@ -1897,7 +1882,6 @@
 				D217A24A1E7B76C7003B44CB /* PresentView.m in Sources */,
 				D22830F11E778C0F00627701 /* LiveBaseView.m in Sources */,
 				D2029CBA1E6EADE10027CD92 /* SDWebImageDecoder.m in Sources */,
-				D207BE9E1E84BD68006A0CE8 /* BarrageManager.m in Sources */,
 				8112D4311E7927A5002E00F6 /* LVCPlayerLoadingView.m in Sources */,
 				D2029D081E6EAE2E0027CD92 /* ZXDeviceInfo.m in Sources */,
 				D24571631E83C40B00AA85D6 /* PrivateView.m in Sources */,
@@ -7,7 +7,7 @@
 //
 #import "AnimationBaseView.h"
-#import "ChatBarrageView.h"
+
 @implementation AnimationBaseView
-//
-//  BarrageManager.h
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/24.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-@class chatMsgModel;
-@class ChatBarrageView;
-#import "AnimationBaseView.h"
-@interface BarrageManager : NSObject <TouchPointDelegate>
-
-/**
- 初始化管理类
- @return 当前manager
- */
-+ (instancetype)sharedManager;
-
-- (ChatBarrageView *)addAnimationWithModel:(chatMsgModel *)model animContentView:(UIView *)animContentView;
-
-@end
-//
-//  BarrageManager.m
-//  LiveVideoCloud
-//
-//  Created by 张旭 on 2017/3/24.
-//  Copyright © 2017年 cnlive. All rights reserved.
-//
-
-#import "BarrageManager.h"
-#import "chatMsgModel.h"
-#import "ChatBarrageView.h"
-
-@interface BarrageManager ()<CAAnimationDelegate>
-
-@property (nonatomic ,strong) NSTimer *           _Nullable       timer;
-@property (nonatomic ,strong) ChatBarrageView *_Nullable          barrageView;
-@property (nonatomic ,strong) AnimationBaseView * _Nullable       animBaseView;
-@property (nonatomic ,assign) CGRect                              barrCurrentRect;
-
-@end
-@implementation BarrageManager
-
-/**
- 初始化管理类
- @return 当前manager
- */
-+ (instancetype)sharedManager{
-    
-    static BarrageManager *manager;
-    
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        manager = [[BarrageManager alloc] init];
-    });
-    return manager;
-}
-
-//- (AnimationBaseView *)animBaseView
-//{
-//    if (!_animBaseView)
-//    {
-//        _animBaseView = [[AnimationBaseView alloc] init];
-//    }
-//    return _animBaseView;
-//}
-
-/**
- 根据实际model添加动画
- 
- @param model modelobj
- */
-- (ChatBarrageView *)addAnimationWithModel:(chatMsgModel *)model animContentView:(UIView *)animContentView
-{
-    ChatBarrageView *barrageView = [ChatBarrageView barrageViewWithPoint:CGPointMake(SCREEN_WIDTH + 50, 100)];
-    barrageView.backgroundColor = [UIColor blackColor];
-    [animContentView addSubview:barrageView];
-    self.barrageView = barrageView;
-    self.animBaseView = (AnimationBaseView *)animContentView;
-
-    barrageView.model = model;
-    
-    [self animationWithDuration:8
-                        YValues:@[ @(SCREEN_WIDTH + 50), @(-(200))]
-                       keyTimes:@[@0.0, @1.0]
-                timingFunctions:@[
-                                  [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear],
-                                  ]
-                        addView:barrageView];
-    [self createTimer];
-    self.animBaseView.isBarrage = YES;
-    
-//    [UIView animateWithDuration:10 animations:^{
-//        
-//        barrageView.left = - 200;
-//    } completion:^(BOOL finished) {
-//        [self stopTimer];
-//        [barrageView removeFromSuperview];
-//        NSLog(@"finished");
-//    }];
-    return barrageView;
-}
-
-// 实时监测 ，也可以用循环定时器
-- (void)createTimer{
-    if (!self.timer) {
-        self.timer = [NSTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(jianCe) userInfo:nil repeats:YES];
-    }
-}
-- (void) jianCe{
-    CGRect rect = [[self.barrageView.layer presentationLayer ]frame];  // view指动画中移动的view
-    self.barrCurrentRect = rect;
-//    NSLog(@"箭%@",NSStringFromCGRect(rect));
-}
-
-- (void)stopTimer
-{
-    if(self.timer)
-    {
-        [self.timer invalidate];
-        self.timer = nil;
-    }
-}
-
-#pragma mark - touchPointDelegate
-- (void)touchPoint:(CGPoint)touchPoint
-{
-    CGFloat dxLeft = touchPoint.x - self.barrCurrentRect.origin.x;// >0
-    CGFloat dxRight = touchPoint.x - self.barrCurrentRect.origin.x - self.barrCurrentRect.size.width;// < 0
-    CGFloat dyLeft = touchPoint.y - self.barrCurrentRect.origin.y;// >0
-    CGFloat dyRight = touchPoint.y - self.barrCurrentRect.origin.y - self.barrCurrentRect.size.height;// <0
-
-    if (dxLeft > 0 && dxRight < 0 && dyLeft > 0 && dyRight < 0) {
-        //在当前矩形区域内
-//        NSLog(@"在当前矩形区域内");
-        [self.barrageView barrageViewClickWithModel:self.barrageView.model];
-    }else
-    {
-//        NSLog(@"不在当前矩形区域内");
-    }
-}
-
-- (void)animationWithDuration:(float)duration YValues:(NSArray *)YValues keyTimes:(NSArray *)keyTimes timingFunctions:(NSArray *)timingFunctions addView:(UIView *)addView{
-    CAKeyframeAnimation *rocketAnim = [CAKeyframeAnimation animation];
-    rocketAnim.keyPath = @"position.x";
-    rocketAnim.values = YValues;
-    rocketAnim.keyTimes = keyTimes;
-    rocketAnim.timingFunctions = timingFunctions;
-    rocketAnim.duration = duration;
-    rocketAnim.fillMode = kCAFillModeForwards;
-    rocketAnim.removedOnCompletion = NO;
-    rocketAnim.delegate = self;
-    [addView.layer addAnimation:rocketAnim forKey:@"positionY"];
-}
-
-- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
-    NSLog(@"didStop");
-    [self stopTimer];
-    [self.barrageView removeFromSuperview];
-    self.animBaseView.isBarrage = NO;
-}
-@end
@@ -8,6 +8,7 @@
 #import "ChatBarrageAnimAction.h"
+
 @class AnimationBaseView;
 @class chatMsgModel;
 @interface ChatBarrageView : ChatBarrageAnimAction
@@ -21,4 +21,9 @@
 @property (nonatomic) BOOL isMine;//消息是否是自己发送
 @property (nonatomic ,copy) NSString * _Nullable            ID;//唯一标识
+/////
+@property (nonatomic ,assign) CGFloat                          priCellHeight;
+@property (nonatomic ,assign) CGFloat                          priCellWidth;
+
+
 @end
@@ -29,4 +29,22 @@
      //   NSLog(@"cellHeight = %f",_cellHeight);
     return _cellHeight;
 }
+
+- (CGFloat)priCellHeight
+{
+    //如果计算过高度,直接返回
+    if (_priCellHeight) return _priCellHeight;
+    
+    _priCellHeight = 0;
+    NSString *content = self.content;
+    //文字
+    CGFloat textMaxW = self.priCellWidth;
+    CGSize textMaxSize = CGSizeMake(textMaxW, MAXFLOAT);
+    CGSize textSize = [content boundingRectWithSize:textMaxSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14]} context:nil].size;
+    
+    //底部空隙
+    _priCellHeight += textSize.height + ChatCellMargin;
+//       NSLog(@"pricellHeight = %f",_priCellHeight);
+    return _priCellHeight;
+}
 @end
@@ -20,7 +20,6 @@
 #import "ChatBarrageManager.h"
 #import "userInfoModel.h"
 #import "PrivateView.h"
-//#import "BarrageManager.h"
 #import "ChatBarrageView.h"
 #import "AnimationBaseView.h"
@@ -35,7 +34,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     PopTypePriMessage        //私信弹窗
 };
-@interface LiveBaseView ()<bottomBtnDeledate,PresentViewDelegate,UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,userClickDelegate,CNLiveChatManagerDelegate>
+@interface LiveBaseView ()<bottomBtnDeledate,PresentViewDelegate,UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,userClickDelegate,CNLiveChatManagerDelegate,PopViewDelegate>
 @property (nonatomic ,strong           ) UIScrollView *   _Nullable scrollView;
 @property (nonatomic ,strong ,readwrite) AnimationBaseView *         _Nullable animationBaseView;//展示层View
@@ -53,8 +52,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 @property (nonatomic ,assign           ) CGFloat   offsetHeight;
 @property (nonatomic ,strong           ) UISwitch *           _Nullable barrageSwitch;
 @property (nonatomic ,strong           ) ChatBarrageManager * _Nullable chatManager;
-//@property (nonatomic ,strong           ) BarrageManager * _Nullable barrManager;
-
 @property (nonatomic ,strong) ChatBarrageView * _Nullable             barrageView;
 @end
@@ -251,9 +248,16 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 - (void)showPrivateView
 {
     PrivateView *privateView = [PrivateView privateView];
-    privateView.backgroundColor = [UIColor yellowColor];
+    privateView.backgroundColor = [UIColor whiteColor];
     [self addSubview:privateView];
+    privateView.delegate = self;
     self.giftPopView = privateView;
+    
+    [UIView animateWithDuration:0.5 animations:^{
+        privateView.top -= 300;
+    } completion:^(BOOL finished) {
+        
+    }];
 }
 - (void)hiddenView:(BOOL)isHidden
@@ -288,12 +292,20 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
             break;
         case PopTypePriMessage:
         {
-            [UIView animateWithDuration:0.25 animations:^{
-                
-                self.giftPopView.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, SCREEN_HEIGHT);
-                [self hiddenView:NO];
-            } completion:^(BOOL finished) {
-            }];
+            if (((PrivateView *)self.giftPopView).isEditing) {
+                //正在编辑
+                [(PrivateView *)self.giftPopView endCurrentEditing];
+
+            }else//已结束编辑
+            {
+                [UIView animateWithDuration:0.25 animations:^{
+                    
+                    self.giftPopView.frame = CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, 300);
+                    [self hiddenView:NO];
+                } completion:^(BOOL finished) {
+                }];
+            }
+            
         }
             break;
         default:
@@ -345,6 +357,12 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     }];
 }
+#pragma mark - PriClosePopViewDelegate
+- (void)closeCurrentPopView
+{
+    [self clearCurrentPopView];
+}
+
 #pragma mark - CNLiveChatManagerDelegate
 /**
  连接状态的的监听器
@@ -387,40 +405,70 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 - (void)onReceived:(CNLiveChatMessage *)message
 {
 //    NSLog(@"onReceived");
-    NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
-    NSString *content = [JSONDic objectForKey:message_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;
-    [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:message_barrage] integerValue];
-    
-    if (isBarrage) {//此条消息飘弹幕
-
-        chatMsgModel *barrageModel = [[chatMsgModel alloc] init];
-        barrageModel.name = message.userInfo.name;
-        barrageModel.content = content;
-        barrageModel.icon = message.userInfo.portraitUri;
-//        self.barrageView = [self.barrManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];
-        [self.chatManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];//self.barrageView = 
+    switch (message.conversationType) {
+        case CNLive_ConversationType_CHATROOM:
+        {
+            NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
+            NSString *content = [JSONDic objectForKey:message_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;
+            [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:message_barrage] integerValue];
+            
+            if (isBarrage) {//此条消息飘弹幕
+                
+                chatMsgModel *barrageModel = [[chatMsgModel alloc] init];
+                barrageModel.name = message.userInfo.name;
+                barrageModel.content = content;
+                barrageModel.icon = message.userInfo.portraitUri;
+                [self.chatManager addAnimationWithModel:barrageModel animContentView:self.animationBaseView];
+            }
+        }
+            break;
+        case CNLive_ConversationType_PRIVATE:
+        {
+            NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
+            NSString *content = [JSONDic objectForKey:message_content];
+            PrivateView *privateView = [PrivateView privateView];
-        self.animationBaseView.delegate = self.chatManager;
-//        self.animationBaseView.barrageView = self.barrageView;
+            //将消息显示到列表中
+            chatMsgModel *model = [[chatMsgModel alloc] init];
+            model.name = message.userInfo.name;
+            model.isMine = NO;
+            model.content = content;
+            model.ID = message.targetId;
+            model.icon = message.userInfo.portraitUri;
+            model.cellWidth = privateView.tableView.width - 20;
+            [privateView.chatArray addObject:model];
+            [privateView.tableView reloadData];
+            
+            NSInteger section = [privateView.tableView numberOfSections];
+            if (section < 1) return;
+            NSInteger row = [privateView.tableView numberOfRowsInSection:section - 1];
+            if (row < 1) return;
+            NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
+            [privateView.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
+            [privateView.tableView reloadData];
+        }
+            break;
+        default:
+            break;
     }
 }
@@ -629,14 +677,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     return _giftListView;
 }
-//- (BarrageManager *)barrManager
-//{
-//    if (!_barrManager)
-//    {
-//        _barrManager = [BarrageManager sharedManager];
-//    }
-//    return _barrManager;
-//}
 - (ChatBarrageManager *)chatManager
 {
     if (!_chatManager)
+//
+//  PriChatCell.h
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "BaseTableViewCell.h"
+
+@class chatMsgModel;
+@interface PriChatCell : BaseTableViewCell
+
+@end
+//
+//  PriChatCell.m
+//  LiveVideoCloud
+//
+//  Created by 张旭 on 2017/3/27.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "PriChatCell.h"
+#import "chatMsgModel.h"
+
+#define CHAT_POP_WIDTH 260
+#define TOP_MARGIN 6
+
+@interface PriChatCell ()
+
+@property (nonatomic ,strong) chatMsgModel * _Nullable model;
+@property (nonatomic ,strong) UIImageView *  _Nullable icon;
+@property (nonatomic ,strong) UILabel *      _Nullable content;
+@property (nonatomic ,strong) UIImageView *  _Nullable bgImgView;
+
+@end
+
+@implementation PriChatCell
+
+- (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        self.backgroundColor = [UIColor clearColor];
+        self.selectionStyle = UITableViewCellSelectionStyleNone;
+    }
+    return self;
+}
+
+- (void)loadUIWithModel:(chatMsgModel *)model
+{
+    _model = model;
+    [self bindView];
+    [self.icon sd_setImageWithURL:[NSURL URLWithString:model.icon] placeholderImage:nil];
+    self.content.text = model.content;
+}
+
+- (void)bindView
+{
+    self.icon.frame = CGRectMake(self.width - 30, TOP_MARGIN, 25, 25);
+//    NSLog(@"self.icon.centerY%f",self.height * 0.5);//13.353516
+    self.icon.top = 13.353516;
+    self.content.frame = CGRectMake(self.width - 30 - CHAT_POP_WIDTH, TOP_MARGIN, CHAT_POP_WIDTH, self.height - 2 * TOP_MARGIN);
+//    self.bgImgView.frame = CGRectMake(<#CGFloat x#>, <#CGFloat y#>, <#CGFloat width#>, <#CGFloat height#>);
+    self.icon.backgroundColor = ZXRandomColor;
+    self.content.backgroundColor = ZXRandomColor;
+}
+
+#pragma mark - getter
+- (UILabel * _Nullable)content
+{
+    if (!_content)
+    {
+        _content = [[UILabel alloc] init];
+        _content.textAlignment = NSTextAlignmentCenter;
+        _content.textColor = [UIColor blackColor];
+        _content.numberOfLines = 0;
+        _content.font = [UIFont systemFontOfSize:14.f];
+        [self addSubview:_content];
+    }
+    return _content;
+}
+
+- (UIImageView * _Nullable)icon
+{
+    if (!_icon)
+    {
+        _icon = [[UIImageView alloc] init];
+        _icon.layer.masksToBounds = YES;
+        _icon.layer.cornerRadius = 15.f;
+        [self addSubview:_icon];
+    }
+    return _icon;
+}
+
+- (UIImageView * _Nullable)bgImgView
+{
+    if (!_bgImgView)
+    {
+        _bgImgView = [[UIImageView alloc] init];
+        [self addSubview:_bgImgView];
+    }
+    return _bgImgView;
+}
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
+    [super setSelected:selected animated:animated];
+
+    // Configure the view for the selected state
+}
+
+@end
@@ -8,8 +8,24 @@
 #import <UIKit/UIKit.h>
+
+@protocol PopViewDelegate <NSObject>
+
+- (void)closeCurrentPopView;
+
+@end
+
 @interface PrivateView : UIView
-+ (instancetype)privateView;
++ (instancetype _Nonnull)privateView;
+
+- (void)endCurrentEditing;
+
+@property (nonatomic ,assign) BOOL                          isEditing;
+
+@property (nonatomic ,strong) _Nonnull id <PopViewDelegate>             delegate;
+@property (nonatomic ,strong) UITableView *      _Nullable tableView;
+
+@property (nonatomic ,strong) NSMutableArray * _Nullable             chatArray;
 @end
@@ -7,13 +7,245 @@
 //
 #import "PrivateView.h"
+#import "PriChatCell.h"
+#import "chatMsgModel.h"
+
+@interface PrivateView ()<UITextFieldDelegate,UITableViewDelegate,UITableViewDataSource>
+
+@property (nonatomic ,strong) UILabel *          _Nullable nameLbl;
+@property (nonatomic ,strong) UIButton *         _Nullable closeBtn;
+
+@property (nonatomic ,strong) UIImageView *      _Nullable bottomTool;
+@property (nonatomic ,strong) UIButton *         _Nullable sendBtn;
+@property (nonatomic ,strong) UITextField *      _Nullable textField;
+
+@end
 @implementation PrivateView
+static NSString *message_content = @"message_content";
+
 + (instancetype)privateView
 {
-    return [[PrivateView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - 300, SCREEN_WIDTH, 300)];
+    static PrivateView *privateView;
+    
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        privateView = [[PrivateView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT, SCREEN_WIDTH, 300)];
+    });
+    return privateView;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    if (self = [super initWithFrame:frame]) {
+        
+        [self addSubview:self.tableView];
+        [self addSubview:self.nameLbl];
+        [self.bottomTool addSubview:self.sendBtn];
+        [self.bottomTool addSubview:self.textField];
+        
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil];
+    }
+    return self;
+}
+
+- (void)closeAction
+{
+    if ([self.delegate respondsToSelector:@selector(closeCurrentPopView)]) {
+        [self.delegate closeCurrentPopView];
+    }
+}
+
+- (void)sendClick
+{
+    [self textFieldShouldReturn:self.textField];
+}
+
+- (void)keyboardWillShow:(NSNotification *)notify {
+    
+    NSDictionary *userInfo = notify.userInfo;
+    CGRect newFrameKeyboard = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];//变化前的frame
+    [UIView animateWithDuration:0.25 animations:^{
+        self.top = SCREEN_HEIGHT - newFrameKeyboard.size.height - self.height;
+    }];
+    self.isEditing = YES;
+    NSLog(@"showtop:%f",self.top);
+}
+
+- (void)keyboardWillHidden:(NSNotification *)notify {
+    
+    [UIView animateWithDuration:0.1 animations:^{
+        self.top = SCREEN_HEIGHT - 300;
+    }];
+    NSLog(@"hiddentop:%f",self.top);
+    self.isEditing = NO;
+}
+
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+    if (![textField.text isEqualToString:@""]) {
+                
+        NSDictionary *dic = @{message_content:textField.text};
+        weakself
+        NSString *message = [Tools dictionaryToJson:dic];
+        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_PRIVATE targetId:@"1234" success:^(CNLiveChatMessage *message) {
+            
+            dispatch_async(dispatch_get_main_queue(), ^{
+                strongself
+                NSDictionary *JSONDic = [Tools dictionaryWithJsonString:message.messageContent];
+                NSString *content = [JSONDic objectForKey:message_content];
+                
+                //将消息显示到列表中
+                chatMsgModel *model = [[chatMsgModel alloc] init];
+                model.name = message.userInfo.name;
+                model.isMine = YES;
+                model.content = content;
+//                model.ID = message.targetId;
+                model.icon = message.userInfo.portraitUri;
+                model.priCellWidth = self.tableView.width * 0.5 - 30;
+                //        model.sendTime;//发送时间
+                [self.chatArray addObject:model];
+                [self.tableView reloadData];
+                
+                NSInteger section = [self.tableView numberOfSections];
+                if (section < 1) return;
+                NSInteger row = [self.tableView numberOfRowsInSection:section - 1];
+                if (row < 1) return;
+                NSIndexPath *indexPath = [NSIndexPath indexPathForRow:row - 1 inSection:section - 1];
+                [self.tableView scrollToRowAtIndexPath:indexPath atScrollPosition:UITableViewScrollPositionBottom animated:YES];
+                [self.tableView reloadData];
+
+            });
+        } error:^(CNLiveChatErrorCode errors, NSString *messageId, NSString *targetId) {
+            NSLog(@"%@",messageId);
+        }];
+        
+        textField.text = @"";
+    }
+    [textField resignFirstResponder];
+    return YES;
+}
+
+- (void)endCurrentEditing
+{
+    self.top = SCREEN_HEIGHT - 300;
+    [self.textField resignFirstResponder];
+}
+
+#pragma mark - 私聊消息列表
+#pragma mark - UITableViewDataSource
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return self.chatArray.count;
 }
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    PriChatCell * cell = [tableView dequeueReusableCellWithIdentifier:NSStringFromClass([PriChatCell class]) forIndexPath:indexPath];
+    [cell loadUIWithModel:self.chatArray[indexPath.row]];
+    return cell;
+}
+
+#pragma mark - UITableViewDelegate
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return [self.chatArray[indexPath.row] priCellHeight];
+}
+
+- (NSMutableArray *)chatArray
+{
+    if (!_chatArray)
+    {
+        _chatArray = [[NSMutableArray alloc] init];
+    }
+    return _chatArray;
+}
+
+- (UILabel *)nameLbl
+{
+    if (!_nameLbl)
+    {
+        _nameLbl = [[UILabel alloc] initWithFrame:CGRectMake(100, 5, self.width - 100, 30)];
+        _nameLbl.centerX = self.width * 0.5;
+        _nameLbl.text = @"哈哈哈主播的名字";
+        [_nameLbl setTextColor:[UIColor cyanColor]];
+        _nameLbl.numberOfLines = 1;
+        _nameLbl.textAlignment = NSTextAlignmentCenter;
+    }
+    return _nameLbl;
+}
+
+- (UIButton *)closeBtn
+{
+    if (!_closeBtn)
+    {
+        UIButton *closeBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+        closeBtn.frame = CGRectMake(SCREEN_WIDTH - 41,10, 31, 30);
+        [closeBtn setImage:[UIImage imageNamed:@"close"] forState:UIControlStateNormal];
+        [closeBtn setImage:[UIImage imageNamed:@"close"] forState:UIControlStateHighlighted];
+        [closeBtn addTarget:self action:@selector(closeAction) forControlEvents:UIControlEventTouchUpInside];
+        _closeBtn = closeBtn;
+        [self addSubview:_closeBtn];
+
+    }
+    return _closeBtn;
+}
+
+- (UITableView *)tableView
+{
+    if (!_tableView)
+    {
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, self.closeBtn.bottom + 10, self.width, self.height - self.closeBtn.bottom - 10 - self.bottomTool.height)];
+        [_tableView registerClass:[PriChatCell class] forCellReuseIdentifier:NSStringFromClass([PriChatCell class])];
+        _tableView.delegate = self;
+        _tableView.dataSource = self;
+        _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.showsHorizontalScrollIndicator = NO;
+    }
+    return _tableView;
+}
+
+- (UIImageView *)bottomTool
+{
+    if (!_bottomTool)
+    {
+        _bottomTool = [[UIImageView alloc] initWithFrame:CGRectMake(0, self.height - 40, self.width, 40)];
+        _bottomTool.image = [[UIImage imageNamed:@"priToolBg"] resizableImageWithCapInsets:UIEdgeInsetsMake(0, 0, 0, 0) resizingMode:UIImageResizingModeStretch];
+        _bottomTool.userInteractionEnabled = YES;
+        
+        [self addSubview:_bottomTool];
+    }
+    return _bottomTool;
+}
+
+- (UIButton *)sendBtn
+{
+    if (!_sendBtn)
+    {
+        _sendBtn = [[UIButton alloc] initWithFrame:CGRectMake(self.bottomTool.width - 60, 4, 60, self.bottomTool.height - 8)];
+        [_sendBtn setTitle:@"发送" forState:UIControlStateNormal];
+        [_sendBtn setTitleColor:[UIColor cyanColor] forState:UIControlStateNormal];
+        [_sendBtn addTarget:self action:@selector(sendClick) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _sendBtn;
+}
+
+- (UITextField *)textField
+{
+    if (!_textField)
+    {
+        _textField = [[UITextField alloc] initWithFrame:CGRectMake(4, 4, self.bottomTool.width - self.sendBtn.width - 8, self.bottomTool.height - 8)];
+        _textField.borderStyle = UITextBorderStyleLine;
+        _textField.returnKeyType       = UIReturnKeySend;
+        _textField.delegate = self;
+    }
+    return _textField;
+}
+
 /*
 // Only override drawRect: if you perform custom drawing.
 // An empty implementation adversely affects performance during animation.
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "iphone",
+      "filename" : "close.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "贡献榜小头像.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "priToolBg.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file