修改直播退出按钮,并测试播放何时去掉加载图最佳

王军波
1 parent 9f6a6533
Showing 7 changed files with 15 additions and 10 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.h
LiveVideoCloud/LiveVideoCloud/Classes/Sections/InteractionSections/LiveBaseView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/LiveSections/Controller/LVCLiveViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/HomeViewController.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLiveListView.m
LiveVideoCloud/LiveVideoCloud/Classes/Sections/homeSections/Controller/LVCUGCLivePlayerController.m
@@ -628,8 +628,8 @@
 		D2888DB31E6EC154003A77C8 /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
 		D2888DB51E6EC1B8003A77C8 /* LVCMyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCMyViewController.h; sourceTree = "<group>"; };
 		D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCMyViewController.m; sourceTree = "<group>"; };
-		D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLiveListView.h; sourceTree = "<group>"; };
-		D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLiveListView.m; sourceTree = "<group>"; };
+		D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LVCUGCLiveListView.h; path = ../Controller/LVCUGCLiveListView.h; sourceTree = "<group>"; };
+		D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = LVCUGCLiveListView.m; path = ../Controller/LVCUGCLiveListView.m; sourceTree = "<group>"; };
 		D29D88461E88C53300543A03 /* LVCUGCLivePrepareView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCLivePrepareView.h; sourceTree = "<group>"; };
 		D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCLivePrepareView.m; sourceTree = "<group>"; };
 		D29E81EB1E88DC5B008C9906 /* PriChatCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PriChatCell.h; sourceTree = "<group>"; };
@@ -1686,8 +1686,6 @@
 				810B64E21E779AFE00133E15 /* LVCLivePlayerController.m */,
 				810B65081E77B39D00133E15 /* LVCFullScreenPlayerController.h */,
 				810B65091E77B39D00133E15 /* LVCFullScreenPlayerController.m */,
-				D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */,
-				D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */,
 				D25BF87E1E7BD266007FB138 /* LVCUGCLivePlayerController.h */,
 				D25BF87F1E7BD266007FB138 /* LVCUGCLivePlayerController.m */,
 				81A483151E88BED00097A80A /* LVCTVLiveViewController.h */,
@@ -1719,6 +1717,8 @@
 				81A483041E88B32C0097A80A /* LVCHeaderRollCollectionViewCell.m */,
 				8112D42F1E7927A5002E00F6 /* LVCPlayerLoadingView.h */,
 				8112D4301E7927A5002E00F6 /* LVCPlayerLoadingView.m */,
+				D28F5FFD1E8BC7EF00914142 /* LVCUGCLiveListView.h */,
+				D28F5FFE1E8BC7EF00914142 /* LVCUGCLiveListView.m */,
 				D2A089E61E89FA720071412C /* LVCUGCLivePlayerCell.h */,
 				D2A089E71E89FA720071412C /* LVCUGCLivePlayerCell.m */,
 				D25BF8811E7F775F007FB138 /* LVCUGCPlayerLoadingView.h */,
@@ -22,6 +22,7 @@ typedef NS_ENUM(NSInteger, JumpControllerType) {//跳转控制器类型
 };
 @interface LiveBaseView : BaseView 
+@property (nonatomic ,strong           ) UIButton *       _Nullable closeBtn;
 @property (nonatomic) JumpControllerType              jumpType;
 @property (nonatomic ,strong) UIViewController * _Nullable             viewController;
 @property (nonatomic ,strong ,readonly) PresentView *   _Nullable presentView;
@@ -39,7 +39,7 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
 @property (nonatomic ,strong           ) UIScrollView *   _Nullable scrollView;
 @property (nonatomic ,strong ,readwrite) AnimationBaseView *         _Nullable animationBaseView;//展示层View
 @property (nonatomic ,strong           ) BottomToolView*  _Nullable bottomToolView;
-@property (nonatomic ,strong           ) UIButton *       _Nullable closeBtn;
+
 @property (nonatomic ,strong           ) GiftListView *   _Nullable giftListView;
 @property (nonatomic ,weak             ) UIView *         _Nullable giftPopView;
 @property (nonatomic ,strong ,readwrite) PresentView *    _Nullable presentView;//连击View
@@ -720,7 +720,6 @@ typedef NS_ENUM(NSInteger, PopType) {//弹窗类型
         closeBtn.frame = CGRectMake(SCREEN_WIDTH - 43,SCREEN_HEIGHT - self.bottomToolView.height + (self.bottomToolView.height - 33)*0.5, 33, 33);
         [closeBtn setBackgroundImage:[UIImage imageNamed:@"LiveCloseNormal"] forState:UIControlStateNormal];
         [closeBtn setBackgroundImage:[UIImage imageNamed:@"LiveCloseTouch"] forState:UIControlStateHighlighted];
-        [closeBtn addTarget:self action:@selector(closeAction) forControlEvents:UIControlEventTouchUpInside];
         _closeBtn = closeBtn;
     }
     return _closeBtn;
@@ -114,6 +114,7 @@
         _liveBaseView.jumpType = JumpControllerTypePresent;
         _liveBaseView.viewController = self;
         _liveBaseView.backgroundColor = [UIColor clearColor];
+        [_liveBaseView.closeBtn addTarget:self action:@selector(quitBtnClick) forControlEvents:UIControlEventTouchUpInside];
     }
     return _liveBaseView;
 }
@@ -170,7 +170,7 @@
         LVCUGCLiveListView *liveListView = (LVCUGCLiveListView *)[pagingScrollView pageViewByIndex:index];
         if (!liveListView) {
-            liveListView = [[LVCUGCLiveListView alloc] initWithFrame:self.view.bounds];
+            liveListView = [[LVCUGCLiveListView alloc] initWithFrame:CGRectMake(0, 64, SCREEN_WIDTH, SCREEN_HEIGHT - 114)];
         }
         return liveListView;
     }
@@ -11,6 +11,7 @@
 #import "LVCUGCLivePlayerCell.h"
 #import "LVCUGCLiveListModel.h"
 #import "LVCUGCLivePlayerModel.h"
+#import "LVCUGCLivePlayerController.h"
 static NSString *cellId = @"cellId";
@@ -85,7 +86,8 @@ static NSString *cellId = @&quot;cellId&quot;;
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
-    
+    LVCUGCLivePlayerController *player = [[LVCUGCLivePlayerController alloc] init];
+    [self.viewController.navigationController pushViewController:player animated:YES];
 }
 #pragma mark - GetMethod !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -83,7 +83,7 @@
                                                                  }];
-    //[self.view addSubview:self.bgView];
+    [self.view addSubview:self.bgView];
 }
 #pragma mark - UIPanGestureRecognizer !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -267,9 +267,11 @@
             NSLog(@"loadStateDidChange: MPMovieLoadStatePlaythroughOK: %d\n", (int)loadState);
         } else if ((loadState & MPMovieLoadStateStalled) != 0) {
+            
             NSLog(@"loadStateDidChange: MPMovieLoadStateStalled: %d\n", (int)loadState);
         } else {
+            
             NSLog(@"loadStateDidChange: ???: %d\n", (int)loadState);
         }
     }
@@ -370,7 +372,7 @@
     if (_player.anchorStatus == 2) {  // 已结束
     }
-    //    _bgView.anchorStatus = _player.anchorStatus;
+    _bgView.anchorStatus = _player.anchorStatus;
 }