iOS Team / LiveVideoCloud · Commits

Commit 25ea651ea6aa757aaae2fc9b919220dda21f281d

Authored by 王军波
1 parent b9d2543e

no message

Inline Side-by-side
Showing 3 changed files with 10 additions and 8 deletions
LiveVideoCloud/AppDelegate/AppDelegate.m
  View file @25ea651
... ... @@ -52,7 +52,7 @@
52 52 // 20170327 20170328
53 53  
54 54  
55   - CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"2017063222" name:@"阿jhsda的" portrait:@"http://b.hiphotos.baidu.com/zhidao/wh%3D450%2C600/sign=f0c5c08030d3d539c16807c70fb7c566/8ad4b31c8701a18bbef9f231982f07082838feba.jpg"];
  55 + CNLiveChatUserInfo *userInfo = [[CNLiveChatUserInfo alloc] initWithUserId:@"2017063339" name:@"设计的" portrait:@"http://b.hiphotos.baidu.com/zhidao/wh%3D450%2C600/sign=f0c5c08030d3d539c16807c70fb7c566/8ad4b31c8701a18bbef9f231982f07082838feba.jpg"];
56 56  
57 57  
58 58 [[CNLiveChatManager sharedCNLiveChatManager] loginServer:userInfo success:^(NSString *userId) {
... ...
LiveVideoCloud/Classes/Sections/UGCSections/Controller/LVCUGCLivePlayerController.m
  View file @25ea651
... ... @@ -89,7 +89,7 @@
89 89 _bgView.anchorStatus = 4;
90 90 _bgView.model = _model;
91 91  
92   - } else if ([_model.activityStatus isEqualToString:@"4"]) {
  92 + } else if ([_model.activityStatus isEqualToString:@"5"]) { /////////////////////
93 93  
94 94 _bgView.anchorStatus = 5;
95 95 _bgView.model = _model;
... ... @@ -177,7 +177,7 @@
177 177  
178 178 }];
179 179  
180   - } else if ([model.activityStatus isEqualToString:@"2"]) {
  180 + } else if ([model.activityStatus isEqualToString:@"4"]) {
181 181  
182 182 //用来更新视频当前播放时间
183 183 _currentTimer = [NSTimer scheduledTimerWithTimeInterval:0.5 target:self selector:@selector(timeChange) userInfo:nil repeats:YES];
... ... @@ -204,6 +204,8 @@
204 204 #pragma mark - UIPanGestureRecognizer !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
205 205 - (void)panGesture:(UIPanGestureRecognizer *)recognizer {
206 206  
  207 + return;
  208 +
207 209 CGPoint t = [recognizer translationInView:self.viewSecond];
208 210 NSLog(@"移动距离>>>>>>>>>>>>>>%f",t.y);
209 211  
... ... @@ -264,7 +266,7 @@
264 266  
265 267 //往下滑 播放上一个
266 268 if (_index >= 0) {
267   - if ([_playArray[_index].activityStatus isEqualToString:@"2"]) {
  269 + if ([_playArray[_index].activityStatus isEqualToString:@"4"]) {
268 270  
269 271 [_liveBaseView removeFromSuperview];
270 272 [_viewSecond addSubview:self.vodPlayerQuitBtn];
... ... @@ -317,7 +319,7 @@
317 319 _bgView.anchorStatus = 4;
318 320 _bgView.model = _playArray[_index];
319 321  
320   - } else if ([_playArray[_index].activityStatus isEqualToString:@"4"]) {
  322 + } else if ([_playArray[_index].activityStatus isEqualToString:@"5"]) {
321 323  
322 324 _bgView.anchorStatus = 5;
323 325 _bgView.model = _playArray[_index];
... ... @@ -373,7 +375,7 @@
373 375 //往上滑 播放下一个
374 376 if (_index < _playArray.count) { // 判越界
375 377  
376   - if ([_playArray[_index].activityStatus isEqualToString:@"2"]) {
  378 + if ([_playArray[_index].activityStatus isEqualToString:@"4"]) {
377 379  
378 380 [_liveBaseView removeFromSuperview];
379 381 [_viewSecond addSubview:self.vodPlayerQuitBtn];
... ... @@ -424,7 +426,7 @@
424 426 _bgView.anchorStatus = 4;
425 427 _bgView.model = _playArray[_index];
426 428  
427   - } else if ([_playArray[_index].activityStatus isEqualToString:@"4"]) {
  429 + } else if ([_playArray[_index].activityStatus isEqualToString:@"5"]) {
428 430  
429 431 _bgView.anchorStatus = 5;
430 432 _bgView.model = _playArray[_index];
... ...
LiveVideoCloud/Classes/Sections/homeSections/View/LVCCommentView.m
  View file @25ea651
... ... @@ -68,7 +68,7 @@ static NSString *commentCellId = @&quot;commentCellId&quot;;
68 68 for (CNLiveCommentDetailInfoResult *result in _commentArray) {
69 69 if (result.content) {
70 70 CGRect contentRect = [result.content boundingRectWithSize:CGSizeMake(KScreenWidth-20, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14]} context:nil];
71   - CGFloat contentHeight = contentRect.size.height;
  71 + CGFloat contentHeight = contentRect.size.height;
72 72 [_cellHeightArrayM addObject:[NSString stringWithFormat:@"%f",contentHeight]];
73 73 } else {
74 74 [_cellHeightArrayM addObject:@"0"];
... ...