no message

朱林
1 parent efed3d62
Showing 14 changed files with 945 additions and 15 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCInputView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLivePlayerController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCMoreProgramViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/Danmu/LVCDanmuLabel.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/Danmu/LVCDanmuLabel.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/Danmu/LVCDanmuManager.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/Danmu/LVCDanmuManager.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/Danmu/LVCDanmuUtil.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/Danmu/LVCDanmuUtil.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/Danmu/LVCDanmuView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/Danmu/LVCDanmuView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/LVCTelevisionView.m
@@ -26,6 +26,10 @@
 		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 */; };
 		811BB68E1E8116C8005C6291 /* NSString+StringSize.m in Sources */ = {isa = PBXBuildFile; fileRef = 811BB68D1E8116C8005C6291 /* NSString+StringSize.m */; };
+		8128E26E1E8A3AFE00B40E75 /* LVCDanmuUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 8128E26D1E8A3AFE00B40E75 /* LVCDanmuUtil.m */; };
+		8128E2711E8A3BF000B40E75 /* LVCDanmuView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8128E2701E8A3BF000B40E75 /* LVCDanmuView.m */; };
+		8128E2741E8A3C1900B40E75 /* LVCDanmuLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 8128E2731E8A3C1900B40E75 /* LVCDanmuLabel.m */; };
+		8128E2771E8A3CD700B40E75 /* LVCDanmuManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8128E2761E8A3CD700B40E75 /* LVCDanmuManager.m */; };
 		8130911E1E84C0F0005F0BFF /* LVCMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = 8130911D1E84C0F0005F0BFF /* LVCMessage.m */; };
 		81A1B9A91E8277410079FF5F /* LVCInputView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A1B9A81E8277410079FF5F /* LVCInputView.m */; };
 		81A482F51E88ACC80097A80A /* LVCTelevisionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 81A482F41E88ACC80097A80A /* LVCTelevisionView.m */; };
@@ -274,6 +278,14 @@
 		811BB6871E8107B4005C6291 /* LVCChatViewTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCChatViewTableViewCell.m; sourceTree = "<group>"; };
 		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>"; };
+		8128E26C1E8A3AFE00B40E75 /* LVCDanmuUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCDanmuUtil.h; sourceTree = "<group>"; };
+		8128E26D1E8A3AFE00B40E75 /* LVCDanmuUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCDanmuUtil.m; sourceTree = "<group>"; };
+		8128E26F1E8A3BF000B40E75 /* LVCDanmuView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCDanmuView.h; sourceTree = "<group>"; };
+		8128E2701E8A3BF000B40E75 /* LVCDanmuView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCDanmuView.m; sourceTree = "<group>"; };
+		8128E2721E8A3C1900B40E75 /* LVCDanmuLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCDanmuLabel.h; sourceTree = "<group>"; };
+		8128E2731E8A3C1900B40E75 /* LVCDanmuLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCDanmuLabel.m; sourceTree = "<group>"; };
+		8128E2751E8A3CD700B40E75 /* LVCDanmuManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCDanmuManager.h; sourceTree = "<group>"; };
+		8128E2761E8A3CD700B40E75 /* LVCDanmuManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCDanmuManager.m; sourceTree = "<group>"; };
 		8130911C1E84C0F0005F0BFF /* LVCMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMessage.h; sourceTree = "<group>"; };
 		8130911D1E84C0F0005F0BFF /* LVCMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMessage.m; sourceTree = "<group>"; };
 		81A1B9A71E8277410079FF5F /* LVCInputView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCInputView.h; sourceTree = "<group>"; };
@@ -701,6 +713,21 @@
 			path = ../ChatView;
 			sourceTree = "<group>";
 		};
+		8128E26B1E8A3AD400B40E75 /* Danmu */ = {
+			isa = PBXGroup;
+			children = (
+				8128E26C1E8A3AFE00B40E75 /* LVCDanmuUtil.h */,
+				8128E26D1E8A3AFE00B40E75 /* LVCDanmuUtil.m */,
+				8128E26F1E8A3BF000B40E75 /* LVCDanmuView.h */,
+				8128E2701E8A3BF000B40E75 /* LVCDanmuView.m */,
+				8128E2721E8A3C1900B40E75 /* LVCDanmuLabel.h */,
+				8128E2731E8A3C1900B40E75 /* LVCDanmuLabel.m */,
+				8128E2751E8A3CD700B40E75 /* LVCDanmuManager.h */,
+				8128E2761E8A3CD700B40E75 /* LVCDanmuManager.m */,
+			);
+			path = Danmu;
+			sourceTree = "<group>";
+		};
 		812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
 			isa = PBXGroup;
 			children = (
@@ -1630,6 +1657,7 @@
 		D2888DAA1E6EC014003A77C8 /* View */ = {
 			isa = PBXGroup;
 			children = (
+				8128E26B1E8A3AD400B40E75 /* Danmu */,
 				811BB67B1E80F858005C6291 /* ChatView */,
 				810B64DE1E779AE900133E15 /* LVCPlayer.h */,
 				810B64DF1E779AE900133E15 /* LVCPlayer.m */,
@@ -1881,6 +1909,7 @@
 				D2029D011E6EAE2E0027CD92 /* UIColor+HexString.m in Sources */,
 				D2029CA41E6EADE10027CD92 /* MJRefreshComponent.m in Sources */,
 				D2575C7A1E76A4F300E3A8FC /* NHCarViews.m in Sources */,
+				8128E26E1E8A3AFE00B40E75 /* LVCDanmuUtil.m in Sources */,
 				D2029CBC1E6EADE10027CD92 /* SDWebImageDownloaderOperation.m in Sources */,
 				D2029CA51E6EADE10027CD92 /* MJRefreshFooter.m in Sources */,
 				D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */,
@@ -1933,6 +1962,7 @@
 				D2029CC61E6EADE10027CD92 /* SSKeychain.m in Sources */,
 				811BB68E1E8116C8005C6291 /* NSString+StringSize.m in Sources */,
 				D2029C8B1E6EADE10027CD92 /* AFURLResponseSerialization.m in Sources */,
+				8128E2711E8A3BF000B40E75 /* LVCDanmuView.m in Sources */,
 				D2029C921E6EADE10027CD92 /* UIImageView+AFNetworking.m in Sources */,
 				D224B1971E826ED800CC61D0 /* ChatBarrageAnimAction.m in Sources */,
 				D2029C9E1E6EADE10027CD92 /* NSObject+MJCoding.m in Sources */,
@@ -1943,7 +1973,6 @@
 				D2029D041E6EAE2E0027CD92 /* UILabel+ContentSize.m in Sources */,
 				D25530031E79115100DF38A5 /* AnimQueueManager.m in Sources */,
 				D2029C871E6EADE10027CD92 /* AFHTTPSessionManager.m in Sources */,
-				D236968D1E7FC7C200E4BF71 /* CNBarrageManager.m in Sources */,
 				81A482F81E88AFA20097A80A /* LVCFirstHeaderReusableView.m in Sources */,
 				D2029B861E6EAAA50027CD92 /* main.m in Sources */,
 				D2029C8C1E6EADE10027CD92 /* AFURLSessionManager.m in Sources */,
@@ -1952,6 +1981,7 @@
 				D2888DB11E6EC05F003A77C8 /* TempViewController.m in Sources */,
 				81A483011E88B0130097A80A /* LVCBannerModel.m in Sources */,
 				810B65021E779B1F00133E15 /* MASViewAttribute.m in Sources */,
+				8128E2771E8A3CD700B40E75 /* LVCDanmuManager.m in Sources */,
 				D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */,
 				D2029CAC1E6EADE10027CD92 /* MJRefreshBackStateFooter.m in Sources */,
 				D2029CB11E6EADE10027CD92 /* MJRefreshConst.m in Sources */,
@@ -1961,6 +1991,7 @@
 				D2029D051E6EAE2E0027CD92 /* UILabel+labelFitSize.m in Sources */,
 				D2029CB21E6EADE10027CD92 /* UIScrollView+MJExtension.m in Sources */,
 				D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */,
+				8128E2741E8A3C1900B40E75 /* LVCDanmuLabel.m in Sources */,
 				D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */,
 				D2029C8E1E6EADE10027CD92 /* AFImageDownloader.m in Sources */,
 				81A483201E88F4BF0097A80A /* LVCProgramModel.m in Sources */,
@@ -45,7 +45,7 @@
             [self.delegate lvcInputView:self sendMessage:_inputTextField.text];
         }
-        [self endEditing:YES];
+//        [self endEditing:YES];
         _inputTextField.text = @"";
     }
@@ -64,7 +64,7 @@
             [self.delegate lvcInputView:self sendMessage:_inputTextField.text];
         }
-        [self endEditing:YES];
+//        [self endEditing:YES];
         textField.text = @"";
         return YES;
     }
@@ -11,7 +11,7 @@
 #import "LVCInteractionController.h"
 #import "LVCLivePlayerController.h"
 #import "LVCUGCLivePlayerController.h"
-#import "LVCTVLiveViewController.h"
+#import "LVCLivePlayerController.h"
 @interface HomeViewController ()
@@ -56,8 +56,8 @@
 - (void)liveAction
 {
-    LVCTVLiveViewController *liveVC = [[LVCTVLiveViewController alloc] init];
-//    self.navigationController.navigationBar.hidden = YES;
+    LVCLivePlayerController *liveVC = [[LVCLivePlayerController alloc] init];
+    self.navigationController.navigationBar.hidden = YES;
     [self.navigationController pushViewController:liveVC animated:YES];
 }
@@ -26,6 +26,9 @@
 @property (nonatomic, strong) LVCInputView *inputView;
 @property (nonatomic, strong) LVCChatView *chatView;
+@property (nonatomic, strong) NSTimer *timer;
+@property (nonatomic, assign) NSTimeInterval countTime;
+
 @end
 @implementation LVCLivePlayerController
@@ -72,8 +75,13 @@
     [self makeConstraints];
     [_player autoHideControlView];      //自动隐藏工具条
+    
+
+
+
 }
+
 - (void)addObservers
 {
     [[NSNotificationCenter defaultCenter] addObserver:self
@@ -140,9 +148,7 @@
 //当键盘出现
 - (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{
@@ -214,7 +220,7 @@
     }
 }
-- (void)lvcPlayer:(LVCPlayer *)player clickedFullScreenBtn:(UIButton *)fullScreenBtn
+- (void)lvcPlayer:(LVCPlayer *)player clicketullScreenBtn:(UIButton *)fullScreenBtn
 {
     if (_player.isFullScreen) {//全屏
         [self toHalfScreenWithrotationAngle:M_PI_2];
@@ -236,8 +242,7 @@
 {
     NSLog(@"发送消息(%@)",message);
-    [_chatView sendMsgWithMessage:message];
-
+//    [_chatView sendMsgWithMessage:message];
 }
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
@@ -315,6 +320,7 @@
     return _chatView;
 }
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -73,7 +73,6 @@
     }];
 }
-
 - (void)refreshAction
 {
     [self request:1 refresh:YES];
+//
+//  LVCDanmuLabel.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "LVCDanmuUtil.h"
+
+@interface LVCDanmuLabel : UILabel
+
+
+@property (nonatomic, strong, readonly) NSDictionary *info;
+@property (nonatomic, readonly) DanmuState danmuState;
+@property (nonatomic, readonly) CGFloat animationDuartion;
+@property (nonatomic, strong, readonly) NSDictionary *dicOptional;
+
+@property (nonatomic, readonly) CGFloat speed;
+@property (nonatomic, readonly) CGFloat currentRightX;
+
+@property (nonatomic, readonly) CGFloat startTime;
+
+
+@property (nonatomic, getter=isFontSizeBig,     readonly) BOOL fontSizeBig;
+@property (nonatomic, getter=isFontSizeMiddle,  readonly) BOOL fontSizeMiddle;
+@property (nonatomic, getter=isFontSizeSmall,   readonly) BOOL fontSizeSmall;
+@property (nonatomic, getter=isMoveModeRolling, readonly) BOOL moveModeRolling;
+@property (nonatomic, getter=isPositionTop,     readonly) BOOL positionTop;
+@property (nonatomic, getter=isPositionMiddle,  readonly) BOOL positionMiddle;
+@property (nonatomic, getter=isPositionBottom,  readonly) BOOL positionBottom;
+
++ (instancetype)createWithInfo:(NSDictionary *)info inView:(UIView *)view;
+
+- (void)setDanmuChannel:(NSUInteger)channel offset:(CGFloat)xy;
+
+- (void)animationDanmuItem:(NSTimeInterval)waitTime;
+
+- (void)pause;
+
+- (void)resume:(NSTimeInterval)nowTime;
+
+- (void)removeDanmu;
+
+@end
+//
+//  LVCDanmuLabel.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCDanmuLabel.h"
+
+static NSString * const DANMU_FONT_SIZE_BIG = @"l";
+static NSString * const DANMU_FONT_SIZE_MIDDLE = @"m";
+static NSString * const DANMU_FONT_SIZE_SMALL = @"s";
+
+static NSString * const DANMU_MOVE_MODE_ROLLING = @"l";
+
+static NSString * const DANMU_POSITION_TOP = @"t";
+static NSString * const DANMU_POSITION_MIDDLE = @"m";
+static NSString * const DANMU_POSITION_BOTTOM = @"b";
+
+#define ARC4RANDOM_MAX      0x100000000
+
+#define ROLL_ANIMATION_DURATION_TIME 5
+
+#define ANIMATION_DELAY_TIME 3
+
+@interface LVCDanmuLabel ()
+
+@property (nonatomic, strong, readwrite) NSDictionary *info;
+@property (nonatomic, readwrite) DanmuState danmuState;
+@property (nonatomic, readwrite) CGFloat animationDuartion;
+@property (nonatomic, strong, readwrite) NSDictionary *dicOptional;
+
+@property (nonatomic, readwrite) CGFloat speed;
+@property (nonatomic, readwrite) CGFloat currentRightX;
+
+@property (nonatomic) NSUInteger nChannel;
+@property (nonatomic, weak)   UIView *superView;
+
+@property (nonatomic) CGFloat originalX;
+
+@end
+
+@implementation LVCDanmuLabel
+
+- (void)dealloc {
+    _info = nil;
+    _dicOptional = nil;
+}
+
+#pragma mark - Private
+
+- (void)p_initData {
+    self.textColor = [UIColor blackColor];
+    // 弹幕颜色
+    //    id optional = [self.info objectForKey:kDanmuOptionalKey];
+    //    if ([optional isKindOfClass:[NSString class]]) {
+    //        optional = [LVCDanmuUtil defaultOptions];
+    //    }
+    id optional = [LVCDanmuUtil randomOptions];
+    self.dicOptional = [NSDictionary dictionaryWithDictionary:optional];
+    
+    int color = [[optional objectForKey:@"c"] intValue];
+    [self setTextColor:[LVCDanmuUtil colorFromARGB: color]];
+    
+    CGFloat fontsize = 15;
+    if (self.isFontSizeBig) {
+        fontsize = 19;
+    }else if (self.isFontSizeMiddle) {
+        fontsize = 17;
+    }
+    
+    UIFont *font = [UIFont systemFontOfSize:fontsize];
+    self.font = font;
+    
+    NSString *content = [_info objectForKey:kDanmuContentKey];
+    self.text = content;
+}
+
+- (void)p_initFrame:(CGFloat)offsetX {
+    NSString *content = [self.info objectForKey:kDanmuContentKey];
+    CGSize size = [LVCDanmuUtil getSizeWithString:content withFont:self.font size:(CGSize){MAXFLOAT, CHANNEL_HEIGHT}];
+    CGRect frame = (CGRect){(CGPoint){_superView.frame.size.width + offsetX, 0}, size};
+    self.frame = frame;
+    _originalX = frame.origin.x + frame.size.width;
+}
+
+- (void)p_rollAnimation:(CGFloat)time delay:(NSTimeInterval)waitTime {
+    self.danmuState = DanmuStateAnimationing;
+    [UIView animateWithDuration:time delay:waitTime options:UIViewAnimationOptionCurveLinear animations:^{
+        CGRect frame = self.frame;
+        frame.origin.x = -self.frame.size.width;
+        self.frame = frame;
+    } completion:^(BOOL finished) {
+        if (finished)
+            [self removeDanmu];
+    }];
+}
+
+#pragma mark - Action
+
++ (instancetype)createWithInfo:(NSDictionary *)info inView:(UIView *)view {
+    LVCDanmuLabel *danmuLabel = [[LVCDanmuLabel alloc] init];
+    
+    danmuLabel.info = info;
+    danmuLabel.superView = view;
+    danmuLabel.nChannel = 0;
+    
+    [danmuLabel p_initData];
+    [danmuLabel p_initFrame:0];
+    
+    return danmuLabel;
+}
+
+- (void)setDanmuChannel:(NSUInteger)channel offset:(CGFloat)xy {
+    self.danmuState = DanmuStateStop;
+    self.nChannel = channel;
+    CGRect frame = self.frame;
+    frame.origin.x += xy;
+    frame.origin.y = CHANNEL_HEIGHT*_nChannel;
+    self.frame = frame;
+    _originalX = frame.origin.x + frame.size.width;
+    [_superView addSubview:self];
+}
+
+- (void)animationDanmuItem:(NSTimeInterval)waitTime {
+
+    [self p_rollAnimation:self.animationDuartion delay:waitTime];
+}
+
+- (void)pause {
+    self.danmuState = DanmuStateStop;
+    UIView *view = self;
+    CALayer *layer = view.layer;
+    CGRect rect = view.frame;
+    if (layer.presentationLayer) {
+        rect = ((CALayer *)layer.presentationLayer).frame;
+        //            rect.origin.x -= 1;
+    }
+    view.frame = rect;
+    [view.layer removeAllAnimations];
+}
+
+- (void)resume:(NSTimeInterval)nowTime {
+    CGFloat waitTime = self.startTime;
+    if (waitTime > nowTime)
+        waitTime = waitTime - nowTime;
+    else
+        waitTime = 0;
+    
+    CGFloat time = (self.frame.origin.x + self.frame.size.width)/self.speed;
+    [self p_rollAnimation:time delay:waitTime];
+}
+
+- (void)removeDanmu {
+    self.danmuState = DanmuStateFinish;
+    [self.layer removeAllAnimations];
+    [self removeFromSuperview];
+}
+
+
+#pragma mark - Get
+
+- (CGFloat)speed {
+    _speed = _originalX/self.animationDuartion;
+    return _speed;
+}
+
+- (CGFloat)animationDuartion {
+    _animationDuartion = ROLL_ANIMATION_DURATION_TIME;
+    return _animationDuartion;
+}
+
+- (CGFloat)currentRightX {
+    switch (self.danmuState) {
+        case DanmuStateStop: {
+            _currentRightX = CGRectGetMaxX(self.frame) - _superView.frame.size.width;
+            break;
+        }
+        case DanmuStateAnimationing: {
+            CALayer *layer = self.layer;
+            _currentRightX = _originalX;
+            if (layer.presentationLayer)
+                _currentRightX = ((CALayer *)layer.presentationLayer).frame.origin.x + self.frame.size.width;
+            _currentRightX -= _superView.frame.size.width;
+            break;
+        }
+        case DanmuStateFinish: {
+            _currentRightX = -_superView.frame.size.width;
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+    return _currentRightX;
+}
+
+#pragma mark -
+
+- (CGFloat)startTime {
+    return [[self.info valueForKey:kDanmuTimeKey] floatValue];
+}
+
+- (NSString *)fontSize {
+    return [self.dicOptional valueForKey: @"s"];
+}
+
+- (NSString *)moveMode {
+    return [self.dicOptional valueForKey: @"m"];
+}
+
+- (NSString *)position {
+    return [self.dicOptional valueForKey: @"p"];
+}
+
+- (BOOL)isFontSizeBig {
+    return [[self fontSize] isEqualToString: DANMU_FONT_SIZE_BIG];
+}
+
+- (BOOL)isFontSizeMiddle {
+    return [[self fontSize] isEqualToString: DANMU_FONT_SIZE_MIDDLE];
+}
+
+- (BOOL)isFontSizeSmall {
+    return [[self fontSize] isEqualToString: DANMU_FONT_SIZE_SMALL];
+}
+
+- (BOOL)isMoveModeRolling {
+    return [[self moveMode] isEqualToString: DANMU_MOVE_MODE_ROLLING];
+}
+
+- (BOOL)isPositionTop {
+    return [[self position] isEqualToString: DANMU_POSITION_TOP];
+}
+
+- (BOOL)isPositionMiddle {
+    return [[self position] isEqualToString: DANMU_POSITION_MIDDLE];
+}
+
+- (BOOL)isPositionBottom {
+    return [[self position] isEqualToString: DANMU_POSITION_BOTTOM];
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
+//
+//  LVCDanmuManager.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import "LVCDanmuUtil.h"
+
+/**
+ *  弹幕状态
+ */
+typedef NS_ENUM(NSUInteger, DanmuManagerState) {
+    /**
+     *  弹幕准备
+     */
+    DanmuManagerStateWait = 1,
+    /**
+     *  弹幕关闭
+     */
+    DanmuManagerStateStop,
+    /**
+     *  弹幕运动
+     */
+    DanmuManagerStateAnimationing,
+    /**
+     *  弹幕暂停
+     */
+    DanmuManagerStatePause
+};
+
+@interface LVCDanmuManager : NSObject
+
+/**
+ *  弹幕添加的UIView
+ */
+@property (nonatomic, strong, readonly) UIView *danmuView;
+/**
+ *  弹幕状态
+ */
+@property (nonatomic, readonly) DanmuManagerState danmuManagerState;
+/**
+ *  创建弹幕管理对象
+ *
+ *  @param frame 弹幕显示的frame
+ *  @param infos 弹幕信息，数组集合
+ *  @param view  弹幕添加的UIView
+ *  @param time  弹幕刷新的间隔时间，一般1秒
+ *
+ *  @return
+ */
+- (instancetype)initWithFrame:(CGRect)frame data:(NSArray *)infos inView:(UIView *)view durationTime:(NSUInteger)time;
+/**
+ *  弹幕初始化创建
+ */
+- (void)initStart;
+/**
+ *  弹幕滚动
+ *
+ *  @param startTime 目前的时间点
+ */
+- (void)rollDanmu:(NSTimeInterval)startTime;
+/**
+ *  弹幕关闭
+ */
+- (void)stop;
+/**
+ *  弹幕暂停
+ */
+- (void)pause;
+/**
+ *  弹幕继续
+ *
+ *  @param nowTime 现在的时间点
+ */
+- (void)resume:(NSTimeInterval)nowTime;
+/**
+ *  弹幕重新恢复
+ */
+- (void)restart;
+/**
+ *  发射弹幕
+ *
+ *  @param info 弹幕信息，字典集合
+ */
+- (void)insertDanmu:(NSDictionary *)info;
+/**
+ *  重置弹幕
+ *
+ *  @param frame 弹幕显示的frame
+ *  @param infos 弹幕信息，数组集合
+ *  @param view  弹幕添加的UIView
+ *  @param time  弹幕刷新的间隔时间，一般1秒
+ */
+- (void)resetDanmuWithFrame:(CGRect)frame data:(NSArray *)infos inView:(UIView *)view durationTime:(NSUInteger)time;
+/**
+ *  重置弹幕
+ *
+ *  @param frame 弹幕显示的frame
+ */
+- (void)resetDanmuWithFrame:(CGRect)frame;
+
+
+@end
+//
+//  LVCDanmuManager.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCDanmuManager.h"
+
+#import "LVCDanmuLabel.h"
+#import "LVCDanmuView.h"
+
+#define CHANNEL_WIDTH_MAX 120
+#define CHANNEL_SPACE 10
+
+struct DanmuPositionStruct {
+    NSInteger start;
+    NSInteger length;
+};
+typedef struct DanmuPositionStruct DanmuPositionStruct;
+
+@interface LVCDanmuManager ()
+
+@property (nonatomic, strong, readwrite) UIView *danmuView;
+@property (nonatomic, readwrite) DanmuManagerState danmuManagerState;
+
+@property (nonatomic) CGRect frame;
+@property (nonatomic, strong) NSArray *infos;
+@property (nonatomic, weak) UIView *superView;
+@property (nonatomic) NSUInteger durationTime;//添加弹幕的间隔时间
+@property (nonatomic) NSUInteger currentIndex;
+
+@property (nonatomic, strong) NSMutableArray *arRollChannelInfo;
+@property (nonatomic) NSUInteger countChannel;
+
+@property (nonatomic) DanmuPositionStruct upPosition;
+@property (nonatomic) DanmuPositionStruct middlePosition;
+@property (nonatomic) DanmuPositionStruct downPosition;
+
+@end
+
+@implementation LVCDanmuManager
+
+- (void)dealloc {
+    _infos = nil;
+    _danmuView = nil;
+    _arRollChannelInfo = nil;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame data:(NSArray *)infos inView:(UIView *)view durationTime:(NSUInteger)time {
+    self = [super init];
+    if (self) {
+        self.frame = frame;
+        self.infos = infos;
+        self.superView = view;
+        self.durationTime = time;
+        
+        [self p_initInfo];
+    }
+    return self;
+}
+
+#pragma mark - Private
+
+- (void)p_initInfo {
+    _countChannel = self.frame.size.height/CHANNEL_HEIGHT;
+    
+    self.arRollChannelInfo = [NSMutableArray arrayWithCapacity:_countChannel];
+    
+    NSUInteger sectionLines = nearbyintf((CGFloat)_countChannel / 3);
+    NSUInteger firstLines = MAX(_countChannel - sectionLines*2, sectionLines);
+    //滚动航道布局
+    //上中下，假设10，上：0-3，中：4-6，下：7-9
+    _upPosition = (DanmuPositionStruct){0, firstLines};
+    _middlePosition = (DanmuPositionStruct){_upPosition.length, sectionLines};
+    _downPosition = (DanmuPositionStruct){_middlePosition.start + _middlePosition.length, _countChannel - _middlePosition.start - _middlePosition.length};
+
+    _danmuManagerState = DanmuManagerStateWait;
+}
+
+- (void)p_initData {
+    [self.arRollChannelInfo removeAllObjects];
+    
+    for (int i = 0; i < _countChannel; i++) {
+        [self.arRollChannelInfo addObject:[NSNumber numberWithInt:i]];
+    }
+
+    self.currentIndex = 0;
+    [self.danmuView removeFromSuperview];
+    self.danmuView = nil;
+    self.danmuView = [[LVCDanmuView alloc] initWithFrame:_frame];
+    [self.superView addSubview:self.danmuView];
+    
+    _danmuManagerState = DanmuManagerStateWait;
+}
+
+- (void)p_danmu:(NSTimeInterval)startTime {
+    __weak typeof(self) weakSelf = self;
+    
+    __block NSMutableArray *danmuInfos = [NSMutableArray new];
+    __block NSUInteger index = 0;
+    
+    for (int i = (int)self.currentIndex; i < self.infos.count; i++) {
+        NSDictionary *obj = [self.infos objectAtIndex:i];
+        CGFloat time = [[obj objectForKey:kDanmuTimeKey] floatValue];
+        if (time >= startTime && time < startTime + weakSelf.durationTime) {
+            [danmuInfos addObject:obj];
+        }
+        if (time >= startTime + weakSelf.durationTime) {
+            index = i;
+            break;
+        }
+    }
+    
+    if (danmuInfos.count > 0) {
+        self.currentIndex = index;
+        
+        void(^func)(LVCDanmuLabel *danmuLabel, NSUInteger idx, CGFloat offsetXY) = ^(LVCDanmuLabel *danmuLabel, NSUInteger idx, CGFloat offsetXY){
+            if (idx != NSNotFound) {
+                [danmuLabel setDanmuChannel:idx offset:offsetXY];
+                CGFloat time = [danmuLabel startTime];
+                time = time - startTime;
+                [danmuLabel animationDanmuItem:time];
+            }
+        };
+        
+        [danmuInfos enumerateObjectsUsingBlock:^(NSDictionary *obj, NSUInteger idx, BOOL *stop) {
+            __block LVCDanmuLabel *danmuLabel = [LVCDanmuLabel createWithInfo:obj inView:weakSelf.danmuView];
+            [weakSelf p_getRollBestChannel:danmuLabel completion:^(NSUInteger idx, CGFloat offsetX) {
+                func(danmuLabel, idx, offsetX);
+            }];
+        }];
+    }
+}
+
+- (void)p_getRollBestChannel:(LVCDanmuLabel *)newDanmuL completion:(void(^)(NSUInteger idx, CGFloat offsetX))completion {
+    DanmuPositionStruct danmuPosition;
+    if (newDanmuL.isPositionMiddle) {
+        danmuPosition = _middlePosition;
+    }
+    else if (newDanmuL.isPositionBottom) {
+        danmuPosition = _downPosition;
+    }
+    else {
+        danmuPosition = _upPosition;
+    }
+    
+    NSUInteger index = danmuPosition.start;
+    BOOL bFind = NO;
+    for (int i = (int)danmuPosition.start; i < danmuPosition.start + danmuPosition.length; i++) {
+        id obj = [self.arRollChannelInfo objectAtIndex:i];
+        index = i;
+        if ([obj isKindOfClass:[LVCDanmuLabel class]]) {
+            bFind = [self p_last:obj new:newDanmuL];
+        }else {
+            bFind = YES;
+        }
+        
+        if (bFind)
+            break;
+    }
+    
+    if (bFind) {
+        id obj = [self.arRollChannelInfo objectAtIndex:index];
+        [self.arRollChannelInfo replaceObjectAtIndex:index withObject:newDanmuL];
+        if ([obj isKindOfClass:[LVCDanmuLabel class]]) {
+            CGFloat x = ((LVCDanmuLabel *)obj).currentRightX;
+            completion(index, x < 0 ? 0 : x);
+        }else
+            completion(index, 0);
+    }else {
+        if (index < danmuPosition.start + danmuPosition.length - 1) {
+            index += 1;
+            [self.arRollChannelInfo replaceObjectAtIndex:index withObject:newDanmuL];
+            completion(index, 0);
+        }
+        else {
+            NSUInteger index = NSNotFound;
+            index = [self p_allChannelWithPosition:danmuPosition new:newDanmuL];
+            if (index != NSNotFound) {
+                LVCDanmuLabel *obj = [self.arRollChannelInfo objectAtIndex:index];
+                [self.arRollChannelInfo replaceObjectAtIndex:index withObject:newDanmuL];
+                CGFloat x = obj.currentRightX;
+                completion(index, x < CHANNEL_SPACE ? CHANNEL_SPACE : x);
+            }else
+                completion(NSNotFound, 0);
+        }
+    }
+}
+
+//选择完全不会碰撞的航道
+- (BOOL)p_last:(LVCDanmuLabel *)lastDanmuL new:(LVCDanmuLabel *)newDanmuL {
+    CGFloat durationTime = newDanmuL.startTime - lastDanmuL.startTime;
+    if (durationTime > newDanmuL.animationDuartion) {
+        return YES;
+    }
+    CGFloat timeS = lastDanmuL.frame.size.width/lastDanmuL.speed;
+    if (timeS >= durationTime) {
+        return NO;
+    }
+    CGFloat timeE = newDanmuL.currentRightX/newDanmuL.speed;
+    if (timeE <= durationTime) {
+        return NO;
+    }
+    
+    return YES;
+}
+
+//选择在不超出缓冲区的且缓冲区最长的航道
+- (NSUInteger)p_allChannelWithPosition:(DanmuPositionStruct)danmuPosition new:(LVCDanmuLabel *)newDanmuL {
+    CGFloat width = CHANNEL_WIDTH_MAX;
+    NSUInteger index = NSNotFound;
+    for (int i = (int)danmuPosition.start; i < danmuPosition.start + danmuPosition.length; i++) {id obj = [self.arRollChannelInfo objectAtIndex:i];
+        if ([obj isKindOfClass:[LVCDanmuLabel class]]) {
+            CGFloat rightX = ((LVCDanmuLabel *)obj).currentRightX;
+            if (rightX <= CHANNEL_WIDTH_MAX) {
+                CGFloat xx = rightX;
+                if (xx < width) {
+                    width = xx;
+                    index = i;
+                }
+            }
+        }
+    }
+    
+    return index;
+}
+
+- (NSUInteger)p_arDanmuLabel:(NSMutableArray *)arDanmuLs position:(DanmuPositionStruct)danmuPosition new:(LVCDanmuLabel *)newDanmuL {
+    BOOL bFind = NO;
+    NSUInteger index = danmuPosition.start;
+    for (int i = (int)danmuPosition.start; i < danmuPosition.start + danmuPosition.length; i++) {
+        id obj = [arDanmuLs objectAtIndex:i];
+        index = i;
+        if ([obj isKindOfClass:[LVCDanmuLabel class]]) {
+            LVCDanmuLabel *lastDanmuL = obj;
+            CGFloat durationTime = newDanmuL.startTime - lastDanmuL.startTime;
+            bFind = (durationTime > (newDanmuL.animationDuartion - 1));
+        }else {
+            bFind = YES;
+        }
+        
+        if (bFind)
+            break;
+    }
+    if (!bFind) {
+        if (index < danmuPosition.start + danmuPosition.length - 1)
+            index += 1;
+        else
+            index = NSNotFound;
+    }
+    
+    return index;
+}
+
+#pragma mark - Action
+
+- (void)initStart {
+    if (_danmuManagerState == DanmuManagerStateWait ||
+        _danmuManagerState == DanmuManagerStateStop) {
+        [self p_initData];
+    }
+}
+
+- (void)rollDanmu:(NSTimeInterval)startTime {
+    if (_danmuManagerState == DanmuManagerStateStop)
+        return;
+    if (_danmuManagerState != DanmuManagerStateAnimationing)
+        _danmuManagerState = DanmuManagerStateAnimationing;
+    
+    if ((NSInteger)startTime % _durationTime == 0) {
+        [self p_danmu:startTime];
+    }
+}
+
+- (void)stop {
+    _danmuManagerState = DanmuManagerStateStop;
+    [self.arRollChannelInfo removeAllObjects];
+    [self.danmuView.subviews makeObjectsPerformSelector:@selector(removeDanmu)];
+    [self.danmuView removeFromSuperview];
+}
+
+- (void)pause {
+    if (_danmuManagerState != DanmuManagerStateAnimationing)
+        return;
+    _danmuManagerState = DanmuManagerStatePause;
+    [self.danmuView.subviews makeObjectsPerformSelector:@selector(pause)];
+}
+
+- (void)resume:(NSTimeInterval)nowTime {
+    if (_danmuManagerState != DanmuManagerStatePause)
+        return;
+    _danmuManagerState = DanmuManagerStateAnimationing;
+    for (id subview in self.danmuView.subviews) {
+        if ([subview isKindOfClass:[LVCDanmuLabel class]]) {
+            [(LVCDanmuLabel *)subview resume:nowTime];
+        }
+    }
+}
+
+- (void)restart {
+    [self p_initData];
+    _danmuManagerState = DanmuManagerStateAnimationing;
+}
+
+- (void)insertDanmu:(NSDictionary *)info {
+    __block LVCDanmuLabel *danmuLabel = [LVCDanmuLabel createWithInfo:info inView:self.danmuView];
+    [self p_getRollBestChannel:danmuLabel completion:^(NSUInteger idx, CGFloat offsetX) {
+        if (idx != NSNotFound) {
+            [danmuLabel setDanmuChannel:idx offset:offsetX];
+        }
+    }];
+}
+
+- (void)resetDanmuWithFrame:(CGRect)frame data:(NSArray *)infos inView:(UIView *)view durationTime:(NSUInteger)time {
+    self.frame = frame;
+    if (infos != nil)
+        self.infos = infos;
+    self.superView = view;
+    self.durationTime = time;
+    
+    [self p_initInfo];
+}
+
+- (void)resetDanmuWithFrame:(CGRect)frame {
+    self.frame = frame;
+    [self p_initInfo];
+}
+
+
+@end
+//
+//  LVCDanmuUtil.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+typedef NS_ENUM(NSUInteger, DanmuState) {
+    DanmuStateStop = 1,
+    DanmuStateAnimationing,
+    DanmuStateFinish
+};
+
+#define CHANNEL_HEIGHT 25
+
+extern NSString * const kDanmuContentKey;       //弹幕内容
+extern NSString * const kDanmuTimeKey;          //视频时间
+extern NSString * const kDanmuOptionalKey;      //弹幕样式
+
+@interface LVCDanmuUtil : NSObject
+
++ (CGSize)getSizeWithString:(NSString *)str withFont:(UIFont *)font size:(CGSize)size;
+
++ (UIColor *)colorFromARGB:(int)argb;
+
++ (NSDictionary *)defaultOptions;
+
++ (NSDictionary *)randomOptions;
+
++ (BOOL)isOrientationLandscape;
+
+@end
+//
+//  LVCDanmuUtil.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCDanmuUtil.h"
+
+NSString * const kDanmuContentKey = @"c";
+NSString * const kDanmuTimeKey = @"v";
+NSString * const kDanmuOptionalKey = @"t";
+
+@implementation LVCDanmuUtil
+
++ (CGSize)getSizeWithString:(NSString *)str withFont:(UIFont *)font size:(CGSize)size {
+    CGRect stringRect = [str boundingRectWithSize:size
+                                          options:(NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading)
+                                       attributes:@{ NSFontAttributeName : font }
+                                          context:nil];
+    
+    return stringRect.size;
+}
+
++ (UIColor *)colorFromARGB:(int)argb {
+    int blue = argb & 0xff;
+    int green = argb >> 8 & 0xff;
+    int red = argb >> 16 & 0xff;
+    //int alpha = argb >> 24 & 0xff;
+    //NSLog(@"%i, %i, %i", red, green, blue);
+    return [UIColor colorWithRed:red/255.f green:green/255.f blue:blue/255.f alpha: 1];
+}
+
++ (long)argbFromHex:(NSString *)hex
+{
+    const char *cStr = [hex cStringUsingEncoding:NSASCIIStringEncoding];
+    long x = strtol(cStr + 1, NULL, 16);
+    return x;
+    //    return [self colorFromARGB: (int)x];
+}
+
++ (NSDictionary *)defaultOptions {
+    return @{@"c": [NSNumber numberWithLong:[LVCDanmuUtil argbFromHex: @"#ffffff"]],
+             @"m": @"l",
+             @"p": @"t",
+             @"s": @"m",
+             @"l": @"n"
+             };
+}
+
++ (NSDictionary *)randomOptions {
+    NSUInteger c = arc4random_uniform(4);
+    NSArray *arColor = @[@"#ffffff", @"#ff0000", @"#00ff00", @"#0000ff"];
+    NSUInteger s = arc4random_uniform(3);
+    NSArray *arFontSize = @[@"l", @"m", @"s"];
+    NSUInteger m = arc4random_uniform(4);
+    NSArray *arMode = @[@"l", @"f", @"l", @"l"];
+    return @{@"c": [NSNumber numberWithLong:[LVCDanmuUtil argbFromHex:arColor[c]]],
+             @"m": arMode[m],
+             @"p": @"t",
+             @"s": arFontSize[s],
+             @"l": @"n"
+             };
+}
+
++ (BOOL)isOrientationLandscape {
+    //if (UIDeviceOrientationIsLandscape([[UIDevice currentDevice] orientation])) {
+    if (UIInterfaceOrientationIsLandscape([UIApplication sharedApplication].statusBarOrientation)) {
+        return YES;
+    } else {
+        return NO;
+    }
+}
+
+@end
+//
+//  LVCDanmuView.h
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LVCDanmuView : UIView
+
+@end
+//
+//  LVCDanmuView.m
+//  LiveVideoCloud
+//
+//  Created by iOS on 17/3/28.
+//  Copyright © 2017年 cnlive. All rights reserved.
+//
+
+#import "LVCDanmuView.h"
+
+@implementation LVCDanmuView
+
+- (instancetype)initWithFrame:(CGRect)frame {
+    self = [super initWithFrame:frame];
+    if (self) {
+        self.backgroundColor = [UIColor clearColor];
+        self.clipsToBounds = YES;
+    }
+    return self;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
@@ -234,6 +234,8 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
     } failure:^(NSURLSessionDataTask * _Nullable task, NSError * _Nonnull error) {
+        [self.collectionView.header endRefreshing];
+
         NSLog(@"获取电视台数据失败");
     }];
@@ -274,8 +276,7 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
         _collectionView.dataSource = self;
         _collectionView.delegate = self;
-//        MJRefreshGifHeader *header = [CNRefreshHeader headerWithRefreshingTarget:self refreshingAction:@selector(refresh)];
-//        _collectionView.header = header;
+        _collectionView.header = [MJRefreshNormalHeader headerWithRefreshingTarget:self refreshingAction:@selector(refresh)];
     }
     return _collectionView;
 }