Browse Source

1.备份设置

huangxiaodong 1 year ago
parent
commit
7ee121bc7c

+ 8 - 2
创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/backupsSetViewController.m

@@ -187,7 +187,9 @@
 }
 }
 
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-    return 2;
+    //return 2;
+    
+    return 1;
 }
 }
 
 
 - (fileSetTableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
 - (fileSetTableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
@@ -228,7 +230,11 @@
         maskLayer.path = maskPath.CGPath;
         maskLayer.path = maskPath.CGPath;
         cell.bgViewLayer = maskLayer;
         cell.bgViewLayer = maskLayer;
         cell.cellBgView.layer.mask = cell.bgViewLayer;
         cell.cellBgView.layer.mask = cell.bgViewLayer;
-    }else if (row == 1){
+    }
+        
+    //if (row == 1)
+    if (row == 0)
+    {
         [cell.titleLabel setText:NSLocalizedString(@"File_backups_set_battery_level",nil)];
         [cell.titleLabel setText:NSLocalizedString(@"File_backups_set_battery_level",nil)];
  
  
         BOOL haveOpenMask = [HWDataManager getBoolWithKey:Const_file_backups_battery_level];
         BOOL haveOpenMask = [HWDataManager getBoolWithKey:Const_file_backups_battery_level];

+ 5 - 3
创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/view/filePathCreatPopView.m

@@ -46,7 +46,8 @@
     [whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
     [whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(0);
         make.left.mas_equalTo(0);
         make.right.mas_equalTo(0);
         make.right.mas_equalTo(0);
-        make.height.mas_equalTo(418+ 10 + safeArea);
+        //make.height.mas_equalTo(418+ 10 + safeArea);
+        make.height.mas_equalTo(200+ 10 + safeArea);
         make.bottom.mas_equalTo(10);
         make.bottom.mas_equalTo(10);
     }];
     }];
     
     
@@ -80,10 +81,11 @@
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
     [self.tableView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(15);
         make.left.mas_equalTo(15);
         make.right.mas_equalTo(-15);
         make.right.mas_equalTo(-15);
-        make.height.mas_equalTo(70*2+50);
+        //make.height.mas_equalTo(70*2+50);
+        make.height.mas_equalTo(0.0);
         make.top.equalTo(titleLabel.mas_bottom).offset(15.f);
         make.top.equalTo(titleLabel.mas_bottom).offset(15.f);
     }];
     }];
-    
+    self.tableView.hidden = YES;
     
     
     UILabel *tipLabel = [[UILabel alloc] init];
     UILabel *tipLabel = [[UILabel alloc] init];
     tipLabel.text = NSLocalizedString(@"File_upload_path_new_name_tip",nil);
     tipLabel.text = NSLocalizedString(@"File_upload_path_new_name_tip",nil);

+ 3 - 3
创维盒子/双子星云手机/Class/Set/view/mySetHeadView.m

@@ -293,9 +293,9 @@
         make.height.mas_equalTo(40);
         make.height.mas_equalTo(40);
     }];
     }];
     
     
-    arrowImageView2.hidden = YES;
-    BackupsRightLabel.hidden = YES;
-    BackupsSetBut.hidden = YES;
+//    arrowImageView2.hidden = YES;
+//    BackupsRightLabel.hidden = YES;
+//    BackupsSetBut.hidden = YES;
     
     
     UIButton *BackupsEyeBut = [[UIButton alloc] init];
     UIButton *BackupsEyeBut = [[UIButton alloc] init];
     //BackupsEyeBut.backgroundColor = [UIColor greenColor];
     //BackupsEyeBut.backgroundColor = [UIColor greenColor];

+ 11 - 11
创维盒子/双子星云手机/CloudPlayer/PlayerViewController+backupsFile.m

@@ -273,17 +273,17 @@
 #pragma mark 处理上传过程
 #pragma mark 处理上传过程
 - (void)handleBackupsingFun:(NSNumber*)fileLengthNum
 - (void)handleBackupsingFun:(NSNumber*)fileLengthNum
 {
 {
-//    BOOL isCanUseCellular = [HWDataManager getBoolWithKey:Const_file_backups_canUse_Cellular];
-//
-//    if(!isCanUseCellular){//不允许流量备份
-//        //
-//        if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN){
-//            self.curPhotosBackupsTaskMod.isBackupsSuspendType = backupsSuspendByOther;
-//            self.curPhotosBackupsTaskMod.curBackupsState = backupsStateSuspend;
-//            [[backupsFileManager shareInstance] changeBackupsFileStateWithSpeedFun];
-//        }
-//
-//    }
+    BOOL isCanUseCellular = [HWDataManager getBoolWithKey:Const_file_backups_canUse_Cellular];
+
+    if(!isCanUseCellular){//不允许流量备份
+        //
+        if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN){
+            self.curPhotosBackupsTaskMod.isBackupsSuspendType = backupsSuspendByOther;
+            self.curPhotosBackupsTaskMod.curBackupsState = backupsStateSuspend;
+            [[backupsFileManager shareInstance] changeBackupsFileStateWithSpeedFun];
+        }
+
+    }
     
     
     
     
     if(self.curPhotosBackupsTaskMod.isBackupsSuspendType != backupsSuspendNone){
     if(self.curPhotosBackupsTaskMod.isBackupsSuspendType != backupsSuspendNone){