Commit ba24b2690deadce291446d59bac398f51533b33b
1 parent
b012dad0
专题二级页面,点击更多,右上角返回客户端闪退
答记者问推荐点击播闪退遗留问题
Showing
4 changed files
with
32 additions
and
16 deletions
CNLiveScioLive.xcodeproj/xcshareddata/xcschemes/CNLiveScioLive.xcscheme
| @@ -27,8 +27,6 @@ | @@ -27,8 +27,6 @@ | ||
| 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> | ||
| 32 | <MacroExpansion> | 30 | <MacroExpansion> |
| 33 | <BuildableReference | 31 | <BuildableReference |
| 34 | BuildableIdentifier = "primary" | 32 | BuildableIdentifier = "primary" |
| @@ -38,8 +36,8 @@ | @@ -38,8 +36,8 @@ | ||
| 38 | ReferencedContainer = "container:CNLiveScioLive.xcodeproj"> | 36 | ReferencedContainer = "container:CNLiveScioLive.xcodeproj"> |
| 39 | </BuildableReference> | 37 | </BuildableReference> |
| 40 | </MacroExpansion> | 38 | </MacroExpansion> |
| 41 | - <AdditionalOptions> | ||
| 42 | - </AdditionalOptions> | 39 | + <Testables> |
| 40 | + </Testables> | ||
| 43 | </TestAction> | 41 | </TestAction> |
| 44 | <LaunchAction | 42 | <LaunchAction |
| 45 | buildConfiguration = "Debug" | 43 | buildConfiguration = "Debug" |
| @@ -62,6 +60,11 @@ | @@ -62,6 +60,11 @@ | ||
| 62 | </BuildableReference> | 60 | </BuildableReference> |
| 63 | </BuildableProductRunnable> | 61 | </BuildableProductRunnable> |
| 64 | <AdditionalOptions> | 62 | <AdditionalOptions> |
| 63 | + <AdditionalOption | ||
| 64 | + key = "NSZombieEnabled" | ||
| 65 | + value = "YES" | ||
| 66 | + isEnabled = "YES"> | ||
| 67 | + </AdditionalOption> | ||
| 65 | </AdditionalOptions> | 68 | </AdditionalOptions> |
| 66 | </LaunchAction> | 69 | </LaunchAction> |
| 67 | <ProfileAction | 70 | <ProfileAction |
CNLiveScioLive/Pages/Home/新闻详情/OldController/MoreSpecialViewController.m
| @@ -56,6 +56,16 @@ | @@ -56,6 +56,16 @@ | ||
| 56 | self.navigationItem.title = _dictionary[@"cmsColumnName"]; | 56 | self.navigationItem.title = _dictionary[@"cmsColumnName"]; |
| 57 | 57 | ||
| 58 | } | 58 | } |
| 59 | + | ||
| 60 | +-(void)goBack | ||
| 61 | +{ | ||
| 62 | + if(self.navigationController.viewControllers.count > 0){ | ||
| 63 | + [self.navigationController popViewControllerAnimated:YES]; | ||
| 64 | + | ||
| 65 | + }else{ | ||
| 66 | + [self dismissViewControllerAnimated:YES completion:nil]; | ||
| 67 | + } | ||
| 68 | +} | ||
| 59 | - (void)viewDidLoad { | 69 | - (void)viewDidLoad { |
| 60 | [super viewDidLoad]; | 70 | [super viewDidLoad]; |
| 61 | self.view.backgroundColor = HEXCOLOR(0xeaeded); | 71 | self.view.backgroundColor = HEXCOLOR(0xeaeded); |
CNLiveScioLive/Pages/Home/新闻详情/OldController/OldVideoDetailViewController.m
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | @end | 19 | @end |
| 20 | @implementation OldVideoDetailViewController | 20 | @implementation OldVideoDetailViewController |
| 21 | - (void)Pop:(id)sender{ | 21 | - (void)Pop:(id)sender{ |
| 22 | - [self.videoController stop]; | 22 | +// [self.videoController stop]; |
| 23 | for(UIViewController *controller in self.navigationController.viewControllers) { | 23 | for(UIViewController *controller in self.navigationController.viewControllers) { |
| 24 | if([controller isKindOfClass:[CNLiveMyCollectionViewController class]]) { | 24 | if([controller isKindOfClass:[CNLiveMyCollectionViewController class]]) { |
| 25 | [self.navigationController popViewControllerAnimated:YES]; | 25 | [self.navigationController popViewControllerAnimated:YES]; |
| @@ -73,6 +73,10 @@ | @@ -73,6 +73,10 @@ | ||
| 73 | 73 | ||
| 74 | #pragma mark - UI | 74 | #pragma mark - UI |
| 75 | 75 | ||
| 76 | +-(void)dealloc | ||
| 77 | +{ | ||
| 78 | + NSLog(@"delloc"); | ||
| 79 | +} | ||
| 76 | - (void)loadShareView { | 80 | - (void)loadShareView { |
| 77 | UIImageView *lineImage = [[UIImageView alloc] init]; | 81 | UIImageView *lineImage = [[UIImageView alloc] init]; |
| 78 | if (iPhoneX) { | 82 | if (iPhoneX) { |
| @@ -318,33 +322,32 @@ | @@ -318,33 +322,32 @@ | ||
| 318 | self.videoController.videoPlayerGoBackBlock = ^{ | 322 | self.videoController.videoPlayerGoBackBlock = ^{ |
| 319 | __strong typeof(self) strongSelf = weakSelf; | 323 | __strong typeof(self) strongSelf = weakSelf; |
| 320 | [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"]; | 324 | [[NSUserDefaults standardUserDefaults] setObject:@0 forKey:@"ZXVideoPlayer_DidLockScreen"]; |
| 321 | - strongSelf.videoController = nil; | 325 | +// strongSelf.videoController = nil; |
| 322 | [strongSelf Pop:nil]; | 326 | [strongSelf Pop:nil]; |
| 323 | - | ||
| 324 | //时长统计结束 | 327 | //时长统计结束 |
| 325 | if ([strongSelf->_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/djzw/"]) { | 328 | if ([strongSelf->_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/djzw/"]) { |
| 326 | //记者问答 | 329 | //记者问答 |
| 327 | [CNLiveStat endEvent:@"djzwsc"]; | 330 | [CNLiveStat endEvent:@"djzwsc"]; |
| 328 | - }else if ([_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/zgsfz/"]){ | 331 | + }else if ([strongSelf->_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/zgsfz/"]){ |
| 329 | //视界 | 332 | //视界 |
| 330 | [CNLiveStat endEvent:@"sjsc"]; | 333 | [CNLiveStat endEvent:@"sjsc"]; |
| 331 | - }else if ([_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/gxzf/"]){ | 334 | + }else if ([strongSelf->_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/gxzf/"]){ |
| 332 | //国新联播 | 335 | //国新联播 |
| 333 | [CNLiveStat endEvent:@"gxlbsc"]; | 336 | [CNLiveStat endEvent:@"gxlbsc"]; |
| 334 | - }else if ([_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/jlzg/"]){ | 337 | + }else if ([strongSelf->_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/jlzg/"]){ |
| 335 | //记录中国 | 338 | //记录中国 |
| 336 | [CNLiveStat endEvent:@"jlzgsc"]; | 339 | [CNLiveStat endEvent:@"jlzgsc"]; |
| 337 | - }else if ([_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/fbhhf/"]){ | 340 | + }else if ([strongSelf->_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/fbhhf/"]){ |
| 338 | //发布会回放 | 341 | //发布会回放 |
| 339 | [CNLiveStat endEvent:@"fbhhfsc"]; | 342 | [CNLiveStat endEvent:@"fbhhfsc"]; |
| 340 | - }else if ([_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/icons/"]){ | 343 | + }else if ([strongSelf->_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/icons/"]){ |
| 341 | //CHINA ICONS | 344 | //CHINA ICONS |
| 342 | [CNLiveStat endEvent:@"iconssc"]; | 345 | [CNLiveStat endEvent:@"iconssc"]; |
| 343 | - }else if ([_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/gxzs/"]){ | 346 | + }else if ([strongSelf->_dictionary[@"cmsColumnId"] isEqualToString:@"spzl/gxzs/"]){ |
| 344 | //CHINA ICONS | 347 | //CHINA ICONS |
| 345 | [CNLiveStat endEvent:@"gxzssc"]; | 348 | [CNLiveStat endEvent:@"gxzssc"]; |
| 346 | } | 349 | } |
| 347 | - | 350 | + |
| 348 | }; | 351 | }; |
| 349 | 352 | ||
| 350 | } | 353 | } |
CNLiveScioLive/Pages/Tools/ZXVideoPlayer/Classes/ZXVideoPlayerController.h
| @@ -25,9 +25,9 @@ | @@ -25,9 +25,9 @@ | ||
| 25 | /// 竖屏模式下点击返回 | 25 | /// 竖屏模式下点击返回 |
| 26 | @property (nonatomic, copy) void(^videoPlayerGoBackBlock)(void); | 26 | @property (nonatomic, copy) void(^videoPlayerGoBackBlock)(void); |
| 27 | /// 将要切换到竖屏模式 | 27 | /// 将要切换到竖屏模式 |
| 28 | -@property (nonatomic, copy) void(^videoPlayerWillChangeToOriginalScreenModeBlock)(); | 28 | +@property (nonatomic, copy) void(^videoPlayerWillChangeToOriginalScreenModeBlock)(void); |
| 29 | /// 将要切换到全屏模式 | 29 | /// 将要切换到全屏模式 |
| 30 | -@property (nonatomic, copy) void(^videoPlayerWillChangeToFullScreenModeBlock)(); | 30 | +@property (nonatomic, copy) void(^videoPlayerWillChangeToFullScreenModeBlock)(void); |
| 31 | 31 | ||
| 32 | - (instancetype)initWithFrame:(CGRect)frame; | 32 | - (instancetype)initWithFrame:(CGRect)frame; |
| 33 | /// 展示播放器 | 33 | /// 展示播放器 |