1.上传文件是退出是跳过获取图片/视频页

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileRecordViewController.h

@@ -9,7 +9,7 @@
 #import "TZImageManager.h"
 #import "TZAssetModel+imageData.h"
 #import "downloadThumbnailManager.h"
-
+#import "uploadImageOrVideoViewController.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileRecordViewController.m

@@ -1034,24 +1034,28 @@
 
 
 
-//-(void)backBtnPressed{
-//    //[super backBtnPressed];
-//
-//    NSArray *vcArrs = self.navigationController.viewControllers;
-//
-//    BOOL didPopType = NO;
-//    for (UIViewController *vc in vcArrs) {
-//        if([vc isKindOfClass:[MySetViewController class]]){
-//            didPopType = YES;
-//            [self.navigationController popToViewController:vc animated:YES];
-//            return;
-//        }
-//    }
-//
-//    if(!didPopType){
-//        [self.navigationController popViewControllerAnimated:YES];
-//    }
-//}
+-(void)backBtnPressed{
+    //[super backBtnPressed];
+
+    NSArray *vcArrs = self.navigationController.viewControllers;
+    NSInteger count = vcArrs.count;
+  
+    
+    UIViewController *vc = nil;
+    if(count > 2){
+        UIViewController *lastVC = vcArrs[count-2];
+        if([lastVC isKindOfClass:[uploadImageOrVideoViewController class]]){
+            vc = vcArrs[count-3];
+        }
+    }
+    
+    if(vc){
+        [self.navigationController popToViewController:vc animated:YES];
+    }
+    else{
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+}
 
 - (void)backupsFileRefreshFun:(NSNotification*)not
 {