修复重复跳转bug

yanglingyu
1 parent e2ad1b6b
Showing 5 changed files with 57 additions and 1 deletions
CNLiveScioLive.xcodeproj/project.pbxproj
CNLiveScioLive/Pages/Live/Controller/CNLiveViewController.m
CNLiveScioLive/Pages/Live/Controller/GraphicLiveViewController.m
CNLiveScioLive/Pages/Tools/Category/UINavigationController+PushOneVC.h
CNLiveScioLive/Pages/Tools/Category/UINavigationController+PushOneVC.m
@@ -53,6 +53,7 @@
 		0838487D215CF6FC00186618 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0838487C215CF6FB00186618 /* BaseViewController.m */; };
 		0838487E215CF6FC00186618 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0838487C215CF6FB00186618 /* BaseViewController.m */; };
 		0838487F215CF6FC00186618 /* BaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 0838487C215CF6FB00186618 /* BaseViewController.m */; };
+		083CB9C926D8CF6100E21EBC /* UINavigationController+PushOneVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 083CB9C826D8CF6100E21EBC /* UINavigationController+PushOneVC.m */; };
 		08471A9F25E7864E0043FC2D /* VideoDetailPresent.m in Sources */ = {isa = PBXBuildFile; fileRef = 08471A9E25E7864E0043FC2D /* VideoDetailPresent.m */; };
 		084ACDFD21547AE80089E035 /* CNLiveContactUsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 084ACDFC21547AE80089E035 /* CNLiveContactUsViewController.m */; };
 		084ACDFE21547AE80089E035 /* CNLiveContactUsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 084ACDFC21547AE80089E035 /* CNLiveContactUsViewController.m */; };
@@ -659,6 +660,8 @@
 		08384877215CC9E400186618 /* GraphicLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GraphicLiveViewController.h; sourceTree = "<group>"; };
 		0838487B215CF6FB00186618 /* BaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseViewController.h; sourceTree = "<group>"; };
 		0838487C215CF6FB00186618 /* BaseViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BaseViewController.m; sourceTree = "<group>"; };
+		083CB9C726D8CF6100E21EBC /* UINavigationController+PushOneVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UINavigationController+PushOneVC.h"; sourceTree = "<group>"; };
+		083CB9C826D8CF6100E21EBC /* UINavigationController+PushOneVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "UINavigationController+PushOneVC.m"; sourceTree = "<group>"; };
 		08471A9D25E7864E0043FC2D /* VideoDetailPresent.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = VideoDetailPresent.h; sourceTree = "<group>"; };
 		08471A9E25E7864E0043FC2D /* VideoDetailPresent.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = VideoDetailPresent.m; sourceTree = "<group>"; };
 		084ACDFB21547AE80089E035 /* CNLiveContactUsViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CNLiveContactUsViewController.h; sourceTree = "<group>"; };
@@ -1877,6 +1880,8 @@
 				08C090862150C96C00E23D16 /* UIView+Extension.m */,
 				08940D732154EB2C00F85DB6 /* UILabel+TextAlign.h */,
 				08940D742154EB2C00F85DB6 /* UILabel+TextAlign.m */,
+				083CB9C726D8CF6100E21EBC /* UINavigationController+PushOneVC.h */,
+				083CB9C826D8CF6100E21EBC /* UINavigationController+PushOneVC.m */,
 			);
 			path = Category;
 			sourceTree = "<group>";
@@ -2707,6 +2712,7 @@
 				08C721BE24CAC9B700970100 /* TAAnimatedDotView.m in Sources */,
 				0838487D215CF6FC00186618 /* BaseViewController.m in Sources */,
 				C3004D35215A583400A83C3D /* CNLiveNewsDetailsView.m in Sources */,
+				083CB9C926D8CF6100E21EBC /* UINavigationController+PushOneVC.m in Sources */,
 				08C721BA24CAC9B700970100 /* UIView+SDExtension.m in Sources */,
 				0816B5E42648C23A005E1F8C /* UIColor+CNGray.m in Sources */,
 			);
@@ -62,12 +62,12 @@ static NSString *indicatorTableViewCell = @&quot;CNLiveIndicatorTableViewCell&quot;;
 //        self->_isLoaded = YES;
     } failure:^(NSError *error) {
+        [MBProgressHUD hideHUDForView:self.view animated:YES];
         NSData *data = [[NSUserDefaults standardUserDefaults] objectForKey:@"LiveHeader"];
         if (data) {
             [self dealDictionaryData:data];
         }
         [AlertViewTool showHUDAddedToView:self.view text:CustomStr(@"ServerBusy")];
-        [MBProgressHUD hideHUDForView:self.view animated:YES];
     }];
 }
@@ -197,6 +197,7 @@
     [shareButton addTarget:self action:@selector(shareButton:) forControlEvents:UIControlEventTouchUpInside];
     [shareButton setImage:[UIImage imageNamed:@"cnlive_live_share"] forState:UIControlStateNormal];
     [shareButton setFrame:CGRectMake(MainScreenWidth-40, StatusBarHeight+7, 30, 30)];
+    shareButton.centerY = backButton.centerY;
     [self.view addSubview:shareButton];
 }
@@ -232,6 +233,7 @@
         [shareButton addTarget:self action:@selector(shareButton:) forControlEvents:UIControlEventTouchUpInside];
         [shareButton setImage:[UIImage imageNamed:@"cnlive_live_share"] forState:UIControlStateNormal];
         [shareButton setFrame:CGRectMake(MainScreenWidth-40, StatusBarHeight+7, 30, 30)];
+        shareButton.centerY = backButton.centerY;
         [bgView addSubview:shareButton];
         if (self.type == PlayerTypeLiving) {
+//
+//  UINavigationController+PushOneVC.h
+//  CNLiveScioLive
+//
+//  Created by CNLive on 2021/8/27.
+//  Copyright © 2021 CNLive. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface UINavigationController (PushOneVC)
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  UINavigationController+PushOneVC.m
+//  CNLiveScioLive
+//
+//  Created by CNLive on 2021/8/27.
+//  Copyright © 2021 CNLive. All rights reserved.
+//
+
+#import "UINavigationController+PushOneVC.h"
+#import <objc/runtime.h>
+
+@implementation UINavigationController (PushOneVC)
++(void)load
+{
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        Method origin = class_getInstanceMethod(self, @selector(pushViewController:animated:));
+        Method new = class_getInstanceMethod(self, @selector(CN_pushViewController:animated:));
+        method_exchangeImplementations(origin, new);
+    });
+}
+
+-(void)CN_pushViewController:(UIViewController *)viewController animated:(BOOL)animated
+{
+    if ([self.viewControllers.lastObject isKindOfClass:[viewController class]]) {
+        return;
+    }
+    self.modalPresentationStyle = UIModalPresentationFullScreen;
+    [self CN_pushViewController:viewController animated:YES];
+}
+@end