Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud

# Conflicts: # LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/LiveVideoCloud
# Conflicts: # LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
张旭
2 parents 319a2c13 05694338
Showing 30 changed files with 971 additions and 36 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/CNLivePlayerSDK
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Info.plist
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatRoomModel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatRoomModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatViewTableViewCell.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatViewTableViewCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCInputView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCInputView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCFullScreenPlayerController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLivePlayerController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCPlayer.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCPlayer.m
LiveVideoCloud/LiveVideoCloud/UtilKits/Category/NSString+StringSize.h
LiveVideoCloud/LiveVideoCloud/UtilKits/Category/NSString+StringSize.m
LiveVideoCloud/LiveVideoCloud/animation.xcassets/player/Gift box right.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/player/Gift box right.imageset/Gift box right.png
@@ -21,8 +21,13 @@
 		810B65071E779B1F00133E15 /* ViewController+MASAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B64FD1E779B1F00133E15 /* ViewController+MASAdditions.m */; };
 		810B650A1E77B39D00133E15 /* LVCFullScreenPlayerController.m in Sources */ = {isa = PBXBuildFile; fileRef = 810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */; };
 		8112D4311E7927A5002E00F6 /* LVCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */; };
-		812E50531E7699DC004F5FCD /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */; };
-		812E50581E7699E9004F5FCD /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		811BB6801E80F858005C6291 /* LVCChatView.m in Sources */ = {isa = PBXBuildFile; fileRef = 811BB67D1E80F858005C6291 /* LVCChatView.m */; };
+		811BB6831E8106A2005C6291 /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 811BB6821E8106A2005C6291 /* CNLivePlayerSDK.framework */; };
+		811BB6851E8106AF005C6291 /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 811BB6821E8106A2005C6291 /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		811BB6881E8107B4005C6291 /* LVCChatViewTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 811BB6871E8107B4005C6291 /* LVCChatViewTableViewCell.m */; };
+		811BB68B1E8108DB005C6291 /* LVCChatRoomModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 811BB68A1E8108DB005C6291 /* LVCChatRoomModel.m */; };
+		811BB68E1E8116C8005C6291 /* NSString+StringSize.m in Sources */ = {isa = PBXBuildFile; fileRef = 811BB68D1E8116C8005C6291 /* NSString+StringSize.m */; };
+		81A1B9A91E8277410079FF5F /* LVCInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A1B9A81E8277410079FF5F /* LVCInputView.m */; };
 		81FB5B3C1E7A6FFC00F98E1D /* SevenSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 81FB5B3B1E7A6FFC00F98E1D /* SevenSwitch.m */; };
 		D2029B861E6EAAA50027CD92 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D2029B851E6EAAA50027CD92 /* main.m */; };
 		D2029B911E6EAAA50027CD92 /* animation.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = D2029B901E6EAAA50027CD92 /* animation.xcassets */; };
@@ -204,7 +209,7 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				812E50581E7699E9004F5FCD /* CNLivePlayerSDK.framework in Embed Frameworks */,
+				811BB6851E8106AF005C6291 /* CNLivePlayerSDK.framework in Embed Frameworks */,
 				D25BF89B1E7FE046007FB138 /* CNLiveChatManager.framework in Embed Frameworks */,
 				D25BF89D1E7FE049007FB138 /* CNLiveMsgTools.framework in Embed Frameworks */,
 			);
@@ -247,7 +252,17 @@
 		810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCFullScreenPlayerController.m; sourceTree = "<group>"; };
 		8112D42F1E7927A5002E00F6 /* LVCPlayerLoadingView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCPlayerLoadingView.h; sourceTree = "<group>"; };
 		8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCPlayerLoadingView.m; sourceTree = "<group>"; };
-		812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
+		811BB67C1E80F858005C6291 /* LVCChatView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCChatView.h; sourceTree = "<group>"; };
+		811BB67D1E80F858005C6291 /* LVCChatView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCChatView.m; sourceTree = "<group>"; };
+		811BB6821E8106A2005C6291 /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
+		811BB6861E8107B4005C6291 /* LVCChatViewTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCChatViewTableViewCell.h; sourceTree = "<group>"; };
+		811BB6871E8107B4005C6291 /* LVCChatViewTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCChatViewTableViewCell.m; sourceTree = "<group>"; };
+		811BB6891E8108DB005C6291 /* LVCChatRoomModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LVCChatRoomModel.h; path = LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatRoomModel.h; sourceTree = SOURCE_ROOT; };
+		811BB68A1E8108DB005C6291 /* LVCChatRoomModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCChatRoomModel.m; path = LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatRoomModel.m; sourceTree = SOURCE_ROOT; };
+		811BB68C1E8116C8005C6291 /* NSString+StringSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+StringSize.h"; sourceTree = "<group>"; };
+		811BB68D1E8116C8005C6291 /* NSString+StringSize.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+StringSize.m"; sourceTree = "<group>"; };
+		81A1B9A71E8277410079FF5F /* LVCInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCInputView.h; sourceTree = "<group>"; };
+		81A1B9A81E8277410079FF5F /* LVCInputView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCInputView.m; sourceTree = "<group>"; };
 		81FB5B3A1E7A6FFC00F98E1D /* SevenSwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SevenSwitch.h; sourceTree = "<group>"; };
 		81FB5B3B1E7A6FFC00F98E1D /* SevenSwitch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SevenSwitch.m; sourceTree = "<group>"; };
 		D2029B811E6EAAA50027CD92 /* LiveVideoCloud.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LiveVideoCloud.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -568,11 +583,11 @@
 			files = (
 				D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */,
 				D2575C7D1E76A4F300E3A8FC /* NHGiftAnimtionSDK.a in Frameworks */,
-				812E50531E7699DC004F5FCD /* CNLivePlayerSDK.framework in Frameworks */,
 				D25BF89A1E7FE046007FB138 /* CNLiveChatManager.framework in Frameworks */,
 				D25BF8971E7FE01B007FB138 /* CNLiveMsgTools.framework in Frameworks */,
 				D25BF8991E7FE033007FB138 /* CNLiveChatManager.framework in Frameworks */,
 				D25BF89C1E7FE049007FB138 /* CNLiveMsgTools.framework in Frameworks */,
+				811BB6831E8106A2005C6291 /* CNLivePlayerSDK.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -625,13 +640,35 @@
 			path = Masonry;
 			sourceTree = "<group>";
 		};
+		811BB67B1E80F858005C6291 /* ChatView */ = {
+			isa = PBXGroup;
+			children = (
+				811BB67C1E80F858005C6291 /* LVCChatView.h */,
+				811BB67D1E80F858005C6291 /* LVCChatView.m */,
+				81A1B9A71E8277410079FF5F /* LVCInputView.h */,
+				81A1B9A81E8277410079FF5F /* LVCInputView.m */,
+				811BB6861E8107B4005C6291 /* LVCChatViewTableViewCell.h */,
+				811BB6871E8107B4005C6291 /* LVCChatViewTableViewCell.m */,
+			);
+			name = ChatView;
+			path = ../ChatView;
+			sourceTree = "<group>";
+		};
+		812E504D1E769995004F5FCD /* CNLiveSDK */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			name = CNLiveSDK;
+			path = LiveVideoCloud/Classes/CNLiveSDK;
+			sourceTree = SOURCE_ROOT;
+		};
 		812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
 			isa = PBXGroup;
 			children = (
+				811BB6821E8106A2005C6291 /* CNLivePlayerSDK.framework */,
 				D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */,
 				D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */,
 				D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */,
-				812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */,
 			);
 			path = CNLiveSDK;
 			sourceTree = "<group>";
@@ -1146,6 +1183,8 @@
 			children = (
 				D24571561E8393EB00AA85D6 /* UIImageView+ZXExtension.h */,
 				D24571571E8393EB00AA85D6 /* UIImageView+ZXExtension.m */,
+				811BB68C1E8116C8005C6291 /* NSString+StringSize.h */,
+				811BB68D1E8116C8005C6291 /* NSString+StringSize.m */,
 				D2029CDE1E6EAE2E0027CD92 /* NSNumber+ScaleHeight.h */,
 				D2029CDF1E6EAE2E0027CD92 /* NSNumber+ScaleHeight.m */,
 				D2029CE01E6EAE2E0027CD92 /* UIColor+HexString.h */,
@@ -1527,6 +1566,8 @@
 		D2888DA91E6EC014003A77C8 /* Model */ = {
 			isa = PBXGroup;
 			children = (
+				811BB6891E8108DB005C6291 /* LVCChatRoomModel.h */,
+				811BB68A1E8108DB005C6291 /* LVCChatRoomModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1534,6 +1575,7 @@
 		D2888DAA1E6EC014003A77C8 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				811BB67B1E80F858005C6291 /* ChatView */,
 				810B64DE1E779AE900133E15 /* LVCPlayer.h */,
 				810B64DF1E779AE900133E15 /* LVCPlayer.m */,
 				8112D42F1E7927A5002E00F6 /* LVCPlayerLoadingView.h */,
@@ -1810,11 +1852,13 @@
 				D2029CB61E6EADE10027CD92 /* MKAnnotationView+WebCache.m in Sources */,
 				810B64FE1E779B1F00133E15 /* MASCompositeConstraint.m in Sources */,
 				D2029C981E6EADE10027CD92 /* MJExtensionConst.m in Sources */,
+				811BB68B1E8108DB005C6291 /* LVCChatRoomModel.m in Sources */,
 				D2575C671E76A25400E3A8FC /* LVCInteractionController.m in Sources */,
 				D2029CAE1E6EADE10027CD92 /* MJRefreshNormalHeader.m in Sources */,
 				D23696921E7FC83800E4BF71 /* chatMsgModel.m in Sources */,
 				D2029C901E6EADE10027CD92 /* UIActivityIndicatorView+AFNetworking.m in Sources */,
 				D2029CC61E6EADE10027CD92 /* SSKeychain.m in Sources */,
+				811BB68E1E8116C8005C6291 /* NSString+StringSize.m in Sources */,
 				D2029C8B1E6EADE10027CD92 /* AFURLResponseSerialization.m in Sources */,
 				D2029C921E6EADE10027CD92 /* UIImageView+AFNetworking.m in Sources */,
 				D224B1971E826ED800CC61D0 /* ChatBarrageAnimAction.m in Sources */,
@@ -1869,6 +1913,8 @@
 				810B650A1E77B39D00133E15 /* LVCFullScreenPlayerController.m in Sources */,
 				D217A24E1E7B77C7003B44CB /* ComboCell.m in Sources */,
 				D2029CBD1E6EADE10027CD92 /* SDWebImageManager.m in Sources */,
+				811BB6881E8107B4005C6291 /* LVCChatViewTableViewCell.m in Sources */,
+				811BB6801E80F858005C6291 /* LVCChatView.m in Sources */,
 				D2029CB41E6EADE10027CD92 /* UIView+MJExtension.m in Sources */,
 				81FB5B3C1E7A6FFC00F98E1D /* SevenSwitch.m in Sources */,
 				D2029CA91E6EADE10027CD92 /* MJRefreshAutoStateFooter.m in Sources */,
@@ -1885,6 +1931,7 @@
 				D2888DB41E6EC154003A77C8 /* HomeViewController.m in Sources */,
 				D2B7B2541E824B2D00ED084E /* ChatBarrageView.m in Sources */,
 				D25530061E7911A800DF38A5 /* GiftAnimationAction.m in Sources */,
+				81A1B9A91E8277410079FF5F /* LVCInputView.m in Sources */,
 				D2029CD41E6EADE70027CD92 /* HttpService.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -8,6 +8,7 @@
 #import "AppDelegate.h"
 #import "ZXTabBarController.h"
+
 @interface AppDelegate ()
 @end
@@ -20,6 +21,18 @@
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     self.window.rootViewController = [[ZXTabBarController alloc] init];
+    
+    //初始化直播SDK
+    [[CNLiveWebcastManager manager] initWithAppId:AppId appKey:AppKey];
+    
+    //初始化聊天SDK并连接服务器
+    [[CNLiveChatManager sharedCNLiveChatManager] initWithAppKey:AppKey appId:AppId];
+    [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{
+        NSLog(@"连接服务器-----success");
+    } error:^(CNLiveChatConnectErrorCode errors) {
+        NSLog(@"连接服务器失败-----%ld", errors);
+    }];;
+    
     [self.window makeKeyAndVisible];
     [[CNLiveChatManager sharedCNLiveChatManager] initWithAppKey:AppKey appId:AppId];
+//
+//  LVCChatRoomModel.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/21.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface LVCChatRoomModel : NSObject
+
+@property (nonatomic, strong) NSString *iconURL;
+@property (nonatomic, strong) NSString *nikeName;
+@property (nonatomic, strong) NSString *message;
+@property (nonatomic, assign) BOOL isReceive;
+
+@end
+//
+//  LVCChatRoomModel.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/21.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCChatRoomModel.h"
+
+@implementation LVCChatRoomModel
+
+
+@end
+//
+//  LVCChatView.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/21.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCChatView : UIView
+
+- (instancetype)initWithFrame:(CGRect)frame roomId:(NSString *)roomId;
+
+@end
+//
+//  LVCChatView.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/21.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCChatView.h"
+#import "LVCChatViewTableViewCell.h"
+#import "LVCChatRoomModel.h"
+#import "UILabel+ContentSize.h"
+#import "NSString+StringSize.h"
+
+@interface LVCChatView ()<CNLiveChatManagerDelegate,UITableViewDelegate,UITableViewDataSource>
+{
+    NSString *_roomId;
+    NSMutableArray *_chatDataArr;
+}
+
+@property (nonatomic, strong) UITableView *tableView;
+@property (nonatomic, strong) UILabel *chatLab;
+@property (nonatomic, strong) NSMutableArray *messageHeight;
+
+@end
+
+@implementation LVCChatView
+
+- (instancetype)initWithFrame:(CGRect)frame roomId:(NSString *)roomId
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        
+        self.backgroundColor = [UIColor whiteColor];
+        _chatDataArr = [NSMutableArray new];
+        _messageHeight = [NSMutableArray new];
+        [self addData];
+        
+        [self addSubview:self.tableView];
+        [self addSubview:self.chatLab];
+        
+        [self joinChatRoomWithRoomId:roomId];
+    }
+    return self;
+}
+
+- (void)addData
+{
+    for (int i = 0; i < 8; i ++) {
+        LVCChatRoomModel *model = [[LVCChatRoomModel alloc] init];
+        model.nikeName = @"zzllzz";
+        model.isReceive = NO;
+        model.message = @"我有一只😁啦啡哦我";
+        [_chatDataArr addObject:model];
+        [self cellMessageLabelHeightWithModel:model];
+    }
+
+    [_tableView reloadData];
+}
+
+- (void)joinChatRoomWithRoomId:(NSString *)roomId
+{
+    [[CNLiveChatManager sharedCNLiveChatManager] joinExistChatRoom:roomId messageCount:10 success:^(NSString *targetId) {
+        NSLog(@"电视台--加入聊天室---success-%@",targetId);
+    } error:^(CNLiveChatErrorCode errors, NSString *targetId) {
+        NSLog(@"电视台--加入聊天室---failed -%ld",(long)errors);
+    }];
+    
+    [CNLiveChatManager sharedCNLiveChatManager].delegate = self;
+}
+
+//发送消息
+- (void)sendMsgWithMessage:(NSString *)message
+{
+    [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_CHATROOM targetId:_roomId success:^(CNLiveChatMessage *message) {
+        
+        NSLog(@"电视台--发送消息---success-%@",message);
+        
+    } error:^(CNLiveChatErrorCode errors, NSString *messageId, NSString *targetId) {
+        NSLog(@"电视台--发送消息---failed-%ld",(long)errors);
+    }];
+}
+
+//退出聊天室
+- (void)quit
+{
+    [[CNLiveChatManager sharedCNLiveChatManager] quitChatRoom:_roomId success:^(NSString *targetId) {
+        NSLog(@"电视台--退出聊天室---success-%@",targetId);
+    } error:^(CNLiveChatErrorCode errors, NSString *targetId) {
+        NSLog(@"电视台--退出聊天室---success-%ld",(long)errors);
+    }];
+}
+
+#pragma mark -
+#pragma mark - CNLiveChatManagerDelegate
+- (void)onReceived:(CNLiveChatMessage *)message
+{
+    //接收消息
+}
+
+#pragma mark -
+#pragma mark - UITableView
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    return _chatDataArr.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    static NSString *cellID = @"cellID";
+    LVCChatViewTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:cellID];
+    if (!cell) {
+        cell = [[LVCChatViewTableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:cellID];
+    }
+    
+    LVCChatRoomModel *model = _chatDataArr[indexPath.row];
+    cell.model = model;
+    
+    return cell;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    LVCChatRoomModel *model = [_chatDataArr objectAtIndex:indexPath.row];
+    
+    return [LVCChatViewTableViewCell getCellHeight:model filterName:model.nikeName height:[_messageHeight objectAtIndex:indexPath.row]];
+}
+
+- (void)cellMessageLabelHeightWithModel:(LVCChatRoomModel *)model {
+    
+    UILabel *messageLabel = [[UILabel alloc]init];
+        messageLabel.text = model.message;
+
+    messageLabel.width = [messageLabel contentWidth].width;
+    
+    if ((SCREEN_WIDTH - messageLabel.width - 85) < 0) {  // 多行
+        CGSize statusLabelSize = [messageLabel.text sizeWithLabelWidth:SCREEN_WIDTH - 85 font:[UIFont systemFontOfSize:14]];
+        [_messageHeight addObject:@(statusLabelSize.height)];
+    } else {                                                   // 单行
+        CGSize statusLabelSize = [messageLabel.text sizeWithLabelWidth:messageLabel.width font:[UIFont systemFontOfSize:14]];
+        [_messageHeight addObject:@(statusLabelSize.height)];
+    }
+}
+
+#pragma mark -
+#pragma mark - gatter
+- (UITableView *)tableView
+{
+    if (!_tableView) {
+        _tableView = [[UITableView alloc] initWithFrame:CGRectMake(0, 40, SCREEN_WIDTH, self.height-40) style:UITableViewStylePlain];
+        _tableView.delegate = self;
+        _tableView.dataSource = self;
+        _tableView.backgroundColor = [UIColor blackColorZX];
+        _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
+        _tableView.allowsSelection = NO;
+        _tableView.showsVerticalScrollIndicator = NO;
+        _tableView.showsHorizontalScrollIndicator = NO;
+    }
+    return _tableView;
+}
+
+- (UILabel *)chatLab
+{
+    if (!_chatLab) {
+        _chatLab = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 40)];
+        _chatLab.text = @"聊一聊";
+        _chatLab.backgroundColor = [UIColor blackColorZX];
+        _chatLab.textColor = [UIColor whiteColor];
+        _chatLab.textAlignment = NSTextAlignmentCenter;
+    }
+    return _chatLab;
+}
+
+@end
+//
+//  LVCChatViewTableViewCell.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/21.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "LVCChatRoomModel.h"
+
+@interface LVCChatViewTableViewCell : UITableViewCell
+
+@property (nonatomic, strong) LVCChatRoomModel *model;      //聊天室model
+
++ (CGFloat)getCellHeight:(LVCChatRoomModel *)message filterName:(NSString *)filterName height:(NSNumber *)height;
+
+
+@end
+//
+//  LVCChatViewTableViewCell.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/21.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCChatViewTableViewCell.h"
+#import "UILabel+ContentSize.h"
+#import "NSString+StringSize.h"
+
+#define HEAD_SIZE 35.0f
+
+@interface LVCChatViewTableViewCell ()
+
+@property (nonatomic, strong) UIImageView *iconImageView;   //头像
+@property (nonatomic, strong) UILabel *nickNameLab;         //昵称
+@property (nonatomic, strong) UILabel *messageLab;          //消息
+@property (nonatomic, strong) UILabel *lineLab;             //分割线
+@property (nonatomic, strong) UIImageView *bgImageView;     //背景
+
+@end
+
+@implementation LVCChatViewTableViewCell
+
+- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
+{
+    self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
+    if (self) {
+        
+        self.contentView.backgroundColor = [UIColor blackColorZX];
+        [self setSelectionStyle:UITableViewCellSelectionStyleNone];
+
+        [self.contentView addSubview:self.iconImageView];
+        [self.contentView addSubview:self.bgImageView];
+        [self.bgImageView addSubview:self.nickNameLab];
+        [self.bgImageView addSubview:self.messageLab];
+        [self.bgImageView addSubview:self.lineLab];
+
+    }
+    return self;
+}
+
+- (void)setModel:(LVCChatRoomModel *)model
+{
+    if (!model || ![model isKindOfClass:[LVCChatRoomModel class]]) {
+        return;
+    }
+    
+    _model = model;
+    
+    self.messageLab.text = model.message;
+    self.nickNameLab.text = model.nikeName;
+    if (model.isReceive) {      //收到的消息
+        
+        UIImage *bgImage = [UIImage imageNamed:@"Gift box"];
+        bgImage = [bgImage stretchableImageWithLeftCapWidth:0 topCapHeight:50];
+        self.bgImageView.image = bgImage;
+        
+        self.nickNameLab.hidden = NO;
+        self.lineLab.hidden = NO;
+        self.iconImageView.frame = CGRectMake(10,10,HEAD_SIZE,HEAD_SIZE);
+        self.nickNameLab.frame = CGRectMake(13,2.5,200,20);
+
+        self.messageLab.width = [self.messageLab contentWidth].width;
+        
+        //多行
+        if ((SCREEN_WIDTH - self.messageLab.width - 85) < 0) {
+            CGSize statusLabelSize = [self.messageLab.text sizeWithLabelWidth:SCREEN_WIDTH - 85 font:[UIFont systemFontOfSize:14]];
+            self.bgImageView.frame = CGRectMake(60, 7.5, SCREEN_WIDTH - 70, statusLabelSize.height + 35);
+            self.messageLab.frame = CGRectMake(13, 27.5, SCREEN_WIDTH - 80, statusLabelSize.height);
+            self.lineLab.width = self.bgImageView.width - 20;
+            
+        } else {    //单行
+            
+            CGSize statusLabelSize = [self.messageLab.text sizeWithLabelWidth:self.messageLab.width font:[UIFont systemFontOfSize:14]];
+            
+            self.nickNameLab.width = [self.nickNameLab contentWidth].width;
+            if (self.nickNameLab.width > self.messageLab.width) {
+                self.bgImageView.frame = CGRectMake(60, 7.5, self.nickNameLab.width + 20, statusLabelSize.height + 35);
+                self.lineLab.width = self.nickNameLab.width + 5;
+            } else {
+                self.bgImageView.frame = CGRectMake(60, 7.5, self.messageLab.width + 20, statusLabelSize.height + 35);
+                self.lineLab.width = self.messageLab.width + 5;
+            }
+            self.messageLab.frame = CGRectMake(13, 27.5, self.messageLab.width, statusLabelSize.height);
+        }
+    
+    
+    } else {    //我的消息
+
+        UIImage *bgImage = [UIImage imageNamed:@"Gift box right"];
+        bgImage = [bgImage stretchableImageWithLeftCapWidth:10 topCapHeight:27];
+        self.bgImageView.image = bgImage;
+        self.nickNameLab.hidden = YES;
+        self.lineLab.hidden = YES;
+        self.iconImageView.frame = CGRectMake(SCREEN_WIDTH - 50,6,40,40);
+        
+        self.messageLab.width = [self.messageLab contentWidth].width;
+        
+        if ((SCREEN_WIDTH - self.messageLab.width - 85) < 0) {  // 多行
+            CGSize statusLabelSize = [self.messageLab.text sizeWithLabelWidth:SCREEN_WIDTH - 85 font:[UIFont systemFontOfSize:14]];
+            
+            self.bgImageView.frame = CGRectMake(10, 7.5, SCREEN_WIDTH - 65, statusLabelSize.height + 20);
+            
+            self.messageLab.frame = CGRectMake(10, 10, SCREEN_WIDTH - 85, statusLabelSize.height);
+            
+        } else {                                                   // 单行
+            CGSize statusLabelSize = [self.messageLab.text sizeWithLabelWidth:self.messageLab.width font:[UIFont systemFontOfSize:14]];
+            self.bgImageView.frame = CGRectMake(SCREEN_WIDTH - self.messageLab.width - 75, 7.5, self.messageLab.width + 20, statusLabelSize.height + 20);
+            self.messageLab.frame = CGRectMake(8, 10, self.messageLab.width, statusLabelSize.height);
+        }
+
+        
+    }
+}
+
+#pragma mark - action
++ (CGFloat)getCellHeight:(LVCChatRoomModel *)message filterName:(NSString *)filterName height:(NSNumber *)height
+{
+    if (!message) {
+        return 0;
+    }
+    
+    CGFloat height1 = [height floatValue];
+    
+    if ([message.nikeName isEqualToString:filterName]) {
+        return height1 + 20 + 15;
+    } else {
+        return height1 + 20 + 15 + 40;
+    }
+}
+
+
+#pragma mark -
+#pragma mark - getter
+- (UIImageView *)iconImageView
+{
+    if (!_iconImageView) {
+        _iconImageView = [[UIImageView alloc] initWithFrame:CGRectMake(10, 5, HEAD_SIZE, HEAD_SIZE)];
+        _iconImageView.image = [UIImage imageNamed:@"touxiang"];
+    }
+    return _iconImageView;
+}
+
+- (UIImageView *)bgImageView
+{
+    if (!_bgImageView) {
+        _bgImageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 0, 0)];
+    }
+    return _bgImageView;
+}
+
+- (UILabel *)lineLab
+{
+    if (!_lineLab) {
+        _lineLab = [[UILabel alloc] initWithFrame:CGRectMake(10, 23.5, 80, 0.5)];
+        _lineLab.backgroundColor = [UIColor colorWithHexString:@"#5a5b5b"];
+    }
+    return _lineLab;
+}
+
+- (UILabel *)nickNameLab
+{
+    if (!_nickNameLab) {
+        _nickNameLab = [[UILabel alloc] initWithFrame:CGRectMake(13,2.5,200,20)];
+        _nickNameLab.font = [UIFont systemFontOfSize:10];
+        _nickNameLab.textColor = [UIColor colorWithHexString:@"#5a5b5b"];
+        _nickNameLab.text = @"zzll";
+    }
+    return _nickNameLab;
+}
+
+- (UILabel *)messageLab
+{
+    if (!_messageLab) {
+        _messageLab = [[UILabel alloc] initWithFrame:CGRectMake(10, 25, SCREEN_WIDTH - 85, 30)];
+        _messageLab.textColor = [UIColor whiteColor];
+        _messageLab.font = [UIFont systemFontOfSize:14];
+        _messageLab.text = @"哈哈哈哈";
+        _messageLab.numberOfLines = 0;
+    }
+    return _messageLab;
+}
+
+
+- (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
+//
+//  LVCInputView.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/22.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class LVCInputView;
+@protocol LVCInputViewDelegate <NSObject>
+
+- (void)lvcInputView:(LVCInputView *)inputView sendMessage:(NSString *)message;
+
+@end
+
+@interface LVCInputView : UIView
+
+@property (nonatomic, assign) id<LVCInputViewDelegate> delegate;
+
+@end
+//
+//  LVCInputView.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/22.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCInputView.h"
+
+#define RGB(rgbValue) [UIColor colorWithRed:((float)((rgbValue & 0xFF0000) >> 16)) / 255.0 green:((float)((rgbValue & 0xFF00) >> 8)) / 255.0 blue:((float)(rgbValue & 0xFF)) / 255.0 alpha:1.0]
+
+@interface LVCInputView ()<UITextFieldDelegate>
+
+@property (nonatomic, strong) UITextField *inputTextField;
+@property (nonatomic, strong) UIButton *sendBtn;
+@end
+
+@implementation LVCInputView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        
+        self.backgroundColor = RGB(0xf6f6f6);
+        
+        [self addSubview:self.inputTextField];
+        [self addSubview:self.sendBtn];
+        
+        [self setUI];
+    }
+    return self;
+}
+
+#pragma mark -
+#pragma mark - action
+- (void)sendBtnClick:(UIButton *)btn
+{
+    NSString *temp = [_inputTextField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+    
+    if (temp.length > 0) {
+        
+        if (self.delegate && [self.delegate respondsToSelector:@selector(lvcInputView:sendMessage:)]) {
+            [self.delegate lvcInputView:self sendMessage:_inputTextField.text];
+        }
+        
+        [self endEditing:YES];
+        _inputTextField.text = @"";
+
+    }
+
+}
+
+#pragma mark -
+#pragma mark - UITextFieldDelegate
+- (BOOL)textFieldShouldReturn:(UITextField *)textField
+{
+    NSString *temp = [textField.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+    
+    if (temp.length > 0) {
+        
+        if (self.delegate && [self.delegate respondsToSelector:@selector(lvcInputView:sendMessage:)]) {
+            [self.delegate lvcInputView:self sendMessage:_inputTextField.text];
+        }
+        
+        [self endEditing:YES];
+        textField.text = @"";
+        return YES;
+    }
+    
+    return NO;
+}
+
+- (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string
+{
+    return YES;
+    
+}
+
+#pragma mark -
+#pragma mark - makeConstraints
+- (void)setUI
+{
+    [self.inputTextField mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(6);
+        make.left.mas_offset(10);
+        make.bottom.equalTo(self.mas_bottom).offset(-6);
+        make.right.equalTo(self).offset(-50);
+    }];
+    
+    [self.sendBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.inputTextField.mas_right).offset(10);
+        make.centerY.equalTo(self.mas_centerY);
+        make.width.height.mas_equalTo(30);
+    }];
+}
+
+#pragma mark -
+#pragma mark - getter
+- (UITextField *)inputTextField
+{
+    if (!_inputTextField) {
+        _inputTextField = [[UITextField alloc] init];
+        _inputTextField.returnKeyType = UIReturnKeySend;
+        _inputTextField.borderStyle = UITextBorderStyleRoundedRect;
+        _inputTextField.font = [UIFont systemFontOfSize:16];
+        _inputTextField.placeholder = @"说点什么吧..";
+        _inputTextField.delegate = self;
+    }
+    return _inputTextField;
+}
+
+- (UIButton *)sendBtn {
+    if (_sendBtn == nil) {
+        _sendBtn = [[UIButton alloc]init];
+        _sendBtn.titleLabel.textColor = RGB(0x666666);
+        _sendBtn.titleLabel.font = [UIFont systemFontOfSize:14];
+        [_sendBtn setImage:[UIImage imageNamed:@"send"] forState:UIControlStateNormal];
+        [_sendBtn addTarget:self action:@selector(sendBtnClick:) forControlEvents:UIControlEventTouchUpInside];
+    }
+    return _sendBtn;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
@@ -33,7 +33,11 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor blackColor];
+}
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    [self.view endEditing:YES];
 }
 - (void)didReceiveMemoryWarning {
@@ -9,20 +9,22 @@
 #import "LVCLivePlayerController.h"
 #import "LVCPlayer.h"
 #import "LVCFullScreenPlayerController.h"
+#import "LVCInputView.h"
+#import "LVCChatView.h"
-#define WIDTH_SCREEN  [UIScreen mainScreen].bounds.size.width
-#define HEIGHT_SCREEN  [UIScreen mainScreen].bounds.size.height
-
-@interface LVCLivePlayerController ()<LVCPlayerDelegate>
+@interface LVCLivePlayerController ()<LVCPlayerDelegate,LVCInputViewDelegate>
 {
     BOOL isHiddenStatusBar;             //记录状态的隐藏显示
     CGRect     playerFrame;             //
     NSInteger _originalDirection;       //记录原始方向
-
+    CGFloat keyboardHeight;             //键盘高度
+    
 }
 @property (nonatomic, strong) LVCPlayer *player;
 @property (nonatomic, strong) LVCFullScreenPlayerController *fullVC;
+@property (nonatomic, strong) LVCInputView *inputView;
+@property (nonatomic, strong) LVCChatView *chatView;
 @end
@@ -44,15 +46,17 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.view.backgroundColor = [UIColor whiteColor];
+    self.view.backgroundColor = [UIColor blackColor];
-    playerFrame = CGRectMake(0, 0,WIDTH_SCREEN, WIDTH_SCREEN*9/16);
+    playerFrame = CGRectMake(0, 20, SCREEN_WIDTH, SCREEN_WIDTH*9/16);
     _originalDirection = 0;
     //注册通知
     [self addObservers];
     [self.view addSubview:self.player];
+    [self.view addSubview:self.chatView];
+    [self.view addSubview:self.inputView];
     [self makeConstraints];
 }
@@ -63,8 +67,18 @@
                                              selector:@selector(onDeviceOrientationChange:)
                                                  name:UIDeviceOrientationDidChangeNotification
                                                object:nil];
-
-
+    
+    //增加监听，当键盘出现或改变时收出消息
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(keyboardWillShow:)
+                                                 name:UIKeyboardWillShowNotification
+                                               object:nil];
+    //增加监听，当键退出时收出消息
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(keyboardWillHide:)
+                                                 name:UIKeyboardWillHideNotification
+                                               object:nil];
+    
 }
 #pragma mark -
@@ -84,7 +98,6 @@
                 [self toHalfScreenWithrotationAngle:-M_PI_2];
             }
             _originalDirection = 0;
-            _player.isFullScreen = NO;
         }
             break;
@@ -111,32 +124,52 @@
     }
 }
+//当键盘出现
+- (void)keyboardWillShow:(NSNotification *)aNotification{
+    //获取键盘的高度
+    NSDictionary* info = [aNotification userInfo];
+    CGSize kbSize = [[info objectForKey:UIKeyboardFrameEndUserInfoKey] CGRectValue].size;
+    _inputView.frame = CGRectMake(0, SCREEN_HEIGHT-kbSize.height-50, SCREEN_WIDTH, 50);
+}
+
+- (void)keyboardWillHide:(NSNotification *)aNotification{
+    _inputView.frame = CGRectMake(0, SCREEN_HEIGHT-50, SCREEN_WIDTH, 50);
+}
+
 //旋转至全屏
 - (void)toFullWithrotationAngle:(CGFloat)angle
 {
-    if (self.player.isFullScreen) return;
-    
+    if (_player.isFullScreen) return;
+   
+    _player.isFullScreen = YES;
+
     [self presentViewController:self.fullVC animated:NO completion:^{
         [_player removeFromSuperview];
         [self.fullVC.view addSubview:self.player];
+        [_inputView removeFromSuperview];
+        [self.fullVC.view addSubview:self.inputView];
         [self makePlayerViewConstraints:YES];
+        
         self.player.transform = CGAffineTransformMakeRotation(angle);
         [UIView animateWithDuration:0.3 animations:^{
             self.player.transform = CGAffineTransformMakeRotation(0);
         }];
     }];
-    self.player.isFullScreen = YES;
-    
 }
 //旋转至半屏
 - (void)toHalfScreenWithrotationAngle:(CGFloat)angle
 {
+    _player.isFullScreen = NO;
+
     [_fullVC dismissViewControllerAnimated:NO completion:^{
         [_player removeFromSuperview];
         [self.view addSubview:self.player];
+        [self.inputView removeFromSuperview];
+        [self.view addSubview:self.inputView];
         [self makePlayerViewConstraints:NO];
+        
         self.player.transform = CGAffineTransformMakeRotation(angle);
         [UIView animateWithDuration:0.3 animations:^{
             self.player.transform = CGAffineTransformMakeRotation(0);
@@ -149,7 +182,7 @@
 - (void)lvcPlayer:(LVCPlayer *)player clickedBackBtn:(UIButton *)backBtn
 {
     //如果是全屏返回半屏，如果是半屏直接退出
-    if (self.player.isFullScreen) {
+    if (_player.isFullScreen) {
         [self toHalfScreenWithrotationAngle:M_PI_2];
         self.player.isFullScreen = NO;
     } else {
@@ -161,7 +194,7 @@
 - (void)lvcPlayer:(LVCPlayer *)player clickedFullScreenBtn:(UIButton *)fullScreenBtn
 {
-    if (self.player.isFullScreen == YES) {//全屏
+    if (_player.isFullScreen) {//全屏
         [self toHalfScreenWithrotationAngle:M_PI_2];
         self.player.isFullScreen = NO;
@@ -172,7 +205,20 @@
 - (void)lvcPlayer:(LVCPlayer *)player clickedEditBtn:(UIButton *)editBtn
 {
-    NSLog(@"开始编辑~~~~");
+    
+}
+
+#pragma mark -
+#pragma mark - LVCInputViewDelegate
+- (void)lvcInputView:(LVCInputView *)inputView sendMessage:(NSString *)message
+{
+    NSLog(@"发送消息(%@)",message);
+
+}
+
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    [self.view endEditing:YES];
 }
 #pragma mark -
@@ -180,23 +226,35 @@
 - (void)makeConstraints
 {
     [self.player mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.left.right.mas_equalTo(0);
+        make.top.mas_equalTo(20);
+        make.left.right.mas_equalTo(0);
         make.height.equalTo(@(playerFrame.size.height));
     }];
+
+    _inputView.frame = CGRectMake(0, SCREEN_HEIGHT-50, SCREEN_WIDTH, 49);
+
 }
 - (void)makePlayerViewConstraints:(BOOL)fullScreen
 {
-    if (fullScreen) {
+    if (fullScreen) {   //全屏
+        
         [self.player mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.top.left.right.bottom.mas_equalTo(0);
         }];
-    } else {
+        _inputView.frame = CGRectMake(0, SCREEN_HEIGHT-50, SCREEN_WIDTH, 49);
+        
+    } else {            //半屏
+        
         [self.player mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.top.left.right.mas_equalTo(0);
+            make.top.mas_equalTo(20);
+            make.left.right.mas_equalTo(0);
             make.height.equalTo(@(playerFrame.size.height));
         }];
+        
+        _inputView.frame = CGRectMake(0, SCREEN_HEIGHT-50, SCREEN_WIDTH, 49);
+
     }
 }
@@ -218,6 +276,24 @@
     }
     return _fullVC;
 }
+
+- (LVCInputView *)inputView
+{
+    if (!_inputView) {
+        _inputView = [[LVCInputView alloc]init];
+        _inputView.delegate = self;
+    }
+    return _inputView;
+}
+
+- (LVCChatView *)chatView
+{
+    if (!_chatView) {
+        _chatView = [[LVCChatView alloc] initWithFrame:CGRectMake(0, SCREEN_WIDTH*9/16+20, SCREEN_WIDTH, SCREEN_HEIGHT-SCREEN_WIDTH*9/16-20-49) roomId:@"1122"];
+    }
+    return _chatView;
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -27,7 +27,7 @@
 @property (nonatomic, strong) UIImageView *contentView;     //所有空间统一管理在这个view中
 @property (nonatomic, strong) UIButton *backBtn;            //返回
-@property (nonatomic, assign) BOOL isFullScreen;            //是否是全屏
+@property (nonatomic, readwrite, assign) BOOL isFullScreen;            //是否是全屏
 - (void)stopPlaying;
@@ -14,10 +14,8 @@
 #define kAppKey     @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
 #define kbundleId   @"com.cnlive.zhangxu.LiveVideoCloud"
-@interface LVCPlayer ()
-{
-    BOOL _isFull;
-}
+@interface LVCPlayer ()<UIGestureRecognizerDelegate>
+
 @property (nonatomic, strong) UIImageView *topBgView;               //顶部蒙版
 @property (nonatomic, strong) UIImageView *bottomBgView;            //底部蒙版
 @property (nonatomic, strong) UIButton *playOrPauseBtn;             //播放/暂停
@@ -117,7 +115,10 @@
         self.bottomBgView.alpha = self.bottomBgView.alpha == 0 ? 1 : 0;
         self.editBtn.alpha = self.editBtn.alpha == 0 ? 1 : 0;
     }];
-    [[UIApplication sharedApplication] setStatusBarHidden:self.topBgView.alpha == 0 ? YES : NO withAnimation:UIStatusBarAnimationFade];
+    
+    if (_isFullScreen) {
+        [[UIApplication sharedApplication] setStatusBarHidden:self.topBgView.alpha == 0 ? YES : NO withAnimation:UIStatusBarAnimationFade];
+    }
 }
@@ -135,6 +136,14 @@
     }
 }
+#pragma mark - UIGestureRecognizerDelegate 手势冲突
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldReceiveTouch:(UITouch *)touch {
+    if ([NSStringFromClass([touch.view class]) isEqualToString:@"SevenSwitch"]) {
+        return NO;
+    }
+    return YES;
+}
+
 #pragma mark -
 #pragma mark - Notification
 - (void)addObservers
@@ -342,7 +351,7 @@
     [self.backBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.topBgView).with.offset(5);
         make.width.height.mas_equalTo(30);
-        make.top.equalTo(self.topBgView).with.offset(20);
+        make.top.equalTo(self.topBgView).with.offset(10);
     }];
     [self.topBgView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -364,7 +373,9 @@
     [self.titleLab mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.backBtn).offset(40);
-        make.top.trailing.bottom.mas_equalTo(0);
+        make.top.mas_equalTo(15);
+        make.height.mas_equalTo(20);
+        make.right.equalTo(self.topBgView).offset(-100);
     }];
     [self.playOrPauseBtn mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -387,7 +398,37 @@
 #pragma mark -
 #pragma mark - setter
+- (void)setIsFullScreen:(BOOL)isFullScreen
+{
+    _isFullScreen = isFullScreen;
+    if (isFullScreen) {
+        
+        _barrageSwitch.hidden = NO;
+        _editBtn.hidden = NO;
+        
+        [self.backBtn mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.topBgView).with.offset(20);
+        }];
+        
+        [self.titleLab mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(25);
+        }];
+        
+    } else {
+        
+        _barrageSwitch.hidden = YES;
+        _editBtn.hidden = YES;
+
+        [self.backBtn mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.top.equalTo(self.topBgView).with.offset(10);
+        }];
+        
+        [self.titleLab mas_updateConstraints:^(MASConstraintMaker *make) {
+            make.top.mas_equalTo(15);
+        }];
+    }
+}
 #pragma mark -
 #pragma mark - getter
@@ -478,6 +519,7 @@
 {
     if (!_singleTap) {
         _singleTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(singleTapView)];
+        _singleTap.delegate = self;
     }
     return _singleTap;
 }
@@ -492,7 +534,7 @@
         _barrageSwitch.activeColor = [UIColor blackColor];
         _barrageSwitch.inactiveColor = [UIColor blackColor];
         _barrageSwitch.on = YES;
-//        _barrageSwitch.hidden = YES;
+        _barrageSwitch.hidden = YES;
         [_barrageSwitch addTarget:self action:@selector(barrageSwitchAction) forControlEvents:UIControlEventValueChanged];
     }
     return _barrageSwitch;
@@ -504,6 +546,7 @@
         _editBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         [_editBtn setImage:[UIImage imageNamed:@"Barrage input"] forState:UIControlStateNormal];
         [_editBtn addTarget:self action:@selector(editBtnAction:) forControlEvents:UIControlEventTouchUpInside];
+        _editBtn.hidden = YES;
     }
     return _editBtn;
 }
+//
+//  NSString+StringSize.h
+//  testTableview
+//
+//  Created by cnliveJunBo on 16/11/7.
+//  Copyright © 2016年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface NSString (StringSize)
+- (CGSize)sizeWithLabelWidth:(CGFloat)width font:(UIFont *)font;
+@end
+//
+//  NSString+StringSize.m
+//  testTableview
+//
+//  Created by cnliveJunBo on 16/11/7.
+//  Copyright © 2016年 cnlive. All rights reserved.
+//
+
+#import "NSString+StringSize.h"
+
+@implementation NSString (StringSize)
+- (CGSize)sizeWithLabelWidth:(CGFloat)width font:(UIFont *)font{
+    NSDictionary *dict=@{NSFontAttributeName : font};
+    CGRect rect=[self boundingRectWithSize:CGSizeMake(width,MAXFLOAT) options:(NSStringDrawingUsesLineFragmentOrigin|NSStringDrawingUsesFontLeading) attributes:dict context:nil];
+    CGFloat sizeWidth=ceilf(CGRectGetWidth(rect));
+    CGFloat sizeHieght=ceilf(CGRectGetHeight(rect));
+    return CGSizeMake(sizeWidth, sizeHieght);
+}
+@end
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Gift box right.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Gift box.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "fenxiangshupinghou_weixiao.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "keyboard.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "send.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "touxiang.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file