浏览代码

1.已有任务正在上传中,可选中文件再次上传

huangxiaodong 1 年之前
父节点
当前提交
4ee92deb2f

+ 30 - 2
创维盒子/双子星云手机/Class/Set/previewFile/view/previewToUploadFileView.m

@@ -15,13 +15,41 @@
 
 - (id)initWithFrame:(CGRect)frame{
     self = [super initWithFrame:frame];
-    self.backgroundColor = [UIColor hwColor:@"#000000" alpha:0.6];
-    [self drawAnyView];
+    [self checkDidHadUploadTaskFun];
+    //[self drawAnyView];
     return self;
 }
 
+-(void)checkDidHadUploadTaskFun
+{
+   KWeakSelf
+   [[uploadFileManager shareInstance] getDataInDatabaseFun:YES complete:^(NSMutableArray * _Nonnull Arr) {
+       mainBlock(^{
+           if(Arr && Arr.count== 3){
+               NSArray *uploadingArr = Arr.firstObject;
+               if(uploadingArr.count == 0){
+                   [weakSelf drawAnyView];
+               }
+               else{
+                   [[iToast makeText:NSLocalizedString(@"upload_task_not_done_tip",nil)] show];
+                   if(self->_didClickCloseFun){
+                       self->_didClickCloseFun();
+                   }
+                   [weakSelf removeFromSuperview];
+               }
+           }
+           else{
+               [weakSelf drawAnyView];
+           };
+       });
+           
+   }];
+}
+
 - (void)drawAnyView{
     
+    self.backgroundColor = [UIColor hwColor:@"#000000" alpha:0.6];
+    
     UIView *whiteBgView = [[UIView alloc] init];
     whiteBgView.backgroundColor = [UIColor whiteColor];
     [self addSubview:whiteBgView];

+ 1 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/uploadImageOrVideoViewController.m

@@ -703,7 +703,7 @@
     [super viewDidAppear:animated];
     [self showUploadTipFun];
     
-    //旋转访问时 重新拿数据
+    //权限访问时 重新拿数据 验证iOS 15.0有效 17.5.1无效 (viewDidAppear 和applicationDidBecomeActive 均不走)
     [self.photoGroupView setupGroup];
     [self delayedSetPhotoGroupViewFrameFun];
 }