Browse Source

1.去掉非nas下载相关情况

huangxiaodong 6 months ago
parent
commit
de2eb9d589

+ 19 - 19
创维盒子/双子星云手机/AppDelegate/SceneDelegate.m

@@ -640,23 +640,23 @@
 
 - (void)scene:(UIScene *)scene openURLContexts:(NSSet<UIOpenURLContext *> *)URLContexts {
     HLog(@"scene openURLContexts")
-    NSEnumerator *enumerator = [URLContexts objectEnumerator];
-    UIOpenURLContext *context;
-    while (context = [enumerator nextObject]) {
-        NSLog(@"context.URL =====%@",context.URL);
-        //openprivacyxapp://page?param1=value1&param2=value2
-        NSString *curStr = context.URL.absoluteString;
-        if([curStr rangeOfString:@"openprivacyxapp://page"].location != NSNotFound){
-            _getShareStr = curStr;
-            [self delayedHandlShareAwakenAppBy:curStr];
-            break;
-        }
-        else{
-            
-        }
-        //NSLog(@"context.options.sourceApplication ===== %@",context.options.sourceApplication);
-        
-    }
+//    NSEnumerator *enumerator = [URLContexts objectEnumerator];
+//    UIOpenURLContext *context;
+//    while (context = [enumerator nextObject]) {
+//        NSLog(@"context.URL =====%@",context.URL);
+//        //openprivacyxapp://page?param1=value1&param2=value2
+//        NSString *curStr = context.URL.absoluteString;
+//        if([curStr rangeOfString:@"openprivacyxapp://page"].location != NSNotFound){
+//            _getShareStr = curStr;
+//            [self delayedHandlShareAwakenAppBy:curStr];
+//            break;
+//        }
+//        else{
+//            
+//        }
+//        //NSLog(@"context.options.sourceApplication ===== %@",context.options.sourceApplication);
+//        
+//    }
     
     _session = nil;
     _connectionOptions = nil;
@@ -993,10 +993,10 @@
     [nasDownloadFileManager shareInstance].databaseArr = nil;
     
     //[[backupsFileManager shareInstance] suspendBackupsFileFun];
-    [[nasBackupsManager shareInstance] suspendBackupsFileFun];
+    //[[nasBackupsManager shareInstance] suspendBackupsFileFun];
     
     //frp的下载
-    [[customDownloadManager shareManager] suspendAllDownloadTask];
+    //[[customDownloadManager shareManager] suspendAllDownloadTask];
     
     NSString *uid =ksharedAppDelegate.DeviceThirdIdMod.data.sn;
     if(uid){

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

@@ -155,16 +155,17 @@
     
     [self getBackupsDatabaseFun];
     
-    if(!_isReceiveType){
-        [_curReceiveView getAllDataFun];
-    }
+//    if(!_isReceiveType){
+//        [_curReceiveView getAllDataFun];
+//    }
 }
 
 - (void)handleRemoveIndicator
 {
     if(_didGetUploadDataType
        && _didGetDownloadDataType
-       && _didGetbackupsloadDataType){
+       //&& _didGetbackupsloadDataType
+       ){
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
             [SVProgressHUD dismiss];
         });
@@ -660,15 +661,15 @@
 
 - (void)getBackupsDatabaseFun
 {
-    KWeakSelf
-    [photosBackupsTaskModel bg_findAsync:backups_photos_tableName limit:1 orderBy:nil desc:YES complete:^(NSArray * _Nullable array) {
-        mainBlock(^{
-            weakSelf.didGetbackupsloadDataType = YES;
-            [weakSelf handleRemoveIndicator];
-            weakSelf.rightTableView.curDataArr = array;
-        });
-            
-    }];
+//    KWeakSelf
+//    [photosBackupsTaskModel bg_findAsync:backups_photos_tableName limit:1 orderBy:nil desc:YES complete:^(NSArray * _Nullable array) {
+//        mainBlock(^{
+//            weakSelf.didGetbackupsloadDataType = YES;
+//            [weakSelf handleRemoveIndicator];
+//            weakSelf.rightTableView.curDataArr = array;
+//        });
+//            
+//    }];
 }
 
 #pragma mark 读取数据库数据
@@ -1386,12 +1387,12 @@
 - (void)setIsReceiveType:(NSInteger)isReceiveType
 {
     _isReceiveType = isReceiveType;
-    KWeakSelf
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-        weakSelf.curReceiveView.isReceiveType = isReceiveType;
-        [weakSelf.curReceiveView getAllDataFun];
-        [weakSelf delayChangeUIFunWithIndex:4];
-    });
+//    KWeakSelf
+//    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//        weakSelf.curReceiveView.isReceiveType = isReceiveType;
+//        [weakSelf.curReceiveView getAllDataFun];
+//        [weakSelf delayChangeUIFunWithIndex:4];
+//    });
 }
 
 #pragma mark 删除云机文件数据

+ 5 - 3
创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager+downloadNasFile.m

@@ -104,7 +104,8 @@
 //                 self->curYCDownloadItem = nil;
 //             }
              
-             [[boxDownloadFileManager shareInstance] deleteDownloadDonePlistInfoBy:fullPath];
+             [[nasDownloadFileManager shareInstance] deleteDownloadDonePlistInfoBy:fullPath];
+             //[[boxDownloadFileManager shareInstance] deleteDownloadDonePlistInfoBy:fullPath];
              
          } else {
              HLog(@"未能将图片保存至相册");
@@ -135,6 +136,7 @@
 //            }
             
             [[boxDownloadFileManager shareInstance] deleteDownloadDonePlistInfoBy:fullPath];
+            //[[boxDownloadFileManager shareInstance] deleteDownloadDonePlistInfoBy:fullPath];
         } else {
             HLog(@"未能将视频保存至相册");
             mainBlock(^{
@@ -215,7 +217,7 @@
                 else{
                     //nas下载流程
                     [[NSFileManager defaultManager] removeItemAtPath:self.nasFullPath error:nil];
-                    [[boxDownloadFileManager shareInstance] deleteDownloadDonePlistInfoBy:self.nasFullPath];
+                    //[[boxDownloadFileManager shareInstance] deleteDownloadDonePlistInfoBy:self.nasFullPath];
                     [[nasDownloadFileManager shareInstance] deleteDownloadDonePlistInfoBy:self.nasFullPath];
                     self.nasFullPath = nil;
                     [self checkSaveNasFileAgainFun];
@@ -249,7 +251,7 @@
 #pragma mark 再次读取下载完成数据做保存操作
 - (void)checkSaveNasFileAgainFun
 {
-    [[boxDownloadFileManager shareInstance] checkDownloadDonePlistInfoFun];
+    //[[boxDownloadFileManager shareInstance] checkDownloadDonePlistInfoFun];
     
     [[nasDownloadFileManager shareInstance] checkDownloadDonePlistInfoFun];
 }

+ 1 - 0
创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.h

@@ -19,6 +19,7 @@
 #import "couldPhoneCommonModel.h"
 #import "extraMediaEventModel.h"
 #import "AudioSessionObject.h"
+#import "nasDownloadFileManager.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

+ 1 - 1
创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.m

@@ -638,7 +638,7 @@
     BOOL isBackupsingType = NO;//[[nasBackupsManager shareInstance] checkBackupsingFun];
     BOOL isUploadingType = [[nasMixUploadManager shareManager] checkUploadTaskDoingFun];
     BOOL isDownloadingType = [[nasDownloadManager shareManager] isDownLoadIngType];
-    BOOL isNasDownloadingType = [customDownloadManager shareManager].isDownLoadIngType;
+    BOOL isNasDownloadingType = NO;//[customDownloadManager shareManager].isDownLoadIngType;
     
     BOOL isBackground = [HWDataManager getBoolWithKey:stringKeyAddSn(Const_file_Transfe_working_background)];