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

王军波
2 parents b9af0a70 309568ae
Showing 20 changed files with 147 additions and 43 deletions
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/BottomToolView/BottomToolView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Chat/ChatViews/chatListCell.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftAnimOperation.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftAnimationAction.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHCarViews.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHFighterView+animDelegagte.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource/NHFighterView+animDelegagte.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/PrivateView/PrivateView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/TopToolView/TopToolView.m
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/22.imageset/22.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/22.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/Gift/背景400x60.imageset/背景400x60.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/priToolBg.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/privateChat.png.imageset/privateChat.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/privateChat11.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/privateChat11.imageset/privateChat11.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/privateChat3.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/Interaction/privateChat3.imageset/privateChat3.png
@@ -13,6 +13,7 @@
 @property (nonatomic ,strong) UIButton * _Nullable             chatBtn;
 @property (nonatomic ,strong) UIButton * _Nullable             privateChatBtn;
 @property (nonatomic ,strong) UIButton * _Nullable             giftBtn;
+@property (nonatomic ,strong) UIImageView * _Nullable             bgView;
 @end
@@ -21,6 +22,7 @@
 - (instancetype)initWithFrame:(CGRect)frame
 {
     if (self = [super initWithFrame:frame]) {
+        [self addSubview:self.bgView];
         [self addSubview:self.chatBtn];
         [self addSubview:self.privateChatBtn];
         [self addSubview:self.giftBtn];
@@ -50,6 +52,16 @@
     }
 }
+- (UIImageView *)bgView
+{
+    if (!_bgView)
+    {
+        _bgView = [[UIImageView alloc] initWithFrame:self.bounds];
+        _bgView.image = [UIImage imageNamed:@"背景400x60"];
+    }
+    return _bgView;
+}
+
 #pragma mark - getter
 - (UIButton *)chatBtn
 {
@@ -71,8 +83,9 @@
     {
         UIButton *privateChatBtn = [UIButton buttonWithType:UIButtonTypeCustom];
         privateChatBtn.frame = CGRectMake(self.width*0.5 - 50, (self.height - 45)*0.5, 45, 45);
-        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"privateChat.png"] forState:UIControlStateNormal];
-        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"privateChat.png"] forState:UIControlStateHighlighted];
+        //[UIColor colorWithRed:0.61 green:0.61 blue:0.61 alpha:1.00]
+        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"22"] forState:UIControlStateNormal];
+        [privateChatBtn setBackgroundImage:[UIImage imageNamed:@"22"] forState:UIControlStateHighlighted];
         [privateChatBtn addTarget:self action:@selector(privateChatAction) forControlEvents:UIControlEventTouchUpInside];
         _privateChatBtn = privateChatBtn;
     }
@@ -47,7 +47,7 @@
     NSMutableAttributedString *str = [[NSMutableAttributedString alloc] initWithString:self.contentLabel.text];
     // 设置文字颜色
     [str addAttribute:NSForegroundColorAttributeName value:ZXRandomColor range:NSMakeRange(0, name.length)];
-    [str addAttribute:NSForegroundColorAttributeName value:[UIColor cyanColor] range:NSMakeRange(name.length, content.length)];
+    [str addAttribute:NSForegroundColorAttributeName value:[UIColor whiteColor] range:NSMakeRange(name.length, content.length)];
     // 将配置好的NSMutableAttributedString传给attributedText属性
     self.contentLabel.attributedText = str;
@@ -34,10 +34,11 @@
     GiftAnimOperation *giftAnimOperation = [[GiftAnimOperation alloc]initWithGiftModel:model animContentView:animContentView];
-    if (model.giftStyle == GiftStyleFighter) {
-        [[NSNotificationCenter defaultCenter] addObserver:giftAnimOperation selector:@selector(fighterAnimationDidStart) name:NSNotificationAnimationDidStart object:nil];
-        [[NSNotificationCenter defaultCenter] addObserver:giftAnimOperation selector:@selector(fighterAnimationDidStop) name:NSNotificationAnimationDidStop object:nil];
-    }
+//    if (model.giftStyle == GiftStyleFighter) {
+//        NSLog(@"add notification op: %@,self %@",giftAnimOperation,self);
+//        [[NSNotificationCenter defaultCenter] addObserver:giftAnimOperation selector:@selector(fighterAnimationDidStart) name:NSNotificationAnimationDidStart object:nil];
+//        [[NSNotificationCenter defaultCenter] addObserver:giftAnimOperation selector:@selector(fighterAnimationDidStop) name:NSNotificationAnimationDidStop object:nil];
+//    }
     return giftAnimOperation;
 }
@@ -61,6 +62,8 @@
  开始方法(KVO控制队列任务状态)
  */
 - (void)start{
+    NSLog(@"animation start op:%@",self);
+    
     //这里动画队列任务不存在Cancelled状态所以不需要判断，直接开始执行
     [self willChangeValueForKey:@"isExecuting"];
     _executing = YES;
@@ -100,6 +103,7 @@
         [self.giftCarView startPorschAnimationWithCompletion:^{
+            NSLog(@"animation porsch stop");
             [self willChangeValueForKey:@"isFinished"];
             _finished = YES;
@@ -117,22 +121,35 @@
         [self.giftFighterView addAnimationsMoveToPoint:CGPointMake(SCREEN_WIDTH, 60) endPoint:CGPointMake( -500, 600)];
         [self.animContentView addSubview:self.giftFighterView];
-    });
-}
+        
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(12 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self willChangeValueForKey:@"isFinished"];
+            
+            _finished = YES;
+            
+            [self didChangeValueForKey:@"isFinished"];
-- (void)fighterAnimationDidStart
-{
-    
+        });
+    });
 }
-- (void)fighterAnimationDidStop
-{
-    [self willChangeValueForKey:@"isFinished"];
-    
-    _finished = YES;
-    
-    [self didChangeValueForKey:@"isFinished"];
-}
+//- (void)fighterAnimationDidStart
+//{
+//    NSLog(@"fight start op:%@",self);
+//}
+//
+//- (void)fighterAnimationDidStop
+//{
+//    NSLog(@"fight stop op:%@",self);
+//    [self willChangeValueForKey:@"isFinished"];
+//    
+//    _finished = YES;
+//    
+//    [self didChangeValueForKey:@"isFinished"];
+//    
+////    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSNotificationAnimationDidStart object:nil];
+////    [[NSNotificationCenter defaultCenter] removeObserver:self name:NSNotificationAnimationDidStop object:nil];
+////}
 - (void)planeAnimation
 {
@@ -145,6 +162,7 @@
         [self.giftPlaneView startPlaneAnimationWithCompletion:^{
+            NSLog(@"animation plane stop");
             [self willChangeValueForKey:@"isFinished"];
             _finished = YES;
@@ -15,6 +15,7 @@
  */
 - (void)startPorschAnimationWithCompletion:(giftAnimationCompletion)Completion
 {
+    NSLog(@"animation PorschStart");
     _giftAnimationCompletion = Completion;
 }
@@ -23,6 +24,7 @@
  */
 - (void)startPlaneAnimationWithCompletion:(giftAnimationCompletion)Completion
 {
+    NSLog(@"animation PlaneStart");
     _giftAnimationCompletion = Completion;
 }
@@ -33,6 +35,7 @@
  @param flag 是否完成标记
  */
 - (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag{
+    NSLog(@"animationDidStop");
     _giftAnimationCompletion();
 }
@@ -101,12 +101,12 @@
     animationGroup.animations = @[position,scaleAnimation];
     if (self.animations.count == 0) {
-        NSLog(@"第一次动画%ld",self.animations.count);
+//        NSLog(@"第一次动画%ld",self.animations.count);
         [self.animations addObject:animationGroup];
         [self.layer addAnimation:animationGroup forKey:@"carView"];
     }else{
         [self.animations addObject:animationGroup];
-        NSLog(@"添加动画");
+//        NSLog(@"添加动画");
     }
 }
@@ -139,7 +139,7 @@
     [self removeFromSuperview];
     _giftAnimationCompletion();
-    NSLog(@"删除动画");
+//    NSLog(@"删除动画");
 //    [self.animations removeObjectAtIndex:0];
     if (self.animations.count > 0) {
@@ -8,6 +8,9 @@
 #import "NHFighterView.h"
+//typedef void(^fighterAnimationCompletion)();
+
 @interface NHFighterView (animDelegagte)
+//@property (nonatomic) fighterAnimationCompletion          completion;
 @end
@@ -9,16 +9,23 @@
 #import "NHFighterView+animDelegagte.h"
 #import "GiftAnimationAction.h"
+
+
 @implementation NHFighterView (animDelegagte)
-- (void)animationDidStart:(CAAnimation *)anim
-{
-    [[NSNotificationCenter defaultCenter] postNotificationName:NSNotificationAnimationDidStart object:nil];
-}
+//@dynamic completion;
-- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
-{
-    [[NSNotificationCenter defaultCenter] postNotificationName:NSNotificationAnimationDidStop object:nil];
-}
+//- (void)animationDidStart:(CAAnimation *)anim
+//{
+////    [[NSNotificationCenter defaultCenter] postNotificationName:NSNotificationAnimationDidStart object:nil];
+//    NSLog(@"fighter start:%@",self);
+//}
+//
+//- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
+//{
+//    NSLog(@"fighter stop:%@",self);
+//    self.completion();
+////    [[NSNotificationCenter defaultCenter] postNotificationName:NSNotificationAnimationDidStop object:nil];
+//}
 @end
@@ -83,8 +83,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         [[LVCAnimationManager shareManager] bubblingWithCenterPoint:CGPointMake(SCREEN_WIDTH - 50, SCREEN_HEIGHT - 50) toView:self.animationBaseView speed:1];
         [self.animationBaseView addSubview:self.chatTableView];
-        self.chatTableView.backgroundColor = [UIColor whiteColor];
-        self.chatTableView.alpha = 0.7;
         [self.animationBaseView addSubview:self.topToolsView];
         [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
@@ -154,8 +152,8 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         [bgView addSubview:sendBtn];
         _commentText = [[UITextField alloc] initWithFrame:CGRectMake(_barrageSwitch.right + 20, 5, _commentsView.width - _barrageSwitch.right - 20 - 100, _commentsView.height - 10)];
-        _commentText.layer.borderColor   = [UIColor blueColor].CGColor;
-        _commentText.layer.borderWidth   = 1.0;
+//        _commentText.layer.borderColor   = [UIColor blueColor].CGColor;
+//        _commentText.layer.borderWidth   = 1.0;
         _commentText.layer.cornerRadius  = 2.0;
         _commentText.layer.masksToBounds = YES;
         _commentText.inputAccessoryView  = _commentsView;
@@ -644,9 +642,9 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     if (!_barrageSwitch)
     {
         _barrageSwitch = [[UISwitch alloc] initWithFrame:CGRectMake(10, 10, 40, 30)];
-        _barrageSwitch.tintColor = [UIColor orangeColor];
-        _barrageSwitch.onTintColor = [UIColor orangeColor];
-        _barrageSwitch.thumbTintColor = [UIColor lightGrayColor];
+        _barrageSwitch.tintColor = [UIColor greenColor];
+        _barrageSwitch.onTintColor = [UIColor greenColor];
+        _barrageSwitch.thumbTintColor = [UIColor whiteColor];
         _barrageSwitch.centerY = _commentsView.height * 0.5;
         [_barrageSwitch addTarget:self action:@selector(barrageSiwthChange:) forControlEvents:UIControlEventValueChanged];
     }
@@ -659,8 +657,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
     {
         _bottomToolView = [[BottomToolView alloc] initWithFrame:CGRectMake(0, SCREEN_HEIGHT - BottomToolHeight, SCREEN_WIDTH, BottomToolHeight)];
         _bottomToolView.delegate = self;
-        _bottomToolView.backgroundColor = [UIColor lightGrayColor];
-        _bottomToolView.alpha = 0.7;
     }
     return _bottomToolView;
 }
@@ -685,6 +681,14 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         tableView.showsHorizontalScrollIndicator = NO;
         tableView.bounces = NO;
         tableView.backgroundColor = [UIColor clearColor];
+        
+//        UIView *view = [[UIView alloc] initWithFrame:tableView.bounds];
+//        [tableView addSubview:view];
+//        
+//        UIImageView *bgView = [[UIImageView alloc] initWithFrame:view.bounds];
+//        bgView.image = [UIImage imageNamed:@"背景400x300"];
+//        [view addSubview:bgView];
+//        tableView.backgroundView = view;
         _chatTableView = tableView;
     }
     return _chatTableView;
@@ -184,6 +184,7 @@ static NSString *message_content = @&quot;message_content&quot;;
     {
         _nameLbl = [[UILabel alloc] initWithFrame:CGRectMake(100, 5, self.width - 100, 30)];
         _nameLbl.centerX = self.width * 0.5;
+        _nameLbl.centerY = self.closeBtn.centerY;
         _nameLbl.text = @"哈哈哈主播的名字";
         [_nameLbl setTextColor:[UIColor cyanColor]];
         _nameLbl.numberOfLines = 1;
@@ -220,7 +221,7 @@ static NSString *message_content = @&quot;message_content&quot;;
         _tableView.showsHorizontalScrollIndicator = NO;
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _tableView.bounces = NO;
-        _tableView.backgroundColor = [UIColor clearColor];
+        _tableView.backgroundColor = [UIColor colorWithRed:0.96 green:0.98 blue:0.98 alpha:1.00];
     }
     return _tableView;
 }
@@ -75,7 +75,7 @@
     if (!_bgView)
     {
         _bgView = [[UIImageView alloc] initWithFrame:self.bounds];
-        _bgView.backgroundColor = ZXRandomColor;
+        _bgView.image = [UIImage imageNamed:@"背景200x50"];
         _bgView.layer.masksToBounds = YES;
         _bgView.layer.cornerRadius = _bgView.height * 0.5;
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "22.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "privateChat.png",
+      "filename" : "背景400x60.png",
       "scale" : "1x"
     },
     {
@@ -4,6 +4,14 @@
       "idiom" : "universal",
       "filename" : "priToolBg.png",
       "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
     }
   ],
   "info" : {
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "privateChat11.png",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "privateChat3.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file