Sfoglia il codice sorgente

1.上传视频/图片中,右上角记录没有红色标点

huangxiaodong 1 anno fa
parent
commit
5e5d81c6e3
1 ha cambiato i file con 63 aggiunte e 10 eliminazioni
  1. 63 10
      创维盒子/双子星云手机/NAS/NASViewController.m

+ 63 - 10
创维盒子/双子星云手机/NAS/NASViewController.m

@@ -31,6 +31,10 @@
 @interface NASViewController ()<UITableViewDelegate,UITableViewDataSource>
 {
     BOOL canShareType;
+    
+    UIView* rightRedView;//
+    BOOL hadUploadTaskType;
+    BOOL hadDownloadTaskType;
 }
 @property (nonatomic,strong)UITableView*tableView;
 
@@ -108,32 +112,45 @@
     
     //添加按钮
     UIButton *addButton = [[UIButton alloc] init];
-    [addButton setBackgroundImage:[UIImage imageNamed:@"nas_add_icon"] forState:UIControlStateNormal];
+    [addButton setImage:[UIImage imageNamed:@"nas_add_icon"] forState:UIControlStateNormal];
     addButton.tag = 1;
     [addButton addTarget:self action:@selector(didClickHeadButtonFun:) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:addButton];
     
     [addButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(imageTopY);
-        make.right.mas_equalTo(-16);
-        make.width.mas_equalTo(24);
-        make.height.mas_equalTo(24);
+        make.centerY.equalTo(welcomeImageV.mas_centerY).offset(0);
+        make.right.mas_equalTo(-10);
+        make.width.mas_equalTo(40);
+        make.height.mas_equalTo(40);
     }];
     
     UIButton *rightTransferListButton = [[UIButton alloc] init];
     //[rightTransferListButton setImage:[UIImage imageNamed:@"icon_file_transfer"] forState:UIControlStateNormal];
-    [rightTransferListButton setBackgroundImage:[UIImage imageNamed:@"icon_file_transfer"] forState:UIControlStateNormal];
+    [rightTransferListButton setImage:[UIImage imageNamed:@"icon_file_transfer"] forState:UIControlStateNormal];
     rightTransferListButton.tag = 2;
     [rightTransferListButton addTarget:self action:@selector(didClickHeadButtonFun:) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:rightTransferListButton];
     
     [rightTransferListButton mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.mas_equalTo(imageTopY);
-        make.right.equalTo(addButton.mas_left).offset(-24);
-        make.width.mas_equalTo(24);
-        make.height.mas_equalTo(24);
+        //make.top.mas_equalTo(imageTopY);
+        make.centerY.equalTo(welcomeImageV.mas_centerY).offset(0);
+        make.right.equalTo(addButton.mas_left).offset(-10);
+        make.width.mas_equalTo(40);
+        make.height.mas_equalTo(40);
     }];
     
+    rightRedView = [[UIView alloc] init];
+    rightRedView.backgroundColor = [UIColor hwColor:@"#DD4E4E" alpha:1.0];
+    [rightTransferListButton addSubview:rightRedView];
+    rightRedView.layer.cornerRadius = 7;
+    rightRedView.hidden = YES;
+    
+    [rightRedView mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.width.mas_equalTo(14);
+        make.height.mas_equalTo(14);
+        make.right.mas_equalTo(0);
+        make.top.mas_equalTo(6);
+    }];
     
     [self.view addSubview:self.tableView];
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -524,6 +541,10 @@
     [self getLastFileDataFun];
     
     [self queryShareSwitchFunFun];
+    
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [self checkFileTransferTask];
+    });
 }
 
 - (void)viewWillDisappear:(BOOL)animated{
@@ -651,4 +672,36 @@
     }];
 }
 
+- (void)checkFileTransferTask
+{//有个偶现的闪退在BGFMDB
+    
+    [[uploadFileManager shareInstance] checkHadUploadTaskWithComplete:^(BOOL isSuccess) {
+        self->hadUploadTaskType = isSuccess;
+        [self setRightButtonRedTypeFun];
+    }];
+    
+    KWeakSelf
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        [[downloadManager shareInstance] checkHadDownloadTaskWithComplete:^(BOOL isSuccess) {
+            self->hadDownloadTaskType = isSuccess;
+            [weakSelf setRightButtonRedTypeFun];
+        }];
+    });
+   
+}
+
+- (void)setRightButtonRedTypeFun
+{
+    mainBlock(^{
+        if(self->hadUploadTaskType || self->hadDownloadTaskType){
+            self->rightRedView.hidden = NO;
+        }
+        else{
+            self->rightRedView.hidden = YES;
+        }
+
+    });
+}
+
+
 @end