no message

zhangxiaowen
1 parent bc74da45
Showing 8 changed files with 93 additions and 51 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.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>";
@@ -9,7 +9,7 @@
 #import "GraphicLiveViewController.h"
 #import "OldVideoDetailViewController.h"
-@interface GraphicLiveViewController ()
+@interface GraphicLiveViewController ()<CNLivePlayerControllerDelegate>
 @end
 @implementation GraphicLiveViewController
 - (void)Pop:(id)sender{
@@ -192,47 +192,49 @@
 - (void)shareButton:(UIButton *)btn{
     NSString *text = [NSString stringWithFormat:@"%@",_dictionary[@"Description"]];
+    NSString *shareUrl = [NSString stringWithFormat:@"%@",_dictionary[@"shareUrl"]];
+
     if ([text isEqualToString:@"<null>"]) {
         text = _dictionary[@"title"];
     }
     NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
     [shareParams SSDKSetupShareParamsByText:text
                                      images:nil
-                                        url:[NSURL URLWithString:_dictionary[@"pageUrl"]]
+                                        url:[NSURL URLWithString:shareUrl?shareUrl:@"http://app.scio.gov.cn/gxbShare.html"]
                                       title:_dictionary[@"title"]
                                        type:SSDKContentTypeAuto];
     //2、分享（可以弹出我们的分享菜单和编辑界面）
-    [ShareSDK showShareActionSheet:nil //要显示菜单的视图, iPad版中此参数作为弹出菜单的参照视图，只有传这个才可以弹出我们的分享菜单，可以传分享的按钮对象或者自己创建小的view 对象，iPhone可以传nil不会影响
-                             items:nil
-                       shareParams:shareParams
-               onShareStateChanged:^(SSDKResponseState state, SSDKPlatformType platformType, NSDictionary *userData, SSDKContentEntity *contentEntity, NSError *error, BOOL end) {
+    //要显示菜单的视图, 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;
-                   }
-               }
-     ];
+       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 {
@@ -253,15 +255,12 @@
         [backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside];
         [bgView addSubview:backButton];
-        ////////////////  分享  ////////////////
         UIButton *shareButton = [UIButton buttonWithType:UIButtonTypeCustom];
-        shareButton.backgroundColor = [UIColor redColor];
-        [shareButton setFrame:CGRectMake(MainScreenWidth-40, StatusBarHeight+7, 30, 30)];
-        [shareButton setImage:[UIImage imageNamed:@"cnlive_live_share"] forState:UIControlStateNormal];
         [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) {
             // 直播
             self.liveController = [[CNLivePlayerController alloc] initLivePlayWithChannelId:_dictionary[@"channelId"] activityId:_dictionary[@"activityId"] anchorStatus:YES authSuccess:^{
@@ -273,6 +272,8 @@
             } getAnchorStatusResult:^(BOOL result) {
                 NSLog(@"获取主播状态%d", result ? YES : NO);
             }];
+            self.liveController.delegate = self;
+
         } else {
             // 点播
             self.liveController = [[CNLivePlayerController alloc] initVodPlayWithVId:_dictionary[@"playbackId"] authSuccess:^{
@@ -282,6 +283,7 @@
             } authFailed:^(NSDictionary *errorInfo) {
                 NSLog(@"初始化点播播放器失败%@", errorInfo);
             }];
+            self.liveController.delegate = self;
         }
         [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"];
         __weak typeof(self) weakSelf = self;
@@ -298,6 +300,10 @@
     self.liveController.video = video;
 }
+- (void)shareButtonCNLivePlayerController:(CNLivePlayerController *)view{
+    [self shareButton:nil];
+    
+}
 - (void)backButtonAction:(UIButton *)sender {
     [self.navigationController popViewControllerAnimated:YES];
 }
@@ -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;