整合推流和交互页面

张旭
1 parent ebb60740
Showing 14 changed files with 138 additions and 64 deletions
LiveVideoCloud/LiveVideoCloud/Classes/Helpers/Tools.h
LiveVideoCloud/LiveVideoCloud/Classes/Helpers/Tools.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/AnimationBaseView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatMsgModel/chatMsgModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftViews/GiftListView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PriChatCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PrivateView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
LiveVideoCloud/LiveVideoCloud/UtilKits/Const/ZXConst.m
LiveVideoCloud/LiveVideoCloud/UtilKits/Macro/Macros/NotificationMacro.h
LiveVideoCloud/LiveVideoCloud/UtilKits/Macro/Macros/UserDefaultKeyMacro.h
@@ -27,6 +27,8 @@ typedef NS_ENUM(NSInteger, ShowMessageType) {//消息背景类型
 + (void)closeBouces;
++ (void)showNaviViewWithMessage:(NSString *_Nonnull)message;
+
 + (NSString *_Nullable)dictionaryToJson:(NSDictionary *_Nullable)dic;
 + (NSDictionary *_Nullable)dictionaryWithJsonString:(NSString *_Nullable)jsonString;
@@ -83,6 +83,32 @@
     }];
 }
++ (void)showNaviViewWithMessage:(NSString *_Nonnull)message
+{
+    UIImageView *bgView = [[UIImageView alloc] initWithFrame:CGRectMake(0, - 60, SCREEN_WIDTH, 60)];
+    bgView.backgroundColor = [UIColor cyanColor];
+    UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(10, 25, SCREEN_WIDTH - 20, 30)];
+    label.text = message;
+    label.textAlignment = NSTextAlignmentCenter;
+    label.textColor = [UIColor whiteColor];
+    [bgView addSubview:label];
+    [[UIApplication sharedApplication].keyWindow addSubview:bgView];
+    
+    [UIView animateWithDuration:0.5 animations:^{
+        bgView.top = 0;
+    } completion:^(BOOL finished) {
+        NSTimer *timer = [NSTimer timerWithTimeInterval:3 repeats:NO block:^(NSTimer * _Nonnull timer) {
+            [UIView animateWithDuration:0.5 animations:^{
+                bgView.top = - 60;
+            } completion:^(BOOL finished) {
+                [bgView removeFromSuperview];
+            }];
+        }];
+        [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSRunLoopCommonModes];
+    }];
+}
+
+
 /**
  把字典转换成格式化的JSON格式的字符串
@@ -14,7 +14,7 @@
 - (instancetype)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame]) {
-        self.backgroundColor = [UIColor redColor];
+
         self.clipsToBounds = YES;
     }
     return self;
@@ -35,7 +35,7 @@
     //如果计算过高度,直接返回
     if (_priCellHeight) return _priCellHeight;
-    _priCellHeight = 0;
+    _priCellHeight = 10;
     NSString *content = self.content;
     //文字
     CGFloat textMaxW = self.priCellWidth;
@@ -43,7 +43,7 @@
     CGSize textSize = [content boundingRectWithSize:textMaxSize options:NSStringDrawingUsesLineFragmentOrigin attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:kContentFont]} context:nil].size;
     //底部空隙
-    _priCellHeight += textSize.height + 5;
+    _priCellHeight += textSize.height + 10;
 //       NSLog(@"pricellHeight = %f",_priCellHeight);
     return _priCellHeight;
 }
@@ -111,6 +111,7 @@
 - (void)sendClick
 {
     NSLog(@"sendClick");
+    [Tools showNaviViewWithMessage:@"请先充值钻石哦"];
 }
 - (void)payClick
@@ -16,8 +16,13 @@ typedef NS_ENUM(NSInteger, BounceBtnType) {//弹窗按钮类型
     BounceBtnTypeHome           ,//主页按钮点击
 };
+typedef NS_ENUM(NSInteger, JumpControllerType) {//跳转控制器类型
+    JumpControllerTypePresent        = 1,//present
+    JumpControllerTypePush               //push
+};
 @interface LiveBaseView : BaseView 
+@property (nonatomic) JumpControllerType              jumpType;
 @property (nonatomic ,strong) UIViewController * _Nullable             viewController;
 @property (nonatomic ,strong ,readonly) PresentView *   _Nullable presentView;
 @property (nonatomic ,strong ,readonly) AnimationBaseView * _Nullable             animationBaseView;
@@ -52,7 +52,7 @@ 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) ChatBarrageView * _Nullable             barrageView;
+@property (nonatomic ,strong           ) ChatBarrageView *    _Nullable barrageView;
 @end
@@ -87,8 +87,8 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         self.chatTableView.alpha = 0.7;
         [self.animationBaseView addSubview:self.topToolsView];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:self];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:self];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil];
         [CNLiveChatManager sharedCNLiveChatManager].delegate = self;
         [[CNLiveChatManager sharedCNLiveChatManager] joinChatRoom:@"1234" messageCount:10 success:^(NSString *targetId) {
@@ -102,9 +102,16 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     return self;
 }
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification object:nil];
+}
+
 - (void)keyboardWillShow:(NSNotification *)notify {
-    if ([notify.object isKindOfClass:[LiveBaseView class]]) {
-        
+    NSString *class = [[NSUserDefaults standardUserDefaults] objectForKey:keyboard];
+    if ([class isEqualToString:NSStringFromClass([self class])])
+    {
         NSDictionary *userInfo = notify.userInfo;
         CGRect newFrameKeyboard = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];//变化前的frame
         [UIView animateWithDuration:0.25 animations:^{
@@ -115,7 +122,9 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 }
 - (void)keyboardWillHidden:(NSNotification *)notify {
-    if ([notify.object isKindOfClass:[LiveBaseView class]]) {
+    NSString *class = [[NSUserDefaults standardUserDefaults] objectForKey:keyboard];
+    if ([class isEqualToString:NSStringFromClass([self class])])
+    {
         [UIView animateWithDuration:0.1 animations:^{
             self.animationBaseView.top = 0;
             [self.animationBaseView setNeedsDisplay];
@@ -259,7 +268,8 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         case BtnClickTypeChat:
         {
             self.popType = PopTypeChat;
-            
+            [[NSUserDefaults standardUserDefaults] setObject:NSStringFromClass([self class]) forKey:keyboard];
+            [[NSUserDefaults standardUserDefaults] synchronize];
             [self showCommentText];
         }
             break;
@@ -268,6 +278,8 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
             self.popType = PopTypePriMessage;
             [self hiddenView:YES];
             [self showPrivateView];
+            [[NSUserDefaults standardUserDefaults] setObject:NSStringFromClass([PrivateView class]) forKey:keyboard];
+            [[NSUserDefaults standardUserDefaults] synchronize];
         }
             break;
         case BtnClickTypeGift:
@@ -345,7 +357,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
                     [self.giftPopView removeFromSuperview];
                 }];
             }
-            
         }
             break;
         default:
@@ -353,7 +364,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     }
 }
-
 #pragma mark - buttonClick触摸屏幕关闭方法
 - (void)tapGestureClick:(UITapGestureRecognizer *)gesture
 {
@@ -364,7 +374,20 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 - (void)closeAction
 {
-    [self.viewController.navigationController popViewControllerAnimated:YES];
+    switch (self.jumpType) {
+        case JumpControllerTypePresent:
+        {
+            [self.viewController dismissViewControllerAnimated:YES completion:nil];
+        }
+            break;
+        case JumpControllerTypePush:
+        {
+            [self.viewController.navigationController popViewControllerAnimated:YES];
+        }
+            break;
+        default:
+            break;
+    }
 }
 - (void)sendClick
@@ -37,15 +37,43 @@
     [self bindView];
     [self.icon sd_setImageWithURL:[NSURL URLWithString:model.icon] placeholderImage:nil];
     self.content.text = model.content;
+    CGSize size = [self.content labelSizeWithWidth:_model.priCellWidth];
+    if (_model.isMine) {
+        if (_model.priCellHeight < 37) {//1行 // 36.7
+            
+            self.content.frame = CGRectMake(self.width - 30 - size.width - 10, 2.5, size.width, size.height);//self.height - 5
+            self.content.textAlignment = NSTextAlignmentRight;
+            self.content.centerY = self.icon.centerY;
+        }else
+        {
+            self.content.frame = CGRectMake(self.width - 30 - size.width - 10, 10, size.width, size.height);//self.height - 5
+            self.content.textAlignment = NSTextAlignmentLeft;
+        }
+    }else
+    {
+         if (_model.priCellHeight < 37) {//1行
+             self.icon.frame = CGRectMake(5, 6, 25, 25);
+             self.icon.centerY = (self.height - 25)*0.5 + 12.5;//13.353516;
+             self.content.frame = CGRectMake(5 + 30 + 10, 2.5, size.width, size.height);//self.height - 5
+             self.content.textAlignment = NSTextAlignmentLeft;
+             self.content.centerY = self.icon.centerY;
+         }else
+         {
+             self.icon.frame = CGRectMake(5, 6, 25, 25);
+             self.icon.centerY = (self.height - 25)*0.5 + 12.5;//13.353516;
+             self.content.frame = CGRectMake(5 + 30 + 10, 10, size.width, size.height);//self.height - 5
+             self.content.textAlignment = NSTextAlignmentLeft;
+         }
+    }
 }
 - (void)bindView
 {
     if (_model.isMine) {
         self.icon.frame = CGRectMake(self.width - 30, 6, 25, 25);
-        NSLog(@"self.icon.centerY%f",self.height * 0.5);//13.353516
+        NSLog(@"self.icon.centerY%f,%f",self.height * 0.5,_model.priCellHeight);//13.353516 21.707031 155.363281
         self.icon.centerY = (self.height - 25)*0.5 + 12.5;//13.353516;
-        self.content.frame = CGRectMake(self.width - 30 - 5 - CHAT_POP_WIDTH, 2.5, CHAT_POP_WIDTH, self.height - 5);
+        self.content.frame = CGRectMake(self.width - 30 - CHAT_POP_WIDTH, 2.5, CHAT_POP_WIDTH - 10, self.height - 5);
         self.content.backgroundColor = [UIColor blueColorZX];
     }else{
@@ -66,8 +94,6 @@
         _content.textColor = [UIColor blackColor];
         _content.numberOfLines = 0;
         _content.font = [UIFont systemFontOfSize:kContentFont];
-        _content.layer.cornerRadius = 10;
-        _content.layer.masksToBounds = YES;
         [self addSubview:_content];
     }
     return _content;
@@ -45,8 +45,8 @@ static NSString *message_content = @&quot;message_content&quot;;
         [self.bottomTool addSubview:self.sendBtn];
         [self.bottomTool addSubview:self.textField];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:self];
-        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:self];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
+        [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillHidden:) name:UIKeyboardWillHideNotification object:nil];
     }
     return self;
 }
@@ -63,9 +63,17 @@ static NSString *message_content = @&quot;message_content&quot;;
     [self textFieldShouldReturn:self.textField];
 }
+- (void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillShowNotification object:nil];
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:UIKeyboardWillHideNotification object:nil];
+}
+
 - (void)keyboardWillShow:(NSNotification *)notify {
-    if ([notify.object isKindOfClass:[PrivateView class]]) {
+    NSString *class = [[NSUserDefaults standardUserDefaults] objectForKey:keyboard];
+    if ([class isEqualToString:NSStringFromClass([self class])])
+    {
         NSDictionary *userInfo = notify.userInfo;
         CGRect newFrameKeyboard = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];//变化前的frame
         [UIView animateWithDuration:0.25 animations:^{
@@ -77,8 +85,9 @@ static NSString *message_content = @&quot;message_content&quot;;
 }
 - (void)keyboardWillHidden:(NSNotification *)notify {
-    
-    if ([notify.object isKindOfClass:[PrivateView class]]) {
+    NSString *class = [[NSUserDefaults standardUserDefaults] objectForKey:keyboard];
+    if ([class isEqualToString:NSStringFromClass([self class])])
+    {
         [UIView animateWithDuration:0.1 animations:^{
             self.top = SCREEN_HEIGHT - 300;
         }];
@@ -11,6 +11,7 @@
 #import <CNLivePlayerSDK/CNLiveWebcastManager.h>
 #import "FilterFunctionView.h"
 #import "LVCUGCLivePrepareView.h"
+#import "LiveBaseView.h"
 #define KAppId @"60_irn9edco29"
 #define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
@@ -33,6 +34,9 @@
 @property (nonatomic, strong) UIButton *openFlashButton;
+@property (nonatomic ,strong) LiveBaseView * _Nullable             liveBaseView;
+
+
 @end
 @implementation LVCLiveViewController
@@ -43,6 +47,7 @@
     self.view.backgroundColor = [UIColor blueColor];
     [self.view addSubview:self.captureView];
+    
     [self.view addSubview:self.prepareView];
     [self.view addSubview:self.quitButton];
     [self.view addSubview:self.changeCameraButton];
@@ -101,13 +106,28 @@
 }
+- (LiveBaseView *)liveBaseView
+{
+    if (!_liveBaseView)
+    {
+        _liveBaseView = [LiveBaseView liveBaseView];
+        _liveBaseView.jumpType = JumpControllerTypePresent;
+        _liveBaseView.viewController = self;
+        _liveBaseView.backgroundColor = [UIColor clearColor];
+    }
+    return _liveBaseView;
+}
+
 #pragma mark - UIButton Action  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 - (void)startCapture:(UIButton *)button {   // 开始推流
-    
+    [_quitButton removeFromSuperview];
     [_prepareView removeFromSuperview];
     [_kitCN startStream:^{
         NSLog(@"开启推流成功 ------- success");
+        
+        [self.view insertSubview:self.liveBaseView atIndex:1];
+
     } failure:^(NSDictionary *errorDic) {
         NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
         NSLog(@"%@",str);
@@ -8,31 +8,16 @@
 #import "HomeViewController.h"
 #import "LVCLivePlayerController.h"
-#import "LVCInteractionController.h"
 #import "LVCLivePlayerController.h"
 #import "LVCUGCLivePlayerController.h"
 #import "LVCTVLiveViewController.h"
 @interface HomeViewController ()
-@property (nonatomic ,strong) UIButton * _Nullable             interactionBtn;
-
 @end
 @implementation HomeViewController
-- (void)viewWillAppear:(BOOL)animated
-{
-    [super viewWillAppear:animated];
-    [[UIApplication sharedApplication].keyWindow addSubview:self.interactionBtn];
-}
-
-- (void)viewWillDisappear:(BOOL)animated
-{
-    [super viewWillDisappear:animated];
-    [self.interactionBtn removeFromSuperview];
-}
-
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
@@ -50,8 +35,6 @@
     [UGCLiveBtn setTitle:@"UGC直播" forState:UIControlStateNormal];
     [UGCLiveBtn addTarget:self action:@selector(UGCLiveAction) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:UGCLiveBtn];
-    
-    [[UIApplication sharedApplication].keyWindow addSubview:self.interactionBtn];
 }
 - (void)liveAction
@@ -67,28 +50,6 @@
     [self.navigationController pushViewController:UGCLiveVC animated:YES];
 }
-- (void)interactionAction
-{
-    LVCInteractionController *intVC = [[LVCInteractionController alloc] init];
-    self.navigationController.navigationBar.hidden = YES;
-    [self.navigationController pushViewController:intVC animated:YES];
-}
-
-
-- (UIButton *)interactionBtn
-{
-    if (!_interactionBtn)
-    {
-        UIButton *interactionBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-        interactionBtn.frame = CGRectMake(200, 400, 50, 30);
-        [interactionBtn setTitle:@"互动" forState:UIControlStateNormal];
-        [interactionBtn setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-        [interactionBtn addTarget:self action:@selector(interactionAction) forControlEvents:UIControlEventTouchUpInside];
-        _interactionBtn = interactionBtn;
-    }
-    return _interactionBtn;
-}
-
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -23,3 +23,4 @@ CGFloat const kContentFont = 14.0;
 /** 详细内容字体字号 */
 CGFloat const kDetailContentFont = 12.0;
+
@@ -16,5 +16,4 @@
 /** 标题按钮重复点击的通知 */
 static NSString *const ZXTitleButtonDidRepeatClickNotification                    = @"ZXTitleButtonDidRepeatClickNotification";
-
 #endif /* NotificationMacro_h */
@@ -16,6 +16,7 @@
 /** 用户搜索信息key */
 static NSString *const UserInfoAllKeys                    = @"UserInfoAllKeys";
-
+/** 当前键盘监听者 */
+static NSString *const keyboard                    = @"keyboard";
 #endif /* UserDefaultKeyMacro_h */