memory leak

Example/Example/Info.plist

@@ -25,6 +25,10 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSCameraUsageDescription</key>
+	<string>访问相机</string>
+	<key>NSPhotoLibraryAddUsageDescription</key>
+	<string>访问相册</string>
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>audio</string>

Example/Example/MoviePlayerViewController.m

@@ -138,7 +138,7 @@ - (void)viewWillAppear:(BOOL)animated {
         _guideView.missHandler = ^{
             wplayer.isLockScreen = NO;
             dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [wplayer showControlView:NO];
+                [self showControlView:NO];
 
                 [df setBool:YES forKey:@"isShowGuide"];
                 [df synchronize];
@@ -331,7 +331,7 @@ - (void)viewDidLoad {
         if (allList.count > 0) {
             [self.playerView playWithModel:[_liveDataSourceArray[0] getPlayerModel]];
             if (self.guideView) {
-                [self.playerView showControlView:YES];
+                [self showControlView:YES];
             }
         }
 
@@ -377,6 +377,7 @@ - (SuperPlayerView *)playerView {
         _playerView.fatherView = _playerFatherView;
         // 设置代理
         _playerView.delegate = self;
+        [self setupDanmakuData];
     }
     return _playerView;
 }
@@ -582,6 +583,52 @@ - (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)
     return NO;
 }
 
+#define kRandomColor [UIColor colorWithRed:arc4random_uniform(256) / 255.0 green:arc4random_uniform(256) / 255.0 blue:arc4random_uniform(256) / 255.0 alpha:1]
+#define font [UIFont systemFontOfSize:15]
+
+- (void)setupDanmakuData
+{
+    NSString *danmakufile = [[NSBundle mainBundle] pathForResource:@"danmakufile" ofType:nil];
+    NSArray *danmakusDicts = [NSArray arrayWithContentsOfFile:danmakufile];
+
+    NSMutableArray* danmakus = [NSMutableArray array];
+    for (NSDictionary* dict in danmakusDicts) {
+        CFDanmaku* danmaku = [[CFDanmaku alloc] init];
+        NSMutableAttributedString *contentStr = [[NSMutableAttributedString alloc] initWithString:dict[@"m"] attributes:@{NSFontAttributeName : font, NSForegroundColorAttributeName : kRandomColor}];
+
+        NSString* emotionName = [NSString stringWithFormat:@"smile_%u", arc4random_uniform(90)];
+        UIImage* emotion = [UIImage imageNamed:emotionName];
+        NSTextAttachment* attachment = [[NSTextAttachment alloc] init];
+        attachment.image = emotion;
+        attachment.bounds = CGRectMake(0, -font.lineHeight*0.3, font.lineHeight*1.5, font.lineHeight*1.5);
+        NSAttributedString* emotionAttr = [NSAttributedString attributedStringWithAttachment:attachment];
+
+        [contentStr appendAttributedString:emotionAttr];
+        danmaku.contentStr = contentStr;
+
+        NSString* attributesStr = dict[@"p"];
+        NSArray* attarsArray = [attributesStr componentsSeparatedByString:@","];
+        danmaku.timePoint = [[attarsArray firstObject] doubleValue] / 1000;
+        danmaku.position = [attarsArray[1] integerValue];
+        //        if (danmaku.position != 0) {
+
+        [danmakus addObject:danmaku];
+        //        }
+    }
+
+    [self.playerView.danmakuView prepareDanmakus:danmakus];
+}
+
+- (void)showControlView:(BOOL)isShow {
+    if (isShow) {
+        [self.playerView.controlView playerShowControlView];
+        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+            [self.playerView.controlView playerCancelAutoFadeOutControlView];
+        });
+    } else {
+        [self.playerView.controlView playerHideControlView];
+    }
+}
 
 #pragma mark - ScrollView Delegate
 

SuperPlayer.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |spec|
     spec.name = 'SuperPlayer'
-    spec.version = '1.0.3'
+    spec.version = '1.0.4'
     spec.license = { :type => 'MIT' }
     spec.homepage = 'https://cloud.tencent.com/product/mlvb'
     spec.authors = { 'annidyfeng' => '[email protected]' }
     spec.summary = 'Tencent Cloud Player'
-    spec.source = { :git => 'https://github.com/tencentyun/SuperPlayer.git', :tag => 'v1.0.3' }
+    spec.source = { :git => 'https://github.com/tencentyun/SuperPlayer.git', :tag => 'v1.0.4' }
 
     spec.ios.deployment_target = '8.0'
     spec.requires_arc = true

SuperPlayer/Category/UINavigationController+SuperPlayerRotation.h

@@ -0,0 +1,6 @@
+
+#import <UIKit/UIKit.h>
+
+@interface UINavigationController (SuperPlayerRotation)<UIGestureRecognizerDelegate>
+
+@end

SuperPlayer/Category/UINavigationController+SuperPlayerRotation.m

@@ -0,0 +1,34 @@
+#import "UINavigationController+SuperPlayerRotation.h"
+#import <objc/runtime.h>
+
+@implementation UINavigationController (SuperPlayerRotation)
+
+/**
+ * 如果window的根视图是UINavigationController，则会先调用这个Category，然后调用UIViewController+ZFPlayerRotation
+ * 只需要在支持除竖屏以外方向的页面重新下边三个方法
+ */
+
+// 是否支持自动转屏
+- (BOOL)shouldAutorotate {
+    return [self.topViewController shouldAutorotate];
+}
+
+// 支持哪些屏幕方向
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    return [self.topViewController supportedInterfaceOrientations];
+}
+
+// 默认的屏幕方向（当前ViewController必须是通过模态出来的UIViewController（模态带导航的无效）方式展现出来的，才会调用这个方法）
+- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
+    return [self.topViewController preferredInterfaceOrientationForPresentation];
+}
+
+- (UIViewController *)childViewControllerForStatusBarStyle {
+    return self.topViewController;
+}
+
+- (UIViewController *)childViewControllerForStatusBarHidden {
+    return self.topViewController;
+}
+
+@end

SuperPlayer/Category/UIViewController+SuperPlayerRotation.h

@@ -0,0 +1,5 @@
+#import <UIKit/UIKit.h>
+
+@interface UIViewController (SuperPlayerRotation)
+
+@end

SuperPlayer/Category/UIViewController+SuperPlayerRotation.m

@@ -0,0 +1,32 @@
+#import "UIViewController+SuperPlayerRotation.h"
+
+@implementation UIViewController (SuperPlayerRotation)
+
+/**
+ * 默认所有都不支持转屏,如需个别页面支持除竖屏外的其他方向，请在viewController重新下边这三个方法
+ */
+
+// 是否支持自动转屏
+- (BOOL)shouldAutorotate {
+    return NO;
+}
+
+// 支持哪些屏幕方向
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    return UIInterfaceOrientationMaskPortrait;
+}
+
+// 默认的屏幕方向（当前ViewController必须是通过模态出来的UIViewController（模态带导航的无效）方式展现出来的，才会调用这个方法）
+- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
+    return UIInterfaceOrientationPortrait;
+}
+
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return UIStatusBarStyleDefault; // your own style
+}
+
+- (BOOL)prefersStatusBarHidden {
+    return NO; // your own visibility code
+}
+
+@end

SuperPlayer/SuperPlayerGlobleConfig.h

@@ -22,7 +22,10 @@
 @property (nonatomic) CGRect floatViewRect;
 /** 是否开启硬件加速 */
 @property (nonatomic) BOOL enableHWAcceleration;
-/** 默认播放填充模式 */
+/**
+ * 默认播放填充模式
+ * 可选值 RENDER_MODE_FILL_EDGE, RENDER_MODE_FILL_SCREEN
+ */
 @property (nonatomic) NSInteger renderMode;
 /** 播放器最大缓存个数 */
 @property (nonatomic) NSInteger maxCacheItem;

SuperPlayer/SuperPlayerView.h

@@ -5,6 +5,9 @@
 #import "TXLivePlayer.h"
 #import "TXLiveBase.h"
 #import "TXImageSprite.h"
+#import "CFDanmakuView.h"
+
+@class SuperPlayerControlView;
 
 @protocol SuperPlayerDelegate <NSObject>
 @optional
@@ -41,6 +44,11 @@ typedef NS_ENUM(NSInteger, SuperPlayerState) {
 @property (nonatomic, assign) BOOL isLockScreen;
 /** 是否是直播流 */
 @property (readonly) BOOL isLive;
+/// 弹幕视图
+@property CFDanmakuView *danmakuView;
+/// 超级播放器控制层
+@property SuperPlayerControlView *controlView;
+
 /**
  * 播放model
  */
@@ -61,8 +69,4 @@ typedef NS_ENUM(NSInteger, SuperPlayerState) {
  */
 - (void)pause;
 
-/**
- * 是否显示控制层
- */
-- (void)showControlView:(BOOL)isShow;
 @end