0.0.5 修改上拉下拉视频从新播放问题

yinqiaojuan
1 parent a01ebdf5
Showing 3 changed files with 18 additions and 15 deletions
CNLiveWitnessVideoModule.podspec
CNLiveWitnessVideoModule/Classes/Controller/CNBWitnessListController.m
Example/CNLiveWitnessVideoModule/CNLIVEViewController.m
@@ -8,7 +8,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveWitnessVideoModule'
-  s.version          = '0.0.4'
+  s.version          = '0.0.5'
   s.summary          = '目击者视频播放功能'
 # This description is used to generate tags and improve search results.
@@ -73,10 +73,10 @@ NSString * const kIdentifier   = @&quot;CNBWitnessListCell&quot;;
                             [_dataSource addObject:witnessModel];
                         }
                     }else {
-                        NSDictionary *dic = list[currentIndex];
+                        _currentPlayIndex = 0;
+                        NSDictionary *dic = list[_currentPlayIndex];
                         CNBWitnessListModel *witnessModel = [CNBWitnessListModel mj_objectWithKeyValues:dic];
                         [_dataSource addObject:witnessModel];
-                        _currentPlayIndex = 0;
                     }
                     _pageIndex = pageNum + 1;
                     _isHaveNext = @"1";
@@ -403,7 +403,7 @@ NSString * const kIdentifier   = @&quot;CNBWitnessListCell&quot;;
 #pragma mark - scrollViewDelegate
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView {
     NSInteger currentIndex = round(scrollView.contentOffset.y / KScreenHeight);
-    if (currentIndex != self.currentPlayIndex && !self.isRefreshMore) {
+    if (currentIndex != self.currentPlayIndex && !self.isRefreshMore && [self.type isEqualToString:@"0"]) {
         [self.videoPlayerManager resetPlayer];
         self.currentPlayIndex = currentIndex;
         if (!self.isRefreshMore && [self.isHaveNext isEqualToString:@"1"]) {
@@ -415,26 +415,29 @@ NSString * const kIdentifier   = @&quot;CNBWitnessListCell&quot;;
 }
 - (void)scrollViewDidEndDecelerating:(UIScrollView *)scrollView {
     NSLog(@"播放下一个");
-    if (self.currentPlayIndex >= 0 && self.dataSource.count > self.currentPlayIndex) {
-        if ([CNLiveNetworking isNetworking]) {
-            if ([CNLiveNetworking isWiFiNetwork]) {
-                [self playIndex:self.currentPlayIndex isAutoPlay:YES];
-            }else if ([CNLiveNetworking isWWANNetwork]) {
-                BOOL isAgress4G = [[NSUserDefaults standardUserDefaults] objectForKey:@"isAgress4G"];
-                if (isAgress4G) {
+    if ([self.type isEqualToString:@"0"]) {
+        if (self.currentPlayIndex >= 0 && self.dataSource.count > self.currentPlayIndex) {
+            if ([CNLiveNetworking isNetworking]) {
+                if ([CNLiveNetworking isWiFiNetwork]) {
                     [self playIndex:self.currentPlayIndex isAutoPlay:YES];
+                }else if ([CNLiveNetworking isWWANNetwork]) {
+                    BOOL isAgress4G = [[NSUserDefaults standardUserDefaults] objectForKey:@"isAgress4G"];
+                    if (isAgress4G) {
+                        [self playIndex:self.currentPlayIndex isAutoPlay:YES];
+                    }else {
+                        [self playIndex:self.currentPlayIndex isAutoPlay:NO];
+                    }
                 }else {
                     [self playIndex:self.currentPlayIndex isAutoPlay:NO];
                 }
-            }else {
-                [self playIndex:self.currentPlayIndex isAutoPlay:NO];
             }
         }
     }
+    
 }
 - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate {
     CGFloat currentIndex = scrollView.contentOffset.y / KScreenHeight;
-    if(fabs(currentIndex - self.currentPlayIndex)>1) {
+    if((fabs(currentIndex - self.currentPlayIndex)>1) && [self.type isEqualToString:@"0"]) {
         [self.videoPlayerManager resetPlayer];
     }
 }
@@ -35,7 +35,7 @@
 }
 - (void)setUPCollectionView {
     UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc]init];
-    CGFloat itemWidth = (KScreenWidth - 40) / 3;
+    CGFloat itemWidth = (KScreenWidth - 60) / 3;
     //设置单元格大小
     layout.itemSize = CGSizeMake(itemWidth, itemWidth);