1.去掉启动nas相关逻辑

创维盒子/双子星云手机/AppDelegate/AppDelegate.m

@@ -267,58 +267,58 @@
     }
     
     //是否备份中 处理切换网络环境 用户无感备份切换
-    if(([nasBackupsManager shareInstance].curPhotosBackupsTaskMod
-       && [nasBackupsManager shareInstance].curPhotosBackupsTaskMod.curBackupsState == backupsStateUploading)
-       || [nasBackupsManager shareInstance].isWifiNeedReBackupsType){
-        
-        //1.先暂停备份
-        [[nasBackupsManager shareInstance] suspendBackupsFileFun];
-        
-        //2.重新开启备份
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [[nasBackupsManager shareInstance] reBackupsFileFun];
-        });
-    }
+//    if(([nasBackupsManager shareInstance].curPhotosBackupsTaskMod
+//       && [nasBackupsManager shareInstance].curPhotosBackupsTaskMod.curBackupsState == backupsStateUploading)
+//       || [nasBackupsManager shareInstance].isWifiNeedReBackupsType){
+//        
+//        //1.先暂停备份
+//        [[nasBackupsManager shareInstance] suspendBackupsFileFun];
+//        
+//        //2.重新开启备份
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//            [[nasBackupsManager shareInstance] reBackupsFileFun];
+//        });
+//    }
     
     //是否上传中 处理切换网络环境 用户无感上传切换
-    BOOL needToReUploadTaskType = [nasUploadFileManager shareInstance].needToReUploadTaskType;
-    if(needToReUploadTaskType){//如果网络层先保存 这里为YES
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
-        });
-    }
-    else{
-        //有可能是网络变化先收到通知
-        if([nasUploadFileManager shareInstance].uploadingArr.count > 0){
-            [[nasUploadFileManager shareInstance] saveUploadingTaskByNetWorkErrorFun];
-            //因为不知道是网络变化通知快 还是传输快 这里5秒后重新传
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
-            });
-        }
-    }
+//    BOOL needToReUploadTaskType = [nasUploadFileManager shareInstance].needToReUploadTaskType;
+//    if(needToReUploadTaskType){//如果网络层先保存 这里为YES
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//            [[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
+//        });
+//    }
+//    else{
+//        //有可能是网络变化先收到通知
+//        if([nasUploadFileManager shareInstance].uploadingArr.count > 0){
+//            [[nasUploadFileManager shareInstance] saveUploadingTaskByNetWorkErrorFun];
+//            //因为不知道是网络变化通知快 还是传输快 这里5秒后重新传
+//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//                [[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
+//            });
+//        }
+//    }
     
     //HLog(@"hxd 1111")
     //是否下载中 处理切换网络环境 用户无感下载切换
-    BOOL needToReDownloadTaskType = [nasDownloadFileManager shareInstance].needToReDownloadTaskType;
-    if(needToReDownloadTaskType){//如果网络层先保存 这里为YES
-        //HLog(@"hxd 2222")
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [[nasDownloadFileManager shareInstance] reDownloadloadFileFunByNetWork];
-        });
-    }
-    else{
-        //HLog(@"hxd 3333")
-        //有可能是网络变化先收到通知
-        if([nasDownloadFileManager shareInstance].downLoadFileModelDataArr.count > 0){
-            //HLog(@"hxd 4444")
-            [[nasDownloadFileManager shareInstance] saveDownloadloadingTaskByNetWorkErrorFun];
-            //因为不知道是网络变化通知快 还是传输快 这里5秒后重新传
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [[nasDownloadFileManager shareInstance] reDownloadloadFileFunByNetWork];
-            });
-        }
-    }
+//    BOOL needToReDownloadTaskType = [nasDownloadFileManager shareInstance].needToReDownloadTaskType;
+//    if(needToReDownloadTaskType){//如果网络层先保存 这里为YES
+//        //HLog(@"hxd 2222")
+//        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//            [[nasDownloadFileManager shareInstance] reDownloadloadFileFunByNetWork];
+//        });
+//    }
+//    else{
+//        //HLog(@"hxd 3333")
+//        //有可能是网络变化先收到通知
+//        if([nasDownloadFileManager shareInstance].downLoadFileModelDataArr.count > 0){
+//            //HLog(@"hxd 4444")
+//            [[nasDownloadFileManager shareInstance] saveDownloadloadingTaskByNetWorkErrorFun];
+//            //因为不知道是网络变化通知快 还是传输快 这里5秒后重新传
+//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+//                [[nasDownloadFileManager shareInstance] reDownloadloadFileFunByNetWork];
+//            });
+//        }
+//    }
 }
 
 

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

@@ -414,10 +414,10 @@
     }
     
     //下载配置先处理
-    [boxDownloadFileManager shareInstance];
-    
-    [lastFileManager shareManager].uid = ksharedAppDelegate.DeviceThirdIdMod.data.sn;
-    [audioPlayListManager shareManager].uid = ksharedAppDelegate.DeviceThirdIdMod.data.sn;
+//    [boxDownloadFileManager shareInstance];
+//    
+//    [lastFileManager shareManager].uid = ksharedAppDelegate.DeviceThirdIdMod.data.sn;
+//    [audioPlayListManager shareManager].uid = ksharedAppDelegate.DeviceThirdIdMod.data.sn;
     
     //获取NAS相关信息
     [self getNASMsgFun];
@@ -1023,37 +1023,37 @@
 //    [uploadFileManager shareInstance].fileModelDataArr = [NSMutableArray new];
 //    [uploadFileManager shareInstance].curUploadFileDataModel.curUploadStateType = uploadStateWait;
     
-    [[nasUploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
-    [nasUploadFileManager shareInstance].databaseArr = nil;
+    //[[nasUploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
+    //[nasUploadFileManager shareInstance].databaseArr = nil;
     
 //    [[downloadManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
 //    [downloadManager shareInstance].databaseArr = [NSMutableArray new];
 //    [downloadManager shareInstance].downLoadFileModelDataArr = [NSMutableArray new];
     
-    [[nasDownloadFileManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
-    [nasDownloadFileManager shareInstance].databaseArr = nil;
+    //[[nasDownloadFileManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
+    //[nasDownloadFileManager shareInstance].databaseArr = nil;
     
     //[[backupsFileManager shareInstance] suspendBackupsFileFun];
-    [[nasBackupsManager shareInstance] suspendBackupsFileFun];
+    //[[nasBackupsManager shareInstance] suspendBackupsFileFun];
     
     //frp的下载
-    [[customDownloadManager shareManager] suspendAllDownloadTask];
-    
-    NSString *uid =ksharedAppDelegate.DeviceThirdIdMod.data.sn;
-    if(uid){
-        
-    }
-    else{
-        uid = @"";
-    }
-    
-    [customDownloadManager shareManager].uid = uid;
+    //[[customDownloadManager shareManager] suspendAllDownloadTask];
     
-    //盒子1音频在播放音乐，切换盒子2成功，仍在播放中
-    [[DFPlayer sharedPlayer] df_deallocPlayer];
-    
-    [lastFileManager shareManager].uid = uid;
-    [audioPlayListManager shareManager].uid = uid;
+//    NSString *uid =ksharedAppDelegate.DeviceThirdIdMod.data.sn;
+//    if(uid){
+//        
+//    }
+//    else{
+//        uid = @"";
+//    }
+//    
+//    [customDownloadManager shareManager].uid = uid;
+//    
+//    //盒子1音频在播放音乐，切换盒子2成功，仍在播放中
+//    [[DFPlayer sharedPlayer] df_deallocPlayer];
+//    
+//    [lastFileManager shareManager].uid = uid;
+//    [audioPlayListManager shareManager].uid = uid;
     
     
     [self enterMainVCFromScene];

创维盒子/双子星云手机/Class/Set/ChangeDevice/QRCodeScanForChangeDeviceViewController.m

@@ -292,12 +292,12 @@ bool isDownType22 = YES;
 {
     
     //[[uploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
-    [[nasUploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
+    //[[nasUploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
     //[[downloadManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
-    [[nasDownloadFileManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
+    //[[nasDownloadFileManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
     //[[backupsFileManager shareInstance] suspendBackupsFileFun];
-    [[nasBackupsManager shareInstance] suspendBackupsFileFun];
-    [[boxDownloadFileManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
+    //[[nasBackupsManager shareInstance] suspendBackupsFileFun];
+    //[[boxDownloadFileManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
     
     NSString *resStr = resultStr;
     if(resStr.length > 22)

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

@@ -178,7 +178,7 @@
     [[errorAlertTool shareInstance] dismissErrorAlertFun];
     
     //处理相册备份
-    [[nasBackupsManager shareInstance] AutohandlePhotosBackupsFun];
+    //[[nasBackupsManager shareInstance] AutohandlePhotosBackupsFun];
     
     //获取磁盘外挂
     [self getExtraFilesListFun];
@@ -615,7 +615,7 @@
 {
     HLog(@"checkAllTaskFun");
     //处理相册备份
-    [[nasBackupsManager shareInstance] checkReBackupsFileFun];
+    //[[nasBackupsManager shareInstance] checkReBackupsFileFun];
     
     //处理上传失败的重新上传
     //[[nasUploadFileManager shareInstance] reUploadFileFunByNetWork];
@@ -635,10 +635,10 @@
 - (void)checkFileTransfeTaskFun
 {
     
-    BOOL isBackupsingType = [[nasBackupsManager shareInstance] checkBackupsingFun];
-    BOOL isUploadingType = [[nasMixUploadManager shareManager] checkUploadTaskDoingFun];
-    BOOL isDownloadingType = [[nasDownloadManager shareManager] isDownLoadIngType];
-    BOOL isNasDownloadingType = [customDownloadManager shareManager].isDownLoadIngType;
+    BOOL isBackupsingType = NO;//[[nasBackupsManager shareInstance] checkBackupsingFun];
+    BOOL isUploadingType = NO;//[[nasMixUploadManager shareManager] checkUploadTaskDoingFun];
+    BOOL isDownloadingType = NO;//[[nasDownloadManager shareManager] isDownLoadIngType];
+    BOOL isNasDownloadingType = NO;//[customDownloadManager shareManager].isDownLoadIngType;
     
     BOOL isBackground = [HWDataManager getBoolWithKey:stringKeyAddSn(Const_file_Transfe_working_background)];