Commit 2cd76578a7a9616121aa9b3a02290a7f73e29081

Authored by yanglingyu
1 parent ba24b269

8. 视频中点击相关内容,再返回上一级视频,返回后的视频无法播放问题解决

CNLiveScioLive.xcodeproj/xcshareddata/xcschemes/CNLiveScioLive.xcscheme
@@ -27,6 +27,8 @@ @@ -27,6 +27,8 @@
27 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" 27 selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" 28 selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29 shouldUseLaunchSchemeArgsEnv = "YES"> 29 shouldUseLaunchSchemeArgsEnv = "YES">
  30 + <Testables>
  31 + </Testables>
30 <MacroExpansion> 32 <MacroExpansion>
31 <BuildableReference 33 <BuildableReference
32 BuildableIdentifier = "primary" 34 BuildableIdentifier = "primary"
@@ -36,8 +38,8 @@ @@ -36,8 +38,8 @@
36 ReferencedContainer = "container:CNLiveScioLive.xcodeproj"> 38 ReferencedContainer = "container:CNLiveScioLive.xcodeproj">
37 </BuildableReference> 39 </BuildableReference>
38 </MacroExpansion> 40 </MacroExpansion>
39 - <Testables>  
40 - </Testables> 41 + <AdditionalOptions>
  42 + </AdditionalOptions>
41 </TestAction> 43 </TestAction>
42 <LaunchAction 44 <LaunchAction
43 buildConfiguration = "Debug" 45 buildConfiguration = "Debug"
@@ -60,11 +62,6 @@ @@ -60,11 +62,6 @@
60 </BuildableReference> 62 </BuildableReference>
61 </BuildableProductRunnable> 63 </BuildableProductRunnable>
62 <AdditionalOptions> 64 <AdditionalOptions>
63 - <AdditionalOption  
64 - key = "NSZombieEnabled"  
65 - value = "YES"  
66 - isEnabled = "YES">  
67 - </AdditionalOption>  
68 </AdditionalOptions> 65 </AdditionalOptions>
69 </LaunchAction> 66 </LaunchAction>
70 <ProfileAction 67 <ProfileAction
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
@@ -75,6 +75,8 @@ @@ -75,6 +75,8 @@
75 75
76 -(void)dealloc 76 -(void)dealloc
77 { 77 {
  78 + self.liveController = nil;
  79 + self.videoController = nil;
78 NSLog(@"delloc"); 80 NSLog(@"delloc");
79 } 81 }
80 - (void)loadShareView { 82 - (void)loadShareView {
@@ -182,7 +184,7 @@ @@ -182,7 +184,7 @@
182 [super viewWillDisappear:animated]; 184 [super viewWillDisappear:animated];
183 [self.videoController stop]; 185 [self.videoController stop];
184 [self.liveController stop]; 186 [self.liveController stop];
185 - self.liveController = nil; 187 +// self.liveController = nil;
186 [self.navigationController setNavigationBarHidden:NO]; 188 [self.navigationController setNavigationBarHidden:NO];
187 189
188 NSError *error = nil; 190 NSError *error = nil;
@@ -288,7 +290,7 @@ @@ -288,7 +290,7 @@
288 __strong typeof(self) strongSelf = weakSelf; 290 __strong typeof(self) strongSelf = weakSelf;
289 [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"]; 291 [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"];
290 [strongSelf.liveController destroyPlayer]; 292 [strongSelf.liveController destroyPlayer];
291 - strongSelf.liveController = nil; 293 +// strongSelf.liveController = nil;
292 [strongSelf Pop:nil]; 294 [strongSelf Pop:nil];
293 }; 295 };
294 } 296 }
CNLiveScioLive/Pages/Tools/CNLivePlayer/CNLivePlayerController.h
@@ -29,9 +29,9 @@ @@ -29,9 +29,9 @@
29 /// 竖屏模式下点击返回 29 /// 竖屏模式下点击返回
30 @property (nonatomic, copy) void(^videoPlayerGoBackBlock)(void); 30 @property (nonatomic, copy) void(^videoPlayerGoBackBlock)(void);
31 /// 将要切换到竖屏模式 31 /// 将要切换到竖屏模式
32 -@property (nonatomic, copy) void(^videoPlayerWillChangeToOriginalScreenModeBlock)(); 32 +@property (nonatomic, copy) void(^videoPlayerWillChangeToOriginalScreenModeBlock)(void);
33 /// 将要切换到全屏模式 33 /// 将要切换到全屏模式
34 -@property (nonatomic, copy) void(^videoPlayerWillChangeToFullScreenModeBlock)(); 34 +@property (nonatomic, copy) void(^videoPlayerWillChangeToFullScreenModeBlock)(void);
35 35
36 // 配置播放器 36 // 配置播放器
37 - (void)configPlayerWithFrame:(CGRect)frame isLiving:(BOOL)isLiving; 37 - (void)configPlayerWithFrame:(CGRect)frame isLiving:(BOOL)isLiving;
@@ -39,5 +39,6 @@ @@ -39,5 +39,6 @@
39 /// 展示播放器 39 /// 展示播放器
40 - (void)showInView:(UIView *)view; 40 - (void)showInView:(UIView *)view;
41 41
  42 +- (void)stop ;
42 43
43 @end 44 @end
CNLiveScioLive/Pages/Tools/CNLivePlayer/CNLivePlayerController.m
No preview for this file type