Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/ScioLive into App-Store配置

张旭
2 parents 71638ae0 2257d52b
Showing 19 changed files with 260 additions and 71 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/Assets.xcassets/live/cnlive_live_share.imageset/Contents.json
CNLiveScioLive/Assets.xcassets/live/cnlive_live_share.imageset/cnlive_live_share@2x.png
CNLiveScioLive/Assets.xcassets/live/cnlive_live_share.imageset/cnlive_live_share@3x.png
CNLiveScioLive/Pages/Base/CNLiveENTabBarController.m
CNLiveScioLive/Pages/Base/CNLiveTabBarController.m
CNLiveScioLive/Pages/Live/Controller/CNLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.h
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
CNLiveScioLive/Pages/Live/Model/CNLiveModel.h
CNLiveScioLive/Pages/Live/View/CNLiveHeaderView.m
CNLiveScioLive/Pages/Live/View/CNLiveTableViewCell.m
CNLiveScioLive/Pages/Tools/CNLivePlayer/CNLivePlayerController.h
CNLiveScioLive/Pages/Tools/CNLivePlayer/CNLivePlayerController.m
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/ZXVideoPlayerControlView.h
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/ZXVideoPlayerControlView.m
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/ZXVideoPlayerController.h
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/ZXVideoPlayerController.m
@@ -1699,22 +1699,22 @@
 		085D85FA2159C72F0037D480 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
+				085D85FF2159C72F0037D480 /* ZXVideoPlayerController.h */,
+				085D86072159C72F0037D480 /* ZXVideoPlayerController.m */,
+				085D86002159C72F0037D480 /* ZXVideoPlayerControlView.h */,
+				085D86062159C72F0037D480 /* ZXVideoPlayerControlView.m */,
 				085D86942159C8110037D480 /* JGMusicManager.h */,
 				085D86932159C8100037D480 /* JGMusicManager.m */,
-				085D85FB2159C72F0037D480 /* ZXVideo.m */,
-				085D85FC2159C72F0037D480 /* ZXVideoPlayerTimeIndicatorView.h */,
 				085D85FD2159C72F0037D480 /* ZXVideoPlayerVolumeView.h */,
+				085D86042159C72F0037D480 /* ZXVideo.h */,
+				085D85FB2159C72F0037D480 /* ZXVideo.m */,
 				085D85FE2159C72F0037D480 /* ZXVideoPlayerBrightnessView.h */,
-				085D85FF2159C72F0037D480 /* ZXVideoPlayerController.h */,
-				085D86002159C72F0037D480 /* ZXVideoPlayerControlView.h */,
-				085D86012159C72F0037D480 /* ZXVideoPlayerBatteryView.m */,
+				085D86052159C72F0037D480 /* ZXVideoPlayerBrightnessView.m */,
 				085D86022159C72F0037D480 /* ZXVideoPlayerVolumeView.m */,
+				085D85FC2159C72F0037D480 /* ZXVideoPlayerTimeIndicatorView.h */,
 				085D86032159C72F0037D480 /* ZXVideoPlayerTimeIndicatorView.m */,
-				085D86042159C72F0037D480 /* ZXVideo.h */,
-				085D86052159C72F0037D480 /* ZXVideoPlayerBrightnessView.m */,
-				085D86062159C72F0037D480 /* ZXVideoPlayerControlView.m */,
-				085D86072159C72F0037D480 /* ZXVideoPlayerController.m */,
 				085D86082159C72F0037D480 /* ZXVideoPlayerBatteryView.h */,
+				085D86012159C72F0037D480 /* ZXVideoPlayerBatteryView.m */,
 			);
 			path = Classes;
 			sourceTree = "<group>";
@@ -1757,8 +1757,8 @@
 		085D86982159CBBB0037D480 /* CNLivePlayer */ = {
 			isa = PBXGroup;
 			children = (
-				085D86992159CBBB0037D480 /* CNLivePlayerController.m */,
 				085D869A2159CBBB0037D480 /* CNLivePlayerController.h */,
+				085D86992159CBBB0037D480 /* CNLivePlayerController.m */,
 			);
 			path = CNLivePlayer;
 			sourceTree = "<group>";
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "cnlive_live_share@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "cnlive_live_share@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
 \ No newline at end of file
@@ -9,7 +9,9 @@
 #import "CNLiveENTabBarController.h"
 #import "XWTabBarModel.h"
-@interface CNLiveENTabBarController ()
+@interface CNLiveENTabBarController ()<UITabBarDelegate>{
+    NSInteger _indexFlag;
+}
 @property (nonatomic, copy) NSMutableArray *controllers;
 @end
@@ -19,7 +21,8 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    
+    _indexFlag = 0;
+
     [self initItemsAndViewContorllers];
 //    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeLanguageVersion:) name:@"changeLanguageVersion" object:nil];
@@ -127,5 +130,31 @@
     return [self.selectedViewController supportedInterfaceOrientations];
 }
-
+- (void)tabBar:(UITabBar *)tabBar didSelectItem:(UITabBarItem *)item{
+    NSInteger index = [self.tabBar.items indexOfObject:item];
+    if (_indexFlag != index) {
+        [self animationWithIndex:index];
+    }
+}
+// 动画
+- (void)animationWithIndex:(NSInteger) index {
+    NSMutableArray * tabbarbuttonArray = [NSMutableArray array];
+    for (UIView *tabBarButton in self.tabBar.subviews) {
+        if ([tabBarButton isKindOfClass:NSClassFromString(@"UITabBarButton")]) {
+            [tabbarbuttonArray addObject:tabBarButton];
+        }
+    }
+    CABasicAnimation*pulse = [CABasicAnimation animationWithKeyPath:@"transform.scale"];
+    pulse.timingFunction= [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+    pulse.duration = 0.15;
+    pulse.repeatCount= 1;
+    pulse.autoreverses= YES;
+    pulse.fromValue= [NSNumber numberWithFloat:0.7];
+    pulse.toValue= [NSNumber numberWithFloat:1.3];
+    [[tabbarbuttonArray[index] layer]
+     addAnimation:pulse forKey:nil];
+    
+    _indexFlag = index;
+    
+}
 @end
@@ -9,17 +9,19 @@
 #import "CNLiveTabBarController.h"
 #import "XWTabBarModel.h"
-@interface CNLiveTabBarController ()
+@interface CNLiveTabBarController ()<UITabBarDelegate>{
+    NSInteger _indexFlag;
+}
 @property (nonatomic, copy) NSMutableArray *controllers;
 @end
 @implementation CNLiveTabBarController
-
+#pragma mark - life cycle
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    
+    _indexFlag = 0;
     [self initItemsAndViewContorllers];
 //    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(changeLanguageVersion:) name:@"changeLanguageVersion" object:nil];
@@ -34,6 +36,7 @@
 //    }
 //
 //}
+#pragma mark - private methods
 - (void)initItemsAndViewContorllers {
     NSMutableArray *viewControllerArr = [NSMutableArray array];
@@ -71,7 +74,7 @@
     }
     self.viewControllers = viewControllerArr;
 }
-#pragma mark --懒加载
+#pragma mark - getters and setters
 - (NSMutableArray *)controllers {
     if (!_controllers) {
         _controllers = [NSMutableArray array];
@@ -138,4 +141,32 @@
 }
+#pragma mark - UITabBarDelegate
+- (void)tabBar:(UITabBar *)tabBar didSelectItem:(UITabBarItem *)item{
+    NSInteger index = [self.tabBar.items indexOfObject:item];
+    if (_indexFlag != index) {
+        [self animationWithIndex:index];
+    }
+}
+// 动画
+- (void)animationWithIndex:(NSInteger) index {
+    NSMutableArray * tabbarbuttonArray = [NSMutableArray array];
+    for (UIView *tabBarButton in self.tabBar.subviews) {
+        if ([tabBarButton isKindOfClass:NSClassFromString(@"UITabBarButton")]) {
+            [tabbarbuttonArray addObject:tabBarButton];
+        }
+    }
+    CABasicAnimation*pulse = [CABasicAnimation animationWithKeyPath:@"transform.scale"];
+    pulse.timingFunction= [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionEaseInEaseOut];
+    pulse.duration = 0.20;
+    pulse.repeatCount= 1;
+    pulse.autoreverses= YES;
+    pulse.fromValue= [NSNumber numberWithFloat:0.9];
+    pulse.toValue= [NSNumber numberWithFloat:1.1];
+    [[tabbarbuttonArray[index] layer]
+     addAnimation:pulse forKey:nil];
+    
+    _indexFlag = index;
+    
+}
 @end
@@ -173,6 +173,8 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
     self.navigationController.navigationBar.barTintColor = [UIColor whiteColor];
     self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:[UIColor whiteColor], NSFontAttributeName:[UIFont systemFontOfSize:18]};
+    [self.navigationController setNavigationBarHidden:NO];
+
 }
 - (void)viewDidLoad {
@@ -54,5 +54,7 @@ typedef NS_ENUM(NSInteger, PlayerType) {
 @property (nonatomic, assign) PlayerType type;
 @property (nonatomic, strong) NSArray *relatedArray;
--(id)initWithDictionary:(NSDictionary*)dictionary;
+
+- (id)initWithDictionary:(NSDictionary*)dictionary;
+
 @end
@@ -9,14 +9,15 @@
 #import "GraphicLiveViewController.h"
 #import "OldVideoDetailViewController.h"
-@interface GraphicLiveViewController ()
+@interface GraphicLiveViewController ()<CNLivePlayerControllerDelegate>
 @end
 @implementation GraphicLiveViewController
 - (void)Pop:(id)sender{
     [self.videoController stop];
     [self.navigationController popViewControllerAnimated:YES];
 }
-- (id)initWithDictionary:(NSDictionary*)dictionary {
+
+- (id)initWithDictionary:(NSDictionary *)dictionary {
     if (self = [super init]) {
         _dictionary = [NSDictionary dictionaryWithDictionary:dictionary];
         int status = [_dictionary[@"status"] intValue];
@@ -44,12 +45,14 @@
     }
     return self;
 }
+
 - (NSString *)setHTMLString {
     NSString* htmlBody = [[NSString alloc] initWithFormat:@"<p><font style=\"font-size:%@px;\">%@</font></p>",fontArray[fontIndex],[_dic objectForKey:@"Content"]];
     NSString* htmlFooter = @"</body></html>";
     NSString* strHtml = [[NSString alloc] initWithFormat:@"%@%@",htmlBody,htmlFooter];
     return strHtml;
 }
+
 - (void)loadData {
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
@@ -89,12 +92,14 @@
     [[AVAudioSession sharedInstance] setCategory:AVAudioSessionCategoryAmbient error: &error];
     [[AVAudioSession sharedInstance] setActive:YES error:nil];
 }
+
 - (void)viewWillDisappear:(BOOL)animated {
     [super viewWillDisappear:animated];
     [self.liveController stop];
     self.liveController = nil;
     [self.navigationController setNavigationBarHidden:NO];
 }
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor whiteColor];
@@ -168,15 +173,73 @@
 - (void)loadMovieView {
     [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"];
     imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)];
-    imageView.image = [UIImage imageNamed:@"cnlive_placeholder"];
+    [imageView sd_setImageWithURL:[NSURL URLWithString:_dictionary[@"poster"]] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
     [self.view addSubview:imageView];
     UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
     [backButton addTarget:self action:@selector(Pop:) forControlEvents:UIControlEventTouchUpInside];
     [backButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];
-    [backButton setFrame:CGRectMake(0, 20, 44, 44)];
+    [backButton setFrame:CGRectMake(0, StatusBarHeight, 44, 44)];
     [self.view addSubview:backButton];
+    
+    UIButton *shareButton = [UIButton buttonWithType:UIButtonTypeCustom];
+    [shareButton addTarget:self action:@selector(shareButton:) forControlEvents:UIControlEventTouchUpInside];
+    [shareButton setImage:[UIImage imageNamed:@"cnlive_live_share"] forState:UIControlStateNormal];
+    [shareButton setFrame:CGRectMake(MainScreenWidth-40, StatusBarHeight+7, 30, 30)];
+    [self.view addSubview:shareButton];
+    
 }
+
+- (void)shareButton:(UIButton *)btn{
+    NSString *text = [NSString stringWithFormat:@"%@",_dictionary[@"Description"]];
+    NSString *shareUrl = [NSString stringWithFormat:@"%@",_dictionary[@"shareUrl"]];
+
+    if ([text isEqualToString:@"<null>"]) {
+        text = _dictionary[@"title"];
+    }
+    if ([shareUrl isEqualToString:@"<null>"]||[shareUrl isEqualToString:@"(null)"]) {
+        shareUrl = @"http://app.scio.gov.cn/gxbShare.html";
+    }
+    NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
+    [shareParams SSDKSetupShareParamsByText:text
+                                     images:@[[UIImage imageNamed:@"cnlive_zhouxin_icon"]]
+                                        url:[NSURL URLWithString:shareUrl]
+                                      title:_dictionary[@"title"]
+                                       type:SSDKContentTypeAuto];
+    //2、分享（可以弹出我们的分享菜单和编辑界面）
+    //要显示菜单的视图, iPad版中此参数作为弹出菜单的参照视图，只有传这个才可以弹出我们的分享菜单，可以传分享的按钮对象或者自己创建小的view 对象，iPhone可以传nil不会影响
+    [ShareSDK showShareActionSheet:nil items:nil shareParams:shareParams onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
+                   
+       switch (state) {
+           case SSDKResponseStateSuccess:
+           {
+               UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:CustomStr(@"ShareSuccess")
+                                                                   message:nil
+                                                                  delegate:nil
+                                                         cancelButtonTitle:CustomStr(@"Sure")
+                                                         otherButtonTitles:nil];
+               [alertView show];
+               break;
+           }
+           case SSDKResponseStateFail:
+           {
+               UIAlertView *alert = [[UIAlertView alloc] initWithTitle:CustomStr(@"ShareFailure")
+                                                               message:[NSString stringWithFormat:@"%@",error]
+                                                              delegate:nil
+                                                     cancelButtonTitle:CustomStr(@"Sure")
+                                                     otherButtonTitles:nil, nil];
+               [alert show];
+               break;
+           }
+           default:
+               break;
+      
+       }
+    
+    }];
+    
+}
+
 - (void)pausePlayer {
     [self.liveController pause];
 }
@@ -187,12 +250,19 @@
         CGRect frame = CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight);
         UIView *bgView = [[UIView alloc] initWithFrame:frame];
         bgView.backgroundColor = [UIColor blackColor];
+        [self.view addSubview:bgView];
+
         UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
         backButton.frame = CGRectMake(20, 20, 25, 41);
         [backButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];
         [backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside];
         [bgView addSubview:backButton];
-        [self.view addSubview:bgView];
+
+        UIButton *shareButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        [shareButton addTarget:self action:@selector(shareButton:) forControlEvents:UIControlEventTouchUpInside];
+        [shareButton setImage:[UIImage imageNamed:@"cnlive_live_share"] forState:UIControlStateNormal];
+        [shareButton setFrame:CGRectMake(MainScreenWidth-40, StatusBarHeight+7, 30, 30)];
+        [bgView addSubview:shareButton];
         if (self.type == PlayerTypeLiving) {
             // 直播
@@ -205,6 +275,8 @@
             } getAnchorStatusResult:^(BOOL result) {
                 NSLog(@"获取主播状态%d", result ? YES : NO);
             }];
+            self.liveController.delegate = self;
+
         } else {
             // 点播
             self.liveController = [[CNLivePlayerController alloc] initVodPlayWithVId:_dictionary[@"playbackId"] authSuccess:^{
@@ -214,6 +286,7 @@
             } authFailed:^(NSDictionary *errorInfo) {
                 NSLog(@"初始化点播播放器失败%@", errorInfo);
             }];
+            self.liveController.delegate = self;
         }
         [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"];
         __weak typeof(self) weakSelf = self;
@@ -230,6 +303,10 @@
     self.liveController.video = video;
 }
+- (void)shareButtonCNLivePlayerController:(CNLivePlayerController *)view{
+    [self shareButton:nil];
+    
+}
 - (void)backButtonAction:(UIButton *)sender {
     [self.navigationController popViewControllerAnimated:YES];
 }
@@ -23,25 +23,35 @@
     [self.videoController stop];
     [self.navigationController popToRootViewControllerAnimated:YES];
 }
--(id)initWithDictionary:(NSDictionary*)dictionary{
+- (id)initWithDictionary:(NSDictionary*)dictionary{
     if (self = [super init]) {
         _dictionary = [NSDictionary dictionaryWithDictionary:dictionary];
-        if (![_dictionary[@"videoUrl"] isEqualToString:@""]) {
-            isPlay = YES;
-            url = _dictionary[@"videoUrl"];
-            if (0 == [url length]) {
-                url = _dictionary[@"uploadVideoUrl"];
+        if ([_dictionary[@"videoFlag"] isEqualToString:@"1"]) {
+            if (![_dictionary[@"videoUrl"] isEqualToString:@""]) {
+                isPlay = YES;
+                url = _dictionary[@"videoUrl"];
+                if (0 == [url length]) {
+                    url = _dictionary[@"uploadVideoUrl"];
+                }
+                url = [url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+                movieUrl = [NSURL URLWithString:url];
+                
+            } else {
+                isPlay = NO;
             }
-            url = [url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
-            movieUrl = [NSURL URLWithString:url];
+            
         } else {
             isPlay = NO;
+            
         }
+        
         NSLog(@"movieUrl -> %@",movieUrl);
         videoHeight = MainScreenWidth * (9.0 / 16.0);
+
     }
     return self;
 }
+
 - (NSString *)setHTMLString {
 //    NSString* htmlHeader = [[NSString alloc] initWithFormat:@"<html><p><font style=\"font-size:20px;\"><strong>%@</strong></font><br>%@</p><body>",[_dicArticle objectForKey:@"Tittle"],[_dicArticle objectForKey:@"PublishDateTime"]];
     NSString* htmlBody = [[NSString alloc] initWithFormat:@"<p><font style=\"font-size:%@px;\">%@</font></p>",fontArray[fontIndex],[_dicArticle objectForKey:@"Content"]];
@@ -126,6 +136,7 @@
     [shareButton addTarget:self action:@selector(shareButtonTaped:) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:shareButton];
     [shareButton setTag:30000];
+    
 }
 - (void)shareButtonTaped:(id)sender {
     UIButton *btn = (UIButton *)sender;
@@ -297,13 +308,13 @@
 - (void)loadMovieView {
     [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"];
     imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)];
-    imageView.image = [UIImage imageNamed:@"backDefault1"];
+    [imageView sd_setImageWithURL:[NSURL URLWithString:_dictionary[@"poster"]] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
     [self.view addSubview:imageView];
     UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
     [backButton addTarget:self action:@selector(Pop:) forControlEvents:UIControlEventTouchUpInside];
-    [backButton setImage:[UIImage imageNamed:@"navigationBack"] forState:UIControlStateNormal];
-    [backButton setFrame:CGRectMake(0, 20, 44, 44)];
+    [backButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];
+    [backButton setFrame:CGRectMake(0, StatusBarHeight, 44, 44)];
     [self.view addSubview:backButton];
 }
@@ -18,6 +18,12 @@
 @property (nonatomic, copy) NSString *img;
 @property (nonatomic, copy) NSString *selectedImage;
 @property (nonatomic, copy) NSString *createDate;
+@property (nonatomic, copy) NSString *liveShow;//liveShow 展示标识 0:APP不展示 1:展示
+
+
+@property (nonatomic, copy) NSString *liveFlag;//liveFlag 直播标识 0：视频直播 1：图文直播
+
+@property (nonatomic, copy) NSString *videoFlag;//videoFlag 0 图文回放 1视频回放
 /*
@@ -39,7 +45,6 @@
  }
  */
-@property (nonatomic, copy) NSString *liveFlag;
 @property (nonatomic, copy) NSString *activityId;
 @property (nonatomic, copy) NSString *playbackId;
 @property (nonatomic, copy) NSString *checkinfo;
@@ -63,4 +68,6 @@
 @property (nonatomic, copy) NSString *publishDate;
+@property (nonatomic, copy) NSString *shareUrl;
+
 @end
@@ -11,10 +11,8 @@
 @interface CNLiveHeaderView()
 @property (nonatomic, strong) UIImageView *backgroundImage;
-@property (nonatomic, strong) UILabel *titleLabel;
 @property (nonatomic, strong) UILabel *stateLabel;//状态
 @property (nonatomic, strong) UIButton *playImage;//播放
-@property (nonatomic, strong) UILabel *timeLabel;//时间
 @end
@@ -39,13 +37,6 @@
         [_playImage addTarget:self action:@selector(playImageClicked:) forControlEvents:UIControlEventTouchUpInside];
         [self addSubview:_playImage];
-        _titleLabel = [[UILabel alloc] init];
-        _titleLabel.numberOfLines = 1;
-        _titleLabel.lineBreakMode = NSLineBreakByTruncatingTail;
-        _titleLabel.textColor = [UIColor whiteColor];
-        _titleLabel.font = [UIFont systemFontOfSize:14];
-        [self addSubview:_titleLabel];
-        
         _stateLabel = [[UILabel alloc] init];
         _stateLabel.numberOfLines = 1;
         _stateLabel.lineBreakMode = NSLineBreakByTruncatingTail;
@@ -55,13 +46,6 @@
         _stateLabel.layer.masksToBounds = YES;
         _stateLabel.layer.cornerRadius = 2;
         [self addSubview:_stateLabel];
-        
-        _timeLabel = [[UILabel alloc] init];
-        _timeLabel.numberOfLines = 1;
-        _timeLabel.lineBreakMode = NSLineBreakByTruncatingTail;
-        _timeLabel.textColor = [UIColor lightGrayColor];
-        _timeLabel.font = [UIFont systemFontOfSize:12];
-        [self addSubview:_timeLabel];
     }
     return self;
@@ -69,8 +53,6 @@
 }
 - (void)setModel:(CNLiveModel *)model{
     _model = model;
-    _titleLabel.text = @"最新发布会";
-    _timeLabel.text = model.liveStartDateTime;
     [_backgroundImage sd_setImageWithURL:[NSURL URLWithString:model.poster] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
     switch ([model.status intValue]) {
         case 0: {
@@ -152,29 +134,18 @@
     }];
-    [_titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self->_backgroundImage.mas_left).with.offset(10);
-        make.top.equalTo(self->_backgroundImage.mas_top).with.offset(10);
-        make.height.offset(18);
-
-    }];
-    
     [_stateLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.left.equalTo(self->_titleLabel.mas_right).with.offset(5);
-        make.top.equalTo(self->_backgroundImage.mas_top).with.offset(10);
-        make.height.offset(18);
-
-    }];
-    
-    [_timeLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.right.equalTo(self->_backgroundImage.mas_right).with.offset(-10);
+        make.left.equalTo(self->_backgroundImage.mas_left).with.offset(10);
         make.top.equalTo(self->_backgroundImage.mas_top).with.offset(10);
         make.height.offset(18);
     }];
+    
 }
 - (void)playImageClicked:(UIButton *)btn{
     self.block?self.block():@"";
 }
+
 @end
+
@@ -67,6 +67,7 @@
     _titleLabel.text = model.title;
     _timeLabel.text = model.createDate;
     [_picImage sd_setImageWithURL:[NSURL URLWithString:model.img] placeholderImage:[UIImage imageNamed:@"placeholder"]];
+    _playImage.hidden = [model.videoFlag isEqualToString:@"0"];
     [self layoutSubviews];
 }
@@ -12,8 +12,17 @@
 #define kZXVideoPlayerOriginalWidth  MIN([UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height)
 #define kZXVideoPlayerOriginalHeight (kZXVideoPlayerOriginalWidth * (9.0 / 16.0))
+@class CNLivePlayerController;
+
+@protocol CNLivePlayerControllerDelegate <NSObject>
+- (void)shareButtonCNLivePlayerController:(CNLivePlayerController *)view;
+
+@end
+
 @interface CNLivePlayerController : CNLiveMoviePlayerController
+@property (nonatomic, weak) id<CNLivePlayerControllerDelegate> delegate;
+
 @property (nonatomic, assign) CGRect frame;
 /// video model
 @property (nonatomic, strong, readwrite) ZXVideo *video;
@@ -57,6 +57,8 @@
 @property (nonatomic, strong, readwrite) UILabel *titleLabel;
 /// 直播状态
 @property (nonatomic, assign) int liveStatus;
+///分享
+@property (nonatomic, strong, readwrite) UIButton *shareButton;
 - (void)animateHide;
 - (void)animateShow;
@@ -74,6 +74,9 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0;
         // 标题
         [self.topBar addSubview:self.titleLabel];
+        // 标题
+        [self.topBar addSubview:self.shareButton];
+        
         UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(onTap:)];
         [self addGestureRecognizer:tapGesture];
@@ -387,6 +390,16 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0;
     return _retryButton;
 }
+- (UIButton *)shareButton {
+    if (!_shareButton) {
+        _shareButton = [UIButton buttonWithType:UIButtonTypeCustom];
+        [_shareButton setFrame:CGRectMake(MainScreenWidth-40, 20, 30, 30)];
+        [_shareButton setImage:[UIImage imageNamed:@"cnlive_live_share"] forState:UIControlStateNormal];
+
+    }
+    return _shareButton;
+}
+
 #pragma mark - setter
 - (void)setLiveStatus:(int)liveStatus {
     _liveStatus = liveStatus;
@@ -13,6 +13,7 @@
 #define kZXVideoPlayerOriginalWidth  MIN([UIScreen mainScreen].bounds.size.width, [UIScreen mainScreen].bounds.size.height)
 #define kZXVideoPlayerOriginalHeight (kZXVideoPlayerOriginalWidth * (9.0 / 16.0))
+
 @interface ZXVideoPlayerController : MPMoviePlayerController
 @property (nonatomic, assign) CGRect frame;