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

王军波
2 parents 1faf8da6 92f9cf0d
Showing 17 changed files with 159 additions and 47 deletions
LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatMsgModel/chatMsgModel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/Present/ComboCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/Present/PresentViewCell.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/animation.xcassets/Interaction/22.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Chat/left.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Chat/left.imageset/left.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Chat/right.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Chat/right.imageset/right.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Gift/背景220x40.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Gift/背景220x40.imageset/背景220x40.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/privateChat11.imageset/Contents.json
@@ -31,23 +31,20 @@
     //初始化聊天SDK并连接服务器
     [[CNLiveChatManager sharedCNLiveChatManager] initWithAppKey:AppKey appId:AppId];
-    /*
-     [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{
-     NSLog(@"连接服务器-----success");
-     } error:^(CNLiveChatConnectErrorCode errors) {
-     NSLog(@"连接服务器失败-----%ld", errors);
-     }];
-     */
-    // 20170327 20170328
-    /*
-     */
-    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170328" name:@"20170328" portrait:@""];
-    [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
+    [[CNLiveChatManager sharedCNLiveChatManager] connectServerSuccess:^{
         NSLog(@"连接服务器-----success");
-        
     } error:^(CNLiveChatConnectErrorCode errors) {
         NSLog(@"连接服务器失败-----%ld", errors);
     }];
+    // 20170327 20170328
+
+//    CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"20170328" name:@"20170328" portrait:@""];
+//    [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
+//        NSLog(@"连接服务器-----success");
+//        
+//    } error:^(CNLiveChatConnectErrorCode errors) {
+//        NSLog(@"连接服务器失败-----%ld", errors);
+//    }];
     [self.window makeKeyAndVisible];
     return YES;
@@ -35,7 +35,7 @@
     //如果计算过高度,直接返回
     if (_priCellHeight) return _priCellHeight;
-    _priCellHeight = 10;
+    _priCellHeight = 30;
     NSString *content = self.content;
     //文字
     CGFloat textMaxW = self.priCellWidth;
@@ -11,7 +11,7 @@
 @interface ComboCell ()
-@property (nonatomic ,strong) UIView *      _Nullable bgView;
+@property (nonatomic ,strong) UIImageView *      _Nullable bgView;
 @property (nonatomic ,strong) UIImageView * _Nullable icon;
 @property (nonatomic ,strong) UILabel *     _Nullable senderNameLbl;
 @property (nonatomic ,strong) UILabel *     _Nullable giftNameLbl;
@@ -43,6 +43,7 @@
     self.senderNameLbl.size = [self.senderNameLbl labelSize];
     self.giftNameLbl.size = [self.giftNameLbl labelSize];
     self.bgView.frame = CGRectMake(0, 0, self.width, self.height);
+    self.bgView.image = [UIImage imageNamed:@"背景220x40"];
     self.bgView.layer.cornerRadius = self.height * 0.5;
     self.giftImage.frame = CGRectMake(self.width - self.height, 0, self.height, self.height);
     self.giftImage.image = [UIImage imageNamed:model.giftImageName];
@@ -68,7 +69,7 @@
     {
         _senderNameLbl = [[UILabel alloc] initWithFrame:CGRectMake(self.icon.right + 5, 0, 100, 20)];
         _senderNameLbl.font = [UIFont systemFontOfSize:kContentFont];
-        _senderNameLbl.textColor = [UIColor blackColor];
+        _senderNameLbl.textColor = [UIColor whiteColor];
     }
     return _senderNameLbl;
 }
@@ -79,7 +80,7 @@
     {
         _giftNameLbl = [[UILabel alloc] initWithFrame:CGRectMake(self.icon.right + 5, self.senderNameLbl.bottom , 100, 20)];
         _giftNameLbl.font = [UIFont systemFontOfSize:kContentFont];
-        _giftNameLbl.textColor = [UIColor blackColor];
+        _giftNameLbl.textColor = [UIColor yellowColorZX];
     }
     return _giftNameLbl;
 }
@@ -91,9 +92,8 @@
         _icon = [[UIImageView alloc] initWithFrame:CGRectMake(0, 0, 40, 40)];
         _icon.clipsToBounds     = YES;
         _icon.layer.cornerRadius = 20;
-        _icon.layer.borderWidth = 1;
-        _icon.layer.borderColor = [UIColor cyanColor].CGColor;
-
+//        _icon.layer.borderWidth = 1;
+//        _icon.layer.borderColor = [UIColor cyanColor].CGColor;
     }
     return _icon;
 }
@@ -107,13 +107,13 @@
     return _giftImage;
 }
-- (UIView *)bgView
+- (UIImageView *)bgView
 {
     if (!_bgView)
     {
-        _bgView = [[UIView alloc] init];
-        _bgView.backgroundColor = [UIColor yellowColor];
+        _bgView = [[UIImageView alloc] init];
         _bgView.clipsToBounds   = YES;
+        _bgView.alpha = 0.4;
     }
     return _bgView;
 }
@@ -72,8 +72,8 @@
 {
     PresentLable *lable   = [[PresentLable alloc] init];
     lable.backgroundColor = [UIColor clearColor];
-    lable.borderColor     = [UIColor yellowColor];
-    lable.textColor       = [UIColor greenColor];
+    lable.borderColor     = [UIColor orangeColor];
+    lable.textColor       = [UIColor yellowColor];
     lable.font            = [UIFont systemFontOfSize:17.0];
     lable.textAlignment   = NSTextAlignmentCenter;
     lable.alpha           = 0.0;
@@ -253,7 +253,7 @@
     [UIView animateKeyframesWithDuration:interval delay:0 options:0 animations:^{
         [UIView addKeyframeWithRelativeStartTime:0 relativeDuration:1/2.0 animations:^{
-            self.transform = CGAffineTransformMakeScale(4, 4);
+            self.transform = CGAffineTransformMakeScale(2.5, 2.5);
         }];
         [UIView addKeyframeWithRelativeStartTime:1/2.0 relativeDuration:1/2.0 animations:^{
             self.transform = CGAffineTransformMakeScale(0.8, 0.8);
@@ -7,8 +7,10 @@
 //
 #import "BaseView.h"
+#import "AnimationBaseView.h"
+
 @class PresentView;
-@class AnimationBaseView;
+//@class AnimationBaseView;
 typedef NS_ENUM(NSInteger, BounceBtnType) {//弹窗按钮类型
     BounceBtnTypeAite        = 1,//@TA按钮点击
@@ -26,7 +28,7 @@ typedef NS_ENUM(NSInteger, JumpControllerType) {//跳转控制器类型
 @property (nonatomic) JumpControllerType              jumpType;
 @property (nonatomic ,strong) UIViewController * _Nullable             viewController;
 @property (nonatomic ,strong ,readonly) PresentView *   _Nullable presentView;
-@property (nonatomic ,strong ,readonly) AnimationBaseView * _Nullable             animationBaseView;
+@property (nonatomic ,strong) AnimationBaseView * _Nullable             animationBaseView;
 + (instancetype _Nullable)liveBaseView;
@@ -21,7 +21,6 @@
 #import "userInfoModel.h"
 #import "PrivateView.h"
 #import "ChatBarrageView.h"
-#import "AnimationBaseView.h"
 #define BottomToolHeight 60
@@ -37,7 +36,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 @interface LiveBaseView ()<bottomBtnDeledate,PresentViewDelegate,UIScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,UITextFieldDelegate,userClickDelegate,CNLiveChatManagerDelegate,PopViewDelegate>
 @property (nonatomic ,strong           ) UIScrollView *   _Nullable scrollView;
-@property (nonatomic ,strong ,readwrite) AnimationBaseView *         _Nullable animationBaseView;//展示层View
+//@property (nonatomic ,strong ,readwrite) AnimationBaseView *         _Nullable animationBaseView;//展示层View
 @property (nonatomic ,strong           ) BottomToolView*  _Nullable bottomToolView;
 @property (nonatomic ,strong           ) GiftListView *   _Nullable giftListView;
@@ -14,6 +14,7 @@
 @interface PriChatCell ()
 @property (nonatomic ,strong) chatMsgModel * _Nullable model;
+@property (nonatomic ,strong) UIImageView * _Nullable             bgImgView;
 @property (nonatomic ,strong) UIImageView *  _Nullable icon;
 @property (nonatomic ,strong) UILabel *      _Nullable content;
@@ -36,51 +37,67 @@
     _model = model;
     [self bindView];
     [self.icon sd_setImageWithURL:[NSURL URLWithString:model.icon] placeholderImage:nil];
+    self.icon.backgroundColor = [UIColor greenColor];
     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
+        if (_model.priCellHeight < 57) {//1行 // 36.7
+            self.icon.frame = CGRectMake(self.width - 30, 6, 25, 25);
+            self.icon.centerY = (self.height - 25)*0.5 + 12.5;
+            self.content.frame = CGRectMake(self.width - 30 - size.width - 20 - 25, 2.5, size.width, size.height);
             self.content.textAlignment = NSTextAlignmentRight;
-            self.content.centerY = self.icon.centerY;
+            self.content.centerY = self.height * 0.5;
+            self.bgImgView.frame = CGRectMake(self.content.left - 15, self.content.top - 10, self.content.width + 45, self.content.height + 20);
         }else
         {
-            self.content.frame = CGRectMake(self.width - 30 - size.width - 10, 10, size.width, size.height);//self.height - 5
+            self.icon.frame = CGRectMake(self.width - 30, 6, 25, 25);
+            self.icon.centerY = (self.height - 25)*0.5 + 12.5;
+            self.content.frame = CGRectMake(self.width - 30 - size.width - 20 - 25, 10, size.width, size.height);
             self.content.textAlignment = NSTextAlignmentLeft;
+            self.content.centerY = self.height * 0.5;
+            self.bgImgView.frame = CGRectMake(self.content.left - 15, self.content.top - 10, self.content.width + 50, self.content.height + 20);
         }
+        
+        self.bgImgView.image = [[UIImage imageNamed:@"right"]stretchableImageWithLeftCapWidth:167 topCapHeight:100];
     }else
     {
-         if (_model.priCellHeight < 37) {//1行
+         if (_model.priCellHeight < 57) {//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.frame = CGRectMake(5 + 25 + 35, 2.5, size.width, size.height);
              self.content.textAlignment = NSTextAlignmentLeft;
              self.content.centerY = self.icon.centerY;
+             self.bgImgView.frame = CGRectMake(self.content.left - 25, self.content.top - 10, self.content.width + 45, self.content.height + 20);
          }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.frame = CGRectMake(5 + 25 + 35 + 15, 10, size.width, size.height);
              self.content.textAlignment = NSTextAlignmentLeft;
+             self.content.centerY = self.height * 0.5;
+             self.bgImgView.frame = CGRectMake(self.content.left - 35 - 5, self.content.top - 10, self.content.width + 50, self.content.height + 20);
          }
+        
+        self.bgImgView.image = [[UIImage imageNamed:@"left"] stretchableImageWithLeftCapWidth:189 topCapHeight:164];
+
     }
+    _icon.layer.cornerRadius = _icon.height * 0.5;
+    [self sendSubviewToBack:self.bgImgView];
 }
 - (void)bindView
 {
     if (_model.isMine) {
         self.icon.frame = CGRectMake(self.width - 30, 6, 25, 25);
-        NSLog(@"self.icon.centerY%f,%f",self.height * 0.5,_model.priCellHeight);//13.353516 21.707031 155.363281
+//        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 - CHAT_POP_WIDTH, 2.5, CHAT_POP_WIDTH - 10, self.height - 5);
-        self.content.backgroundColor = [UIColor blueColorZX];
     }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, 2.5, CHAT_POP_WIDTH, self.height - 5);
-        self.content.backgroundColor = [UIColor greenColor];
     }
 }
@@ -105,12 +122,22 @@
     {
         _icon = [[UIImageView alloc] init];
         _icon.layer.masksToBounds = YES;
-        _icon.layer.cornerRadius = 15.f;
         [self addSubview:_icon];
     }
     return _icon;
 }
+- (UIImageView * _Nullable)bgImgView
+{
+    if (!_bgImgView)
+    {
+        _bgImgView = [[UIImageView alloc] init];
+
+        [self addSubview:_bgImgView];
+    }
+    return _bgImgView;
+}
+
 - (void)awakeFromNib {
     [super awakeFromNib];
     // Initialization code
@@ -80,7 +80,6 @@ static NSString *message_content = @&quot;message_content&quot;;
             self.top = SCREEN_HEIGHT - newFrameKeyboard.size.height - self.height;
         }];
         self.isEditing = YES;
-        NSLog(@"showtop:%f",self.top);
     }
 }
@@ -91,7 +90,6 @@ static NSString *message_content = @&quot;message_content&quot;;
         [UIView animateWithDuration:0.1 animations:^{
             self.top = SCREEN_HEIGHT - 300;
         }];
-        NSLog(@"hiddentop:%f",self.top);
         self.isEditing = NO;
     }
 }
@@ -104,7 +102,7 @@ static NSString *message_content = @&quot;message_content&quot;;
         NSDictionary *dic = @{message_content:textField.text};
         weakself
         NSString *message = [Tools dictionaryToJson:dic];
-        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_PRIVATE targetId:@"20170327" success:^(CNLiveChatMessage *message) {
+        [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_PRIVATE targetId:@"20170328" success:^(CNLiveChatMessage *message) {
             dispatch_async(dispatch_get_main_queue(), ^{
                 strongself
@@ -256,7 +254,8 @@ static NSString *message_content = @&quot;message_content&quot;;
     if (!_textField)
     {
         _textField = [[UITextField alloc] initWithFrame:CGRectMake(4, 4, self.bottomTool.width - self.sendBtn.width - 8, self.bottomTool.height - 8)];
-        _textField.borderStyle = UITextBorderStyleLine;
+        _textField.borderStyle = UITextBorderStyleNone;
+        _textField.placeholder = @"和主播说点什么吧";
         _textField.returnKeyType       = UIReturnKeySend;
         _textField.delegate = self;
     }
@@ -123,6 +123,12 @@
 - (void)startCapture:(UIButton *)button {   // 开始推流
     [_quitButton removeFromSuperview];
+    [_openFilterButton removeFromSuperview];
+    [_changeCameraButton removeFromSuperview];
+    [_openFlashButton removeFromSuperview];
+    _openFilterButton = nil;
+    _changeCameraButton = nil;
+    _openFlashButton = nil;
     _isStreaming = YES;
@@ -132,7 +138,10 @@
         NSLog(@"开启推流成功 ------- success");
         [self.view insertSubview:self.liveBaseView atIndex:1];
-
+        [self.liveBaseView.animationBaseView addSubview:self.openFilterButton];
+        [self.liveBaseView.animationBaseView addSubview:self.changeCameraButton];
+        [self.liveBaseView.animationBaseView addSubview:self.openFlashButton];
+        
     } failure:^(NSDictionary *errorDic) {
         //NSString *str=[[NSMutableString alloc] initWithData:errorDic[@"errorMessage"] encoding:NSUTF8StringEncoding];
         NSLog(@"%@",errorDic);
@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "22.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "left.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" : "right.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" : "背景220x40.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "privateChat11.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {