完成弹幕逻辑，修改AppId

朱林
1 parent e98d288e
Showing 26 changed files with 694 additions and 1012 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/AppDelegate/AppDelegate.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCChatView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCInputView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/ChatView/LVCMessage.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLivePlayerController.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCLivePlayerController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/Barrage/CNBarrageManager.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/Barrage/CNBarrageManager.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/Barrage/CNBarrageView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/View/Barrage/CNBarrageView.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
@@ -26,10 +26,8 @@
 		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 */; };
+		8128E2881E8A6A3600B40E75 /* CNBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 8128E2851E8A6A3600B40E75 /* CNBarrageManager.m */; };
+		8128E2891E8A6A3600B40E75 /* CNBarrageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8128E2871E8A6A3600B40E75 /* CNBarrageView.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 */; };
@@ -282,14 +280,10 @@
 		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>"; };
+		8128E2841E8A6A3600B40E75 /* CNBarrageManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNBarrageManager.h; sourceTree = "<group>"; };
+		8128E2851E8A6A3600B40E75 /* CNBarrageManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNBarrageManager.m; sourceTree = "<group>"; };
+		8128E2861E8A6A3600B40E75 /* CNBarrageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNBarrageView.h; sourceTree = "<group>"; };
+		8128E2871E8A6A3600B40E75 /* CNBarrageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNBarrageView.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>"; };
@@ -725,19 +719,15 @@
 			path = ../ChatView;
 			sourceTree = "<group>";
 		};
-		8128E26B1E8A3AD400B40E75 /* Danmu */ = {
+		8128E2831E8A6A3600B40E75 /* Barrage */ = {
 			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 */,
+				8128E2841E8A6A3600B40E75 /* CNBarrageManager.h */,
+				8128E2851E8A6A3600B40E75 /* CNBarrageManager.m */,
+				8128E2861E8A6A3600B40E75 /* CNBarrageView.h */,
+				8128E2871E8A6A3600B40E75 /* CNBarrageView.m */,
 			);
-			path = Danmu;
+			path = Barrage;
 			sourceTree = "<group>";
 		};
 		812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
@@ -1667,7 +1657,7 @@
 		D2888DAA1E6EC014003A77C8 /* View */ = {
 			isa = PBXGroup;
 			children = (
-				8128E26B1E8A3AD400B40E75 /* Danmu */,
+				8128E2831E8A6A3600B40E75 /* Barrage */,
 				811BB67B1E80F858005C6291 /* ChatView */,
 				810B64DE1E779AE900133E15 /* LVCPlayer.h */,
 				810B64DF1E779AE900133E15 /* LVCPlayer.m */,
@@ -1922,7 +1912,6 @@
 				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 +1922,7 @@
 				D2029CD01E6EADE10027CD92 /* SearchPresenter.m in Sources */,
 				D2888DB71E6EC1B8003A77C8 /* LVCMyViewController.m in Sources */,
 				D2029CBE1E6EADE10027CD92 /* SDWebImagePrefetcher.m in Sources */,
+				8128E2891E8A6A3600B40E75 /* CNBarrageView.m in Sources */,
 				D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */,
 				D2B7B2571E8261EF00ED084E /* ChatBarrOperation.m in Sources */,
 				810B65011E779B1F00133E15 /* MASLayoutConstraint.m in Sources */,
@@ -1970,6 +1960,7 @@
 				D2029CB61E6EADE10027CD92 /* MKAnnotationView+WebCache.m in Sources */,
 				D2B2ED801E88FC5200F7538A /* LVCUGCLiveEndView.m in Sources */,
 				810B64FE1E779B1F00133E15 /* MASCompositeConstraint.m in Sources */,
+				8128E2881E8A6A3600B40E75 /* CNBarrageManager.m in Sources */,
 				D2029C981E6EADE10027CD92 /* MJExtensionConst.m in Sources */,
 				D2575C671E76A25400E3A8FC /* LVCInteractionController.m in Sources */,
 				D2029CAE1E6EADE10027CD92 /* MJRefreshNormalHeader.m in Sources */,
@@ -1978,7 +1969,6 @@
 				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 */,
@@ -1997,7 +1987,6 @@
 				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 */,
@@ -2007,7 +1996,6 @@
 				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 */,
@@ -2217,7 +2205,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.video;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.shixunyun;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -2240,7 +2228,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.video;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.shixunyun;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;
@@ -23,23 +23,28 @@
     self.window.rootViewController = [[ZXTabBarController alloc] init];
     //初始化直播SDK
-//    [[CNLiveWebcastManager manager] initWithAppId:AppId appKey:AppKey];
+    [[CNLiveWebcastManager manager] initWithAppId:AppId appKey:AppKey];
     //初始化聊天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) {
-            NSLog(@"连接服务器-----success");
-
+    
+    [[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;
@@ -14,10 +14,6 @@
 #import "LiveBaseView.h"
 #import "LVCUGCLiveEndView.h"
-
-#define KAppId @"60_irn9edco29"
-#define KAppKey @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
-
 @interface LVCLiveViewController ()<UIGestureRecognizerDelegate> {
     BOOL _isStreaming;
@@ -61,8 +57,6 @@
     [self.view addSubview:self.openFlashButton];
     [self.view addSubview:self.filterView];
-    [[CNLiveWebcastManager manager] initWithAppId:KAppId appKey:KAppKey];
-
     // 初始化推流
     NSString *activityId = [NSString stringWithFormat:@"%d%d%d%d%d",arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9,arc4random()%9];
@@ -7,9 +7,18 @@
 //
 #import <UIKit/UIKit.h>
+#import "chatMsgModel.h"
+
+@class LVCChatView;
+@protocol LVCChatViewDelegate <NSObject>
+
+- (void)lvcChatView:(LVCChatView *)chatView sendBarrageWithModel:(chatMsgModel *)model;
+
+@end
 @interface LVCChatView : UIView
 @property (nonatomic, strong) UITableView *tableView;
+@property (nonatomic, assign) id<LVCChatViewDelegate> delegate;
 - (instancetype)initWithFrame:(CGRect)frame roomId:(NSString *)roomId;
@@ -69,16 +69,23 @@
 {
     [[CNLiveChatManager sharedCNLiveChatManager] sendMessage:message type:CNLive_ConversationType_CHATROOM targetId:_roomId success:^(CNLiveChatMessage *message) {
-        LVCMessage *msg = [LVCMessage messageWihtContent:message isRight:YES];
+        chatMsgModel *model = [[chatMsgModel alloc] init];
+        model.content = message.messageContent;
+        model.isMine = YES;
+        LVCMessage *msg = [LVCMessage messageWihtContent:message isRight:YES];
         dispatch_sync(dispatch_get_main_queue(), ^{
             [self addData:msg];
+            if (self.delegate && [self.delegate respondsToSelector:@selector(lvcChatView:sendBarrageWithModel:)]) {
+                [self.delegate lvcChatView:self sendBarrageWithModel:model];
+            }
         });
         NSLog(@"电视台--发送消息---success-（%@）",msg.content);
     } error:^(CNLiveChatErrorCode errors, NSString *messageId, NSString *targetId) {
         NSLog(@"电视台--发送消息---failed-（%ld）",(long)errors);
+        
     }];
 }
@@ -100,8 +107,16 @@
      dispatch_queue_t globalQueue=dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
     dispatch_async(globalQueue, ^{
         LVCMessage *msg = [LVCMessage messageWihtContent:message isRight:NO];
+        
+        chatMsgModel *model = [[chatMsgModel alloc] init];
+        model.content = message.messageContent;
+        model.isMine = NO;
+       
         dispatch_sync(dispatch_get_main_queue(), ^{
             [self addData:msg];
+            if (self.delegate && [self.delegate respondsToSelector:@selector(lvcChatView:sendBarrageWithModel:)]) {
+                [self.delegate lvcChatView:self sendBarrageWithModel:model];
+            }
         });
     });
 }
@@ -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;
     }
@@ -39,7 +39,9 @@
     msg.nikename = content.userInfo.name;
     msg.portraits = content.userInfo.portraitUri;
-    CGRect rect = [msg.content boundingRectWithSize:CGSizeMake((SCREEN_WIDTH-60)*0.8, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14]} context:nil];
+    CGFloat width = SCREEN_WIDTH > SCREEN_HEIGHT ? SCREEN_HEIGHT : SCREEN_WIDTH;
+
+    CGRect rect = [msg.content boundingRectWithSize:CGSizeMake((width-60)*0.8, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14]} context:nil];
     CGRect frameOfLabel = CGRectZero;
     frameOfLabel.size = rect.size;
@@ -7,7 +7,10 @@
 //
 #import "BaseViewController.h"
+#import "LVCChannelDetailsModel.h"
 @interface LVCLivePlayerController : BaseViewController
+@property (nonatomic, strong) LVCChannelDetailsModel *model;
+
 @end
@@ -12,7 +12,11 @@
 #import "LVCInputView.h"
 #import "LVCChatView.h"
-@interface LVCLivePlayerController ()<LVCPlayerDelegate,LVCInputViewDelegate>
+#import "CNBarrageManager.h"
+#import "CNBarrageView.h"
+#import "chatMsgModel.h"
+
+@interface LVCLivePlayerController ()<LVCPlayerDelegate,LVCInputViewDelegate,LVCChatViewDelegate>
 {
     BOOL isHiddenStatusBar;             //记录状态的隐藏显示
     CGRect     playerFrame;             //播放器原始位置
@@ -29,6 +33,9 @@
 @property (nonatomic, strong) NSTimer *timer;
 @property (nonatomic, assign) NSTimeInterval countTime;
+@property (nonatomic, strong) CNBarrageManager *barrageManager;     //弹幕管理者
+@property (nonatomic ,strong) UIView *barrageBaseView;              //弹幕总View
+
 @end
 @implementation LVCLivePlayerController
@@ -73,14 +80,20 @@
     };
     [self makeConstraints];
-    
     [_player autoHideControlView];      //自动隐藏工具条
-    
+    self.barrageManager.generateBarrageBlock = ^(CNBarrageView *barrageView) {
+        [weakSelf addBarrageView:barrageView];
+    };
+    [self.player.contentView addSubview:self.barrageBaseView];
 }
-
+- (void)addBarrageView:(CNBarrageView *)barrageView {
+    barrageView.frame = CGRectMake(self.player.width+50, barrageView.trajectory, barrageView.width, barrageView.height);
+    [self.barrageBaseView addSubview:barrageView];
+    [barrageView startAnimation];
+}
 - (void)addObservers
 {
@@ -148,11 +161,16 @@
 //当键盘出现
 - (void)keyboardWillShow:(NSNotification *)aNotification{
     //获取键盘的高度
-    
+    NSDictionary *userInfo = [aNotification userInfo];
+    NSValue *aValue = [userInfo objectForKey:UIKeyboardFrameEndUserInfoKey];
+    CGRect keyboardRect = [aValue CGRectValue];
+    int height = keyboardRect.size.height;
+    _inputView.frame = CGRectMake(0, SCREEN_HEIGHT-49-height, SCREEN_WIDTH, 49);
+
 }
 - (void)keyboardWillHide:(NSNotification *)aNotification{
-    _inputView.frame = CGRectMake(0, SCREEN_HEIGHT-50, SCREEN_WIDTH, 50);
+    _inputView.frame = CGRectMake(0, SCREEN_HEIGHT-49, SCREEN_WIDTH, 49);
 }
 #pragma mark -
@@ -177,6 +195,18 @@
         [UIView animateWithDuration:0.3 animations:^{
             self.player.transform = CGAffineTransformMakeRotation(0);
         }];
+
+        //是否显示弹幕
+        if ([_player displayBarrage]) {
+            [self.player.contentView addSubview:self.barrageBaseView];
+            [self.player.contentView insertSubview:self.barrageBaseView atIndex:1];
+            self.barrageManager.isStopBarrage = NO;
+        } else {
+            self.barrageManager.isStopBarrage = YES;
+            [self.barrageManager stopBarrage];
+            [self.barrageBaseView removeFromSuperview];
+        }
+
     }];
 }
@@ -198,9 +228,24 @@
         [UIView animateWithDuration:0.3 animations:^{
             self.player.transform = CGAffineTransformMakeRotation(0);
         }];
+        
+        self.barrageManager.isStopBarrage = YES;
+        [self.barrageManager stopBarrage];
+        [self.barrageBaseView removeFromSuperview];
+
     }];
 }
+
+#pragma mark -
+#pragma mark - LVCChatViewDelegate
+- (void)lvcChatView:(LVCChatView *)chatView sendBarrageWithModel:(chatMsgModel *)model
+{
+    if (_player.isFullScreen) {
+        [self.barrageManager startBarrageWithNewArray:[NSMutableArray arrayWithObject:model]];
+    }
+}
+
 #pragma mark -
 #pragma mark - LVCPlayerDelegate
 - (void)lvcPlayer:(LVCPlayer *)player clickedBackBtn:(UIButton *)backBtn
@@ -220,7 +265,7 @@
     }
 }
-- (void)lvcPlayer:(LVCPlayer *)player clicketullScreenBtn:(UIButton *)fullScreenBtn
+- (void)lvcPlayer:(LVCPlayer *)player clickedFullScreenBtn:(UIButton *)fullScreenBtn
 {
     if (_player.isFullScreen) {//全屏
         [self toHalfScreenWithrotationAngle:M_PI_2];
@@ -236,13 +281,28 @@
 }
+- (void)lvcPlayer:(LVCPlayer *)player barrageSwitch:(BOOL)on
+{
+    if (on) {       //开启弹幕
+        [self.player.contentView addSubview:self.barrageBaseView];
+        [self.player.contentView insertSubview:self.barrageBaseView atIndex:1];
+        self.barrageManager.isStopBarrage = NO;
+
+    } else {        //关闭弹幕
+        self.barrageManager.isStopBarrage = YES;
+        [self.barrageManager stopBarrage];
+        [self.barrageBaseView removeFromSuperview];
+    }
+}
+
 #pragma mark -
 #pragma mark - LVCInputViewDelegate
 - (void)lvcInputView:(LVCInputView *)inputView sendMessage:(NSString *)message
 {
-    NSLog(@"发送消息(%@)",message);
+    [_chatView sendMsgWithMessage:message];
-//    [_chatView sendMsgWithMessage:message];
+    if (!_player.isFullScreen) return;
+    inputView.hidden = YES;
 }
 - (void)touchesBegan:(NSSet<UITouch *> *)touches withEvent:(UIEvent *)event
@@ -273,6 +333,7 @@
         }];
         _inputView.frame = CGRectMake(0, SCREEN_HEIGHT-50, SCREEN_WIDTH, 49);
+        _barrageBaseView.frame = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
     } else {            //半屏
         [self.player mas_remakeConstraints:^(MASConstraintMaker *make) {
             make.top.mas_equalTo(20);
@@ -289,7 +350,7 @@
 - (LVCPlayer *)player
 {
     if (!_player) {
-        _player = [[LVCPlayer alloc] init];
+        _player = [[LVCPlayer alloc] initWithFrame:CGRectZero playerModel:self.model];
         _player.delegate = self;
     }
     return _player;
@@ -316,10 +377,29 @@
 {
     if (!_chatView) {
         _chatView = [[LVCChatView alloc] initWithFrame:CGRectMake(0, SCREEN_WIDTH*9/16+20, SCREEN_WIDTH, SCREEN_HEIGHT-SCREEN_WIDTH*9/16-20-49) roomId:_roomId];
+        _chatView.delegate = self;
     }
     return _chatView;
 }
+- (UIView *)barrageBaseView
+{
+    if (!_barrageBaseView) {
+        _barrageBaseView = [[UIView alloc] init];
+        _barrageBaseView.backgroundColor = [UIColor clearColor];
+        [self.view addSubview:_barrageBaseView];
+    }
+    return _barrageBaseView;
+}
+
+- (CNBarrageManager *)barrageManager
+{
+    if (!_barrageManager)
+    {
+        self.barrageManager = [[CNBarrageManager alloc] init];
+    }
+    return _barrageManager;
+}
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
+//
+//  CNBarrageManager.h
+//  personalXmppChatDemo
+//
+//  Created by 张旭 on 2016/12/10.
+//  Copyright © 2016年 cnlive. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "chatMsgModel.h"
+
+@class CNBarrageView;
+
+@interface CNBarrageManager : NSObject
+
+@property (nonatomic, copy) void(^generateBarrageBlock)(CNBarrageView *view);//生成弹幕View回调
+@property (nonatomic) BOOL isStopBarrage;//是否关闭了弹幕
+/**
+ 开始弹幕根据新消息数组
+ 
+ @param newBarrageArray 新消息数组
+ */
+- (void)startBarrageWithNewArray:(NSMutableArray <chatMsgModel *>*)newBarrageArray;
+
+/**
+ 停止弹幕
+ */
+- (void)stopBarrage;
+
+
+
+@end
+//
+//  CNBarrageManager.m
+//  personalXmppChatDemo
+//
+//  Created by 张旭 on 2016/12/10.
+//  Copyright © 2016年 cnlive. All rights reserved.
+//
+
+#import "CNBarrageManager.h"
+#import "CNBarrageView.h"
+
+#define MAX_OVERLAP_COUNT 100
+
+@interface CNBarrageManager ()
+
+@property (nonatomic, strong) NSMutableArray *_Nullable allComments;//所有评论
+@property (nonatomic, strong) NSMutableArray *_Nullable tmpComments;//临时评论
+@property (nonatomic ,strong) NSMutableArray *_Nullable barrageQueue;//评论管理队列数组
+@property (nonatomic ,strong) NSMutableArray *_Nullable trajectoryArr;//弹幕轨迹数组
+
+@property BOOL isStarted;//标记是否开始弹幕
+@property BOOL isStopAnimation;//标记是否停止弹幕
+
+@end
+
+@implementation CNBarrageManager
+
+/**
+ 开始弹幕根据新消息数组
+ 
+ @param newBarrageArray 新消息数组
+ */
+- (void)startBarrageWithNewArray:(NSMutableArray <chatMsgModel *>*)newBarrageArray
+{
+    if (self.isStopAnimation && _isStopBarrage) {
+        return;
+    }
+    [self.allComments addObjectsFromArray:newBarrageArray];
+
+    [self startBarrage];
+}
+
+/**
+ 开始弹幕
+ */
+- (void)startBarrage
+{
+    if (self.tmpComments.count == 0) {
+        [self.tmpComments addObjectsFromArray:self.allComments];
+        [self.allComments removeAllObjects];
+    }
+    
+    self.isStarted = YES;
+    self.isStopAnimation = NO;
+    [self initBarrageCommentView];
+}
+
+/**
+ 停止弹幕
+ */
+- (void)stopBarrage
+{
+    self.isStopAnimation = YES;
+
+    [self.barrageQueue enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
+        CNBarrageView *view = obj;
+        [view stopAnimation];
+        view = nil;
+        self.tmpComments = nil;
+        self.allComments = nil;
+        self.trajectoryArr = nil;
+    }];
+    self.barrageQueue = nil;
+}
+
+/**
+ 初始化弹幕的评论View
+ */
+- (void)initBarrageCommentView
+{
+    if(self.isStopAnimation)return;
+    //初始化轨道位置随机
+    long count = self.tmpComments.count;
+    for (int i = 0; i < count; i ++) {
+        chatMsgModel *model = [self.tmpComments firstObject];
+        NSString *comment = model.content;
+        if (comment) {
+            [self.tmpComments removeObjectAtIndex:0];
+            //根据当前未发送弹幕数量生成轨迹
+            NSString *trajectory;
+            if (self.tmpComments.count > MAX_OVERLAP_COUNT)
+            {//数量较多轨迹可重叠
+                trajectory = [self trajectoryOverlap:YES];
+            }else
+            {//数量较少轨迹可能不重叠,但频率高会使轨迹数组已满,造成重叠
+                trajectory = [self trajectoryOverlap:NO];
+            }
+            [self createBarrageComment:comment trajectory:trajectory isMine:model.isMine];
+        }
+        else {
+            //当弹幕没有时跳出循环
+            break;
+        }
+    }
+}
+
+/**
+ 评论弹幕轨迹
+
+ @param isOverlap 是否重叠
+ @return 根据轨迹是否可重叠,生成对应的新轨迹
+ */
+- (NSString *)trajectoryOverlap:(BOOL)isOverlap
+{
+    NSString *trajectory = @"";
+    long arcIndex = arc4random() % MAX_BARRAGE_VERTICAL_COUNT;
+    CGFloat tra = arcIndex * BARRAGE_VERTICAL_HEIGHT + (arcIndex - 1) * BARRAGE_VERTICAL_MARGIN;
+    if (isOverlap) {
+    //生成可重叠的轨迹
+        trajectory = [NSString stringWithFormat:@"%f",tra];
+        [self.trajectoryArr addObject:trajectory];
+        return [NSString stringWithFormat:@"%f",tra];
+    }
+    //生成不重叠的轨迹
+    do {
+        arcIndex = arc4random() % MAX_BARRAGE_VERTICAL_COUNT;
+        tra = arcIndex * BARRAGE_VERTICAL_HEIGHT + (arcIndex - 1) * BARRAGE_VERTICAL_MARGIN;
+        trajectory = [NSString stringWithFormat:@"%f",tra];
+        if (self.trajectoryArr.count >= MAX_BARRAGE_VERTICAL_COUNT) break;
+        
+    } while ([self.trajectoryArr containsObject:trajectory]);
+    if (self.trajectoryArr.count >= MAX_BARRAGE_VERTICAL_COUNT)
+    {//当前轨迹数组已满,弹幕需要重叠显示
+        
+    }else
+    {//当前轨迹数组还没满,弹幕无需重叠
+        [self.trajectoryArr addObject:trajectory];
+    }
+    return trajectory;
+}
+
+/**
+ 下一条评论
+
+ @return 返回当前tmpComments的下一条评论数据
+ */
+- (NSString *)nextComment {
+    chatMsgModel *model = [self.tmpComments firstObject];
+    if (model.content) {
+        [self.tmpComments removeObjectAtIndex:0];
+    }
+    return model.content;
+}
+
+/**
+ 创建评论弹幕,根据评论内容和弹幕轨迹
+
+ @param comment 评论内容
+ @param trajectory 弹幕轨迹
+ */
+- (void)createBarrageComment:(NSString *)comment trajectory:(NSString *)trajectory isMine:(BOOL)isMine
+{
+    if (self.isStopAnimation) {
+        return;
+    }
+    //创建一个弹幕view
+    CNBarrageView *view = [[CNBarrageView alloc] initWithContent:comment isMine:isMine];
+    
+    //设置运行轨迹
+    view.trajectory = [trajectory floatValue];
+    weakself
+    __weak CNBarrageView *weakBarrageView = view;
+    view.moveBlock = ^(CommentMoveState status){
+        strongself
+        if (self.isStopAnimation) {
+            return;
+        }
+        switch (status) {
+            case CommentMoveStateStart:
+            {
+                //弹幕开始,将view加入弹幕管理数组
+                [self.barrageQueue addObject:weakBarrageView];
+            }
+                break;
+            case CommentMoveStateEnter:
+            {
+                [self.trajectoryArr removeObject:trajectory];
+                //弹幕完全进入屏幕,判断接下来是否还有内容,如果有则在该弹幕轨迹队列中创建弹幕
+                NSString *comment = [self nextComment];
+                if (comment) {
+                    [self createBarrageComment:comment trajectory:trajectory isMine:isMine];
+                }
+                else {
+                    //没有评论了
+                }
+            }
+                break;
+            case CommentMoveStateEnd:
+            {
+                //弹幕飞出屏幕后从弹幕管理队列中删除
+                if ([self.barrageQueue containsObject:weakBarrageView]) {
+                    [self.barrageQueue removeObject:weakBarrageView];
+                }
+            }
+                break;
+            default:
+                break;
+        }
+    };
+    //弹幕生成后,传到Controller进行页面展示
+    if (self.generateBarrageBlock) {
+        self.generateBarrageBlock(view);
+    }
+}
+
+#pragma mark - getter
+
+- (NSMutableArray *)allComments {
+    if (!_allComments) {
+        _allComments = [NSMutableArray array];
+    }
+    return _allComments;
+}
+
+- (NSMutableArray *)tmpComments {
+    if (!_tmpComments) {
+        _tmpComments = [NSMutableArray array];
+    }
+    return _tmpComments;
+}
+
+- (NSMutableArray *)barrageQueue {
+    if (!_barrageQueue) {
+        _barrageQueue = [NSMutableArray array];
+    }
+    return _barrageQueue;
+}
+
+- (NSMutableArray *)trajectoryArr {
+    if (!_trajectoryArr) {
+        _trajectoryArr = [NSMutableArray array];
+    }
+    return _trajectoryArr;
+}
+
+@end
+//
+//  CNBarrageView.h
+//  personalXmppChatDemo
+//
+//  Created by 张旭 on 2016/12/10.
+//  Copyright © 2016年 cnlive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+#define BARRAGE_VERTICAL_HEIGHT 25  //每个弹幕View在垂直方向上的高度
+#define MAX_BARRAGE_VERTICAL_COUNT  (long)[UIScreen mainScreen].bounds.size.height / BARRAGE_VERTICAL_HEIGHT         //垂直方向上的弹幕最大数量
+#define BARRAGE_VERTICAL_MARGIN ([UIScreen mainScreen].bounds.size.height - BARRAGE_VERTICAL_HEIGHT * MAX_BARRAGE_VERTICAL_COUNT) / (MAX_BARRAGE_VERTICAL_COUNT - 1)                              //垂直方向上弹幕之间的间隙
+
+typedef NS_ENUM(NSInteger, CommentMoveState){//弹幕移动的状态
+    CommentMoveStateStart = 0,//将要进入屏幕
+    CommentMoveStateEnter    ,//完全进入
+    CommentMoveStateEnd       //完全移除屏幕
+};
+
+
+@interface CNBarrageView : UIView
+
+@property (nonatomic ,copy) void (^moveBlock) (CommentMoveState state);//弹幕移动的状态
+@property (nonatomic) CGFloat trajectory;//弹幕的移动轨迹
+
+/**
+ 初始化弹幕View根据评论内容,消息是否是自己发送
+ 
+ @param content 评论内容
+ @param isMine 是否是自己的评论弹幕
+ @return 弹幕View
+ */
+- (instancetype)initWithContent:(NSString *)content isMine:(BOOL)isMine;
+
+/**
+ 开始移动动画
+ */
+- (void)startAnimation;
+
+/**
+ 停止移动动画
+ */
+- (void)stopAnimation;
+
+@end
+
+//
+//  CNBarrageView.m
+//  personalXmppChatDemo
+//
+//  Created by 张旭 on 2016/12/10.
+//  Copyright © 2016年 cnlive. All rights reserved.
+//
+
+#import "CNBarrageView.h"
+
+#define TotalDuration              5 //弹幕飘过总时间
+#define BARRAGE_Horizontal_Margin  5 //弹幕间水平间隙
+
+#define LVCRandomColor LVCColor(arc4random_uniform(256), arc4random_uniform(256), arc4random_uniform(256))
+#define LVCColor(r, g, b) [UIColor colorWithRed:(r)/255.0 green:(g)/255.0 blue:(b)/255.0 alpha:1.0]
+
+
+
+@interface CNBarrageView ()
+
+@property (nonatomic ,strong) UILabel * _Nullable commentLabel;//评论Label
+@property BOOL isDealloc;//标记资源是否已释放
+
+@end
+
+@implementation CNBarrageView
+
+/**
+ 销毁对象及动画
+ */
+- (void)dealloc
+{
+    [self stopAnimation];
+    self.moveBlock = nil;
+}
+
+/**
+ 初始化弹幕View根据评论内容,消息是否是自己发送
+
+ @param content 评论内容
+ @param isMine 是否是自己的评论弹幕
+ @return 弹幕View
+ */
+- (instancetype)initWithContent:(NSString *)content isMine:(BOOL)isMine
+{
+    if (self = [super init])
+    {
+        NSDictionary *attributes = @{NSFontAttributeName:[UIFont systemFontOfSize:17]};
+        float width = [content sizeWithAttributes:attributes].width;
+//        float height = [content sizeWithAttributes:attributes].height;
+//        NSLog(@"%f",height);//16.707031
+        self.bounds = CGRectMake(0, 0, width + BARRAGE_Horizontal_Margin * 2, BARRAGE_VERTICAL_HEIGHT);
+        self.commentLabel.text = content;
+        self.commentLabel.frame = CGRectMake(BARRAGE_Horizontal_Margin, 0, width, BARRAGE_VERTICAL_HEIGHT);
+        if(isMine)
+        {
+            self.commentLabel.textColor = [UIColor redColor];
+        }else
+        {
+            self.commentLabel.textColor = LVCRandomColor;
+        }
+        
+    }
+    return self;
+}
+
+/**
+ 开始移动动画
+ */
+- (void)startAnimation
+{
+    CGFloat wholeWidth = self.width + SCREEN_WIDTH + 50;//总轨迹长度
+    CGFloat speed = wholeWidth / TotalDuration;//速度
+    CGFloat duration = (self.width + 50) / speed;//完全进入屏幕的时间
+    
+    if (self.moveBlock) {
+        //弹幕开始进入屏幕
+        self.moveBlock(CommentMoveStateStart);
+    }
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(duration * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        //避免重复,若资源已释放 不再操作
+        if (self.isDealloc) {
+            return;
+        }
+        //duration时间后弹幕完全进入屏幕
+        if (self.moveBlock) {
+            self.moveBlock(CommentMoveStateEnter);
+        }
+    });
+    
+    weakself
+    //弹幕完全离开屏幕
+    [UIView animateWithDuration:TotalDuration delay:0 options:UIViewAnimationOptionCurveLinear animations:^{
+        strongself
+        self.left = - self.width;
+    } completion:^(BOOL finished) {
+        if (self.moveBlock) {
+            self.moveBlock(CommentMoveStateEnd);
+        }
+        [self removeFromSuperview];
+    }];
+    
+}
+
+/**
+ 停止移动动画
+ */
+- (void)stopAnimation
+{
+    self.isDealloc = YES;
+    [self.layer removeAllAnimations];
+    [self removeFromSuperview];
+}
+
+#pragma mark getter
+
+- (UILabel *)commentLabel
+{
+    if (!_commentLabel) {
+        _commentLabel = [[UILabel alloc] init];
+        _commentLabel.backgroundColor = [UIColor clearColor];
+        _commentLabel.font = [UIFont systemFontOfSize:17];
+        _commentLabel.textColor = [UIColor whiteColor];
+        [self addSubview:self.commentLabel];
+    }
+    return _commentLabel;
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end
-//
-//  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
@@ -7,6 +7,7 @@
 //
 #import <UIKit/UIKit.h>
+#import "LVCChannelDetailsModel.h"
 @class LVCPlayer;
@@ -14,9 +15,10 @@
 @optional
-- (void)lvcPlayer:(LVCPlayer *)player clickedBackBtn:(UIButton *)backBtn;                       //返回
-- (void)lvcPlayer:(LVCPlayer *)player clickedFullScreenBtn:(UIButton *)fullScreenBtn;           //全屏
-- (void)lvcPlayer:(LVCPlayer *)player clickedEditBtn:(UIButton *)editBtn;                       //全屏编辑按钮
+- (void)lvcPlayer:(LVCPlayer *)player clickedBackBtn:(UIButton *)backBtn;               //返回
+- (void)lvcPlayer:(LVCPlayer *)player clickedFullScreenBtn:(UIButton *)fullScreenBtn;   //全屏
+- (void)lvcPlayer:(LVCPlayer *)player clickedEditBtn:(UIButton *)editBtn;               //全屏编辑按钮
+- (void)lvcPlayer:(LVCPlayer *)player barrageSwitch:(BOOL)on;                           //弹幕开关
 @end
@@ -26,11 +28,15 @@ typedef void(^HideInputViewBlock)(BOOL hide);
 @property (nonatomic, strong) UIImageView *topBgView;               //顶部蒙版
 @property (nonatomic, strong) UIImageView *bottomBgView;            //底部蒙版
+@property (nonatomic, strong) UIImageView *contentView;             //所有空间统一管理在这个view中
+@property (nonatomic, strong) LVCChannelDetailsModel *model;             //所有空间统一管理在这个view中
 @property (nonatomic, readwrite, assign) BOOL isFullScreen;         //是否是全屏
 @property (nonatomic, copy) HideInputViewBlock  hideBlock;               //全屏模式下是否隐藏输入框
-
+@property (nonatomic, assign, readonly) BOOL displayBarrage;          //是否显示弹幕
 @property (nonatomic, assign) id<LVCPlayerDelegate> delegate;
+- (instancetype)initWithFrame:(CGRect)frame playerModel:(LVCChannelDetailsModel *)model;
+
 - (void)autoHideControlView;        //自动隐藏上下功能条
 - (void)stopPlaying;        //停止播放
@@ -10,14 +10,9 @@
 #import "LVCPlayerLoadingView.h"
 #import "SevenSwitch.h"
-#define kAppId      @"60_irn9edco29"
-#define kAppKey     @"69fe70bda67e059286ad509d9f5377f815955645b52f94"
-#define kbundleId   @"com.cnlive.zhangxu.LiveVideoCloud"
-
 @interface LVCPlayer ()<UIGestureRecognizerDelegate>
 @property (nonatomic, strong) UIButton *backBtn;                    //返回
-@property (nonatomic, strong) UIImageView *contentView;             //所有空间统一管理在这个view中
 @property (nonatomic, strong) UIButton *playOrPauseBtn;             //播放/暂停
 @property (nonatomic, strong) UILabel *titleLab;                    //标题
 @property (nonatomic, strong) UIButton *fullScreenBtn;              //控制全屏按钮
@@ -32,12 +27,12 @@
 @implementation LVCPlayer
-- (instancetype)initWithFrame:(CGRect)frame
+- (instancetype)initWithFrame:(CGRect)frame playerModel:(LVCChannelDetailsModel *)model
 {
     self = [super initWithFrame:frame];
     if (self) {
-        [self initPlayer];
+        [self initPlayerWithModel:model];
         [self addSubview:self.contentView];
         [self.contentView addSubview:self.bottomBgView];
@@ -58,27 +53,44 @@
 }
 #pragma mark -
 #pragma mark - initPlayer
-- (void)initPlayer
-{
-    [[CNLiveWebcastManager manager] initWithAppId:kAppId appKey:kAppKey];
-    //点播播放
-    _player = [[CNLiveMoviePlayerController alloc] initVodPlayWithVId:@"aaa123"
-                                                          authSuccess:^{
-                                                              
-          [self addObservers];
-          _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
-          _player.shouldAutoplay = YES;
-          [_player prepareToPlay];
-          [self.contentView addSubview:_player.view];
-          [self.contentView sendSubviewToBack:_player.view];
-                                                             
-          [self makePlayerConstraint];
-
-          
-      } authFailed:^(NSDictionary *errorInfo) {
-          NSLog(@"初始化点播播放器失败%@", errorInfo);
+- (void)initPlayerWithModel:(LVCChannelDetailsModel *)model
+{
+    /*
+     */
+    _player = [[CNLiveMoviePlayerController alloc] initLivePlayWithChannelId:model.mediaId authSuccess:^{
+        [self addObservers];
+        _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
+        _player.shouldAutoplay = YES;
+        [_player prepareToPlay];
+        [self.contentView addSubview:_player.view];
+        [self.contentView sendSubviewToBack:_player.view];
+        
+        [self makePlayerConstraint];
-      }];
+    } authFailed:^(NSDictionary *errorInfo) {
+         NSLog(@"初始化点播播放器失败%@", errorInfo);
+    } getAnchorStatusResult:NULL];
+    
+    /*
+     //点播播放
+     _player = [[CNLiveMoviePlayerController alloc] initVodPlayWithVId:@"aaa123"
+     authSuccess:^{
+     
+     [self addObservers];
+     _player.videoDecoderMode = CNLiveMovieVideoDecoderMode_AUTO;
+     _player.shouldAutoplay = YES;
+     [_player prepareToPlay];
+     [self.contentView addSubview:_player.view];
+     [self.contentView sendSubviewToBack:_player.view];
+     
+     [self makePlayerConstraint];
+     
+     
+     } authFailed:^(NSDictionary *errorInfo) {
+     NSLog(@"初始化点播播放器失败%@", errorInfo);
+     
+     }];
+     */
 }
 #pragma mark -
@@ -112,9 +124,12 @@
 - (void)barrageSwitchAction
 {
-    NSString *string = self.barrageSwitch.on ? @"已开启弹幕" : @"已关闭弹幕";
+    self.editBtn.hidden =! self.barrageSwitch.on;
+    
+    if (self.delegate && [self.delegate respondsToSelector:@selector(lvcPlayer:barrageSwitch:)]) {
+        [self.delegate lvcPlayer:self barrageSwitch:_barrageSwitch.on];
+    }
-    NSLog(@"%@",string);
 }
 - (void)editBtnAction:(UIButton *)btn
@@ -483,6 +498,11 @@
 #pragma mark -
 #pragma mark - getter
+- (BOOL)displayBarrage
+{
+    return _barrageSwitch.on;
+}
+
 - (UIImageView *)contentView
 {
     if (!_contentView) {
@@ -13,6 +13,7 @@
 #import "LVCChannelDetailsModel.h"
 #import "LVCChannelsModel.h"
 #import "LVCBannerModel.h"
+#import "LVCLivePlayerController.h"
 static NSString *cellId             = @"LVCLiveListCollectionViewCell";
 static NSString *firstHeaderId      = @"LVCFirstHeaderReusableView";
@@ -186,8 +187,15 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
 #pragma mark -
 #pragma mark - UICollectionViewDelegate
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
-    NSLog(@"跳转-----");
+    LVCChannelsModel *model = _channelsModelArray[indexPath.section - 1];
+    LVCChannelDetailsModel *details = model.programs[indexPath.item];
+    self.viewController.hidesBottomBarWhenPushed = YES;
+    
+    LVCLivePlayerController *playVC = [[LVCLivePlayerController alloc] init];
+    playVC.model = details;
+    self.viewController.navigationController.navigationBar.hidden = YES;
+    [self.viewController.navigationController pushViewController:playVC animated:YES];
 }
 #pragma mark -
@@ -213,8 +221,7 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
             NSMutableArray *arrayM = [[NSMutableArray alloc]init];
             for (NSDictionary *dict in responseObject[@"channels"]) {
-                LVCChannelsModel *model = [LVCChannelsModel new];
-                [model setValuesForKeysWithDictionary:dict];
+                LVCChannelsModel *model = [LVCChannelsModel mj_objectWithKeyValues:dict];
                 [arrayM addObject:model];
             }
             self.channelsModelArray = arrayM;
@@ -223,8 +230,7 @@ static NSString *otherHeaderId      = @&quot;LVCOtherHeaderReusableView&quot;;
             NSMutableArray *arrayM = [NSMutableArray array];
             for (NSDictionary *dict in responseObject[@"banner"]) {
-                LVCBannerModel *rollModel = [LVCBannerModel new];
-                [rollModel setValuesForKeysWithDictionary:dict];
+                LVCBannerModel *rollModel = [LVCBannerModel mj_objectWithKeyValues:dict];
                 [arrayM addObject:rollModel];
             }
             self.bannerModelArray = arrayM;
@@ -2,19 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
-    <key>NSAppTransportSecurity</key>
-    <dict>
-        <key>NSAllowsArbitraryLoads</key>
-        <true/>
-    </dict>
-    <key>NSCameraUsageDescription</key>
-    <string></string>
-    <key>NSMicrophoneUsageDescription</key>
-    <string></string>
 	<key>CFBundleExecutable</key>
 	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
@@ -59,5 +48,7 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>
@@ -13,15 +13,8 @@
 #ifndef AppMacro_h
 #define AppMacro_h
-#ifdef DEBUG
-#define AppId                       @"3_ix6yg1gl62"
-#define AppKey                      @"d8dd4312037a6aaff83dc4809c027fc9b06847a3f130e5"
-#define AppSceret                   @"78417aa2f74718de7958a0c9632f630904895029755b3e"
-#else
-#define AppId                       @"3_iw67pjcd56"
-#define AppKey                      @"0d88fbc8da13dfd434540a89da71cd96dd78d42d4d62c9"
-#define AppSceret                   @"c70a9bb56f2f654b60db64b2a5fa7e92ebd4954b237435"
-#endif
-
+#define AppId                       @"60_j0uqrv0u11"
+#define AppKey                      @"876c5efece0fc9c98c51ff2180ee1bcfa5c5b5af202c78"
+#define AppSceret                   @"ee844ea67b6be7303b6f5d9365af10ac09933c0828aba7"
 #endif /* AppMacro_h */