聊天室输入框

朱林
1 parent cf9d0686
Showing 17 changed files with 479 additions and 34 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Headers/CNLiveGPUStreamerKit.h
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLivePlayerSDK.framework/Headers/CNLiveWatermark.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatView.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/animation.xcassets/player/fenxiangshupinghou_weixiao.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/player/fenxiangshupinghou_weixiao.imageset/fenxiangshupinghou_weixiao.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/player/keyboard.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/player/keyboard.imageset/keyboard.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/player/send.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/player/send.imageset/send.png
@@ -21,10 +21,12 @@
 		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 */; };
+		811BB67A1E80F6F6005C6291 /* LVCChatView.m in Sources */ = {isa = PBXBuildFile; fileRef = 811BB6791E80F6F6005C6291 /* LVCChatView.m */; };
 		812E50531E7699DC004F5FCD /* CNLivePlayerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */; };
 		812E50551E7699E9004F5FCD /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */; };
 		812E50561E7699E9004F5FCD /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		812E50581E7699E9004F5FCD /* CNLivePlayerSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		814FC9661E7FB62F00944D7D /* LVCInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 814FC9651E7FB62F00944D7D /* 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 */; };
@@ -221,9 +223,12 @@
 		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>"; };
+		811BB6781E80F6F6005C6291 /* LVCChatView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCChatView.h; sourceTree = "<group>"; };
+		811BB6791E80F6F6005C6291 /* LVCChatView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCChatView.m; sourceTree = "<group>"; };
 		812E504F1E7699DC004F5FCD /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
 		812E50501E7699DC004F5FCD /* CNLivePlayerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLivePlayerSDK.framework; sourceTree = "<group>"; };
-		812E50511E7699DC004F5FCD /* KSYGPUResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = KSYGPUResource.bundle; sourceTree = "<group>"; };
+		814FC9641E7FB62F00944D7D /* LVCInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCInputView.h; sourceTree = "<group>"; };
+		814FC9651E7FB62F00944D7D /* 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; };
@@ -574,6 +579,17 @@
 			path = CNLiveSDK;
 			sourceTree = "<group>";
 		};
+		814FC9531E7F6B5D00944D7D /* ChatView */ = {
+			isa = PBXGroup;
+			children = (
+				814FC9641E7FB62F00944D7D /* LVCInputView.h */,
+				814FC9651E7FB62F00944D7D /* LVCInputView.m */,
+				811BB6781E80F6F6005C6291 /* LVCChatView.h */,
+				811BB6791E80F6F6005C6291 /* LVCChatView.m */,
+			);
+			path = ChatView;
+			sourceTree = "<group>";
+		};
 		81FB5B391E7A6FFC00F98E1D /* SevenSwitch */ = {
 			isa = PBXGroup;
 			children = (
@@ -1375,6 +1391,7 @@
 		D2888DA71E6EC014003A77C8 /* homeSections */ = {
 			isa = PBXGroup;
 			children = (
+				814FC9531E7F6B5D00944D7D /* ChatView */,
 				D2888DA81E6EC014003A77C8 /* Controller */,
 				D2888DA91E6EC014003A77C8 /* Model */,
 				D2888DAA1E6EC014003A77C8 /* View */,
@@ -1565,8 +1582,6 @@
 				D2029CB01E6EADE10027CD92 /* MJRefresh.bundle in Resources */,
 				D2575C7C1E76A4F300E3A8FC /* NHFighterView.nib in Resources */,
 				D25BF87D1E7B8C78007FB138 /* KSYGPUResource.bundle in Resources */,
-				D2029B8F1E6EAAA50027CD92 /* Main.storyboard in Resources */,
-				812E50541E7699DC004F5FCD /* KSYGPUResource.bundle in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1593,6 +1608,7 @@
 			files = (
 				D2029CC31E6EADE10027CD92 /* UIImageView+HighlightedWebCache.m in Sources */,
 				D22830FF1E77C69E00627701 /* GiftListView.m in Sources */,
+				814FC9661E7FB62F00944D7D /* LVCInputView.m in Sources */,
 				D2029CC01E6EADE10027CD92 /* UIImage+GIF.m in Sources */,
 				D2029BCF1E6EADD70027CD92 /* ZXTabBarController.m in Sources */,
 				D2029D071E6EAE2E0027CD92 /* ZXConst.m in Sources */,
@@ -1604,6 +1620,7 @@
 				D2029CA01E6EADE10027CD92 /* NSObject+MJProperty.m in Sources */,
 				D2029CB51E6EADE10027CD92 /* SDiOSVersion.m in Sources */,
 				D2029C9C1E6EADE10027CD92 /* MJPropertyType.m in Sources */,
+				811BB67A1E80F6F6005C6291 /* LVCChatView.m in Sources */,
 				D22831091E77D8D500627701 /* GiftModel.m in Sources */,
 				D2029CCD1E6EADE10027CD92 /* SearchModel.m in Sources */,
 				810B65051E779B1F00133E15 /* NSLayoutConstraint+MASDebugAdditions.m in Sources */,
@@ -275,13 +275,11 @@ FOUNDATION_EXPORT NSString *const CNLiveStreamStateDidChangeNotification NS_AVAI
 /**
  @abstract   当前采集设备是否支持自动变焦
- @param      point相机对焦的位置
  */
 - (void)focusAtPoint:(CGPoint )point;
 /**
  @abstract   当前采集设备是否支持自动曝光
- @param      point相机曝光的位置
  */
 - (void)exposureAtPoint:(CGPoint )point;
@@ -15,7 +15,6 @@
  @abstract   水印logo的图片
  @discussion 设置为nil为清除水印图片
  @discussion 请注意背景图片的尺寸, 太大的图片会导致内存占用过高
- @see
  */
 @property (nonatomic, readwrite) UIImage      *logoPic;
@@ -23,7 +22,6 @@
  @abstract   水印logo的图片(网络图片)
  @discussion 设置为nil为清除水印图片
  @discussion 请注意背景图片的尺寸, 太大的图片会导致内存占用过高
- @see
  */
 @property (nonatomic, readwrite) NSURL *logoURL;
+//
+//  LVCChatView.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/21.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCChatView : UIView
+
+@end
+//
+//  LVCChatView.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/21.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCChatView.h"
+
+@interface LVCChatView ()
+
+
+@end
+
+@implementation LVCChatView
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        
+    }
+    return self;
+}
+
+
+@end
+//
+//  LVCInputView.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/20.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+#define kSCREEN_HEIGHT [[UIScreen mainScreen] bounds].size.height //主屏幕的高度
+#define kSCREEN_WIDTH  [[UIScreen mainScreen] bounds].size.width  //主屏幕的宽度
+
+@class LVCInputView;
+
+@protocol LVCInputViewDelegate <NSObject>
+
+//发送文字
+- (void)returnBtnClickedWithText:(NSString *)text;
+
+
+@end
+
+@interface LVCInputView : UIView
+@property (nonatomic, strong) UILabel *placeholderLabel;
+
+@property (nonatomic, strong) UITextView *textView;
+@property (strong, nonatomic) UIButton *sendBtn;
+@property (assign, nonatomic) CGFloat keyboardHeight;
+@property (assign, nonatomic) CGFloat inputH;
+@property (assign, nonatomic) BOOL isEditing;
+
+@property (assign, nonatomic) BOOL isRecording;                  //正在编辑状态
+@property (nonatomic, assign) id<LVCInputViewDelegate> delegate;
+
+@end
+//
+//  LVCInputView.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/20.
+//  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]
+#define IMAGENAMED(NAME)       [UIImage imageNamed:NAME]
+
+@interface LVCInputView ()<UITextViewDelegate>
+
+@property (nonatomic, strong) UIView *backGroundView;
+@property (assign, nonatomic) CGFloat currentTextViewH;
+
+@end
+
+@implementation LVCInputView
+
+- (instancetype)initWithFrame:(CGRect)frame{
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.inputH = 49;
+        self.keyboardHeight = 0;
+        self.backgroundColor = [UIColor whiteColor];
+        
+        [self addSubview:self.backGroundView];
+        [self.backGroundView addSubview:self.textView];
+        [self.backGroundView addSubview:self.sendBtn];
+        [self.textView addSubview:self.placeholderLabel];
+        
+        //增加监听，当键盘出现或改变时收出消息
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:)name:UIKeyboardWillShowNotification object:nil];
+        //增加监听，当键退出时收出消息
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHide:)name:UIKeyboardWillHideNotification
+                                                   object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardDidShow)name:UIKeyboardDidShowNotification
+                                                   object:nil];
+        
+        [self setUI];
+
+    }
+    return self;
+}
+#pragma mark - 录音按钮点击
+- (void)sendBtnClick:(UIButton *)sender {
+    
+}
+
+#pragma mark - 键盘各种状态
+//当键盘出现
+- (void)keyboardWillShow:(NSNotification *)aNotification{
+    //获取键盘的高度
+    self.isEditing = YES;
+    NSValue *aValue = [[aNotification userInfo] objectForKey:UIKeyboardFrameEndUserInfoKey];
+    CGRect keyboardRect = [aValue CGRectValue];
+    if (keyboardRect.size.height > self.keyboardHeight) {
+        self.keyboardHeight = keyboardRect.size.height;
+    }
+    self.frame = CGRectMake(0, kSCREEN_HEIGHT - self.keyboardHeight  - self.inputH, kSCREEN_WIDTH, self.inputH + self.keyboardHeight);
+    self.backGroundView.frame = CGRectMake(0, 0, kSCREEN_WIDTH, self.inputH);
+    
+}
+
+- (void)keyboardWillHide:(NSNotification *)aNotification{
+    self.isEditing = NO;
+    self.frame = CGRectMake(0, kSCREEN_HEIGHT - self.inputH, kSCREEN_WIDTH, self.inputH) ;
+}
+- (void)keyboardDidShow {
+    self.isEditing = YES;
+}
+#pragma mark - UITextViewDelegate
+- (void)textViewDidChange:(UITextView *)textView{
+    self.placeholderLabel.text =  textView.text.length == 0 ? @"说点什么吧...":@"";
+    //---- 计算高度 ---- //
+    NSDictionary *dic = [NSDictionary dictionaryWithObjectsAndKeys:[UIFont systemFontOfSize:16],NSFontAttributeName, nil];
+    CGFloat curheight = [textView.text boundingRectWithSize:CGSizeMake(kSCREEN_WIDTH-110, CGFLOAT_MAX)
+                                                    options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:dic
+                                                    context:nil].size.height;
+    self.inputH = textView.contentSize.height + 12;
+    if (self.currentTextViewH != curheight && curheight < 80) {
+        self.currentTextViewH = curheight;
+        NSString *offset = [NSString stringWithFormat:@"%f",self.keyboardHeight + self.inputH];
+        [[NSNotificationCenter defaultCenter]postNotificationName:@"textInputFrameChange" object:nil userInfo:@{@"offset":offset}];
+    }
+    if (curheight < 19.094) { //一行
+        self.backGroundView.frame = CGRectMake(0,0 , kSCREEN_WIDTH, 49);//y - 49
+    }else if(curheight < 80){ //多行
+        self.backGroundView.frame = CGRectMake(0, 0, kSCREEN_WIDTH, self.inputH);
+    }else{
+        return;
+    }
+    self.frame = CGRectMake(0, kSCREEN_HEIGHT - self.keyboardHeight - self.inputH, kSCREEN_WIDTH,self.inputH + self.keyboardHeight );
+}
+
+#pragma mark - 发送按钮 回车
+- (BOOL)textView:(UITextView *)textView shouldChangeTextInRange:(NSRange)range replacementText:(NSString *)text{
+    if ([text isEqualToString:@"\n"]){ //判断输入的字是否是回车，即按下return
+        if ([self.delegate respondsToSelector:@selector(returnBtnClickedWithText:)]) {
+            [self.delegate returnBtnClickedWithText:self.textView.text];
+        }
+        self.inputH = 49;
+        self.textView.text = @"";
+        self.placeholderLabel.text = @"说点什么吧...";
+        self.frame = CGRectMake(0, kSCREEN_HEIGHT-self.inputH-self.keyboardHeight, kSCREEN_WIDTH, self.inputH+self.keyboardHeight);
+        self.backGroundView.frame = CGRectMake(0, 0, kSCREEN_WIDTH, self.inputH);
+        NSString *offset = [NSString stringWithFormat:@"%f",self.keyboardHeight + self.inputH];
+        [[NSNotificationCenter defaultCenter]postNotificationName:@"textInputFrameChange" object:nil userInfo:@{@"offset":offset}];
+        return NO; //这里返回NO，就代表return键值失效，即页面上按下return，不会出现换行，如果为yes，则输入
+    }
+    return YES;
+}
+
+
+#pragma mark - UI
+
+- (void)setUI{
+    
+    [self.backGroundView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.edges.mas_offset(UIEdgeInsetsMake(0, 0, 0, 0));
+    }];
+    
+    [self.textView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(6);
+        make.left.mas_offset(10);
+        make.bottom.equalTo(self.backGroundView.mas_bottom).offset(-6);
+        make.right.equalTo(self.backGroundView).offset(-50);
+    }];
+    
+    [self.sendBtn mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.textView.mas_right).offset(10);
+        make.centerY.equalTo(self.backGroundView.mas_centerY);
+        make.width.height.mas_equalTo(30);
+    }];
+    
+    [self.placeholderLabel mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.top.mas_equalTo(0);
+        make.left.equalTo(self.textView.mas_left).offset(8);
+        make.height.mas_equalTo(39);
+    }];
+}
+
+#pragma mark - 懒加载控件
+- (UIView *)backGroundView{
+    if (!_backGroundView) {
+        _backGroundView = [[UIView alloc]init];
+        _backGroundView.backgroundColor = RGB(0xf6f6f6);
+    }
+    return _backGroundView;
+}
+- (UITextView *)textView{
+    if (!_textView) {
+        _textView = [[UITextView alloc]init];
+        _textView.font = [UIFont systemFontOfSize:16];
+        _textView.delegate = self;
+        _textView.layer.cornerRadius = 5;
+        _textView.returnKeyType =  UIReturnKeySend;
+    }
+    return _textView;
+}
+
+- (UILabel *)placeholderLabel{
+    if (!_placeholderLabel) {
+        _placeholderLabel = [[UILabel alloc]init];
+        _placeholderLabel.text = @"说点什么吧...";
+        _placeholderLabel.textColor = RGB(0x999999);
+        _placeholderLabel.font = [UIFont systemFontOfSize:14];
+    }
+    return _placeholderLabel;
+}
+
+- (UIButton *)sendBtn {
+    if (_sendBtn == nil) {
+        _sendBtn = [[UIButton alloc]init];
+        _sendBtn.titleLabel.textColor = RGB(0x666666);
+        _sendBtn.titleLabel.font = [UIFont systemFontOfSize:14];
+        [_sendBtn setImage: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,21 +9,23 @@
 #import "LVCLivePlayerController.h"
 #import "LVCPlayer.h"
 #import "LVCFullScreenPlayerController.h"
+#import "LVCInputView.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;
 @end
 @implementation LVCLivePlayerController
@@ -44,15 +46,16 @@
 - (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,WIDTH_SCREEN, WIDTH_SCREEN*9/16);
     _originalDirection = 0;
     //注册通知
     [self addObservers];
     [self.view addSubview:self.player];
+    [self.view addSubview:self.inputView];
     [self makeConstraints];
 }
@@ -63,8 +66,7 @@
                                              selector:@selector(onDeviceOrientationChange:)
                                                  name:UIDeviceOrientationDidChangeNotification
                                                object:nil];
-
-
+    
 }
 #pragma mark -
@@ -84,7 +86,6 @@
                 [self toHalfScreenWithrotationAngle:-M_PI_2];
             }
             _originalDirection = 0;
-            _player.isFullScreen = NO;
         }
             break;
@@ -114,29 +115,38 @@
 //旋转至全屏
 - (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 +159,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 +171,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 +182,24 @@
 - (void)lvcPlayer:(LVCPlayer *)player clickedEditBtn:(UIButton *)editBtn
 {
-    NSLog(@"开始编辑~~~~");
+    
+}
+
+#pragma mark -
+#pragma mark - LVCInputViewDelegate
+- (void)lvcInputView:(LVCInputView *)inputView sendWithText:(NSString *)text
+{
+    NSLog(@"发送消息-------%@",text);
+}
+
+- (void)lvcInputView:(LVCInputView *)inputView emojiBtnClicked:(UIButton *)emojiBtn
+{
+
+}
+
+- (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
+{
+    [self.view endEditing:YES];
 }
 #pragma mark -
@@ -180,23 +207,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, kSCREEN_HEIGHT-50, kSCREEN_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, kSCREEN_HEIGHT-50, kSCREEN_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, kSCREEN_HEIGHT-50, kSCREEN_WIDTH, 49);
+
     }
 }
@@ -218,6 +257,18 @@
     }
     return _fullVC;
 }
+
+- (LVCInputView *)inputView
+{
+    if (!_inputView) {
+        _inputView = [[LVCInputView alloc]init];
+        _inputView.delegate = self;
+    }
+    return _inputView;
+}
+
+
+
 - (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;
 }
+{
+  "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