【IoT Video终端集成测试】ios端回放，选择时间范围无视频，但是还是可以继续播放视频

Tapd: http://tapd.oa.com/20393192/bugtrace/bugs/view?bug_id=1020393192091173519&url_cache_key=acdba194b0e2e0da542714b9a0bf0507

Tapd: http://tapd.oa.com/NEW_IOT/bugtrace/bugs/view?bug_id=1020393192091173519&jump_count=1

Change-Id: I92c421bc5ccf8376fcbb6adaa25a0c97576508cd

Author: ccharlesren

Source/LinkSDKDemo/Video/P2P/View/CustomTimeSlider/TIoTDemoCustomChoiceDateView.m

@@ -312,14 +312,24 @@ - (void)getTimeDataScorllEnd:(UIScrollView *)scrollView {
     NSString *startTimestampString = [NSString getTimeStampWithString:dateString withFormatter:@"YYYY-MM-dd HH:mm:ss" withTimezone:@""];
 
     __weak typeof(self) weakSelf = self;
+    __block NSInteger isEmptyData = 0;
+    
     [self.videoTimeSegmentArray enumerateObjectsUsingBlock:^(id  _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop) {
         TIoTTimeModel *model = obj;
         if (tempStartTime >= model.startTime && tempStartTime <= model.endTime) {
             if (weakSelf.timeModelBlock) {
+                isEmptyData = 1;
                 weakSelf.timeModelBlock(model, startTimestampString.floatValue);
             }
         }
     }];
+    
+    //判断滚动空数据处，返回空数据标识
+    if (isEmptyData == 0) {
+        if (weakSelf.timeModelBlock) {
+            weakSelf.timeModelBlock([TIoTTimeModel new], -1);
+        }
+    }
 }
 
 /*

Source/LinkSDKDemo/Video/PlayBack/CloudStorage/Controller/TIoTCloudStorageVC.m

@@ -289,57 +289,71 @@ - (void)setupUIViews {
     //滑动停止后，获取当前值所在事件开始/结束时间戳
     self.choiceDateView.timeModelBlock = ^(TIoTTimeModel * _Nonnull selectedTimeModel, CGFloat startTimestamp) {
         DDLogVerbose(@"startStamp--%f----%f",startTimestamp,selectedTimeModel.startTime);
-        
-        //关闭定时器
-        [weakSelf closeTime];
-
-        TIoTDemoCloudEventModel *currentModel = [[TIoTDemoCloudEventModel alloc]init];
-
-        NSString *startString = [NSString stringWithFormat:@"%@ 00:00:00",weakSelf.currentDayTime?:@""];
-        NSString *startTimestampString = [NSString getTimeStampWithString:startString withFormatter:@"YYYY-MM-dd HH:mm:ss" withTimezone:@""];
-
-        NSInteger startValue = startTimestampString.integerValue + selectedTimeModel.startTime;
-        NSInteger startDurationValue = startTimestamp - startValue;
-
-        NSInteger endStamp = startTimestampString.integerValue + selectedTimeModel.endTime ;
-        currentModel.StartTime = [NSString stringWithFormat:@"%ld",(long)startValue];
-        currentModel.EndTime = [NSString stringWithFormat:@"%ld",(long)endStamp];
-        weakSelf.currentTime = startDurationValue;
-        weakSelf.slider.value = startDurationValue;
-        weakSelf.player.currentPlaybackTime = startDurationValue;
-        weakSelf.scrollDuraionTime = weakSelf.currentTime;
-        weakSelf.startStamp = startValue;
-        weakSelf.isInnerScroll = YES;
-        weakSelf.isHidePlayBtn = YES;
-        weakSelf.isPause = NO;
-        
-        if (weakSelf.videoTimeModel.StartTime.integerValue <= startTimestamp && weakSelf.videoTimeModel.EndTime.integerValue >=startTimestamp ) {
-            if (weakSelf.isTimerSuspend == YES) {
-                if (weakSelf.timer) {
+        if (startTimestamp == -1) {
+            
+            [MBProgressHUD showError:@"暂无播放数据"];
+            //滑动到空数据, 销毁player, 关闭定时器
+            [weakSelf closeTime];
+            [weakSelf stopPlayMovie];
+            
+        }else {
+            //关闭定时器
+            [weakSelf closeTime];
+
+            TIoTDemoCloudEventModel *currentModel = [[TIoTDemoCloudEventModel alloc]init];
+
+            NSString *startString = [NSString stringWithFormat:@"%@ 00:00:00",weakSelf.currentDayTime?:@""];
+            NSString *startTimestampString = [NSString getTimeStampWithString:startString withFormatter:@"YYYY-MM-dd HH:mm:ss" withTimezone:@""];
+
+            NSInteger startValue = startTimestampString.integerValue + selectedTimeModel.startTime;
+            NSInteger startDurationValue = startTimestamp - startValue;
+
+            NSInteger endStamp = startTimestampString.integerValue + selectedTimeModel.endTime ;
+            currentModel.StartTime = [NSString stringWithFormat:@"%ld",(long)startValue];
+            currentModel.EndTime = [NSString stringWithFormat:@"%ld",(long)endStamp];
+            weakSelf.currentTime = startDurationValue;
+            weakSelf.slider.value = startDurationValue;
+            weakSelf.player.currentPlaybackTime = startDurationValue;
+            weakSelf.scrollDuraionTime = weakSelf.currentTime;
+            weakSelf.startStamp = startValue;
+            weakSelf.isInnerScroll = YES;
+            weakSelf.isHidePlayBtn = YES;
+            weakSelf.isPause = NO;
+            
+            if (weakSelf.videoTimeModel.StartTime.integerValue <= startTimestamp && weakSelf.videoTimeModel.EndTime.integerValue >=startTimestamp ) {
+                
+                if (weakSelf.player == nil) {  //滑动到空数据，销毁player，重新请求
+                    [weakSelf getFullVideoURLWithPartURL:weakSelf.listModel.VideoURL withTime:currentModel isChangeModel:YES];
+                }else {
                     if (weakSelf.isTimerSuspend == YES) {
-                        dispatch_resume(weakSelf.timer);
-                        weakSelf.isTimerSuspend = NO;
+                        if (weakSelf.timer) {
+                            if (weakSelf.isTimerSuspend == YES) {
+                                dispatch_resume(weakSelf.timer);
+                                weakSelf.isTimerSuspend = NO;
+                            }
+                        }
+                        
+                        //关闭定时器
+                        if (weakSelf.timer != nil) {
+                            dispatch_source_cancel(weakSelf.timer);
+                            weakSelf.timer = nil;
+                        }
+                    }
+                    if (weakSelf.player.isPlaying == NO) {
+                        [weakSelf tapVideoView:weakSelf.playPauseBtn];
                     }
+                    [weakSelf startPlayVideoWithStartTime:currentModel.StartTime.integerValue endTime:currentModel.EndTime.integerValue sliderValue:weakSelf.currentTime];
                 }
 
-                //关闭定时器
-                if (weakSelf.timer != nil) {
-                    dispatch_source_cancel(weakSelf.timer);
-                    weakSelf.timer = nil;
-                }
-            }
-            if (weakSelf.player.isPlaying == NO) {
-                [weakSelf tapVideoView:weakSelf.playPauseBtn];
+            }else {
+                [weakSelf getFullVideoURLWithPartURL:weakSelf.listModel.VideoURL withTime:currentModel isChangeModel:YES];
             }
-            [weakSelf startPlayVideoWithStartTime:currentModel.StartTime.integerValue endTime:currentModel.EndTime.integerValue sliderValue:weakSelf.currentTime];
-        }else {
-            [weakSelf getFullVideoURLWithPartURL:weakSelf.listModel.VideoURL withTime:currentModel isChangeModel:YES];
+            
+            TIoTDemoCloudEventModel *scorllCurrentModel = [[TIoTDemoCloudEventModel alloc]init];
+            scorllCurrentModel.StartTime = [NSString stringWithFormat:@"%f",startTimestamp];
+            [weakSelf setScrollOffsetWith:scorllCurrentModel];
         }
 
-        TIoTDemoCloudEventModel *scorllCurrentModel = [[TIoTDemoCloudEventModel alloc]init];
-        scorllCurrentModel.StartTime = [NSString stringWithFormat:@"%f",startTimestamp];
-        [weakSelf setScrollOffsetWith:scorllCurrentModel];
-        
     };
     [self.view addSubview:self.choiceDateView];