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

张旭
2 parents c0cf25a8 802f13cd
Showing 7 changed files with 121 additions and 25 deletions
CNLiveScioLive/Info.plist
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldArticleDetailViewController.m
CNLiveScioLive/Pages/Live/Controller/CNLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/VideoPlayBackViewController.m
CNLiveScioLive/Pages/Tools/CNLivePlayer/CNLivePlayerController.m
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/ZXVideoPlayerControlView.m
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.5.1</string>
+	<string>3.5.2</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -54,7 +54,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>354</string>
+	<string>355</string>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>alipay</string>
@@ -31,7 +31,9 @@
     if (self = [super init]) {
         _dictionary = [NSDictionary dictionaryWithDictionary:dictionary];
         _imageArray = [[ NSMutableArray alloc] init];
-        htmlString = [NSString stringWithContentsOfURL:[NSURL URLWithString:dictionary[@"pageUrl"]] encoding:NSUTF8StringEncoding error:nil];
+        
+        NSString *url = [NSString stringWithFormat:@"%@?from=ios",dictionary[@"pageUrl"]];
+        htmlString = [NSString stringWithContentsOfURL:[NSURL URLWithString:url] encoding:NSUTF8StringEncoding error:nil];
         //替换掉html页面中的展示js
         NSString *replace=[htmlString stringByReplacingOccurrencesOfString:@"previewImage.start(obj);" withString:@""];
         htmlString=replace;
@@ -57,7 +57,7 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
         self.liveModel = [CNLiveModel mj_objectWithKeyValues:dic];
         self.header.model = [CNLiveModel mj_objectWithKeyValues:dic];
         [self.tableView reloadData];
-        self->_isLoaded = YES;
+//        self->_isLoaded = YES;
     } failure:^(NSError *error) {
         [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"ServerBusy")];
@@ -157,12 +157,12 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
     }
 }
 - (void)loadMoreData{
-//    if(!_isRefreshing){
-//        _isRefreshing = YES;
-//        [self loadData];
-//    }
-    [self.tableView.mj_footer endRefreshing];
-    [AlertViewTool showHUDViewText:@"查看往期发布会回放,请点击搜索按钮" block:nil duration:1.5];
+    if(!_isRefreshing){
+        _isRefreshing = YES;
+        [self loadData];
+    }
+//    [self.tableView.mj_footer endRefreshing];
+//    [AlertViewTool showHUDViewText:@"查看往期发布会回放,请点击搜索按钮" block:nil duration:1.5];
 }
 - (void)viewWillAppear:(BOOL)animated{
@@ -370,10 +370,20 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
         [self.navigationController pushViewController:vc animated:YES];
         return;
     }
+    
     CNLiveModel *model = self.data[indexPath.row];
     NSDictionary *dic = [model toDictionary];
+
+//    if ([model.videoFlag isEqualToString:@"0"]){
+//        //查看发布会预告
+//        OldArticleDetailViewController *vc = [[OldArticleDetailViewController alloc] initWithDictionary:dic];
+//        vc.title = dic[@"cmsColumnName"];
+//        vc.hidesBottomBarWhenPushed = YES;
+//        [self.navigationController pushViewController:vc animated:YES];
+//        return;
+//    }
+
     VideoPlayBackViewController *vc = [[VideoPlayBackViewController alloc] initWithDictionary:dic];
-//    OldVideoDetailViewController *vc = [[VideoPlayBackViewController alloc] initWithDictionary:dic];
     vc.title = model.cmsColumnName;
     vc.hidesBottomBarWhenPushed = YES;
     [self.navigationController pushViewController:vc animated:YES];
@@ -424,14 +434,14 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
         //  设置下拉刷新
         MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingTarget:self refreshingAction:@selector(loadMoreData)];
-//        [footer setTitle:CustomStr(@"RefreshBackFooterIdleText") forState:MJRefreshStateIdle];
-//        [footer setTitle:CustomStr(@"RefreshBackFooterPullingText") forState:MJRefreshStatePulling];
-//        [footer setTitle:CustomStr(@"RefreshBackFooterRefreshingText") forState:MJRefreshStateRefreshing];
-//        [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateNoMoreData];
-        [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateIdle];
-        [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStatePulling];
-        [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateRefreshing];
+        [footer setTitle:CustomStr(@"RefreshBackFooterIdleText") forState:MJRefreshStateIdle];
+        [footer setTitle:CustomStr(@"RefreshBackFooterPullingText") forState:MJRefreshStatePulling];
+        [footer setTitle:CustomStr(@"RefreshBackFooterRefreshingText") forState:MJRefreshStateRefreshing];
         [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateNoMoreData];
+//        [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateIdle];
+//        [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStatePulling];
+//        [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateRefreshing];
+//        [footer setTitle:CustomStr(@"RefreshBackFooterNoMoreDataText") forState:MJRefreshStateNoMoreData];
         _tableView.mj_footer = footer;
     }
@@ -513,6 +513,7 @@
         _webView.hidden = YES;
     }
 }
+
 - (void)relatedInfoTaped:(id)sender {
     UIButton *btn = (UIButton *)sender;
     NSDictionary *dic = self.relatedArray[btn.tag - 1000];
@@ -522,15 +523,18 @@
     vc.hidesBottomBarWhenPushed = YES;
     [self.navigationController pushViewController:vc animated:YES];
 }
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
 }
+
 - (BOOL)shouldAutorotate {
     if (!isPlay) {
         return [[[NSUserDefaults standardUserDefaults] objectForKey:@"GraphicLive_DidLockScreen"] boolValue];
     }
     return ![[[NSUserDefaults standardUserDefaults] objectForKey:@"ZXVideoPlayer_DidLockScreen"] boolValue];
 }
+
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations {
     return UIInterfaceOrientationMaskAllButUpsideDown;
 }
@@ -12,7 +12,7 @@
 //#import "ArticleDetailViewController.h"
 //#import "OldVideoDetailViewController.h"
-@interface VideoPlayBackViewController () {
+@interface VideoPlayBackViewController ()<CNLivePlayerControllerDelegate> {
     BOOL isPlay;
 }
@@ -35,14 +35,17 @@
                 }
                 url = [url stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
                 movieUrl = [NSURL URLWithString:url];
-                
+                videoHeight = MainScreenWidth * (9.0 / 16.0);
+
             } else {
                 isPlay = NO;
+                videoHeight = MainScreenWidth * (9.0 / 16.0);
+
             }
         } else {
             isPlay = NO;
-            
+            videoHeight = 0;
         }
         NSLog(@"movieUrl -> %@",movieUrl);
@@ -226,6 +229,22 @@
 - (void)viewWillAppear:(BOOL)animated {
     [super viewWillAppear:animated];
     [[JGMusicManager shareMusicManager] playStop];
+//    if ([_dictionary[@"videoFlag"] isEqualToString:@"0"]) {
+//        self.navigationController.navigationBar.barTintColor = Color_Blue;
+//        self.navigationController.navigationBar.titleTextAttributes = @{NSForegroundColorAttributeName:[UIColor whiteColor], NSFontAttributeName:[UIFont systemFontOfSize:18]};
+//        //左
+//        UIButton *headerButton = [[UIButton alloc] initWithFrame:CGRectMake(0, 0, 20, 44)];
+//        headerButton.layer.cornerRadius = 2.0;
+//        headerButton.layer.masksToBounds = true;
+//        [headerButton setImage:[UIImage imageNamed:@"cnlive_white_back"] forState:UIControlStateNormal];
+//        [headerButton addTarget:self action:@selector(Pop:) forControlEvents:UIControlEventTouchUpInside];
+//        self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:headerButton];
+//        self.navigationItem.title = _dictionary[@"cmsColumnName"];
+//        
+//    }else{
+//        [self.navigationController setNavigationBarHidden:YES];
+//
+//    }
     [self.navigationController setNavigationBarHidden:YES];
     NSError *error = nil;
@@ -308,7 +327,7 @@
 - (void)loadMovieView {
     [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"GraphicLive_DidLockScreen"];
     imageView = [[UIImageView alloc] initWithFrame:CGRectMake(0, iPhoneX ? 44 : 0, MainScreenWidth, videoHeight)];
-    [imageView sd_setImageWithURL:[NSURL URLWithString:_dictionary[@"poster"]] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
+    [imageView sd_setImageWithURL:[NSURL URLWithString:_dictionary[@"img"]] placeholderImage:[UIImage imageNamed:@"cnlive_placeholder"]];
     [self.view addSubview:imageView];
     UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom];
@@ -329,6 +348,7 @@
             strongSelf.videoController = nil;
             [strongSelf Pop:nil];
         };
+        self.liveController.delegate = self;
         [self.videoController showInView:self.view];
     }
     ZXVideo *video = [[ZXVideo alloc] init];
@@ -362,6 +382,8 @@
             strongSelf.liveController = nil;
             [strongSelf Pop:nil];
         };
+        self.liveController.delegate = self;
+
     }
     ZXVideo *video = [[ZXVideo alloc] init];
     video.title = _dictionary[@"title"];
@@ -510,7 +532,63 @@
     }
 }
 - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error{
+    
 }
+
+- (void)shareButtonCNLivePlayerController:(CNLivePlayerController *)view{
+    NSString *img = [NSString stringWithFormat:@"%@",_dictionary[@"img"]];
+    NSArray* imageArray = nil;
+    if (0 == [img length]) {
+        imageArray = @[[UIImage imageNamed:@"cnlive_zhouxin_icon"]];
+    } else {
+        imageArray = @[img];
+    }
+    if (imageArray) {
+        NSString *text = [NSString stringWithFormat:@"%@",_dictionary[@"subTitle"]];
+        if ([text isEqualToString:@"<null>"]) {
+            text = _dictionary[@"title"];
+        }
+        NSMutableDictionary *shareParams = [NSMutableDictionary dictionary];
+        [shareParams SSDKSetupShareParamsByText:text
+                                         images:imageArray
+                                            url:[NSURL URLWithString:_dictionary[@"pageUrl"]]
+                                          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) {
+                       
+                       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)loadRelatedInformation {
     if (![[Reachability reachabilityForInternetConnection] currentReachabilityStatus]) {
         [AlertViewTool showHUDViewText:CustomStr(@"NetworkiInterruption")];
@@ -53,8 +53,8 @@ static const CGFloat kVideoControlBarAutoFadeOutTimeInterval = 5.0;
         // 直播状态
         [self addSubview:self.anchorLabel];
         // 重试按钮
-        [self addSubview:self.retryButton];
-        self.retryButton.hidden = YES;
+//        [self addSubview:self.retryButton];
+//        self.retryButton.hidden = YES;
         // 返回按钮
         [self.topBar addSubview:self.backButton];