Przeglądaj źródła

1.去掉websocket 代码

huangxiaodong 2 miesięcy temu
rodzic
commit
5779e65d57
24 zmienionych plików z 35 dodań i 3184 usunięć
  1. 10 1
      创维盒子/code/AppDelegate/PrefixHeader.pch
  2. 1 1
      创维盒子/code/Class/Set/MySetViewController.m
  3. 1 1
      创维盒子/code/Class/Set/uploadFile/downLoadFile/downLoadPreviewViewController.m
  4. 2 2
      创维盒子/code/Class/Set/uploadFile/uploadFileManager/backupsFileManager.m
  5. 3 3
      创维盒子/code/Class/Set/uploadFile/uploadFileManager/downloadManager.m
  6. 1 1
      创维盒子/code/Class/Set/uploadFile/uploadFileManager/downloadThumbnailManager.m
  7. 8 8
      创维盒子/code/Class/Set/uploadFile/uploadFileManager/uploadFileManager.m
  8. 1 1
      创维盒子/code/NAS/nasDownloadManager/nasDownloadFileManager.h
  9. 0 18
      创维盒子/code/cloudPhone/websocket/webSocketManager+backupsFile.h
  10. 0 649
      创维盒子/code/cloudPhone/websocket/webSocketManager+backupsFile.m
  11. 0 16
      创维盒子/code/cloudPhone/websocket/webSocketManager+baseDownload.h
  12. 0 116
      创维盒子/code/cloudPhone/websocket/webSocketManager+baseDownload.m
  13. 0 21
      创维盒子/code/cloudPhone/websocket/webSocketManager+downloadFile.h
  14. 0 351
      创维盒子/code/cloudPhone/websocket/webSocketManager+downloadFile.m
  15. 0 17
      创维盒子/code/cloudPhone/websocket/webSocketManager+downloadNasFile.h
  16. 0 211
      创维盒子/code/cloudPhone/websocket/webSocketManager+downloadNasFile.m
  17. 0 17
      创维盒子/code/cloudPhone/websocket/webSocketManager+downloadThumbnailImage.h
  18. 0 95
      创维盒子/code/cloudPhone/websocket/webSocketManager+downloadThumbnailImage.m
  19. 0 20
      创维盒子/code/cloudPhone/websocket/webSocketManager+upLoadFile.h
  20. 0 669
      创维盒子/code/cloudPhone/websocket/webSocketManager+upLoadFile.m
  21. 0 140
      创维盒子/code/cloudPhone/websocket/webSocketManager.h
  22. 0 742
      创维盒子/code/cloudPhone/websocket/webSocketManager.m
  23. 8 0
      创维盒子/code/webRtc/webRtcManager/webRtcManager.h
  24. 0 84
      创维盒子/双子星云手机.xcodeproj/project.pbxproj

+ 10 - 1
创维盒子/code/AppDelegate/PrefixHeader.pch

@@ -49,7 +49,7 @@
 #import "connectDeviceManager.h"
 #import "cachesFileManager.h"
 #import "ComontAlretViewController.h"
-#import "webSocketManager.h"
+//#import "webSocketManager.h"
 #import "webRtcManager.h"
 #import "pingManager.h"
 
@@ -57,6 +57,13 @@
 #import "RSATool.h"
 #import "lastFileManager.h"
 
+#import "couldPhoneFileListModel.h"
+#import "nasBackupsManager.h"
+#import "nasMixBackupsManager.h"
+#import "nasDownloadFileManager.h"
+#import "downloadManager.h"
+#import "couldphoneSysInfoModel.h"
+
 #ifdef DEBUG // 调试状态, 打开LOG功能
 #define HLog(fmt, ...) NSLog((@"%@ %s [Line %d] " fmt),[iTools getNowTimeString3], __PRETTY_FUNCTION__, __LINE__, ##__VA_ARGS__);
 
@@ -149,6 +156,8 @@ isBangsScreen; \
 #define User_Info_tableName(userName) [[NSString alloc] initWithFormat:@"User_Info_tableName_%@",userName];
 #define stringKeyAddSn(key)    [[NSString alloc] initWithFormat:@"%@_%@",key,ksharedAppDelegate.DeviceThirdIdMod.data.sn]
 
+#define backups_photos_tableName [[NSString alloc] initWithFormat:@"backups_photos_tableName_%@",ksharedAppDelegate.DeviceThirdIdMod.data.sn]
+
 #pragma mark 音频相关宏定义
 #define USEAAC    NO
 #define AACTOPCM  YES

+ 1 - 1
创维盒子/code/Class/Set/MySetViewController.m

@@ -394,7 +394,7 @@
 
 - (void)gotoUploadFileFunWith:(NSInteger)tag
 {
-    [[webSocketManager shareInstance] getBaseInfoFun];
+    //[[webSocketManager shareInstance] getBaseInfoFun];
     
     uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
     if(tag ==11){

+ 1 - 1
创维盒子/code/Class/Set/uploadFile/downLoadFile/downLoadPreviewViewController.m

@@ -574,7 +574,7 @@
     }
     [dict setObject:_defaultDiskPath forKey:@"path"];
     
-    [[webSocketManager shareInstance] searchFileListBeginFun:dict];
+    //[[webSocketManager shareInstance] searchFileListBeginFun:dict];
     //[self showNewIndicatorWithCanBack:YES canTouch:NO];
     [self showNewIndicatorHaveStrWithCanBack:YES canTouch:NO showText:NSLocalizedString(@"common_loading_tip",nil)];
     

+ 2 - 2
创维盒子/code/Class/Set/uploadFile/uploadFileManager/backupsFileManager.m

@@ -375,7 +375,7 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     _curPhotosBackupsTaskMod.imageData = imageData;
     _curPhotosBackupsTaskMod.didUploadBytes = 0;
     _curPhotosBackupsTaskMod.totalBytes = [imageData length];
-    [[webSocketManager shareInstance] beginGotoBackupsFileFunBy:_curPhotosBackupsTaskMod];
+    //[[webSocketManager shareInstance] beginGotoBackupsFileFunBy:_curPhotosBackupsTaskMod];
     [self RefreshDatabaseFun];
     [self changeBackupsFileStateFun];
 }
@@ -406,7 +406,7 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     }
     
     
-    [[webSocketManager shareInstance] beginGotoBackupsFileFunBy:_curPhotosBackupsTaskMod];
+    //[[webSocketManager shareInstance] beginGotoBackupsFileFunBy:_curPhotosBackupsTaskMod];
     [self RefreshDatabaseFun];
     [self changeBackupsFileStateFun];
 }

+ 3 - 3
创维盒子/code/Class/Set/uploadFile/uploadFileManager/downloadManager.m

@@ -251,7 +251,7 @@ static downloadManager * cur_downloadManager = nil;
     
     _curDownloadFileModel.curDownloadStateType = downloadStateUploading;
     
-    [[webSocketManager shareInstance] begindownloadFileFunBy:_curDownloadFileModel];
+    //[[webSocketManager shareInstance] begindownloadFileFunBy:_curDownloadFileModel];
 }
 
 - (void)DownloadFileDoneOneFileFun
@@ -556,7 +556,7 @@ static downloadManager * cur_downloadManager = nil;
         return;
     }
     
-    [[webSocketManager shareInstance] begindownloadFileFunBy:_curDownloadFileModel];
+    //[[webSocketManager shareInstance] begindownloadFileFunBy:_curDownloadFileModel];
 }
 
 - (BOOL)checkDownloadingFun
@@ -696,7 +696,7 @@ static downloadManager * cur_downloadManager = nil;
             }
             else{//存在 通知保存流程
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    [[webSocketManager shareInstance] saveDownDoneFileToPhoneFunBy:fullPath withKey:model.path];
+                    //[[webSocketManager shareInstance] saveDownDoneFileToPhoneFunBy:fullPath withKey:model.path];
                 });
                 break;
             }

+ 1 - 1
创维盒子/code/Class/Set/uploadFile/uploadFileManager/downloadThumbnailManager.m

@@ -128,7 +128,7 @@ static downloadThumbnailManager * cur_downloadFileShareInstance = nil;
     }
     
     self.taskRenewTime = [iTools getNowTimeStamp];
-    [[webSocketManager shareInstance] begindownloadThumbnailImageFunBy:_curDownloadFileModel];
+    //[[webSocketManager shareInstance] begindownloadThumbnailImageFunBy:_curDownloadFileModel];
 }
 
 - (void)DownloadFileDoneOneFileFun

+ 8 - 8
创维盒子/code/Class/Set/uploadFile/uploadFileManager/uploadFileManager.m

@@ -322,7 +322,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
                 _curUploadFileDataModel.totalBytes = _curUploadFileDataModel.imageData.length;
             }
             
-            [[webSocketManager shareInstance] beginGotoUploadFileFunBy:_curUploadFileDataModel];
+            //[[webSocketManager shareInstance] beginGotoUploadFileFunBy:_curUploadFileDataModel];
             return;
         }
         
@@ -332,7 +332,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         
         if([cachesFileManager checkFileIsSaveState:_curUploadFileDataModel.filename withType:uploadFileTypeVideo]){
         
-            [[webSocketManager shareInstance] beginGotoUploadFileFunBy:_curUploadFileDataModel];
+            //[[webSocketManager shareInstance] beginGotoUploadFileFunBy:_curUploadFileDataModel];
             return;
         }
     }
@@ -416,7 +416,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
 {
     [cachesFileManager getFileNameWithContent:_curUploadFileDataModel.imageData fileName:_curUploadFileDataModel.filename type:uploadFileTypeImage];
     
-    [[webSocketManager shareInstance] beginGotoUploadFileFunBy:_curUploadFileDataModel];
+    //[[webSocketManager shareInstance] beginGotoUploadFileFunBy:_curUploadFileDataModel];
 }
 
 - (void)afterGetImageDataInVideoFun
@@ -430,7 +430,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     
     _curUploadFileDataModel.videoData = nil;
     
-    [[webSocketManager shareInstance] beginGotoUploadFileFunBy:_curUploadFileDataModel];
+    //[[webSocketManager shareInstance] beginGotoUploadFileFunBy:_curUploadFileDataModel];
 }
 
 //修改文件上传的状态
@@ -649,7 +649,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
     }
     
     if(isSuspendAll){
-        [[webSocketManager shareInstance] suspendUploadFileFun];
+        //[[webSocketManager shareInstance] suspendUploadFileFun];
        
         for (uploadFileDataModel*model in _fileModelDataArr) {
             model.curUploadStateType = uploadStateSuspend;
@@ -667,7 +667,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
             curModel = model;
         }
         else{
-            [[webSocketManager shareInstance] suspendUploadFileFun];
+            //[[webSocketManager shareInstance] suspendUploadFileFun];
         }
 
         curModel.curUploadStateType = uploadStateSuspend;
@@ -853,7 +853,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
             if(_curUploadFileDataModel.bg_id.integerValue == uploadFileDataMod.bg_id.integerValue){
                 isDelUploadingModel = YES;
                 
-                [[webSocketManager shareInstance] suspendUploadFileFun];
+                //[[webSocketManager shareInstance] suspendUploadFileFun];
             }
         }
     }
@@ -954,7 +954,7 @@ static uploadFileManager * cur_uploadFileShareInstance = nil;
         return;
     }
     
-    [[webSocketManager shareInstance] beginGotoUploadFileFunBy:_curUploadFileDataModel];
+    //[[webSocketManager shareInstance] beginGotoUploadFileFunBy:_curUploadFileDataModel];
 }
 
 - (BOOL)checkUploadingFun

+ 1 - 1
创维盒子/code/NAS/nasDownloadManager/nasDownloadFileManager.h

@@ -10,7 +10,7 @@
 #import "nasDownloadManager.h"
 #import "customDownloadCacheManager.h"
 //#import "uploadFileManager.h"
-
+#import "couldPhoneFileListModel.h"
 NS_ASSUME_NONNULL_BEGIN
 
 //【IOS端】音频进行下载,下载列表提示下载到文件里,查看部分文件未成功下载到文件里

+ 0 - 18
创维盒子/code/cloudPhone/websocket/webSocketManager+backupsFile.h

@@ -1,18 +0,0 @@
-//
-//  webSocketManager+backupsFile.h
-//  双子星云手机
-//
-//  Created by xd h on 2024/6/20.
-//
-
-#import "webSocketManager.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface webSocketManager (backupsFile)
-- (void)beginGotoBackupsFileFunBy:(photosBackupsTaskModel *)photosBackupsTaskMod;
-- (void)applyBackupsFileServiceResponseFun:(NSDictionary *)dataDict;
-- (void)backupsFileFunServiceResponseFun:(NSDictionary *)dataDict;
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 649
创维盒子/code/cloudPhone/websocket/webSocketManager+backupsFile.m

@@ -1,649 +0,0 @@
-//
-//  webSocketManager+backupsFile.m
-//  双子星云手机
-//
-//  Created by xd h on 2024/6/20.
-//
-
-#import "webSocketManager+backupsFile.h"
-
-@implementation webSocketManager (backupsFile)
-/*****************备份相关**********************************/
-- (void)beginGotoBackupsFileFunBy:(photosBackupsTaskModel *)photosBackupsTaskMod
-{
-    //HLog(@"%@",uploadFileDataMod);
-    
-    self.curPhotosBackupsTaskMod = photosBackupsTaskMod;
-    
-    if(![photosBackupsTaskMod isKindOfClass:[photosBackupsTaskModel class]]){
-        HLog(@"备份的文件类型不对");
-        return;
-    }
-    
-    [self ApplyBackupsFileFun];
-}
-
-#pragma mark 申请备份文件
-- (void)ApplyBackupsFileFun
-{
-    //if(!self.taskUid){
-        self.backupsTaskUid = [iTools getTaskUidStr];
-        
-        if([self.backupsTaskUid isEqualToString:self.downloadFileTaskUid]
-           ||[self.backupsTaskUid isEqualToString:self.taskUid]
-           ||[self.backupsTaskUid isEqualToString:self.downloadThumbnailTaskUid])
-        {//重新生成taskUid
-            [self ApplyBackupsFileFun];
-            return;
-        }
-    
-        self.backupsFileName = self.curPhotosBackupsTaskMod.filename;
-        if(self.curPhotosBackupsTaskMod.curUploadFileType == uploadFileTypeVideo){
-           
-        }
-        else{
-            self.backupsAllFileData = self.curPhotosBackupsTaskMod.imageData;
-        }
-        
-        self.backupsIndexOfUploadFlie = 0;
-        
-    //}
-    
-    NSString * backupsDefaultPath =  self.curPhotosBackupsTaskMod.backupsPath;
-    
-    if(!backupsDefaultPath || backupsDefaultPath.length ==0){
-         backupsDefaultPath = [HWDataManager getStringWithKey:stringKeyAddSn(Const_photo_backups_default_path)];
-        
-        if(!backupsDefaultPath || backupsDefaultPath.length == 0){
-            backupsDefaultPath = Const_default_backups_path;
-            [HWDataManager setStringWithKey:stringKeyAddSn(Const_photo_backups_default_path) value:backupsDefaultPath];
-        }
-        
-        NSString *lastStr= [backupsDefaultPath substringFromIndex:backupsDefaultPath.length-1];
-        if(![lastStr isEqualToString:@"/"]){
-            backupsDefaultPath = [[NSString alloc] initWithFormat:@"%@/",backupsDefaultPath];
-        }
-    }
-    
-    
-   
-    NSString * commandStr = [RCCommandHelp applyForBackupsFileBy:self.backupsTaskUid withFileName:self.backupsFileName withSavePath:backupsDefaultPath];
-    
-    //NSString * commandStr = [RCCommandHelp applyForUploadFileBy:self.taskUid  filePath:self.fileName];
-    
-    //[self.commandChannelManager rc_sendData:commandStr];
-}
-
-- (void)applyBackupsFileServiceResponseFun:(NSDictionary *)dataDict
-{
-    if([dataDict isKindOfClass:[NSDictionary class]]){
-        if ([[dataDict allKeys] containsObject:@"data"]) {
-            NSDictionary *data = dataDict[@"data"];
-
-            if ([[data allKeys] containsObject:@"status"]) {
-                NSString  *status = [data objectForKey:@"status"];
-                if(![status isKindOfClass:[NSString class]]){
-                    status = [[NSString  alloc] initWithFormat:@"%@",status];
-                }
-                
-               if ([status isEqualToString:@"0"]){
-                    if ([[data allKeys] containsObject:@"taskUid"]) {
-                        NSString *taskUid = data[@"taskUid"];
-                        if(![status isKindOfClass:[NSString class]]){
-                            taskUid = [[NSString  alloc] initWithFormat:@"%@",taskUid];
-                        }
-                        
-                        if(taskUid &&  [taskUid isEqualToString:self.backupsTaskUid]){
-                            
-                            NSNumber * fileLengthNum = @0;
-                            if ([[data allKeys] containsObject:@"fileLength"])
-                            {
-                                fileLengthNum = data[@"fileLength"];
-                            }
-                            
-                            self.curBackupsPostion = [fileLengthNum longValue];
-                            
-                            if(self.curPhotosBackupsTaskMod.curUploadFileType == uploadFileTypeImage){
-                                
-                                if([fileLengthNum integerValue] == self.curPhotosBackupsTaskMod.totalBytes){
-                                    self.curPhotosBackupsTaskMod.didBackupsOneFileType = YES;
-                                    HLog(@"文件已备份");
-                                    [[backupsFileManager shareInstance] backupsFileDoneFun];
-                                    
-                                }
-                                else if ([fileLengthNum integerValue] > self.curPhotosBackupsTaskMod.totalBytes){
-                                    self.curPhotosBackupsTaskMod.didBackupsOneFileType = YES;
-                                    HLog(@"云机文件数据大于本地");
-                                    [[backupsFileManager shareInstance] getDataWrongToChangeFailFun];
-                                    
-                                }
-                                else{
-                                    self.curPhotosBackupsTaskMod.didBackupsOneFileType = NO;
-                                    [self beginGotoBackupsImageFun:fileLengthNum];
-                                }
-                                
-                            }
-                            else{
-                                [self backupsBeginGotoUploadVidelFun:fileLengthNum];
-                            }
-                        }
-                    }
-                   
-                }
-                else if([status isEqualToString:@"3"])
-                {
-                    NSString *tipStr = NSLocalizedString(@"disk_not_find_tip",nil);
-                    [[backupsFileManager shareInstance] changeBackupsFileStateToFailWith:tipStr];
-                    mainBlock(^{
-                        [[iToast makeText:tipStr] show];
-                    });
-                    
-                }
-                else if ([status isEqualToString:@"5"]) {
-                    NSString *tipStr = NSLocalizedString(@"disk_space_not_tip",nil);
-                    [[backupsFileManager shareInstance] changeBackupsFileStateToFailWith:tipStr];
-                    mainBlock(^{
-                        [[iToast makeText:tipStr] show];
-                    });
-                }
-                else //if([status isEqualToString:@"1"])
-                {
-                    [[backupsFileManager shareInstance] getDataWrongToChangeFailFun];
-                }
-            }
-        }
-        else{
-            //异常
-            [self tryAgainApplyBackupsFun];
-        }
-    }
-    else{
-        //异常
-        [self tryAgainApplyBackupsFun];
-    }
-}
-
-#pragma mark 遇到异常时 重新上传
-- (void)tryAgainApplyBackupsFun
-{
-    self.backupsTaskUid = nil;
-    [self ApplyBackupsFileFun];
-}
-
-#pragma mark 图片上传
--(void)beginGotoBackupsImageFun:(NSNumber*)fileLengthNum{
-    
-    self.curPhotosBackupsTaskMod.didUploadBytes = [fileLengthNum longLongValue];
-    self.curPhotosBackupsTaskMod.preDidUploadBytes = self.curPhotosBackupsTaskMod.didUploadBytes;
-    
-    self.backupsCutFileDataArr = [self backupsFileCutPartsBy:self.backupsAllFileData withDidUpLoadSize:[fileLengthNum integerValue]];
-    
-    if(!self.backupsCutFileDataArr || self.backupsCutFileDataArr.count == 0){
-        [[backupsFileManager shareInstance] getDataWrongToChangeFailFun];
-        return;
-    }
-    
-    //答复的taskUid 跟申请的一致 开发发送内容
-    [self backupsFileFun];
-}
-
-#pragma mark 视频上传
-//每次从文件重新切一片 传一片
--(void)backupsBeginGotoUploadVidelFun:(NSNumber*)fileLengthNum{
-    
-    self.curPhotosBackupsTaskMod.didUploadBytes = [fileLengthNum longLongValue];
-    self.curPhotosBackupsTaskMod.preDidUploadBytes = self.curPhotosBackupsTaskMod.didUploadBytes;
-    
-    NSData *data = [self backupsCutVideoFileFunAtIndex:fileLengthNum.longLongValue];
-    HLog(@"data leng:%ld",[data length]);
-
-    if([data length] == 0){
-        [self clearBackupsFileDataFun];
-        [[backupsFileManager shareInstance] getDataWrongToChangeFailFun];
-        HLog(@"hxd fail 备份任务异常终止")
-        return;
-    }
-    
-    self.backupsAllFileData  = data;
-    self.backupsCutFileDataArr  = [self backupsFileCutPartsBy:self.backupsAllFileData withDidUpLoadSize:0];
-    self.backupsIndexOfUploadFlie  = 0;
-    
-    //return;
-
-//    NSString*videoPathStr = [cachesFileManager getFilePathWithName:self.curUploadFileDataMod.filename type:uploadFileTypeVideo];
-//    self.AllFileData = [NSData dataWithContentsOfFile:videoPathStr];
-
-   // self.cutFileDataArr = [self fileCutPartsBy:self.AllFileData withDidUpLoadSize:[fileLengthNum integerValue]];
-    
-    if(!self.backupsCutFileDataArr || self.backupsCutFileDataArr.count == 0){
-        [self clearBackupsFileDataFun];
-        [[backupsFileManager shareInstance] getDataWrongToChangeFailFun];
-        
-        HLog(@"hxd fail 备份任务异常终止")
-        return;
-    }
-    
-    //答复的taskUid 跟申请的一致 开发发送内容
-    [self backupsFileFun];
-}
-
-#pragma mark 分段读视频文件
--(NSData*)backupsCutVideoFileFunAtIndex:(NSUInteger)dataIndex{
-    NSString *filePath = [cachesFileManager getFilePathWithName:self.curPhotosBackupsTaskMod.filename type:uploadFileTypeVideo]; // 文件路径
-    
-    NSFileManager *manager0 = [NSFileManager defaultManager];
-    if(![manager0 fileExistsAtPath:filePath]) {
-     
-        return [NSData new];
-    }
-    
-    NSFileHandle *fileHandle = [NSFileHandle fileHandleForReadingAtPath:filePath]; // 创建文件句柄
-      
-    // 设置分段读取的大小,这里以每次读取1KB为例
-    //const NSUInteger chunkSize = 50 * 1024 *1024;
-    const NSUInteger chunkSize = cutVideoPieceSzie;//5 * 1024 *1024;
-    NSMutableData *data = [NSMutableData data];
-    
-    if (fileHandle) {
-       
-        long long endOfFile = [fileHandle seekToEndOfFile];
-        
-        if(dataIndex == 0 || self.curPhotosBackupsTaskMod.totalBytes == 0){
-            self.curPhotosBackupsTaskMod.totalBytes = endOfFile;
-        }
-        
-        if (endOfFile >=  chunkSize) {
-            
-            // 读取文件的分段数据到某个位置
-            [fileHandle seekToFileOffset:dataIndex];
-            
-            // 读取文件的分段数据
-            NSData* chunk = [fileHandle readDataOfLength:chunkSize];
-            if (chunk) {
-                [data appendData:chunk];
-            }
-        }
-        else{
-            // 读取文件的分段数据到某个位置
-            [fileHandle seekToFileOffset:dataIndex];
-            
-            [data appendData:[fileHandle readDataToEndOfFile]];
-        }
-        
-        // 在这里可以对文件内容进行处理
-        // ...
-        
-        // 关闭文件句柄
-        [fileHandle closeFile];
-    }
-    
-    return data;
-}
-
-
-- (void)backupsFileFunServiceResponseFun:(NSDictionary *)dataDict
-{
-    //"type":"backUpFileRandomRet","data":{"progress":"0\/1","filePath":"/sdcard/DCIM/IMG_0889.JPG","fileLenth":258066,"status":"0","msg":"success"}}
-    
-    if([dataDict isKindOfClass:[NSDictionary class]]){
-        if ([[dataDict allKeys] containsObject:@"data"]) {
-            NSDictionary *data = dataDict[@"data"];
-
-            if ([[data allKeys] containsObject:@"status"]) {
-                NSString  *status = [data objectForKey:@"status"];
-                if(![status isKindOfClass:[NSString class]]){
-                    status = [[NSString  alloc] initWithFormat:@"%@",status];
-                }
-                
-                if ([status isEqualToString:@"1"]) {
-                    [[backupsFileManager shareInstance] getDataWrongToChangeFailFun];
-                    
-                }else if ([status isEqualToString:@"2"]){
-                    NSString *tipStr = NSLocalizedString(@"disk_not_find_tip",nil);
-                    [[backupsFileManager shareInstance] changeBackupsFileStateToFailWith:tipStr];
-                    mainBlock(^{
-                        [[iToast makeText:tipStr] show];
-                    });
-                }
-                else if ([status isEqualToString:@"5"]){
-                    NSString *tipStr = NSLocalizedString(@"disk_space_not_tip",nil);
-                    [[backupsFileManager shareInstance] changeBackupsFileStateToFailWith:tipStr];
-                    mainBlock(^{
-                        [[iToast makeText:tipStr] show];
-                    });
-                }
-                else if ([status isEqualToString:@"0"]){
-                    
-                    NSNumber * fileLengthNum = @0;
-                    if ([[data allKeys] containsObject:@"fileLenth"])
-                    {
-                        fileLengthNum = data[@"fileLenth"];
-                    }
-                    
-                    if (fileLengthNum && fileLengthNum.longLongValue >= self.curPhotosBackupsTaskMod.totalBytes)
-                    {//
-                        HLog(@"备份完成");
-                        NSString *commandStr = [RCCommandHelp uploadOrBackupsDoneBy:self.backupsTaskUid withFileName:self.backupsFileName withType:NO];
-                        //[self.commandChannelManager rc_sendData:commandStr];
-                        
-                        [[backupsFileManager shareInstance] backupsFileDoneFun];
-                    }
-                    else{
-                        //异常处理
-                        if([fileLengthNum longValue] - self.curBackupsPostion > EachPieceSzie){
-                            HLog(@"发现上传后返回的长度 出错");
-                            
-                            if(self.curPhotosBackupsTaskMod.curUploadFileType == uploadFileTypeVideo)
-                            {//清除已经取出来的数据  后面会根据fileLengthNum 重新拿数据
-                                [self.backupsCutFileDataArr removeAllObjects];
-                            }
-                            else{
-                                NSInteger curIndex = [fileLengthNum longValue] % EachPieceSzie;
-                                //把当前的上传位置指定已经上传的前一片,后续++
-                                self.backupsIndexOfUploadFlie = curIndex -1;
-                            }
-                        }
-                        
-                        self.curBackupsPostion = [fileLengthNum longValue];
-                        [self handleBackupsingFun:fileLengthNum];
-                    }
-                    
-                }
-            }
-        }
-        else{
-            //异常
-            [self tryAgainApplyBackupsFun];
-        }
-    }
-    else{
-        //异常
-        [self tryAgainApplyBackupsFun];
-    }
-    
-}
-
-#pragma mark 处理上传过程
-- (void)handleBackupsingFun:(NSNumber*)fileLengthNum
-{
-    //异常处理
-    if(fileLengthNum.longValue < 0)
-    {
-        return;
-    }
-
-    
-    BOOL isCanUseCellular = [HWDataManager getBoolWithKey:stringKeyAddSn(Const_file_Transfe_canUse_Cellular_all)];
-
-    if(!isCanUseCellular){//不允许流量备份
-        //
-        if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN){
-            self.curPhotosBackupsTaskMod.isBackupsSuspendType = backupsSuspendByOther;
-            self.curPhotosBackupsTaskMod.curBackupsState = backupsStateSuspend;
-            [[backupsFileManager shareInstance] changeBackupsFileStateFun];
-            return;
-        }
-
-    }
-    
-    BOOL haveOpenBackups = [HWDataManager getBoolWithKey:stringKeyAddSn(Const_photo_backups_state)];
-    if(!haveOpenBackups){
-        self.curPhotosBackupsTaskMod.isBackupsSuspendType = backupsSuspendByOther;
-        self.curPhotosBackupsTaskMod.curBackupsState = backupsStateSuspend;
-        [[backupsFileManager shareInstance] changeBackupsFileStateFun];
-        return;
-    }
-    
-    
-    if(self.curPhotosBackupsTaskMod.isBackupsSuspendType != backupsSuspendNone){
-        [self clearBackupsFileDataFun];
-        return;
-    }
-    
-    self.curPhotosBackupsTaskMod.didUploadBytes = [fileLengthNum longLongValue];
-    [[backupsFileManager shareInstance] changeBackupsFileStateFun];
-    
-    if(self.backupsCutFileDataArr.count >0
-        && self.backupsIndexOfUploadFlie < (self.backupsCutFileDataArr.count -1)) {
-        
-        self.backupsIndexOfUploadFlie ++;
-        [self backupsFileFun];
-    }
-    else if(self.curPhotosBackupsTaskMod.curUploadFileType == uploadFileTypeVideo && fileLengthNum && fileLengthNum.longLongValue < self.curPhotosBackupsTaskMod.totalBytes){
-        //视频做了二次切割 不一定上传完了
-        HLog(@"视频上传传完一片 再来一片");
-        [self backupsBeginGotoUploadVidelFun:fileLengthNum];
-    }
-    else{
-        HLog(@"备份完成");
-        NSString *commandStr = [RCCommandHelp uploadOrBackupsDoneBy:self.backupsTaskUid withFileName:self.backupsFileName withType:NO];
-        //[self.commandChannelManager rc_sendData:commandStr];
-        
-        [[backupsFileManager shareInstance] backupsFileDoneFun];
-    }
-}
-
--(void)clearBackupsFileDataFun{
-    //上传数据清空
-    self.backupsTaskUid = nil;
-    self.backupsFileName = nil;
-    self.backupsAllFileData = nil;
-    self.backupsIndexOfUploadFlie = 0;
-    self.backupsCutFileDataArr = nil;
-    self.curPhotosBackupsTaskMod = nil;
-    
-}
-
-- (Byte)getBCC:(NSData *)data {
-    Byte bcc = 0;
-    unsigned char *bytes = (unsigned char *)[data bytes];
-    for (int i = 0; i < [data length]; i++) {
-        bcc = (Byte)(bcc ^ bytes[i]);
-    }
-    return bcc;
-}
-
-#pragma mark 文件切片
--(NSMutableArray *)backupsFileCutPartsBy:(NSData*)curData withDidUpLoadSize:(NSInteger)didLoadSize{
- 
-    NSData * data = curData;
-    
-    NSUInteger allLength = data.length;
-    
-    NSUInteger subs = EachPieceSzie;//1*1024*1024;//4096;//要切片的大小,我这里设置的是4096字节
-    //NSUInteger subs = 31*1024;//4096;//要切片的大小,内存没有暴增
-    
-    self.cutFileEachPieceSzie = subs;
-    
-    NSInteger index = 0;//起始位置
-    
-    if(didLoadSize != 0){
-        if (didLoadSize % subs != 0){
-            //出错了
-            return nil;
-        }
-        else{
-//            index = didLoadSize/subs;
-//            allLength = allLength - didLoadSize;
-            
-            self.backupsIndexOfUploadFlie = didLoadSize/subs;
-        }
-    }
-
-    NSMutableArray *dataArray =[NSMutableArray new];
-    
-    do {
-        //@autoreleasepool {
-            if (allLength>subs) {
-                
-                NSRange range =NSMakeRange(index*subs, subs);
-                
-                index++;
-                
-                //NSLog(@"%@",NSStringFromRange(range));
-                
-                [dataArray addObject:[data subdataWithRange:range]];
-                
-                allLength = allLength - subs;
-                
-            }else{
-                NSRange range = NSMakeRange(index*subs, allLength);
-                
-                //NSLog(@"%@",NSStringFromRange(range));
-                
-                [dataArray addObject:[data subdataWithRange:range]];
-                
-                allLength = 0;
-            }
-        //}
-        
-    } while (allLength>0);
-    
-    HLog(@"dataArray leng:%ld",dataArray.count);//最后得到切片的结果,数组里面是NSData对象
-
-    return dataArray;
-}
-
-// int转NSData
-- (NSData *)int2Data:(int)i{
-    Byte b0 = i & 0xff;
-    Byte b1 = i >> 8 & 0xff;
-    Byte b2 = i >> 16 & 0xff;
-    Byte b3 = i >> 24 & 0xff;
-    // 有大小端模式问题?
-    //Byte result[] = {b0, b1, b2, b3};
-    Byte result[] = {b3, b2, b1, b0};
-    return [NSData dataWithBytes:result length:sizeof(result)];
-}
-
-// long转NSData
-- (NSData *)long2Data:(long)i{
-    Byte b0 = i & 0xff;
-    Byte b1 = i >> 8 & 0xff;
-    Byte b2 = i >> 16 & 0xff;
-    Byte b3 = i >> 24 & 0xff;
-    Byte b4 = i >> 32 & 0xff;
-    Byte b5 = i >> 40 & 0xff;
-    Byte b6 = i >> 48 & 0xff;
-    Byte b7 = i >> 56 & 0xff;
-    
-    // 有大小端模式问题?
-    //Byte result[] = {b0, b1, b2, b3};
-    //Byte result[] = {b3, b2, b1, b0};
-    Byte result[] = {b7, b6, b5,b4,b3, b2, b1, b0};
-    return [NSData dataWithBytes:result length:sizeof(result)];
-}
-
-// short转NSData
-- (NSData *)short2Data:(short)i{
-    Byte b0 = i & 0xff;
-    Byte b1 = i >> 8 & 0xff;
-    // 有大小端模式问题?
-    //Byte result[] = {b0, b1, b2, b3};
-    Byte result[] = { b1, b0};
-    return [NSData dataWithBytes:result length:sizeof(result)];
-}
-
-#pragma mark 可以发送文件了
-/*
-文件数据字节流byte[]
-  格式1:下载日志文件压缩包
-       |head|msgType|taskId|    datalen            | curNum | totalNum|   data   |bcc校验|end|
-  长度:  1      1      6 (curNum+totalNum+data)        4         4      datalen- 8   1     1
-       0x68  0x0e                                                        0x16
-    bcc校验从第1位 也就是从msgType起 到 校验位前(不包含校验位)数据作bcc校验
- */
-- (void)backupsFileFun
-{
-    //HLog(@"上传文件%ld/%ld",self.indexOfUploadFlie +1,self.cutFileDataArr.count);
-    
-    if(self.backupsCutFileDataArr.count <= self.backupsIndexOfUploadFlie)
-    {
-        return;
-    }
-    
-    //data
-    NSData *curData = self.backupsCutFileDataArr[self.backupsIndexOfUploadFlie];
-    //HLog(@"headData:%@",curData);
-    
-    //head
-    unsigned char headNum = 104;
-    NSData *headData = [NSMutableData dataWithBytes:&headNum length:sizeof(headNum)];
-    //HLog(@"headData:%@",headData);
-    
-    //msgType
-    //unsigned char msgType = 12;
-    //unsigned char msgType = 15;
-    //unsigned char msgType = 16;
-    unsigned char msgType = 21;
-    NSData *msgTypeData = [NSMutableData dataWithBytes:&msgType length:sizeof(msgType)];
-    //HLog(@"msgTypeData:%@",msgTypeData);
-    
-    //taskId
-    NSData *taskIdData = [self.backupsTaskUid dataUsingEncoding:NSUTF8StringEncoding];
-    //HLog(@"taskIdData:%@",taskIdData);
-    
-    //datalen
-    //int datalenNum = int([curData length] +(4+4));
-    int datalenNum = [curData length] + (4+4);
-    //NSData *datalenData = [NSData dataWithBytes:&datalenNum length:sizeof(datalenNum)];
-    NSData *datalenData = [self int2Data:datalenNum];
-    //HLog(@"datalenData %@",datalenData);
-    
-    
-    //curNum
-    int curNum = (int)self.backupsIndexOfUploadFlie ;//+ 1;
-    //NSData *curNumData = [NSData dataWithBytes:&curNum length:sizeof(curNum)];
-    NSData * curNumData = [self int2Data:curNum];
-    //HLog(@"curNumData:%@",curNumData);
-    
-    //totalNum
-    int totalNum = (int)self.backupsCutFileDataArr.count;
-    //NSData *totalNumData = [NSData dataWithBytes:&totalNum length:sizeof(totalNum)];
-    NSData * totalNumData = [self int2Data:totalNum];
-    //HLog(@"totalNumData:%@",totalNumData);
-    
-    long Postion = self.curBackupsPostion;
-    NSData * PostionData = [self long2Data:Postion];
-    HLog(@"PostionData:%@",PostionData);
-
-    NSMutableData *checkBCCData = [NSMutableData new];
-    [checkBCCData appendData:msgTypeData];
-    [checkBCCData appendData:taskIdData];
-    [checkBCCData appendData:datalenData];
-    [checkBCCData appendData:curNumData];
-    [checkBCCData appendData:totalNumData];
-    [checkBCCData appendData:PostionData];
-    [checkBCCData appendData:curData];
-    
-    long length = [curData length];
-    //HLog(@"curData length %d",length);
-    
-    Byte bccCheck = [self getBCC:checkBCCData];
-    //HLog(@"bcc 000 %d",bccCheck);
-    
-    //bcc校验
-    char bccNum = (char)bccCheck;
-    NSData *bccData = [NSMutableData dataWithBytes:&bccNum length:sizeof(bccNum)];
-    //HLog(@"%@",bccData);
-    
-    //end
-    unsigned char endNum = 22;
-    NSData *endData = [NSMutableData dataWithBytes:&endNum length:sizeof(endNum)];
-    //HLog(@"%@",endData);
-    
-    NSMutableData *sendData = [NSMutableData new];
-    [sendData appendData:headData];
-    [sendData appendData:checkBCCData];
-    [sendData appendData:bccData];
-    [sendData appendData:endData];
-    
-    //HLog(@"sendData length %ld",[sendData length]);
-    //[self.commandChannelManager rc_sendData:sendData];
-    //HLog(@"文件上传sendData %@",sendData);
-}
-
-
-
-@end
-

+ 0 - 16
创维盒子/code/cloudPhone/websocket/webSocketManager+baseDownload.h

@@ -1,16 +0,0 @@
-//
-//  webSocketManager+baseDownload.h
-//  双子星云手机
-//
-//  Created by xd h on 2024/6/20.
-//
-
-#import "webSocketManager.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface webSocketManager (baseDownload)
-- (void)handleDownloadResponseFunBy:(id)message;
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 116
创维盒子/code/cloudPhone/websocket/webSocketManager+baseDownload.m

@@ -1,116 +0,0 @@
-//
-//  webSocketManager+baseDownload.m
-//  双子星云手机
-//
-//  Created by xd h on 2024/6/20.
-//
-
-#import "webSocketManager+baseDownload.h"
-
-@implementation webSocketManager (baseDownload)
-
-// NSData转int
-- (int)data2Int:(NSData *)data{
-    Byte *byte = (Byte *)[data bytes];
-    // 有大小端模式问题?
-     return (byte[0] << 24) + (byte[1] << 16) + (byte[2] << 8) + (byte[3]);
-}
-
-
-- (void)handleDownloadResponseFunBy:(id)message
-{
-    NSData *curData = (NSData *)message;
-    
-//    if(curData.length < 20){
-//        return;
-//    }
-    
-    //head
-    NSData *headData = [curData subdataWithRange:NSMakeRange(0, 1)];
-    char head = 0;//104;
-    [headData getBytes:&head length:sizeof(head)];
-    //HLog(@"head: %d",head);
-    
-    //msgType  0x11(17)
-    NSData *msgTypeData = [curData subdataWithRange:NSMakeRange(1, 1)];
-    char msgType = 0;
-    [msgTypeData getBytes:&msgType length:sizeof(msgType)];
-    HLog(@"msgType: %d",msgType);
-    
-    //taskId  6位字符串
-    NSData *taskIdData = [curData subdataWithRange:NSMakeRange(2, 6)];
-    NSString* taskIdStr = [[NSString alloc] initWithData:taskIdData encoding:NSUTF8StringEncoding];;
-    HLog(@"taskId: %@",taskIdStr);
-    
-    if(curData.length <= 15){
-        HLog(@"消息长度不对不处理");
-        return;
-    }
-    
-    //datalen
-    NSData *datalenData = [curData subdataWithRange:NSMakeRange(8, 4)];
-    int datalen = [self data2Int:datalenData];
-    //HLog(@"datalen: %d",datalen);
-
-    //curNum
-    NSData *curNumData = [curData subdataWithRange:NSMakeRange(12, 4)];
-    int curNum = [self data2Int:curNumData];;
-    //HLog(@"curNum: %d",curNum);
-    
-    //totalNum
-    NSData *totalNumData = [curData subdataWithRange:NSMakeRange(16, 4)];
-    int totalNum = [self data2Int:totalNumData];
-    //HLog(@"totalNum: %d",totalNum);
-    
-    BOOL isDownloadDone = curNum == totalNum ? YES : NO;
-    
-    HLog(@"taskUid:%@ curNum:%d totalNum: %d datalen:%d isDownloadDone:%d",taskIdStr,curNum,totalNum,datalen -8,isDownloadDone);
-    
-    if(curData.length <= 23){
-        //data 的位置 装 成功或者失败
-        NSData *failTypeData = [curData subdataWithRange:NSMakeRange(20, 1)];
-        //0xcc (204)失败 0xcd (205)文件不存在 0xdd (221)完成  0xbb 187 完成
-        __block Byte failType;
-        [failTypeData getBytes:&failType length:sizeof(failType)];
-        
-        if(taskIdStr && [taskIdStr isEqualToString:self.downloadFileTaskUid]){
-            
-            if(failType == 0xcc || failType == 0xcf){
-                [[downloadManager shareInstance] DownloadFileFailOneFileFun];
-            }
-            else if(failType == 0xcd ){
-                [[downloadManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
-                NSString *tipStr = NSLocalizedString(@"disk_not_find_tip",nil);
-                mainBlock(^{
-                    [[iToast makeText:tipStr] show];
-                });
-            }
-            else if(failType == 0xdd || failType == 0xbb){
-                [self downloadFileFunServiceResponseFun:[NSData new] with:YES];
-            }
-            else{
-                HLog(@"下载数据未知错误");
-                [[downloadManager shareInstance] DownloadFileFailOneFileFun];
-            }
-        }
-        
-        return;
-    }
-    
-    if(curData.length <= (20 + datalen - 8)){
-        HLog(@"下载数据解析出错了");
-        return;
-    }
-    
-    NSData *fileData = [curData subdataWithRange:NSMakeRange(20, datalen-8)];
-
-    if([taskIdStr isEqualToString:self.downloadFileTaskUid]){
-        [self downloadFileFunServiceResponseFun:fileData with:NO];
-    }
-    else if ([taskIdStr isEqualToString:self.downloadThumbnailTaskUid]){
-        [self downloadThumbnailFileFunServiceResponseFun:fileData with:YES];
-    }
-}
-
-
-@end

+ 0 - 21
创维盒子/code/cloudPhone/websocket/webSocketManager+downloadFile.h

@@ -1,21 +0,0 @@
-//
-//  webSocketManager+downloadFile.h
-//  双子星云手机
-//
-//  Created by xd h on 2024/6/20.
-//
-
-#import "webSocketManager.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface webSocketManager (downloadFile)<UIDocumentPickerDelegate>
-- (void)begindownloadFileFunBy:(couldPhoneFileModel *)couldPhoneFileMod;
-- (void)downloadFileFunServiceResponseFun:(NSData *)fileData with:(BOOL)isDownloadDone;
-- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls;
-
-#pragma mark 处理保存操作
-- (void)saveDownDoneFileToPhoneFunBy:(NSString*)filePath withKey:(NSString *)key;
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 351
创维盒子/code/cloudPhone/websocket/webSocketManager+downloadFile.m

@@ -1,351 +0,0 @@
-//
-//  webSocketManager+downloadFile.m
-//  双子星云手机
-//
-//  Created by xd h on 2024/6/20.
-//
-
-#import "webSocketManager+downloadFile.h"
-
-#import "cachesFileManager.h"
-#import "downloadManager.h"
-
-@implementation webSocketManager (downloadFile)
-- (void)begindownloadFileFunBy:(couldPhoneFileModel *)couldPhoneFileMod
-{
-    self.curDownloadFileModel = couldPhoneFileMod;
-    
-    if(!self.curDownloadFileModel
-       || ![self.curDownloadFileModel isKindOfClass:[couldPhoneFileModel class]]){
-        return;
-    }
-    
-    [self ApplyDownloadFileFun];
-}
-
-#pragma mark 申请下载缩略图
-- (void)ApplyDownloadFileFun
-{
-    
-    self.downloadFileTaskUid = [iTools getTaskUidStr];
- 
-    if([self.downloadFileTaskUid isEqualToString:self.backupsTaskUid]
-       ||[self.downloadFileTaskUid isEqualToString:self.taskUid]
-       ||[self.downloadFileTaskUid isEqualToString:self.downloadThumbnailTaskUid])
-    {//重新生成taskUid
-        [self ApplyDownloadFileFun];
-        return;
-    }
-    
-    NSString *fileName = [self.curDownloadFileModel getFileNameFun];
-    NSString*pathStr = [cachesFileManager getFilePathWithName:fileName type:DownLoadFileType];
-    long didDownloadBytes = 0;
-    
-    NSFileManager *manager0 = [NSFileManager defaultManager];
-    if([manager0 fileExistsAtPath:pathStr]) {
-        NSFileHandle *fileHandle = [NSFileHandle fileHandleForReadingAtPath:pathStr]; // 创建文件句柄
-        if (fileHandle) {
-            didDownloadBytes = [fileHandle seekToEndOfFile];
-            // 关闭文件句柄
-            [fileHandle closeFile];
-        }
-    }
-    
-    NSString * commandStr = [RCCommandHelp applyForDownloadFileBy:self.downloadFileTaskUid withFilePath:self.curDownloadFileModel.path withPosition:didDownloadBytes];
-    //[self.commandChannelManager rc_sendData:commandStr];
-}
-
-- (void)downloadFileFunServiceResponseFun:(NSData *)fileData  with:(BOOL)isDownloadDone
-{
-    if(isDownloadDone){
-        [self handleDownloadDoneFun];
-        return;
-    }
-    
-    NSString *fileName = [self.curDownloadFileModel getFileNameFun];
-        
-    NSString*pathStr = [cachesFileManager getFilePathWithName:fileName type:DownLoadFileType];
-    
-    NSFileManager *manager0 = [NSFileManager defaultManager];
-    long long endOfFile = 0;
-    
-    if(![manager0 fileExistsAtPath:pathStr]) {
-        [cachesFileManager getFileNameWithContent:fileData fileName:fileName type:DownLoadFileType];
-    }
-    else{
-        NSFileHandle *fileHandle = [NSFileHandle fileHandleForWritingAtPath:pathStr]; // 创建文件句柄
-        if (fileHandle) {
-            endOfFile = [fileHandle seekToEndOfFile];
-            if (endOfFile >=  0) {
-                if(endOfFile == self.curDownloadFileModel.didDownloadBytes){
-                    [fileHandle writeData:fileData];
-                }
-            }
-            
-            endOfFile = [fileHandle seekToEndOfFile];
-            // 关闭文件句柄
-            [fileHandle closeFile];
-        }
-    }
-    
-    long didDownloadBytes = fileData.length;
-    if(endOfFile > 0){
-        didDownloadBytes = endOfFile;
-    }
-    
-    self.curDownloadFileModel.didDownloadBytes = didDownloadBytes;
-   
-
-    
-//    if(isDownloadDone || endOfFile == self.curDownloadFileModel.length){
-//        [self handleDownloadDoneFun];
-//    }
-//    else
-    {//获取下一片
-        
-        [[downloadManager shareInstance] DownloadFileChangeingOneFileFun];
-        
-        if([downloadManager shareInstance].isSuspendType){
-            return;
-        }
-        
-        BOOL isCanUseCellular = [HWDataManager getBoolWithKey:stringKeyAddSn(Const_file_Transfe_canUse_Cellular_all)];
-        if(!isCanUseCellular){//不允许流量上传
-            //
-            if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN){
-                [[downloadManager shareInstance] suspendDownloadFileFun:YES withModel:nil];
-                mainBlock(^{
-                    [[NSNotificationCenter defaultCenter] postNotificationName:downloadFileSuspendAllNotification object:nil];
-                    [[iToast makeText:NSLocalizedString(@"File_Transfer_By_Cellular_tip",nil)] show];
-                });
-                return;
-            }
-        }
-        
-        NSString * commandStr = [RCCommandHelp applyForDownloadFileBy:self.downloadFileTaskUid withFilePath:self.curDownloadFileModel.path withPosition:didDownloadBytes];
-        //[self.commandChannelManager rc_sendData:commandStr];
-    }
-    
-}
-
-- (void)handleDownloadDoneFun
-{
-    if(self.nasFullPath && self.nasFullPath.length >0){
-        HLog(@"前面一个保存流程没走完")
-        return;
-    }
-    
-    NSString *fileName = [self.curDownloadFileModel getFileNameFun];
-    NSString*pathStr = [cachesFileManager getFilePathWithName:fileName type:DownLoadFileType];
-    
-    if([self.curDownloadFileModel.fileType containsString:@"jpg"]){
-       
-        if([iTools canSaveFileToAlbumByPhoto:YES withName:fileName]){
-            UIImage *image = [UIImage imageWithContentsOfFile:pathStr];
-            
-            if(image){
-                [self loadImageFinished:image];
-            }
-            else{
-                [cachesFileManager removeItemAtPath:fileName type:DownLoadFileType error:nil];
-                [[downloadManager shareInstance] DownloadFileFailOneFileFun];
-            }
-        }
-        else{
-            [self loadOtherDataFinished];
-        }
-        
-    }
-    else if([self.curDownloadFileModel.fileType isEqualToString:@"video"]){
-        if([iTools canSaveFileToAlbumByPhoto:NO withName:fileName]){
-            [self loadVideoFinished];
-        }
-        else{
-            [self loadOtherDataFinished];
-        }
-        
-    }
-    else
-    {
-        [self loadOtherDataFinished];
-    }
-}
-
-
-- (void)loadImageFinished:(UIImage *)image
-{
-    [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{
-         //写入图片到相册
-         PHAssetChangeRequest *req = [PHAssetChangeRequest creationRequestForAssetFromImage:image];
-            
-     } completionHandler:^(BOOL success, NSError * _Nullable error) {
-         //NSLog(@"success = %d, error = %@", success, error);
-         if (success) {
-             HLog(@"已将图片保存至相册");
-             //NSString *fileName = [self.curDownloadFileModel getFileNameFun];
-             //[cachesFileManager removeItemAtPath:fileName type:DownLoadFileType error:nil];
-             
-         } else {
-             HLog(@"未能将图片保存至相册");
-//             mainBlock(^{
-//                 [[iToast makeText:NSLocalizedString(@"File_Transfer_By_Cellular_tip",nil)] show];
-//             });
-         }
-         NSString *fileName = [self.curDownloadFileModel getFileNameFun];
-         [cachesFileManager removeItemAtPath:fileName type:DownLoadFileType error:nil];
-         [[downloadManager shareInstance] DownloadFileDoneOneFileFun];
-    }];
-}
-
-- (void)loadVideoFinished
-{
-    NSString *fileName = [self.curDownloadFileModel getFileNameFun];
-    NSString*pathStr = [cachesFileManager getFilePathWithName:fileName type:DownLoadFileType];
-    
-    PHPhotoLibrary *photoLibrary = [PHPhotoLibrary sharedPhotoLibrary];
-    [photoLibrary performChanges:^{
-        [PHAssetChangeRequest creationRequestForAssetFromVideoAtFileURL:[NSURL
-    fileURLWithPath:pathStr]];
-    } completionHandler:^(BOOL success, NSError * _Nullable error) {
-        if (success) {
-            HLog(@"已将视频保存至相册");
-            //NSString *fileName = [self.curDownloadFileModel getFileNameFun];
-            //[cachesFileManager removeItemAtPath:fileName type:DownLoadFileType error:nil];
-            
-        } else {
-            HLog(@"未能将视频保存至相册");
-        }
-        
-        [cachesFileManager removeItemAtPath:fileName type:DownLoadFileType error:nil];
-        [[downloadManager shareInstance] DownloadFileDoneOneFileFun];
-    }];
-}
-
-//下载音频 文件等
-- (void)loadOtherDataFinished
-{
-    [[downloadManager shareInstance] DownloadFileDoneOneFileFun];
-    
-    NSString *fileName = [self.curDownloadFileModel getFileNameFun];
-    NSString*filePath = [cachesFileManager getFilePathWithName:fileName type:DownLoadFileType];
-    
-    [self saveDownDoneFileToPhoneFunBy:filePath withKey:self.curDownloadFileModel.path];
-}
-
-#pragma mark 处理保存操作
-- (void)saveDownDoneFileToPhoneFunBy:(NSString*)filePath withKey:(NSString *)key{
-    
-    if (self.isShowingFileDocumentPickerType) {
-        HLog(@"上一个任务保存到问题---没保存完");
-        return;
-    }
-    
-    if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]){
-        HLog(@"没有找到文件:%@",filePath);
-        return;
-    }
-    
-    self.wsDownloadSaveFilePath = filePath;
-    self.wsDownloadDonwPlishPath = key;
-    
-    NSURL * fileURL = [NSURL fileURLWithPath:filePath];
-    UIDocumentPickerViewController *documentPickerVC = [[UIDocumentPickerViewController alloc] initWithURL:fileURL inMode:UIDocumentPickerModeExportToService];
-    // 设置代理
-    documentPickerVC.delegate = self;
-    // 设置模态弹出方式
-    documentPickerVC.modalPresentationStyle = UIModalPresentationFormSheet;
-    //[self.navigationController presentViewController:documentPickerVC animated:YES completion:nil];
-    [ksharedAppDelegate.window.rootViewController presentViewController:documentPickerVC animated:YES completion:nil];
-    
-    self.isShowingFileDocumentPickerType = YES;
-}
- 
-
-#pragma mark - UIDocumentPickerDelegate
-- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
-    // 获取授权
-    BOOL fileUrlAuthozied = [urls.firstObject startAccessingSecurityScopedResource];
-    if (fileUrlAuthozied) {
-        // 通过文件协调工具来得到新的文件地址,以此得到文件保护功能
-        NSFileCoordinator *fileCoordinator = [[NSFileCoordinator alloc] init];
-        NSError *error;
-        
-        [fileCoordinator coordinateReadingItemAtURL:urls.firstObject options:0 error:&error byAccessor:^(NSURL *newURL) {
-            // 读取文件
-            NSString *fileName = [newURL lastPathComponent];
-            NSError *error = nil;
-            //NSData *fileData = [NSData dataWithContentsOfURL:newURL options:NSDataReadingMappedIfSafe error:&error];
-            if (error) {
-                // 读取出错
-                if(self.nasFullPath){
-                    self.nasFullPath = nil;
-                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(20 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                        [self checkSaveNasFileAgainFun];
-                    });
-                }
-                else{
-                    self.wsDownloadSaveFilePath = nil;
-                    self.wsDownloadDonwPlishPath = nil;
-                    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(20 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                        [self checkSaveWebsocketFileAgainFun];
-                    });
-                }
-            } else {
-                NSLog(@"222 fileName : %@", fileName);
-                if(!self.nasFullPath){
-                    // websock下载流程
-                    [[NSFileManager defaultManager] removeItemAtPath:self.wsDownloadSaveFilePath error:nil];
-                    //[cachesFileManager removeItemAtPath:fileName type:DownLoadFileType error:nil];
-                    [[downloadManager shareInstance] deleteDownloadDonePlistInfoBy:self.wsDownloadDonwPlishPath];
-                    self.wsDownloadSaveFilePath = nil;
-                    self.wsDownloadDonwPlishPath = nil;
-                    [self checkSaveWebsocketFileAgainFun];
-                }
-                else{
-                    //nas下载流程
-                    [[NSFileManager defaultManager] removeItemAtPath:self.nasFullPath error:nil];
-                    [[boxDownloadFileManager shareInstance] deleteDownloadDonePlistInfoBy:self.nasFullPath];
-                    self.nasFullPath = nil;
-                    [self checkSaveNasFileAgainFun];
-                }
-                
-            }
-            
-            self.isShowingFileDocumentPickerType = NO;
-        }];
-        [urls.firstObject stopAccessingSecurityScopedResource];
-    } else {
-        // 授权失败
-        if(self.nasFullPath){
-            self.nasFullPath = nil;
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(20 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [self checkSaveNasFileAgainFun];
-            });
-        }
-        else{
-            self.wsDownloadSaveFilePath = nil;
-            self.wsDownloadDonwPlishPath = nil;
-            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(20 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                [self checkSaveWebsocketFileAgainFun];
-            });
-        }
-        
-        self.isShowingFileDocumentPickerType = NO;
-    }
-}
-
-#pragma mark 再次读取下载完成数据做保存操作
-- (void)checkSaveNasFileAgainFun
-{
-    [[boxDownloadFileManager shareInstance] checkDownloadDonePlistInfoFun];
-    
-    [[nasDownloadFileManager shareInstance] checkDownloadDonePlistInfoFun];
-}
-
-#pragma mark 再次读取ws下载完成数据做保存操作
-- (void)checkSaveWebsocketFileAgainFun
-{
-    [[downloadManager shareInstance] checkDownloadDonePlistInfoFun];
-}
-
-@end

+ 0 - 17
创维盒子/code/cloudPhone/websocket/webSocketManager+downloadNasFile.h

@@ -1,17 +0,0 @@
-//
-//  webSocketManager+downloadNasFile.h
-//  双子星云手机
-//
-//  Created by xd h on 2024/7/10.
-//
-
-#import "webSocketManager.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface webSocketManager (downloadNasFile)
-#pragma mark 下载完成
-- (void)NasDownloadTaskFinishedNoti:(customDownloadOperation *)nasDownloadOperation;
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 211
创维盒子/code/cloudPhone/websocket/webSocketManager+downloadNasFile.m

@@ -1,211 +0,0 @@
-//
-//  webSocketManager+downloadNasFile.m
-//  双子星云手机
-//
-//  Created by xd h on 2024/7/10.
-//
-
-#import "webSocketManager+downloadNasFile.h"
-
-@implementation webSocketManager (downloadNasFile)
-#pragma mark 下载完成
-- (void)NasDownloadTaskFinishedNoti:(customDownloadOperation *)nasDownloadOperation
-{
-    if((self.nasFullPath && self.nasFullPath.length >0)
-       || self.isShowingFileDocumentPickerType){
-            HLog(@"上一个任务保存到问题---没保存完");
-        return;
-    }
-    
-    curDownloadmodel = nasDownloadOperation;
-    KWeakSelf
-    if (curDownloadmodel.downloadState == customDownloadStateCompleted) {
-        mainBlock(^{
-            [weakSelf handldDownloadDoneToSaveBy:self->curDownloadmodel];
-        });
-    }
-}
-
-#pragma mark 下载完后处理保持流程
-- (void)handldDownloadDoneToSaveBy:(customDownloadOperation*)model{
-    //解码
-    NSString * urlString = [model.url stringByRemovingPercentEncoding];
-    //[model.url stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-    NSArray *nameArr= [urlString componentsSeparatedByString:@"."];
-    
-    NSString * pathStr= [customDownloadCacheManager getFullPathByOldFullPath:model.fullPath];
-    NSString * decodePathStr= [pathStr stringByRemovingPercentEncoding];
-    
-    HLog(@"downloadNasFile:%@\n%@\n%@",urlString,pathStr,[pathStr stringByRemovingPercentEncoding])
-    
-    if(![pathStr isEqualToString:decodePathStr]){
-        // 尝试移动(即重命名)文件
-        NSError *error = nil;
-        NSFileManager *fileManager = [NSFileManager defaultManager];
-        BOOL success = [fileManager moveItemAtPath:pathStr toPath:decodePathStr error:&error];
-
-        if (success) {
-            NSLog(@"文件重命名成功!");
-        } else {
-            NSLog(@"文件重命名失败: %@", error);
-        }
-        
-        pathStr = decodePathStr;
-    }
-    
-    
-    
-    HLog(@"%@,",pathStr);
-    if (nameArr.count >= 2) {
-        NSString *lastName = nameArr.lastObject;
-        
-        lastName = [lastName lowercaseString];
-        
-        if([iTools canSaveFileToAlbumByPhoto:YES withName:lastName])
-        {//可以保持到相册
-            UIImage *image = [UIImage imageWithContentsOfFile:pathStr];
-            if(image){
-                [self loadImageFinished:image with:pathStr];
-            }
-                
-        }
-        else if([iTools canSaveFileToAlbumByPhoto:NO withName:lastName]){//可以保持到相册
-            [self loadVideoFinishedBy:pathStr];
-            
-        }
-        else{//保存到文件
-            [self loadOtherDataFinishedBy:pathStr];
-        }
-    }
-}
-
-
-- (void)loadImageFinished:(UIImage *)image with:(NSString*)fullPath
-{
-    [[PHPhotoLibrary sharedPhotoLibrary] performChanges:^{
-         //写入图片到相册
-         PHAssetChangeRequest *req = [PHAssetChangeRequest creationRequestForAssetFromImage:image];
-            
-     } completionHandler:^(BOOL success, NSError * _Nullable error) {
-         //NSLog(@"success = %d, error = %@", success, error);
-         if (success) {
-             HLog(@"已将图片保存至相册");
-             //
-             [[NSFileManager defaultManager] removeItemAtPath:fullPath error:nil];
-//             if(self->curYCDownloadItem){
-//                 [YCDownloadManager stopDownloadWithItem:self->curYCDownloadItem];
-//                 self->curYCDownloadItem = nil;
-//             }
-             
-             [[boxDownloadFileManager shareInstance] deleteDownloadDonePlistInfoBy:fullPath];
-             
-         } else {
-             HLog(@"未能将图片保存至相册");
-             mainBlock(^{
-                 [self loadOtherDataFinishedBy:fullPath];
-             });
-         }
-         
-    }];
-}
-
-- (void)loadVideoFinishedBy:(NSString*)fullPath
-{
-    NSString*pathStr = fullPath;
-    
-    PHPhotoLibrary *photoLibrary = [PHPhotoLibrary sharedPhotoLibrary];
-    [photoLibrary performChanges:^{
-        [PHAssetChangeRequest creationRequestForAssetFromVideoAtFileURL:[NSURL
-    fileURLWithPath:pathStr]];
-    } completionHandler:^(BOOL success, NSError * _Nullable error) {
-        if (success) {
-            HLog(@"已将视频保存至相册");
-            //
-            [[NSFileManager defaultManager] removeItemAtPath:pathStr error:nil];
-//            if(self->curYCDownloadItem){
-//                [YCDownloadManager stopDownloadWithItem:self->curYCDownloadItem];
-//                self->curYCDownloadItem = nil;
-//            }
-            
-            [[boxDownloadFileManager shareInstance] deleteDownloadDonePlistInfoBy:fullPath];
-        } else {
-            HLog(@"未能将视频保存至相册");
-            mainBlock(^{
-                [self loadOtherDataFinishedBy:fullPath];
-            });
-        }
-        
-    }];
-}
-
-
-//下载音频 文件等
-- (void)loadOtherDataFinishedBy:(NSString*)fullPath
-{
-    NSString*filePath = fullPath;
-    self.nasFullPath = fullPath;
-    
-    if (![[NSFileManager defaultManager] fileExistsAtPath:filePath]){
-        HLog(@"没有找到文件:%@",filePath);
-        return;
-    }
-    
-    
-    NSURL * fileURL = [NSURL fileURLWithPath:filePath];
-    
-    UIDocumentPickerViewController *documentPickerVC = [[UIDocumentPickerViewController alloc] initWithURL:fileURL inMode:UIDocumentPickerModeExportToService];
-    // 设置代理
-    documentPickerVC.delegate = self;
-    // 设置模态弹出方式
-    documentPickerVC.modalPresentationStyle = UIModalPresentationFormSheet;
-    //[self.navigationController presentViewController:documentPickerVC animated:YES completion:nil];
-    [ksharedAppDelegate.window.rootViewController presentViewController:documentPickerVC animated:YES completion:nil];
-    
-    self.isShowingFileDocumentPickerType = YES;
-}
- 
-//同文件 有了代理 走了 downloadFile 里面的 UIDocumentPickerDelegate
-#pragma mark - UIDocumentPickerDelegate
-//- (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls {
-//    // 获取授权
-//    BOOL fileUrlAuthozied = [urls.firstObject startAccessingSecurityScopedResource];
-//    if (fileUrlAuthozied) {
-//        // 通过文件协调工具来得到新的文件地址,以此得到文件保护功能
-//        NSFileCoordinator *fileCoordinator = [[NSFileCoordinator alloc] init];
-//        NSError *error;
-//
-//        NSURL * firstUrl = urls.firstObject;
-//        [fileCoordinator coordinateReadingItemAtURL:urls.firstObject options:0 error:&error byAccessor:^(NSURL *newURL) {
-//            // 读取文件
-//            NSString *fileName = [firstUrl lastPathComponent];
-//            NSString *pathStr = [firstUrl absoluteString];
-//            NSError *error = nil;
-//            //NSData *fileData = [NSData dataWithContentsOfURL:newURL options:NSDataReadingMappedIfSafe error:&error];
-//            if (error) {
-//                // 读取出错
-//            } else {
-//                // 上传
-//                NSLog(@"111fileName : %@ -- %@ ---%@", fileName,pathStr,self.nasFullPath);
-//
-//                if(!pathStr || [pathStr isEqualToString:self.nasFullPath]){
-//                    pathStr = self.nasFullPath;
-//                }
-//
-//                //
-//                [[NSFileManager defaultManager] removeItemAtPath:pathStr error:nil];
-////                if(self->curYCDownloadItem){
-////                    [YCDownloadManager stopDownloadWithItem:self->curYCDownloadItem];
-////                    self->curYCDownloadItem = nil;
-////                }
-//
-//                [[boxDownloadFileManager shareInstance] deleteDownloadDonePlistInfoBy:pathStr];
-//
-//            }
-//        }];
-//        [urls.firstObject stopAccessingSecurityScopedResource];
-//    } else {
-//        // 授权失败
-//    }
-//}
-@end
-

+ 0 - 17
创维盒子/code/cloudPhone/websocket/webSocketManager+downloadThumbnailImage.h

@@ -1,17 +0,0 @@
-//
-//  webSocketManager+downloadThumbnailImage.h
-//  双子星云手机
-//
-//  Created by xd h on 2024/6/20.
-//
-
-#import "webSocketManager.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface webSocketManager (downloadThumbnailImage)
-- (void)begindownloadThumbnailImageFunBy:(couldPhoneFileModel *)couldPhoneFileMod;
-- (void)downloadThumbnailFileFunServiceResponseFun:(NSData *)fileData with:(BOOL)isDownloadDone;
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 95
创维盒子/code/cloudPhone/websocket/webSocketManager+downloadThumbnailImage.m

@@ -1,95 +0,0 @@
-//
-//  webSocketManager+downloadThumbnailImage.m
-//  双子星云手机
-//
-//  Created by xd h on 2024/6/20.
-//
-
-#import "webSocketManager+downloadThumbnailImage.h"
-
-@implementation webSocketManager (downloadThumbnailImage)
-- (void)begindownloadThumbnailImageFunBy:(couldPhoneFileModel *)couldPhoneFileMod
-{
-    self.curDownloadThumbnailModel = couldPhoneFileMod;
-    
-    if(!self.curDownloadThumbnailModel
-       || ![self.curDownloadThumbnailModel isKindOfClass:[couldPhoneFileModel class]]){
-        return;
-    }
-    
-    [self ApplyDownloadThumbnailFun];
-}
-
-#pragma mark 申请下载缩略图
-- (void)ApplyDownloadThumbnailFun
-{
-    
-    self.downloadThumbnailTaskUid = [iTools getTaskUidStr];
- 
-    if([self.downloadThumbnailTaskUid isEqualToString:self.backupsTaskUid]
-       ||[self.downloadThumbnailTaskUid isEqualToString:self.taskUid]
-       ||[self.downloadThumbnailTaskUid isEqualToString:self.downloadFileTaskUid])
-    {//重新生成taskUid
-        [self ApplyDownloadThumbnailFun];
-        return;
-    }
-    
-    NSString *fileName = [self.curDownloadThumbnailModel getFileNameFun];
-    NSString*pathStr = [cachesFileManager getFilePathWithName:fileName type:DownLoadThumbnail];
-    long didDownloadBytes = 0;
-    
-    NSFileManager *manager0 = [NSFileManager defaultManager];
-    if([manager0 fileExistsAtPath:pathStr]) {
-        NSFileHandle *fileHandle = [NSFileHandle fileHandleForReadingAtPath:pathStr]; // 创建文件句柄
-        if (fileHandle) {
-            didDownloadBytes = [fileHandle seekToEndOfFile];
-            // 关闭文件句柄
-            [fileHandle closeFile];
-        }
-    }
-    
-    NSString * commandStr = [RCCommandHelp applyForDownloadThumbnailFileBy:self.downloadThumbnailTaskUid withFilePath:self.curDownloadThumbnailModel.path withPosition:didDownloadBytes];
-    //[self.commandChannelManager rc_sendData:commandStr];
-}
-
-- (void)downloadThumbnailFileFunServiceResponseFun:(NSData *)fileData with:(BOOL)isDownloadDone
-{
-    
-    NSString *fileName = [self.curDownloadThumbnailModel getFileNameFun];
-        
-    NSString*pathStr = [cachesFileManager getFilePathWithName:fileName type:DownLoadThumbnail];
-    
-    NSFileManager *manager0 = [NSFileManager defaultManager];
-    long long endOfFile = 0;
-    
-    if(![manager0 fileExistsAtPath:pathStr]) {
-        [cachesFileManager getFileNameWithContent:fileData fileName:fileName type:DownLoadThumbnail];
-    }
-    else{
-        NSFileHandle *fileHandle = [NSFileHandle fileHandleForWritingAtPath:pathStr]; // 创建文件句柄
-        if (fileHandle) {
-            endOfFile = [fileHandle seekToEndOfFile];
-            if (endOfFile >=  0) {
-                //if(endOfFile == self.curDownloadThumbnailModel.didDownloadBytes){
-                    [fileHandle writeData:fileData];
-                //}
-            }
-            
-            endOfFile = [fileHandle seekToEndOfFile];
-            // 关闭文件句柄
-            [fileHandle closeFile];
-        }
-    }
-    
-    long didDownloadBytes = fileData.length;
-    if(endOfFile > 0){
-        didDownloadBytes = endOfFile;
-    }
-    
-    //self.curDownloadThumbnailModel.didDownloadBytes = didDownloadBytes;
-   
-    [[downloadThumbnailManager shareInstance] DownloadFileDoneOneFileFun];
-    
-}
-
-@end

+ 0 - 20
创维盒子/code/cloudPhone/websocket/webSocketManager+upLoadFile.h

@@ -1,20 +0,0 @@
-//
-//  webSocketManager+upLoadFile.h
-//  双子星云手机
-//
-//  Created by xd h on 2024/6/20.
-//
-
-#import "webSocketManager.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface webSocketManager (upLoadFile)
-- (void)beginGotoUploadFileFunBy:(uploadFileDataModel *)uploadFileDataMod;
-- (void)suspendUploadFileFun;
-
-- (void)applyUploadFileServiceResponseFun:(NSDictionary *)dataDict;
-- (void)upLoadFileFunServiceResponseFun:(NSDictionary *)dataDict;
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 669
创维盒子/code/cloudPhone/websocket/webSocketManager+upLoadFile.m

@@ -1,669 +0,0 @@
-//
-//  webSocketManager+upLoadFile.m
-//  双子星云手机
-//
-//  Created by xd h on 2024/6/20.
-//
-
-#import "webSocketManager+upLoadFile.h"
-
-@implementation webSocketManager (upLoadFile)
-#pragma mark 监听文件开始的的通知
-- (void)beginGotoUploadFileFunBy:(uploadFileDataModel *)uploadFileDataMod
-{
-    self.isSuspendUploadType = NO;
-    
-    //HLog(@"%@",uploadFileDataMod);
-
-    self.curUploadFileDataMod = uploadFileDataMod;
-    
-    if(![uploadFileDataMod isKindOfClass:[uploadFileDataMod class]]){
-        HLog(@"上传的文件类型不对");
-        return;
-    }
-    
-    [self ApplyUploadFileFun];
-}
-
-- (void)applyUploadFileServiceResponseFun:(NSDictionary *)dataDict
-{
-    if([dataDict isKindOfClass:[NSDictionary class]]){
-        if ([[dataDict allKeys] containsObject:@"data"]) {
-            NSDictionary *data = dataDict[@"data"];
-
-            if ([[data allKeys] containsObject:@"status"]) {
-                NSString  *status = [data objectForKey:@"status"];
-                if(![status isKindOfClass:[NSString class]]){
-                    status = [[NSString  alloc] initWithFormat:@"%@",status];
-                }
-                
-                //if(1)
-                if([status isEqualToString:@"1"])
-                {
-                    //[self tryAgainApplyUploadFun];
-                    [self clearUploadFileDataFun];
-                    [[uploadFileManager shareInstance] uploadFileFailFun];
-                    
-                }else if ([status isEqualToString:@"0"]){
-                    if ([[data allKeys] containsObject:@"taskUid"]) {
-                        NSString *taskUid = data[@"taskUid"];
-                        if(![status isKindOfClass:[NSString class]]){
-                            taskUid = [[NSString  alloc] initWithFormat:@"%@",taskUid];
-                        }
-                        
-                        if(taskUid &&  [taskUid isEqualToString:self.taskUid]){
-                            
-                            NSNumber * fileLengthNum = @0;
-                            if ([[data allKeys] containsObject:@"fileLength"])
-                            {
-                                fileLengthNum = data[@"fileLength"];
-                            }
-                            
-                        //    [[uploadFileManager shareInstance] changeUploadFileState:uploadStateUploading withDidUploadBytes:[fileLengthNum integerValue] withModel:self.curUploadFileDataMod complete:^(BOOL isSuccess) {
-                        //
-                        //    }];
-                            
-                            if([fileLengthNum integerValue] == self.curUploadFileDataMod.totalBytes && self.curUploadFileDataMod.totalBytes != 0){
-                                self.taskUid = nil;
-                                
-                                //self.curUploadFileDataMod.curUploadStateType = uploadStateDone;
-                                
-                                NSMutableArray *delArr = [NSMutableArray new];
-                                [delArr addObject:self.curUploadFileDataMod];
-                                [[uploadFileManager shareInstance] deleteUploadFileRecordBy:delArr withDelCache:NO complete:^(BOOL isSuccess) {
-                                    if (isSuccess) {
-                                        
-                                    }
-                                }];
-                                
-                                mainBlock(^{
-                                    [[iToast makeText:NSLocalizedString(@"File_upload_file_already_exists",nil)] show];
-                                });
-                                
-                                HLog(@"hxd already 上传文件已存在")
-                                return;
-                            }
-                            
-                            self.curUploadPostion = [fileLengthNum longValue];
-                            
-                            if(self.curUploadFileDataMod.curUploadFileType == uploadFileTypeImage){
-                                [self beginGotoUploadImageFun:fileLengthNum];
-                            }
-                            else{
-                                [self beginGotoUploadVidelFun:fileLengthNum];
-                            }
-                        }
-                    }
-                   
-                }
-            }
-        }
-        else{
-            //异常
-            [self tryAgainApplyUploadFun];
-        }
-    }
-    else{
-        //异常
-        [self tryAgainApplyUploadFun];
-    }
-}
-
-
-#pragma mark 图片上传
--(void)beginGotoUploadImageFun:(NSNumber*)fileLengthNum{
-    
-    self.cutFileDataArr = [self fileCutPartsBy:self.AllFileData withDidUpLoadSize:[fileLengthNum integerValue]];
-    
-    if(!self.cutFileDataArr || self.cutFileDataArr.count == 0){
-        [self clearUploadFileDataFun];
-        [[uploadFileManager shareInstance] uploadFileFailFun];
-        
-        HLog(@"hxd fail 上传任务异常终止")
-        return;
-    }
-    
-    //答复的taskUid 跟申请的一致 开发发送内容
-    [self upLoadFileFun];
-}
-
-
-#pragma mark 视频上传
-//每次从文件重新切一片 传一片
--(void)beginGotoUploadVidelFun:(NSNumber*)fileLengthNum{
-    
-    NSData *data = [self cutVideoFileFunAtIndex:fileLengthNum.longLongValue];
-    HLog(@"data leng:%ld",[data length]);
-
-    if([data length] == 0){
-        if(self.curUploadFileDataMod.curUploadStateType == uploadStateDone){
-            [[uploadFileManager shareInstance] uploadFileDoneFun];
-        }
-        else{
-            [[uploadFileManager shareInstance] uploadFileFailFun];
-        }
-        
-        [self clearUploadFileDataFun];
-        
-        return;
-    }
-    
-    self.AllFileData = data;
-    self.cutFileDataArr = [self fileCutPartsBy:self.AllFileData withDidUpLoadSize:0];
-    self.indexOfUploadFlie = 0;
-    
-    //return;
-
-//    NSString*videoPathStr = [cachesFileManager getFilePathWithName:self.curUploadFileDataMod.filename type:uploadFileTypeVideo];
-//    self.AllFileData = [NSData dataWithContentsOfFile:videoPathStr];
-
-   // self.cutFileDataArr = [self fileCutPartsBy:self.AllFileData withDidUpLoadSize:[fileLengthNum integerValue]];
-    
-    if(!self.cutFileDataArr ||self.cutFileDataArr.count ==0){
-        [self clearUploadFileDataFun];
-        [[uploadFileManager shareInstance] uploadFileFailFun];
-        
-        HLog(@"hxd fail 上传任务异常终止")
-        return;
-    }
-    
-    //答复的taskUid 跟申请的一致 开发发送内容
-    [self upLoadFileFun];
-}
-
-#pragma mark 分段读视频文件
--(NSData*)cutVideoFileFunAtIndex:(NSUInteger)dataIndex{
-    NSString *filePath = [cachesFileManager getFilePathWithName:self.curUploadFileDataMod.filename type:uploadFileTypeVideo]; // 文件路径
-    
-    NSFileManager *manager0 = [NSFileManager defaultManager];
-    if(![manager0 fileExistsAtPath:filePath]) {
-     
-        return [NSData new];
-    }
-    
-    NSFileHandle *fileHandle = [NSFileHandle fileHandleForReadingAtPath:filePath]; // 创建文件句柄
-      
-    // 设置分段读取的大小,这里以每次读取1KB为例
-    //const NSUInteger chunkSize = 50 * 1024 *1024;
-    const NSUInteger chunkSize = cutVideoPieceSzie;//5 * 1024 *1024;
-    NSMutableData *data = [NSMutableData data];
-    
-    if (fileHandle) {
-       
-        long long endOfFile = [fileHandle seekToEndOfFile];
-        
-        if(self.curUploadFileDataMod.totalBytes == 0
-           || self.curUploadFileDataMod.totalBytes < endOfFile){//异常处理
-            self.curUploadFileDataMod.totalBytes = endOfFile;
-        }
-        
-        //异常处理
-        if(endOfFile == dataIndex){
-            self.curUploadFileDataMod.totalBytes = endOfFile;
-            self.curUploadFileDataMod.didUploadBytes = endOfFile;
-            self.curUploadFileDataMod.curUploadStateType = uploadStateDone;
-            [fileHandle closeFile];
-            return  data;
-        }
-        
-        if (endOfFile >=  chunkSize) {
-            
-            // 读取文件的分段数据到某个位置
-            [fileHandle seekToFileOffset:dataIndex];
-            
-            // 读取文件的分段数据
-            NSData* chunk = [fileHandle readDataOfLength:chunkSize];
-            if (chunk) {
-                [data appendData:chunk];
-            }
-        }
-        else{
-            // 读取文件的分段数据到某个位置
-            [fileHandle seekToFileOffset:dataIndex];
-            
-            [data appendData:[fileHandle readDataToEndOfFile]];
-        }
-        
-        // 在这里可以对文件内容进行处理
-        // ...
-        
-        // 关闭文件句柄
-        [fileHandle closeFile];
-    }
-    
-    return data;
-}
-
-
-- (void)upLoadFileFunServiceResponseFun:(NSDictionary *)dataDict
-{
-    //{"type":"uploadFileRandomRet","data":{"progress":"9\/10","filePath":"/sdcard/Download/IMG_0036.JPG","status":"0","msg":"success"}}
-    
-    if([dataDict isKindOfClass:[NSDictionary class]]){
-        if ([[dataDict allKeys] containsObject:@"data"]) {
-            NSDictionary *data = dataDict[@"data"];
-            
-            if ([[data allKeys] containsObject:@"taskId"]){
-                NSString *taskId = data[@"taskId"];
-                if(![taskId isEqualToString:self.taskUid]){
-                    return;
-                }
-            }
-            
-            if ([[data allKeys] containsObject:@"status"]) {
-                NSString  *status = [data objectForKey:@"status"];
-                if(![status isKindOfClass:[NSString class]]){
-                    status = [[NSString  alloc] initWithFormat:@"%@",status];
-                }
-                
-                 if ([status isEqualToString:@"0"]){
-                    
-                    NSNumber * fileLengthNum = @0;
-                    if ([[data allKeys] containsObject:@"fileLenth"])
-                    {
-                        fileLengthNum = data[@"fileLenth"];
-                    }
-                    
-                     if (fileLengthNum && fileLengthNum.longLongValue >= self.curUploadFileDataMod.totalBytes)
-                     {//
-                         //告诉代理 完成了
-                         NSString *commandStr = [RCCommandHelp uploadOrBackupsDoneBy:self.taskUid withFileName:self.fileName withType:YES];
-                        
-                         //[self.commandChannelManager rc_sendData:commandStr];
-                         
-                         [self clearUploadFileDataFun];
-                         [[uploadFileManager shareInstance] uploadFileDoneFun];
-                     }
-                     else{
-                         //异常处理
-                         if([fileLengthNum longValue] - self.curUploadPostion > EachPieceSzie){
-                             HLog(@"发现上传后返回的长度 出错");
-                             
-                             if(self.curUploadFileDataMod.curUploadFileType == uploadFileTypeVideo)
-                             {//清除已经取出来的数据  后面会根据fileLengthNum 重新拿数据
-                                 self.cutFileDataArr = [NSMutableArray new];
-                             }
-                             else{
-                                 NSInteger curIndex = [fileLengthNum longValue] % EachPieceSzie;
-                                 //把当前的上传位置指定已经上传的前一片,后续++
-                                 self.indexOfUploadFlie = curIndex -1;
-                             }
-                         }
-                         
-                         self.curUploadPostion = [fileLengthNum longValue];
-                         [self handleUploadingFun:fileLengthNum];
-                     }
-
-                }
-                 else if ([status isEqualToString:@"2"]) {
-                     [self clearUploadFileDataFun];
-                     [[uploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
-                     
-                     NSString *tipStr = NSLocalizedString(@"disk_not_find_tip",nil);
-                     mainBlock(^{
-                         [[iToast makeText:tipStr] show];
-                     });
-                 }
-                 else if ([status isEqualToString:@"5"]) {
-                     [self clearUploadFileDataFun];
-                     [[uploadFileManager shareInstance] suspendUploadFileFun:YES withModel:nil];
-                     
-                     NSString *tipStr = NSLocalizedString(@"disk_space_not_tip",nil);
-                     mainBlock(^{
-                         [[iToast makeText:tipStr] show];
-                     });
-                 }
-                else //if ([status isEqualToString:@"1"])
-                {
-                    //[self tryAgainApplyUploadFun];
-                    [self clearUploadFileDataFun];
-                    [[uploadFileManager shareInstance] uploadFileFailFun];
-                }
-            }
-        }
-        else{
-            //异常
-            [self tryAgainApplyUploadFun];
-        }
-    }
-    else{
-        //异常
-        [self tryAgainApplyUploadFun];
-    }
-    
-}
-
-#pragma mark 申请上传文件
-- (void)ApplyUploadFileFun
-{
-    //if(!self.taskUid){
-        self.taskUid = [iTools getTaskUidStr];
-    
-        if([self.taskUid isEqualToString:self.downloadFileTaskUid]
-           ||[self.taskUid isEqualToString:self.backupsTaskUid]
-           ||[self.taskUid isEqualToString:self.downloadThumbnailTaskUid])
-        {//重新生成taskUid
-            [self ApplyUploadFileFun];
-            return;
-        }
-    
-        self.fileName = self.curUploadFileDataMod.filename;
-        if(self.curUploadFileDataMod.curUploadFileType == uploadFileTypeVideo){
-            //self.AllFileData = self.curUploadFileDataMod.videoData;
-        }
-        else{
-            self.AllFileData = self.curUploadFileDataMod.imageData;
-        }
-        
-        self.indexOfUploadFlie = 0;
-        
-        //HLog(@"%@  %@",self.taskUid,self.fileName);
-        //self.cutFileDataArr = [self fileCutPartsBy:self.AllFileData];
-    //}
-    
-    NSString * commandStr = [RCCommandHelp applyForUploadFileBy:self.taskUid  filePath:self.fileName];
-   // [self.commandChannelManager rc_sendData:commandStr];
-}
-
-#pragma mark 遇到异常时 重新上传
-- (void)tryAgainApplyUploadFun
-{
-    self.taskUid = nil;
-    [self ApplyUploadFileFun];
-}
-
-#pragma mark 处理上传过程
-- (void)handleUploadingFun:(NSNumber*)fileLengthNum
-{
-    //异常处理
-    if(fileLengthNum.longValue < 0)
-    {
-        return;
-    }
-    
-    BOOL isCanUseCellular = [HWDataManager getBoolWithKey:stringKeyAddSn(Const_file_Transfe_canUse_Cellular_all)];
-    
-    if(!isCanUseCellular){//不允许流量备份
-        //
-        if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN){
-            self.isSuspendUploadType = YES;
-        }
-        
-    }
-    
-    if(self.isSuspendUploadType){
-        //暂停
-        self.taskUid = nil;
-        //NSInteger didUploadSize = (self.indexOfUploadFlie+1) * (self.cutFileEachPieceSzie);
-        NSInteger didUploadSize = fileLengthNum.longLongValue;
-        [[uploadFileManager shareInstance] changeUploadFileState:uploadStateSuspend withDidUploadBytes:didUploadSize  withModel:self.curUploadFileDataMod complete:^(BOOL isSuccess) {
-
-        }];
-        
-        return;
-    }
-    
-    if(self.cutFileDataArr.count > 0
-       && self.indexOfUploadFlie < (self.cutFileDataArr.count -1)) {
-        
-        //NSInteger didUploadSize = (self.indexOfUploadFlie+1) * (self.cutFileEachPieceSzie);
-        NSInteger didUploadSize = fileLengthNum.longLongValue;
-        
-        [[uploadFileManager shareInstance] changeUploadFileState:uploadStateUploading withDidUploadBytes:didUploadSize withModel:self.curUploadFileDataMod complete:^(BOOL isSuccess) {
-
-        }];
-        
-        self.indexOfUploadFlie ++;
-        [self upLoadFileFun];
-    }
-    else if(self.curUploadFileDataMod.curUploadFileType == uploadFileTypeVideo && fileLengthNum && fileLengthNum.longLongValue < self.curUploadFileDataMod.totalBytes){
-        //视频做了二次切割 不一定上传完了
-        HLog(@"视频上传传完一片 再来一片");
-        [self beginGotoUploadVidelFun:fileLengthNum];
-    }
-    else{
-        HLog(@"上传完成");
-        
-        //告诉代理 完成了
-        NSString *commandStr = [RCCommandHelp uploadOrBackupsDoneBy:self.taskUid withFileName:self.fileName withType:YES];
-       
-        
-        //[self.commandChannelManager rc_sendData:commandStr];
-        
-        [self clearUploadFileDataFun];
-        [[uploadFileManager shareInstance] uploadFileDoneFun];
-    }
-}
-
--(void)clearUploadFileDataFun{
-    //上传数据清空
-    self.taskUid = nil;
-    self.fileName = nil;
-    self.AllFileData = nil;
-    self.indexOfUploadFlie = 0;
-    self.cutFileDataArr = nil;
-    self.curUploadFileDataMod = nil;
-    self.isSuspendUploadType = NO;
-    
-}
-
-- (Byte)getBCC:(NSData *)data {
-    Byte bcc = 0;
-    unsigned char *bytes = (unsigned char *)[data bytes];
-    for (int i = 0; i < [data length]; i++) {
-        bcc = (Byte)(bcc ^ bytes[i]);
-    }
-    return bcc;
-}
-
-
-#pragma mark 文件切片
--(NSMutableArray *)fileCutPartsBy:(NSData*)curData withDidUpLoadSize:(NSInteger)didLoadSize{
- 
-    NSData * data = curData;
-    
-    NSUInteger allLength = data.length;
-    
-    NSUInteger subs = EachPieceSzie;//1*1024*1024;//4096;//要切片的大小,我这里设置的是4096字节
-    //NSUInteger subs = 31*1024;//4096;//要切片的大小,内存没有暴增
-    
-    self.cutFileEachPieceSzie = subs;
-    
-    NSInteger index = 0;//起始位置
-    
-    if(didLoadSize != 0){
-        if (didLoadSize % subs != 0){
-            //出错了
-            return nil;
-        }
-        else{
-//            index = didLoadSize/subs;
-//            allLength = allLength - didLoadSize;
-            
-            self.indexOfUploadFlie = didLoadSize/subs;
-        }
-    }
-
-    NSMutableArray *dataArray =[NSMutableArray new];
-    
-    do {
-        //@autoreleasepool {
-            if (allLength>subs) {
-                
-                NSRange range =NSMakeRange(index*subs, subs);
-                
-                index++;
-                
-                //NSLog(@"%@",NSStringFromRange(range));
-                
-                [dataArray addObject:[data subdataWithRange:range]];
-                
-                allLength = allLength - subs;
-                
-            }else{
-                NSRange range = NSMakeRange(index*subs, allLength);
-                
-                //NSLog(@"%@",NSStringFromRange(range));
-                NSData *subdata = [data subdataWithRange:range];
-                
-                if(subdata){
-                    [dataArray addObject:subdata];
-                }
-                
-                allLength = 0;
-            }
-        //}
-        
-    } while (allLength>0);
-    
-    HLog(@"dataArray leng:%ld",dataArray.count);//最后得到切片的结果,数组里面是NSData对象
-
-    return dataArray;
-}
-
-// int转NSData
-- (NSData *)int2Data:(int)i{
-    Byte b0 = i & 0xff;
-    Byte b1 = i >> 8 & 0xff;
-    Byte b2 = i >> 16 & 0xff;
-    Byte b3 = i >> 24 & 0xff;
-    // 有大小端模式问题?
-    //Byte result[] = {b0, b1, b2, b3};
-    Byte result[] = {b3, b2, b1, b0};
-    return [NSData dataWithBytes:result length:sizeof(result)];
-}
-
-// long转NSData
-- (NSData *)long2Data:(long)i{
-    Byte b0 = i & 0xff;
-    Byte b1 = i >> 8 & 0xff;
-    Byte b2 = i >> 16 & 0xff;
-    Byte b3 = i >> 24 & 0xff;
-    Byte b4 = i >> 32 & 0xff;
-    Byte b5 = i >> 40 & 0xff;
-    Byte b6 = i >> 48 & 0xff;
-    Byte b7 = i >> 56 & 0xff;
-    
-    // 有大小端模式问题?
-    //Byte result[] = {b0, b1, b2, b3};
-    //Byte result[] = {b3, b2, b1, b0};
-    Byte result[] = {b7, b6, b5,b4,b3, b2, b1, b0};
-    return [NSData dataWithBytes:result length:sizeof(result)];
-}
-
-// short转NSData
-- (NSData *)short2Data:(short)i{
-    Byte b0 = i & 0xff;
-    Byte b1 = i >> 8 & 0xff;
-    // 有大小端模式问题?
-    //Byte result[] = {b0, b1, b2, b3};
-    Byte result[] = { b1, b0};
-    return [NSData dataWithBytes:result length:sizeof(result)];
-}
-
-#pragma mark 可以发送文件了
-/*
-文件数据字节流byte[]
-  格式1:下载日志文件压缩包
-       |head|msgType|taskId|    datalen            | curNum | totalNum|   data   |bcc校验|end|
-  长度:  1      1      6 (curNum+totalNum+data)        4         4      datalen- 8   1     1
-       0x68  0x0e                                                        0x16
-    bcc校验从第1位 也就是从msgType起 到 校验位前(不包含校验位)数据作bcc校验
- */
-- (void)upLoadFileFun
-{
-    //HLog(@"上传文件%ld/%ld",self.indexOfUploadFlie +1,self.cutFileDataArr.count);
-    
-    if(self.cutFileDataArr.count <= self.indexOfUploadFlie)
-    {
-        return;
-    }
-    
-    //data
-    NSData *curData = self.cutFileDataArr[self.indexOfUploadFlie];
-    //HLog(@"headData:%@",curData);
-    
-    //head
-    unsigned char headNum = 104;
-    NSData *headData = [NSMutableData dataWithBytes:&headNum length:sizeof(headNum)];
-    //HLog(@"headData:%@",headData);
-    
-    //msgType
-    //unsigned char msgType = 12;
-    //unsigned char msgType = 15;
-    unsigned char msgType = 20;
-    NSData *msgTypeData = [NSMutableData dataWithBytes:&msgType length:sizeof(msgType)];
-    //HLog(@"msgTypeData:%@",msgTypeData);
-    
-    //taskId
-    NSData *taskIdData = [self.taskUid dataUsingEncoding:NSUTF8StringEncoding];
-    //HLog(@"taskIdData:%@",taskIdData);
-    
-    //datalen
-    //int datalenNum = int([curData length] +(4+4));
-    int datalenNum = [curData length] + (4+4);
-    //NSData *datalenData = [NSData dataWithBytes:&datalenNum length:sizeof(datalenNum)];
-    NSData *datalenData = [self int2Data:datalenNum];
-    //HLog(@"datalenData %@",datalenData);
-    
-    
-    //curNum
-    int curNum = (int)self.indexOfUploadFlie ;//+ 1;
-    //NSData *curNumData = [NSData dataWithBytes:&curNum length:sizeof(curNum)];
-    NSData * curNumData = [self int2Data:curNum];
-    //HLog(@"curNumData:%@",curNumData);
-    
-    //totalNum
-    int totalNum = (int)self.cutFileDataArr.count;
-    //NSData *totalNumData = [NSData dataWithBytes:&totalNum length:sizeof(totalNum)];
-    NSData * totalNumData = [self int2Data:totalNum];
-    //HLog(@"totalNumData:%@",totalNumData);
-    
-    long Postion = self.curUploadPostion;
-    //long Postion = 100000000000;
-    NSData * PostionData = [self long2Data:Postion];
-    HLog(@"PostionData:%@",PostionData);
-
-    NSMutableData *checkBCCData = [NSMutableData new];
-    [checkBCCData appendData:msgTypeData];
-    [checkBCCData appendData:taskIdData];
-    [checkBCCData appendData:datalenData];
-    [checkBCCData appendData:curNumData];
-    [checkBCCData appendData:totalNumData];
-    [checkBCCData appendData:PostionData];
-    [checkBCCData appendData:curData];
-    
-    long length = [curData length];
-    //HLog(@"curData length %d",length);
-    
-    Byte bccCheck = [self getBCC:checkBCCData];
-    //HLog(@"bcc 000 %d",bccCheck);
-    
-    //bcc校验
-    char bccNum = (char)bccCheck;
-    NSData *bccData = [NSMutableData dataWithBytes:&bccNum length:sizeof(bccNum)];
-    //HLog(@"%@",bccData);
-    
-    //end
-    unsigned char endNum = 22;
-    NSData *endData = [NSMutableData dataWithBytes:&endNum length:sizeof(endNum)];
-    //HLog(@"%@",endData);
-    
-    NSMutableData *sendData = [NSMutableData new];
-    [sendData appendData:headData];
-    [sendData appendData:checkBCCData];
-    [sendData appendData:bccData];
-    [sendData appendData:endData];
-    
-    //HLog(@"sendData length %ld",[sendData length]);
-    //[self.commandChannelManager rc_sendData:sendData];
-    //HLog(@"文件上传sendData %@",sendData);
-}
-
-- (void)suspendUploadFileFun
-{
-    self.isSuspendUploadType = YES;
-}
-
-
-@end

+ 0 - 140
创维盒子/code/cloudPhone/websocket/webSocketManager.h

@@ -1,140 +0,0 @@
-//
-//  webSocketManager.h
-//  双子星云手机
-//
-//  Created by xd h on 2024/6/20.
-//
-
-#import <Foundation/Foundation.h>
-//#import <RCCloudPhoneSDK/RCCommandChannel.h>
-#import "AFNetworkReachabilityManager.h"
-#import "backupsFileManager.h"
-#import "nasBackupsManager.h"
-#import "uploadFileManager.h"
-#import "downloadManager.h"
-#import "downloadThumbnailManager.h"
-#import "AudioSessionObject.h"
-#import "commandSendCheckModel.h"
-#import "RCCommandHelp.h"
-#import "cloudPhoneCommonModel.h"
-#import "couldPhoneBaseInfoModel.h"
-#import "couldphoneSysInfoModel.h"
-#import "TvStatusModel.h"
-#import "couldPhoneCommonModel.h"
-#import "extraMediaEventModel.h"
-#import "customDownloadManager.h"
-#import "boxDownloadFileManager.h"
-#import "DFPlayer.h"
-#import "audioPlayingView.h"
-#import "nasDownloadFileManager.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface webSocketManager : NSObject
-{
-    //下载nas相关
-    customDownloadOperation* curDownloadmodel;
-}
-
-+(webSocketManager *)shareInstance;
-//@property (nonatomic, strong) RCCommandChannelManager *commandChannelManager;//指令通道
-
-//上传文件用到
-@property (nonatomic, copy) NSString * _Nullable taskUid;
-@property (nonatomic, copy) NSString * _Nullable fileName;
-@property (nonatomic, strong) NSData * _Nullable AllFileData;
-@property (nonatomic, strong) NSMutableArray * _Nullable cutFileDataArr;
-@property (nonatomic, assign) NSInteger indexOfUploadFlie;
-@property (nonatomic, assign) NSInteger cutFileEachPieceSzie;
-@property (nonatomic, strong) uploadFileDataModel *curUploadFileDataMod;
-@property (nonatomic, assign) BOOL isSuspendUploadType;
-@property (nonatomic, assign) long curUploadPostion;//当前上次片的位置
-
-//下载文件用到
-@property (nonatomic, copy) NSString * _Nullable downloadFileTaskUid;
-@property (nonatomic, strong) couldPhoneFileModel *curDownloadFileModel;
-@property (nonatomic, copy) NSString * _Nullable wsDownloadSaveFilePath;//下载好的ws文件保存路径
-@property (nonatomic, copy) NSString * _Nullable wsDownloadDonwPlishPath;//下载好的ws文件保存key
-
-//备份文件用到
-@property (nonatomic, copy) NSString * _Nullable backupsTaskUid;
-@property (nonatomic, copy) NSString * _Nullable backupsFileName;
-@property (nonatomic, strong) NSData * _Nullable backupsAllFileData;
-@property (nonatomic, strong) NSMutableArray * _Nullable backupsCutFileDataArr;
-@property (nonatomic, assign) NSInteger backupsIndexOfUploadFlie;
-//@property (nonatomic, assign) NSInteger cutFileEachPieceSzie;
-@property (nonatomic, strong) photosBackupsTaskModel *curPhotosBackupsTaskMod;
-@property (nonatomic, assign) long curBackupsPostion;//当前上次片的位置
-
-//下载缩略图用到
-@property (nonatomic, copy) NSString * _Nullable downloadThumbnailTaskUid;
-@property (nonatomic, strong) couldPhoneFileModel *curDownloadThumbnailModel;
-
-//下载nas文件用到
-@property (nonatomic, copy) NSString*nasFullPath;
-
-
-//下载nas ws 文件 保存到文件 正在弹框中
-@property (nonatomic, assign) BOOL isShowingFileDocumentPickerType;
-
-@property(nonatomic,assign)BOOL isRebootIngType;//是否重启中
-@property(nonatomic,assign)BOOL isResetingType;//是否恢复出厂中
-@property(nonatomic,assign)BOOL isChangeBoxType;//是否更换盒子
-@property(nonatomic,assign)BOOL isLogoutByOtherType;//被挤下线
-@property(nonatomic,assign)BOOL isWaitShowLogoutAlert;//隐私模式等待被挤下线弹框是否弹出
-
-@property(nonatomic,assign)BOOL isDiDChangePhoneSizeType;//是否修改了分辨率(如果是 进去云机需要重设解码器)
-
-//链接websocket
-- (void)opencommandChannelManagerrc_openURL;
-- (void)WebSocketNeedRelinkFun;
-//websocket 发消息
-- (void)send_data:(NSString *)dataStr;
-
-//创建备份文件夹
-- (void)createBackupsFolderBy:(NSString*)backupsDefaultPath;
-//获取备份文件夹列表
-- (void)getBackupFolderListFun;
-- (void)searchFileListBeginFun:(NSMutableDictionary *)dict;
-
-#pragma mark 重启云机
-- (void)needToRebootFun;
-#pragma mark 恢复出厂设置云机
-- (void)needToResetFun;
-#pragma mark 获取云机基本信息
-- (void)getBaseInfoFun;
-#pragma mark 获取云机剩余空间(包含外挂磁盘)
-- (void)getExtraFilesListFun;
-#pragma mark 获取云机系统镜像等信息
-- (void)getSysInfoFun;
-
-#pragma mark 云机截图保存到云机图库
-- (void)screenshotInCloudPhoneFun;
-#pragma mark 获取TV投屏状态
-- (void)getTvStatusFun;
-#pragma mark 关闭TV投屏状态
-- (void)offTvFun;
-#pragma mark 开启TV投屏状态
-- (void)onTvFun;
-
-//上传
-- (void)beginGotoUploadFileFunBy:(uploadFileDataModel *)uploadFileDataMod;
-- (void)suspendUploadFileFun;
-//备份
-- (void)beginGotoBackupsFileFunBy:(photosBackupsTaskModel *)photosBackupsTaskMod;
-//下载缩略图
-- (void)begindownloadThumbnailImageFunBy:(couldPhoneFileModel *)couldPhoneFileMod;
-//下载
-- (void)begindownloadFileFunBy:(couldPhoneFileModel *)couldPhoneFileMod;
-
-#pragma mark nas下载完成
-- (void)NasDownloadTaskFinishedNoti:(customDownloadOperation *)nasDownloadOperation;
-
-- (void)handleDownloadResponseFunBy:(id)message;
-- (void)downloadFileFunServiceResponseFun:(NSData *)fileData with:(BOOL)isDownloadDone;
-- (void)downloadThumbnailFileFunServiceResponseFun:(NSData *)fileData with:(BOOL)isDownloadDone;
-#pragma mark 处理ws保存操作
-- (void)saveDownDoneFileToPhoneFunBy:(NSString*)filePath withKey:(NSString *)key;
-@end
-
-NS_ASSUME_NONNULL_END

+ 0 - 742
创维盒子/code/cloudPhone/websocket/webSocketManager.m

@@ -1,742 +0,0 @@
-//
-//  webSocketManager.m
-//  双子星云手机
-//
-//  Created by xd h on 2024/6/20.
-//
-
-#import "webSocketManager.h"
-
-#import "webSocketManager+baseDownload.h"
-#import "webSocketManager+downloadFile.h"
-#import "webSocketManager+downloadThumbnailImage.h"
-#import "webSocketManager+upLoadFile.h"
-#import "webSocketManager+backupsFile.h"
-#import "errorAlertTool.h"
-#import "RcGameWQKeyChain.h"
-#import "USBInsertPopView.h"
-#import "nasMixUploadManager.h"
-
-
-@interface webSocketManager ()
-{
-    NSMutableArray *commandSendCheckArr;//需要检测任务是否发出的的指令
-    ComontAlretViewController *logoutAlertVC;
-    USBInsertPopView *curUSBInsertPopV;
-}
-
-@property(copy,nonatomic)NSString *curIp;
-/**定时器计数*/
-@property (nonatomic, assign) NSInteger      webSocketTime;
-/**定时器计数 任务检测*/
-@property (nonatomic, assign) NSInteger          webSocketTaskTime;
-@property (nonatomic, copy)   NSTimer            *webSocketCheckTimer; // 定时器-控制按钮
-//第一次链接设备 要发送指令信息 实现单点登录
-@property (nonatomic, assign)BOOL didSendfristMsg;
-
-@end
-
-
-@implementation webSocketManager
-static webSocketManager *webSocketManagerInstance = nil;
-+(webSocketManager *)shareInstance;
-{
-    static dispatch_once_t onceToken;
-    
-    dispatch_once(&onceToken, ^{
-        webSocketManagerInstance = [[webSocketManager alloc] init];
-    });
-    
-    return webSocketManagerInstance;
-}
-
-- (void)initOtherFun
-{
-    if(_webSocketCheckTimer){
-        //[_timer invalidate];
-        return;
-    }
-    
-    _webSocketCheckTimer = [NSTimer scheduledTimerWithTimeInterval:5.0 target:self selector:@selector(webScoketTimerChange) userInfo:nil repeats:YES];
-    [[NSRunLoop currentRunLoop] addTimer:_webSocketCheckTimer forMode:NSRunLoopCommonModes];
-    
-    commandSendCheckArr = [NSMutableArray new];
-}
-
-- (void)opencommandChannelManagerrc_openURL
-{
-    
-}
-
-- (void)keepWebSocketOKFun
-{
-    self.webSocketTime = 0;
-}
-
-- (void)WebSocketNeedRelinkFun
-{
-    self.webSocketTime = 0;
-    
-//    if(self.commandChannelManager){
-//        [self opencommandChannelManagerrc_openURL];
-//    }
-}
-
-- (void)webScoketTimerChange {
-    
-    //处理websockt是否断开
-    self.webSocketTime += 5;
-    
-    //处理其他任务
-    self.webSocketTaskTime += 5;
-    
-    if(self.webSocketTime >= 10)
-    {
-        [self WebSocketNeedRelinkFun];
-    }
-    
-    if(self.webSocketTaskTime >= 10)
-    {
-        self.webSocketTaskTime = 0;
-        [self checkAllTaskFun];
-        
-    }
-}
-
-- (void)checkAllTaskFun
-{}
-
-//检测是否正在进行的文件传输任务
-- (void)checkFileTransfeTaskFun
-{
-    
-   //BOOL isBackupsingType = [[backupsFileManager shareInstance] checkBackupsingFun];
-    BOOL isBackupsingType = [[nasBackupsManager shareInstance] checkBackupsingFun];
-   //BOOL isUploadingType = [[uploadFileManager shareInstance] checkUploadingFun];
-    BOOL isUploadingType = [[nasMixUploadManager shareManager] checkUploadTaskDoingFun];
-   //BOOL isDownloadingType = [[downloadManager shareInstance] checkDownloadingFun];
-    BOOL isDownloadingType = [[nasDownloadManager shareManager] isDownLoadIngType];
-   BOOL isNasDownloadingType = [customDownloadManager shareManager].isDownLoadIngType;
-    
-   BOOL isBackground = [HWDataManager getBoolWithKey:stringKeyAddSn(Const_file_Transfe_working_background)];
-    
-    if ((isBackupsingType || isUploadingType || isDownloadingType ||isNasDownloadingType) && isBackground) {
-        HLog(@"后台保活中");
-        [cachesFileManager writeLogsWithMsg:@"Background working"];
-    }
-    else{
-        HLog(@"停止后台保活");
-        [cachesFileManager writeLogsWithMsg:@"stop Background working"];
-        //[[AudioSessionObject shareManager] stopBackgroundActiveFun];
-    }
-    
-}
-
--(void)checkCommandSendTaskFun
-{
-    if(commandSendCheckArr && commandSendCheckArr.count >0){
-        for (commandSendCheckModel *model in commandSendCheckArr) {
-            if(model.reSendNum < 2){
-                model.reSendNum ++;
-                if(model.commandStr){
-                    [self send_data:model.commandStr];
-                    
-                    HLog(@"\n\n\n任务重发 重发次数:%ld 指令:%@\n\n\n",model.reSendNum,model.commandStr);
-                }
-                
-//                if([model.type isEqualToString:@"offline_notification"]){
-//                    model.reSendNum = 1;//只要不收到
-//                }
-            }
-        }
-    }
-}
-
-- (void)send_data:(NSString *)dataStr
-{
-    //[self.commandChannelManager rc_sendData:dataStr];
-}
-
-#pragma mark 盒子链接成功后需要处理的各种各样事情
-- (void)handlAllMsgAfterDidLinkFun
-{
-    _isRebootIngType = NO;
-    _isResetingType = NO;
-    _isChangeBoxType = NO;
-    
-    ksharedAppDelegate.isWebSockLinkOKAginType = YES;
-    
-    //获取云机尺寸 兼容 720*1080 &1080*1920 不同分辨率的展示和触控
-    NSString *getPhoneSizeStr = [RCCommandHelp getPhoneSizecommand];
-    [self send_data:getPhoneSizeStr];
-    
-    //判断是否为需要改机
-    BOOL isNeedRandomChangeParams = [HWDataManager getBoolWithKey:Const_need_random_Change_Params];
-    if(isNeedRandomChangeParams)
-    {
-        NSString *commondStr  = @"{\"type\":\"randomChangeParams\"}";
-        [self send_data:commondStr];
-        
-        [HWDataManager setBoolWithKey:Const_need_random_Change_Params value:NO];
-    }
-    
-    [self fristConnectNeedGiveAMsgFun];
-    
-    [self updateCopydata];
-    
-    //  报链接失败 后面又连接上了
-    [[errorAlertTool shareInstance] dismissErrorAlertFun];
-    
-    //处理相册备份
-    //[[backupsFileManager shareInstance] AutohandlePhotosBackupsFun];
-    [[nasBackupsManager shareInstance] AutohandlePhotosBackupsFun];
-    
-    //获取磁盘外挂
-    [self getExtraFilesListFun];
-    
-    [self getBaseInfoFun];
-    
-    [self getTvStatusFun];
-}
-
-#pragma mark 盒子第一次连接成功  给ws发送信息 单点登录 把其他账号挤下去
-- (void)fristConnectNeedGiveAMsgFun{
-    
-    if(!_didSendfristMsg )
-    {
-        [self getSysInfoFun];
-        
-        NSString *curOaidStr = [RcGameWQKeyChain getOaidStringFun];
-        if(!curOaidStr){
-            curOaidStr = @"";
-        }
-        
-        //暂时屏蔽
-//        NSString *commondStr = [[NSString alloc] initWithFormat:@"{\"type\":\"forwardMsg\",\"data\":\"offline_notification\",\"sign\":\"%@\"}",curOaidStr];
-//        //NSString *commondStr  = @"{\"type\":\"forwardMsg\",\"data\":\"offline_notification\"}";
-//        [self send_data:commondStr];
-//        [self addCommandSendTaskFunWithType:@"offline_notification" WithCommandStr:commondStr];
-        
-        _didSendfristMsg = YES;
-        
-        [self getPreferredLanguage];
-        
-        NSString *commondStr2  = @"{\"type\":\"TvStatus\"}";
-        [self send_data:commondStr2];
-    }
-}
-
-#pragma mark 语言和市区 同步云机
--(void)getPreferredLanguage
-{//{"data":{"language":"zh-CN","timeZone":"Etc/GMT+8"},"type":"setLanguages"}
-    // iOS 获取设备当前语言的代码
-    NSString *preferredLanguage = [[[NSBundle mainBundle] preferredLocalizations] firstObject];
-    HLog(@"当前语言:%@", preferredLanguage);
-
-    //en-US 英文 ja-JP 日文
-    
-    NSArray *arLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
-    NSLog(@"arLanguages:%@",arLanguages);
-    ///获取设备当前地区的代码和APP语言环境
-    NSString *languageCode = [NSLocale preferredLanguages][0];
-  
-   
-    //目前支持 中文(简体 繁体) 英文 日语
-    if([languageCode rangeOfString:@"zh-Hans"].location != NSNotFound)
-    {
-        preferredLanguage = @"zh-CN";
-    }
-    else if([languageCode rangeOfString:@"zh-Hant"].location != NSNotFound)
-    {
-        preferredLanguage = @"zh-HK";
-    }
-    else if([languageCode rangeOfString:@"ja-"].location != NSNotFound)
-    {
-        preferredLanguage = @"ja-JP";
-    }
-    else{
-        preferredLanguage = @"en-US";
-    }
-    
-//    if([languageCode  rangeOfString:preferredLanguage].location != NSNotFound){
-//        preferredLanguage = languageCode;
-//    }
-//    else{
-//        preferredLanguage = @"en-US";
-//    }
-    
-    NSString*gmtStr = [self UTCOffset];
-    HLog(@"%@",gmtStr);
-//    //获取名字,如“GMT+08:00
-    
-    NSString *commondStr = [NSString stringWithFormat:@"{\"type\":\"setLanguages\",\"data\":{\"language\":\"%@\",\"timeZone\":\"%@\"}}",preferredLanguage,gmtStr];
-    
-    [self send_data:commondStr];
-    
-}
-
--(NSString *)UTCOffset {
-    NSTimeZone *localTZ = [NSTimeZone localTimeZone];
-    float offset = localTZ.secondsFromGMT/3600.0;
-    if(offset > 0){
-        return [NSString stringWithFormat:@"Etc/GMT+%g",offset];
-    }
-    return [NSString stringWithFormat:@"Etc/GMT%g",offset];
-}
-
-#pragma mark 重启云机
-- (void)needToRebootFun
-{
-    NSString *commondStr  = @"{\"type\":\"reboot\"}";
-    [self send_data:commondStr];
-    
-    //添加到任务监听
-    [self addCommandSendTaskFunWithType:@"reboot" WithCommandStr:commondStr];
-    
-    //数据埋点
-    [[netWorkManager shareInstance] DataEmbeddingPointBy:3 withEventValue:@"Cloud_restart"];
-    
-    _isRebootIngType = YES;
-}
-
-- (void)needToResetFun
-{
-    NSString *commondStr  = @"{\"type\":\"reset\"}";
-    [self send_data:commondStr];
-    
-    //添加到任务监听
-    [self addCommandSendTaskFunWithType:@"reset" WithCommandStr:commondStr];
-    
-    //数据埋点
-    [[netWorkManager shareInstance] DataEmbeddingPointBy:3 withEventValue:@"Cloud_restore_factory"];
-    _isResetingType = YES;
-}
-
-- (void)updateCopydata{
-    UIPasteboard* pasteboard = [UIPasteboard generalPasteboard];
-    NSString *str = [pasteboard string];
-    
-    HLog(@"__________%s______%@____",__func__,str);
-    
-    if ([str rangeOfString:@"CVLUSTERS_NOUSE_"].location != NSNotFound)
-    {
-        str = nil;
-    }
-    
-    if (str && str.length >0)
-    {
-        //HLog(@"hxd111 cutting  %@",str);
-        /*发送数据*/
-        NSString *dataStr = [RCCommandHelp commandCuttingWithContent:str];
-        //[self.commandChannelManager rc_sendData:dataStr];
-        //pasteboard.string = @"";
-    }
-    
-}
-
-#pragma mark 获取云机以及外挂磁盘
-- (void)getExtraFilesListFun
-{
-    NSString *ExtraCommondStr  = [RCCommandHelp getExtraFilesList];
-    [self send_data:ExtraCommondStr];
-}
-
--(void)addCommandSendTaskFunWithType:(NSString*)type WithCommandStr:(NSString*)commandStr
-{
-    if(!commandSendCheckArr){
-        commandSendCheckArr = [NSMutableArray new];
-    }
-    
-    BOOL didAddType = NO;
-        
-    for (commandSendCheckModel *model in commandSendCheckArr) {
-        if([model.type isEqualToString:type]){
-            didAddType = YES;
-            model.reSendNum = 0;
-            model.sendTimerStamp = [iTools getNowTimeStamp];
-            break;
-        }
-    }
-        
-    if(!didAddType){
-        commandSendCheckModel *model = [commandSendCheckModel new];
-        model.commandStr = commandStr;
-        model.type = type;
-        model.reSendNum = 0;
-        model.sendTimerStamp = [iTools getNowTimeStamp];
-        [commandSendCheckArr addObject:model];
-    }
-    
-}
-
-
--(void)deleteCommandSendTaskFunWith:(NSString*)type
-{
-    if(commandSendCheckArr && commandSendCheckArr.count >0){
-        
-        NSArray *taskArr = [NSArray arrayWithArray:commandSendCheckArr];
-        
-        for (commandSendCheckModel *model in taskArr) {
-            if([type isEqualToString:model.type]){
-                [commandSendCheckArr removeObject:model];
-            }
-        }
-    }
-}
-
-#pragma mark wifi handle
-- (void)sync_wifiBackHandleFun
-{
-    //[self.commandChannelManager rc_sendData:[RCCommandHelp noSyncWifiBack]];
-    [[iToast makeText:NSLocalizedString(@"player_Tip_ios_no_wifi_Sync",nil)] show];
-}
-
-- (void)getCouldPhoneBaseInfoResponseFun:(NSDictionary *)dataDict
-{
-    couldPhoneBaseInfoModel *model = [[couldPhoneBaseInfoModel alloc] initWithDictionary:dataDict error:nil];
-    [[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneBaseInfoNotification object:model];
-}
-
-- (void)getCouldPhoneSysInfoResponseFun:(NSDictionary *)dataDict{
-    couldphoneSysInfoModel *model = [[couldphoneSysInfoModel alloc] initWithDictionary:dataDict error:nil];
-    //[[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneSysInfoNotification object:model];
-        
-//    NSString *hostImgVer = model.data.data.hostImgVer;
-//    NSString *MyNewVersion = model.data.data.MyNewVersion;
-    
-    NSString *hostImgVer = model.data.hostImgVer;
-    NSString *MyNewVersion = model.data.MyNewVersion;
-
-    //test code
-//    hostImgVer = @"1.2.3";
-//    MyNewVersion = @"1.2.0";
-    
-    //判断当前版本号 待更新版本
-    if (!hostImgVer || hostImgVer.length < 3
-        ||!MyNewVersion || MyNewVersion.length < 3) {
-        return;
-    }
-    
-    NSArray *versionArr = [hostImgVer componentsSeparatedByString:@"."];
-    NSArray *MyNewVersionArr = [MyNewVersion componentsSeparatedByString:@"."];
-    
-    NSInteger versionArrCount = versionArr.count;
-    NSInteger MyNewVersionArrCount = MyNewVersionArr.count;
-    NSInteger maxCount =  versionArrCount < MyNewVersionArrCount ? versionArrCount:MyNewVersionArrCount;
-    
-    BOOL isNeedShowType = NO;
-    //判断是否要更新镜像框
-    if(maxCount > 0){
-        for (int i=0; i<maxCount; i++) {
-            NSString * numberStr1 = versionArr[i];
-            NSString * numberStr2 = MyNewVersionArr[i];
-            
-            if(numberStr2.intValue > numberStr1.intValue){
-                isNeedShowType =YES;
-                break;
-            }
-        }
-    }
-    
-    
-    if(isNeedShowType){
-        ksharedAppDelegate.isNeedShowImageNewType = YES;
-    }
-    
-    //是否禁用文件传输 (1.3以及以上的镜像可以使用文件传输)
-    if(versionArr.count >= 3)
-    {
-        NSString * oneStr = versionArr[0];
-        NSString * twoStr = versionArr[1];
-        NSString * threeStr = versionArr[2];
-
-        if(oneStr.integerValue <=1 && twoStr.integerValue <=3 && threeStr.integerValue <=0){//禁用
-            ksharedAppDelegate.DisabledFileTransferType = YES;
-            
-            if(MyNewVersionArr.count >= 3)
-            {
-                NSString * newOneStr = MyNewVersionArr[0];
-                NSString * newTwoStr = MyNewVersionArr[1];
-                NSString * newThreeStr = MyNewVersionArr[2];
-                
-                if(newOneStr.integerValue >=1 && newTwoStr.integerValue >=3 && newThreeStr.integerValue >= 1){
-                    ksharedAppDelegate.isImageNewFor130 = YES;
-                }
-                else{
-                    ksharedAppDelegate.isImageNewFor130 = NO;
-                }
-            }
-        }
-        else{
-            ksharedAppDelegate.DisabledFileTransferType = NO;
-        }
-    }
-    
-    [[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneSysInfoNotification object:model];
-}
-
-- (void)getCouldPhoneTvStatusResponseFun:(NSDictionary *)dataDict
-{
-    TvStatusModel *model = [[TvStatusModel alloc] initWithDictionary:dataDict error:nil];
-    ksharedAppDelegate.TvStatusMod = model;
-    
-    [[NSNotificationCenter defaultCenter] postNotificationName:getCouldPhoneTvStatusNotification object:model];
-    
-//    if(![model.msg containsString:@"PushStreamBActivity"])
-//    {
-//        return;
-//    }
-//    
-//    UIViewController*topVc = self.navigationController.viewControllers.lastObject;
-//    if([topVc isKindOfClass:[PlayerViewController class]]){
-//        [[iToast makeText:NSLocalizedString(@"tv_p2p_ing",nil)] show];
-//    }
-}
-
-
-- (void)createFolderResponseFun:(NSDictionary *)dataDict
-{
-    couldPhoneCommonModel *model = [[couldPhoneCommonModel alloc] initWithDictionary:dataDict error:nil];
-    
-    if(model){
-        NSNumber *curNum = [NSNumber numberWithInteger:model.status];
-        [[NSNotificationCenter defaultCenter] postNotificationName:createFolderDoneNotification object:curNum];/*发送通知*/
-    }
-}
-
-- (void)getFolderListResponseFun:(NSDictionary *)dataDict
-{
-    [[NSNotificationCenter defaultCenter] postNotificationName:getFolderListDoneNotification object:dataDict];/*发送通知*/
-}
-
-- (void)searchFileListResponseFun:(NSDictionary *)dataDict
-{
-    [[NSNotificationCenter defaultCenter] postNotificationName:searchFileListDoneNotification object:dataDict];/*发送通知*/
-}
-
-#pragma mark 获取云机已经外挂产品
-- (void)getExtraFilesResponseFun:(NSDictionary *)dataDict
-{
-    cloudPhoneExtraFileListModel *model = [[cloudPhoneExtraFileListModel alloc] initWithDictionary:dataDict error:nil];
-    ksharedAppDelegate.cloudPhoneExtraFileListMod = model;
-    
-    [[NSNotificationCenter defaultCenter] postNotificationName:getExtraFilesDoneNotification object:dataDict];/*发送通知*/
-}
-
-- (void)getExtraMediaEventResponseFun:(NSDictionary *)dataDict
-{
-    extraMediaEventModel *model = [[extraMediaEventModel alloc] initWithDictionary:dataDict error:nil];
-    
-    NSString *tip = nil;
-    if(model.data.event == 0){
-        tip = NSLocalizedString(@"disk_insertion_tip",nil);
-        [self showInsertPopViewFun:model.data.name];
-    }
-    else if(model.data.event == 1){
-        tip = NSLocalizedString(@"disk_extract_tip",nil);
-    }
-    else if(model.data.event == 2){
-        tip = NSLocalizedString(@"disk_save_extract_tip",nil);
-    }
-    
-    NSString *totalTips = [[NSString alloc] initWithFormat:@"%@%@",model.data.name,tip];
-    
-    mainBlock(^{
-        [[iToast makeText:totalTips] show];
-    });
-}
-
-#pragma mark 显示插入UI弹框
-- (void)showInsertPopViewFun:(NSString*)name
-{
-//    if(self->curUSBInsertPopV){
-//        [self->curUSBInsertPopV removeFromSuperview];
-//        self->curUSBInsertPopV = nil;
-//    }
-//    
-//    self->curUSBInsertPopV = [[USBInsertPopView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_W, SCREEN_H) withName:name];
-//    
-//    [[iTools getKeyWindow] addSubview:self->curUSBInsertPopV];
-}
-
-- (void)createBackupsFolderBy:(NSString*)backupsDefaultPath
-{
-    NSString *folderName = backupsDefaultPath;
-    
-    if(folderName && folderName.length >0){
-        NSString * commandStr = [RCCommandHelp applyForCreateFolderwithFolderName:folderName];
-        //[self.commandChannelManager rc_sendData:commandStr];
-    }
-}
-
-- (void)getBackupFolderListFun
-{
-    NSString * commandStr = [RCCommandHelp getCreateFolderList];
-    //[self.commandChannelManager rc_sendData:commandStr];
-}
-
-- (void)searchFileListBeginFun:(NSMutableDictionary *)dict
-{
-    NSMutableDictionary *objectDict = dict;
-    NSNumber *curNum = @1;
-    
-    if ([[objectDict allKeys] containsObject:@"type"]) {
-        curNum = [objectDict objectForKey:@"type"];
-    }
-    
-    NSString *pathStr = @"";
-    
-    if ([[objectDict allKeys] containsObject:@"path"]) {
-        pathStr = [objectDict objectForKey:@"path"];
-    }
-    
-    NSString *fileType = @"video";
-    
-    if(curNum.boolValue)
-    {
-        fileType = @"jpg";
-    }
-    
-    NSString * commandStr = [RCCommandHelp searchCouldPhoneFilewithType:fileType withPath:pathStr];
-    //[self.commandChannelManager rc_sendData:commandStr];
-}
-
-
-#pragma mark 获取云机基本信息
-- (void)getBaseInfoFun
-{
-    NSString *commondStr  = @"{\"type\":\"getBaseInfo\"}";
-    [self send_data:commondStr];
-}
-
-#pragma mark 获取云机系统镜像等信息
-- (void)getSysInfoFun
-{
-    NSString *commondStr  = @"{\"type\":\"getSysInfo\"}";
-    [self send_data:commondStr];
-}
-
-#pragma mark 云机截图保存到云机图库
-- (void)screenshotInCloudPhoneFun{
-    NSString*taskUid = [iTools getTaskUidStr];
-    NSString *commondStr  = [RCCommandHelp commandCloudPhoneScreenshotWithTaskUid:taskUid];
-    [self send_data:commondStr];
-}
-
-#pragma mark 获取TV投屏状态
-- (void)getTvStatusFun
-{
-    NSString *commondStr  = @"{\"type\":\"TvStatus\"}";
-    [self send_data:commondStr];
-}
-
-#pragma mark 关闭TV投屏状态
-- (void)offTvFun
-{
-    NSString *commondStr  = @"{\"type\":\"TvOff\"}";
-    [self send_data:commondStr];
-}
-
-#pragma mark 开启TV投屏状态
-- (void)onTvFun
-{
-    NSString *commondStr  = @"{\"type\":\"wakeupTV\"}";
-    [self send_data:commondStr];
-}
-
-#pragma mark 告诉别的ws收到的挤下线消息
-- (void)didReceiveLogoutMsgFun
-{
-    NSString *curOaidStr = [RcGameWQKeyChain getOaidStringFun];
-    if(!curOaidStr){
-        curOaidStr = @"";
-    }
-    NSString *commondStr = [[NSString alloc] initWithFormat:@"{\"type\":\"forwardMsg\",\"data\":\"only one socket2\",\"sign\":\"%@\"}",curOaidStr];
-    //NSString *commondStr  = @"{\"type\":\"forwardMsg\",\"data\":\"offline_notification\"}";
-    [self send_data:commondStr];
-}
-
-#pragma mark 单点登录被挤下线弹框
-- (void)LogoutByOtherFun
-{
-    
-    if(logoutAlertVC){
-        return;
-    }
-    
-    [self didReceiveLogoutMsgFun];
-    
-    //通知音视频断开链接
-    [[NSNotificationCenter defaultCenter] postNotificationName:logoutByOtherNotification object:nil];
-    
-    //yyyy-MM-dd HH:mm:ss
-    NSString*dateStr = [iTools getNowTimeString2];
-    if(dateStr && dateStr.length == 19){
-        dateStr = [dateStr substringWithRange:NSMakeRange(11, 5)];
-    }
-    
-    NSString *LogoutTimerStr = [[NSString alloc] initWithFormat:@"%@%@%@",NSLocalizedString(@"single_sign_on_Tips_one",nil),dateStr,NSLocalizedString(@"single_sign_on_Tips_two",nil)];
-    
-    
-    NSString * loginAgainStr = NSLocalizedString(@"single_sign_on_login_again",nil);
-    BOOL isOkBtnHighlight = YES;
-    if(!ksharedAppDelegate.DeviceThirdIdMod.data.isPrivacyMode){
-        loginAgainStr = @"";
-        isOkBtnHighlight = NO;
-    }
-    
-    _isLogoutByOtherType = YES;
-    _didSendfristMsg = NO;
-    _isWaitShowLogoutAlert = YES;
-    
-    //被挤下线 ws断开
-    //[self.commandChannelManager rc_close];
-    //self.commandChannelManager = nil;
-    
-    if([DFPlayer sharedPlayer].currentAudioModel
-       &&([DFPlayer sharedPlayer].state == DFPlayerStateBuffering
-          || [DFPlayer sharedPlayer].state == DFPlayerStatePlaying)
-       ){
-        [[DFPlayer sharedPlayer] df_pause];
-        [[audioPlayingView sharedInstance] setAudioPlayingStateFunBy:NO];
-    }
-    
-    
-    if(ksharedAppDelegate.isDidShowPwdType){
-        
-        KWeakSelf
-        dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [weakSelf LogoutByOtherFun];
-            HLog(@"weakSelf LogoutByOtherFun")
-        });
-        return;
-    }
-    
-    _isWaitShowLogoutAlert = NO;;
-    
-    /*弹窗提示重启*/
-    //KWeakSelf
-    logoutAlertVC = [[ComontAlretViewController alloc] initWithTiTle:NSLocalizedString(@"single_sign_on_Tips_logout",nil)
-                                                                                     msg:LogoutTimerStr
-                                                                                imageStr:@""
-                                                                             cancelTitle:NSLocalizedString(@"single_sign_on_exit",nil)
-                                                                                 okTitle:loginAgainStr isOkBtnHighlight:isOkBtnHighlight
-                                                                             didClickOk:^{
-        //[weakSelf tryAgain];
-        //[[webSocketManager shareInstance] WebSocketNeedRelinkFun];
-        
-        self->_isLogoutByOtherType = NO;
-        self->logoutAlertVC = nil;
-        [[NSNotificationCenter defaultCenter] postNotificationName:lockBypwdNotification object:nil];
-        
-    } didClickCancel:^{
-        exit(0);/*强制退出app*/
-    }];
-    logoutAlertVC.modalPresentationStyle = UIModalPresentationCustom;
-
-    [[iTools appRootViewController] presentViewController:logoutAlertVC animated:YES completion:^{
-        self->logoutAlertVC.view.superview.backgroundColor = [UIColor clearColor];
-    }];
-    
-}
-@end

+ 8 - 0
创维盒子/code/webRtc/webRtcManager/webRtcManager.h

@@ -16,6 +16,14 @@
 #import "queryHeartbeatModel.h"
 #import "BoxHeartbeatReStartSucView.h"
 #import "BoxHeartbeatReStartView.h"
+#import "customDownloadOperation.h"
+#import "DFPlayer.h"
+#import "RCCommandHelp.h"
+#import "customDownloadCacheManager.h"
+#import "boxDownloadFileManager.h"
+#import "commandSendCheckModel.h"
+#import "couldPhoneCommonModel.h"
+#import "extraMediaEventModel.h"
 
 NS_ASSUME_NONNULL_BEGIN
 

+ 0 - 84
创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -704,10 +704,6 @@
 		6B7E04352C3E5A98004B4948 /* NSURLSession+customDownloadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B7E04252C3E5A97004B4948 /* NSURLSession+customDownloadTask.h */; };
 		6B7E04362C3E5A98004B4948 /* NSURLSession+customDownloadTask.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B7E04262C3E5A97004B4948 /* NSURLSession+customDownloadTask.m */; };
 		6B7E04372C3E5A98004B4948 /* NSURLSession+customDownloadTask.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B7E04262C3E5A97004B4948 /* NSURLSession+customDownloadTask.m */; };
-		6B7E043A2C3E6BBC004B4948 /* webSocketManager+downloadNasFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B7E04382C3E6BBC004B4948 /* webSocketManager+downloadNasFile.h */; };
-		6B7E043B2C3E6BBC004B4948 /* webSocketManager+downloadNasFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B7E04392C3E6BBC004B4948 /* webSocketManager+downloadNasFile.m */; };
-		6B7E043C2C3E6BBC004B4948 /* webSocketManager+downloadNasFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B7E04392C3E6BBC004B4948 /* webSocketManager+downloadNasFile.m */; };
-		6B7E043D2C3E6BBC004B4948 /* webSocketManager+downloadNasFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B7E04382C3E6BBC004B4948 /* webSocketManager+downloadNasFile.h */; };
 		6B7E04432C3EA65A004B4948 /* previewLandscapeTopView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B7E04412C3EA65A004B4948 /* previewLandscapeTopView.h */; };
 		6B7E04442C3EA65A004B4948 /* previewLandscapeTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B7E04422C3EA65A004B4948 /* previewLandscapeTopView.m */; };
 		6B7E04452C3EA65A004B4948 /* previewLandscapeTopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B7E04422C3EA65A004B4948 /* previewLandscapeTopView.m */; };
@@ -900,30 +896,6 @@
 		6BC7413B2C23C8870049BA8D /* cloudPhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC741392C23C8860049BA8D /* cloudPhoneViewController.m */; };
 		6BC7413C2C23C8870049BA8D /* cloudPhoneViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC741382C23C8860049BA8D /* cloudPhoneViewController.h */; };
 		6BC7413D2C23C8870049BA8D /* cloudPhoneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC741392C23C8860049BA8D /* cloudPhoneViewController.m */; };
-		6BC741402C23DCD10049BA8D /* webSocketManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC7413E2C23DCD10049BA8D /* webSocketManager.h */; };
-		6BC741412C23DCD10049BA8D /* webSocketManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC7413F2C23DCD10049BA8D /* webSocketManager.m */; };
-		6BC741422C23DCD10049BA8D /* webSocketManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC7413E2C23DCD10049BA8D /* webSocketManager.h */; };
-		6BC741432C23DCD10049BA8D /* webSocketManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC7413F2C23DCD10049BA8D /* webSocketManager.m */; };
-		6BC741462C24097E0049BA8D /* webSocketManager+baseDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC741442C24097E0049BA8D /* webSocketManager+baseDownload.h */; };
-		6BC741472C24097E0049BA8D /* webSocketManager+baseDownload.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC741452C24097E0049BA8D /* webSocketManager+baseDownload.m */; };
-		6BC741482C24097E0049BA8D /* webSocketManager+baseDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC741442C24097E0049BA8D /* webSocketManager+baseDownload.h */; };
-		6BC741492C24097E0049BA8D /* webSocketManager+baseDownload.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC741452C24097E0049BA8D /* webSocketManager+baseDownload.m */; };
-		6BC7414C2C240A670049BA8D /* webSocketManager+downloadFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC7414A2C240A670049BA8D /* webSocketManager+downloadFile.h */; };
-		6BC7414D2C240A670049BA8D /* webSocketManager+downloadFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC7414B2C240A670049BA8D /* webSocketManager+downloadFile.m */; };
-		6BC7414E2C240A670049BA8D /* webSocketManager+downloadFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC7414A2C240A670049BA8D /* webSocketManager+downloadFile.h */; };
-		6BC7414F2C240A670049BA8D /* webSocketManager+downloadFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC7414B2C240A670049BA8D /* webSocketManager+downloadFile.m */; };
-		6BC741522C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC741502C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.h */; };
-		6BC741532C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC741512C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.m */; };
-		6BC741542C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC741502C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.h */; };
-		6BC741552C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC741512C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.m */; };
-		6BC741582C2413B20049BA8D /* webSocketManager+upLoadFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC741562C2413B20049BA8D /* webSocketManager+upLoadFile.h */; };
-		6BC741592C2413B20049BA8D /* webSocketManager+upLoadFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC741572C2413B20049BA8D /* webSocketManager+upLoadFile.m */; };
-		6BC7415A2C2413B20049BA8D /* webSocketManager+upLoadFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC741562C2413B20049BA8D /* webSocketManager+upLoadFile.h */; };
-		6BC7415B2C2413B20049BA8D /* webSocketManager+upLoadFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC741572C2413B20049BA8D /* webSocketManager+upLoadFile.m */; };
-		6BC7415E2C24150C0049BA8D /* webSocketManager+backupsFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC7415C2C24150C0049BA8D /* webSocketManager+backupsFile.h */; };
-		6BC7415F2C24150C0049BA8D /* webSocketManager+backupsFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC7415D2C24150C0049BA8D /* webSocketManager+backupsFile.m */; };
-		6BC741602C24150C0049BA8D /* webSocketManager+backupsFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BC7415C2C24150C0049BA8D /* webSocketManager+backupsFile.h */; };
-		6BC741612C24150C0049BA8D /* webSocketManager+backupsFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC7415D2C24150C0049BA8D /* webSocketManager+backupsFile.m */; };
 		6BCCF1AC2D1E487B00BAF144 /* UpgradeInfoModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BCCF1AA2D1E487B00BAF144 /* UpgradeInfoModel.h */; };
 		6BCCF1AD2D1E487B00BAF144 /* UpgradeInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BCCF1AB2D1E487B00BAF144 /* UpgradeInfoModel.m */; };
 		6BCCF1AE2D1E487B00BAF144 /* UpgradeInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BCCF1AB2D1E487B00BAF144 /* UpgradeInfoModel.m */; };
@@ -1995,8 +1967,6 @@
 		6B7E04242C3E5A97004B4948 /* customDownloadOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = customDownloadOperation.m; sourceTree = "<group>"; };
 		6B7E04252C3E5A97004B4948 /* NSURLSession+customDownloadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURLSession+customDownloadTask.h"; sourceTree = "<group>"; };
 		6B7E04262C3E5A97004B4948 /* NSURLSession+customDownloadTask.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSURLSession+customDownloadTask.m"; sourceTree = "<group>"; };
-		6B7E04382C3E6BBC004B4948 /* webSocketManager+downloadNasFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "webSocketManager+downloadNasFile.h"; sourceTree = "<group>"; };
-		6B7E04392C3E6BBC004B4948 /* webSocketManager+downloadNasFile.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "webSocketManager+downloadNasFile.m"; sourceTree = "<group>"; };
 		6B7E04412C3EA65A004B4948 /* previewLandscapeTopView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = previewLandscapeTopView.h; sourceTree = "<group>"; };
 		6B7E04422C3EA65A004B4948 /* previewLandscapeTopView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = previewLandscapeTopView.m; sourceTree = "<group>"; };
 		6B7EA7962BF5B4A6002D5CC2 /* NASFilePicModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NASFilePicModel.h; sourceTree = "<group>"; };
@@ -2098,18 +2068,6 @@
 		6BBB35E12AE935C000E4A59B /* DDYLanguageTool.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DDYLanguageTool.m; sourceTree = "<group>"; };
 		6BC741382C23C8860049BA8D /* cloudPhoneViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cloudPhoneViewController.h; sourceTree = "<group>"; };
 		6BC741392C23C8860049BA8D /* cloudPhoneViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = cloudPhoneViewController.m; sourceTree = "<group>"; };
-		6BC7413E2C23DCD10049BA8D /* webSocketManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = webSocketManager.h; sourceTree = "<group>"; };
-		6BC7413F2C23DCD10049BA8D /* webSocketManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = webSocketManager.m; sourceTree = "<group>"; };
-		6BC741442C24097E0049BA8D /* webSocketManager+baseDownload.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "webSocketManager+baseDownload.h"; sourceTree = "<group>"; };
-		6BC741452C24097E0049BA8D /* webSocketManager+baseDownload.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "webSocketManager+baseDownload.m"; sourceTree = "<group>"; };
-		6BC7414A2C240A670049BA8D /* webSocketManager+downloadFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "webSocketManager+downloadFile.h"; sourceTree = "<group>"; };
-		6BC7414B2C240A670049BA8D /* webSocketManager+downloadFile.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "webSocketManager+downloadFile.m"; sourceTree = "<group>"; };
-		6BC741502C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "webSocketManager+downloadThumbnailImage.h"; sourceTree = "<group>"; };
-		6BC741512C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "webSocketManager+downloadThumbnailImage.m"; sourceTree = "<group>"; };
-		6BC741562C2413B20049BA8D /* webSocketManager+upLoadFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "webSocketManager+upLoadFile.h"; sourceTree = "<group>"; };
-		6BC741572C2413B20049BA8D /* webSocketManager+upLoadFile.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "webSocketManager+upLoadFile.m"; sourceTree = "<group>"; };
-		6BC7415C2C24150C0049BA8D /* webSocketManager+backupsFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "webSocketManager+backupsFile.h"; sourceTree = "<group>"; };
-		6BC7415D2C24150C0049BA8D /* webSocketManager+backupsFile.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "webSocketManager+backupsFile.m"; sourceTree = "<group>"; };
 		6BCCF1AA2D1E487B00BAF144 /* UpgradeInfoModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = UpgradeInfoModel.h; sourceTree = "<group>"; };
 		6BCCF1AB2D1E487B00BAF144 /* UpgradeInfoModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UpgradeInfoModel.m; sourceTree = "<group>"; };
 		6BCCF1B02D1EA97100BAF144 /* imageVersionUpdateDoneView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = imageVersionUpdateDoneView.h; sourceTree = "<group>"; };
@@ -3386,20 +3344,6 @@
 			children = (
 				183AE6A52A8C9EA900B11CB0 /* RCCommandHelp.h */,
 				183AE6A72A8C9EAA00B11CB0 /* RCCommandHelp.m */,
-				6BC7413E2C23DCD10049BA8D /* webSocketManager.h */,
-				6BC7413F2C23DCD10049BA8D /* webSocketManager.m */,
-				6BC741442C24097E0049BA8D /* webSocketManager+baseDownload.h */,
-				6BC741452C24097E0049BA8D /* webSocketManager+baseDownload.m */,
-				6BC7414A2C240A670049BA8D /* webSocketManager+downloadFile.h */,
-				6BC7414B2C240A670049BA8D /* webSocketManager+downloadFile.m */,
-				6BC741502C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.h */,
-				6BC741512C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.m */,
-				6BC741562C2413B20049BA8D /* webSocketManager+upLoadFile.h */,
-				6BC741572C2413B20049BA8D /* webSocketManager+upLoadFile.m */,
-				6BC7415C2C24150C0049BA8D /* webSocketManager+backupsFile.h */,
-				6BC7415D2C24150C0049BA8D /* webSocketManager+backupsFile.m */,
-				6B7E04382C3E6BBC004B4948 /* webSocketManager+downloadNasFile.h */,
-				6B7E04392C3E6BBC004B4948 /* webSocketManager+downloadNasFile.m */,
 			);
 			path = websocket;
 			sourceTree = "<group>";
@@ -4054,7 +3998,6 @@
 				6B5D40372B4BEEF8000965CF /* downloadThumbnailManager.h in Headers */,
 				6B9354AD2BF3879200AA8D31 /* shareRecordTableViewCell.h in Headers */,
 				6B0582802B01C67400D37290 /* uploadFileRecordViewController.h in Headers */,
-				6BC7415E2C24150C0049BA8D /* webSocketManager+backupsFile.h in Headers */,
 				6BEA31752BB65606005167AA /* clearCacheAlretViewController.h in Headers */,
 				6B4C0F842C0315880070EF2E /* audioPlayerViewController.h in Headers */,
 				6B257E9F2C95964E00CBB70A /* backupPathListModel.h in Headers */,
@@ -4139,7 +4082,6 @@
 				6B679DFE2C255DC900D0DC03 /* MineCommonUsedView.h in Headers */,
 				6B8676982C85973200F81DFC /* webRtcMsgModel.h in Headers */,
 				6B238C952C60AF6A00C5AC2F /* nasDownloadFileManager.h in Headers */,
-				6B7E043A2C3E6BBC004B4948 /* webSocketManager+downloadNasFile.h in Headers */,
 				6B5BE5812BFC81E300A1B9B3 /* NASFileAndFolderModel.h in Headers */,
 				6B7EA7BC2BF759AC002D5CC2 /* shareSecretTableViewCell.h in Headers */,
 				6B2C1E362C070ADE00FDCF82 /* ZFPlayerControlView.h in Headers */,
@@ -4198,7 +4140,6 @@
 				183AE6D42A8CAFAE00B11CB0 /* UIView+View.h in Headers */,
 				6BEF9B852C64CDD300142B75 /* frpUploadModel.h in Headers */,
 				6B9354892BF2FE8700AA8D31 /* editTypeHeadView.h in Headers */,
-				6BC7414C2C240A670049BA8D /* webSocketManager+downloadFile.h in Headers */,
 				6B2C1E4A2C070ADE00FDCF82 /* ZFSpeedLoadingView.h in Headers */,
 				6BED888A2B4E819000F76DDC /* downloadFileRecordTableView.h in Headers */,
 				6B2C1E562C070ADE00FDCF82 /* UIScrollView+ZFPlayer.h in Headers */,
@@ -4211,7 +4152,6 @@
 				6BED888E2B4E901900F76DDC /* downloadFileRecordCell.h in Headers */,
 				184C8ACC2A94557200F26650 /* HidenMaskSetViewController.h in Headers */,
 				6B6ABEF22BFF6B4C00480BAC /* boxSaveFileManager.h in Headers */,
-				6BC741582C2413B20049BA8D /* webSocketManager+upLoadFile.h in Headers */,
 				6BA08F532C01D05B00A2242D /* CWUploadTask.h in Headers */,
 				6B2C1E682C070ADE00FDCF82 /* ZFLandscapeRotationManager_iOS16.h in Headers */,
 				6B3E7A7B2C89AD5500B032C4 /* webRtcPlayerViewController+AdjustPlayerViewFrame.h in Headers */,
@@ -4245,7 +4185,6 @@
 				6B0581A22AFCF50300D37290 /* AJPhotoListCell.h in Headers */,
 				6B238C8F2C60AAE200C5AC2F /* nasDownloadManager.h in Headers */,
 				6B3AD68A2BF4AE630096D6B7 /* backupsOptionViewController.h in Headers */,
-				6BC741462C24097E0049BA8D /* webSocketManager+baseDownload.h in Headers */,
 				187076772A9F400300F15F7F /* PlayerLoadingView.h in Headers */,
 				6B7EA7982BF5B4A6002D5CC2 /* NASFilePicModel.h in Headers */,
 				6B7E04342C3E5A98004B4948 /* NSURLSession+customDownloadTask.h in Headers */,
@@ -4267,7 +4206,6 @@
 				6B2C1E742C070ADE00FDCF82 /* ZFLandscapeViewController.h in Headers */,
 				6B5D86742C22C63F008D25EA /* NASCommonUsedView.h in Headers */,
 				6B72725B2B0E22D000C03F87 /* uploadFileRecordBgScorllView.h in Headers */,
-				6BC741522C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.h in Headers */,
 				6B1F7FD62C00772500954720 /* boxDownloadFileManager.h in Headers */,
 				6B3941D02C50A7CA00C8FB28 /* queryShareReportMarkModel.h in Headers */,
 				18A909982ABC4A3300E6D2BE /* ComontAlretViewController.h in Headers */,
@@ -4277,7 +4215,6 @@
 				6B2C1E8C2C070ADE00FDCF82 /* ZFPlayerGestureControl.h in Headers */,
 				6BA464D92D2384E300AD08ED /* imageVersionUpdateFailView.h in Headers */,
 				186820192AB94877005702A6 /* GuideLastView.h in Headers */,
-				6BC741402C23DCD10049BA8D /* webSocketManager.h in Headers */,
 				6B6ABEEC2BFF5B2F00480BAC /* receiveSaveRecordTableView.h in Headers */,
 				6B5D86802C22EA5B008D25EA /* lastFileManager.h in Headers */,
 				6B0582632AFF4B7D00D37290 /* PhotoPreviewViewController.h in Headers */,
@@ -4350,7 +4287,6 @@
 				6BD506A72B9576A4006E7CB0 /* downloadThumbnailManager.h in Headers */,
 				6B9354AE2BF3879200AA8D31 /* shareRecordTableViewCell.h in Headers */,
 				6BD506A82B9576A4006E7CB0 /* uploadFileRecordViewController.h in Headers */,
-				6BC741602C24150C0049BA8D /* webSocketManager+backupsFile.h in Headers */,
 				6BEA31782BB65606005167AA /* clearCacheAlretViewController.h in Headers */,
 				6B4C0F872C0315880070EF2E /* audioPlayerViewController.h in Headers */,
 				6B257EA12C95964E00CBB70A /* backupPathListModel.h in Headers */,
@@ -4435,7 +4371,6 @@
 				6B679E002C255DC900D0DC03 /* MineCommonUsedView.h in Headers */,
 				6B86769A2C85973200F81DFC /* webRtcMsgModel.h in Headers */,
 				6B238C962C60AF6A00C5AC2F /* nasDownloadFileManager.h in Headers */,
-				6B7E043D2C3E6BBC004B4948 /* webSocketManager+downloadNasFile.h in Headers */,
 				6B5BE5832BFC81E300A1B9B3 /* NASFileAndFolderModel.h in Headers */,
 				6B7EA7BE2BF759AC002D5CC2 /* shareSecretTableViewCell.h in Headers */,
 				6B2C1E372C070ADE00FDCF82 /* ZFPlayerControlView.h in Headers */,
@@ -4494,7 +4429,6 @@
 				6BD506E42B9576A4006E7CB0 /* UIView+View.h in Headers */,
 				6BEF9B872C64CDD300142B75 /* frpUploadModel.h in Headers */,
 				6B93548A2BF2FE8700AA8D31 /* editTypeHeadView.h in Headers */,
-				6BC7414E2C240A670049BA8D /* webSocketManager+downloadFile.h in Headers */,
 				6B2C1E4B2C070ADE00FDCF82 /* ZFSpeedLoadingView.h in Headers */,
 				6BD506E52B9576A4006E7CB0 /* downloadFileRecordTableView.h in Headers */,
 				6B2C1E572C070ADE00FDCF82 /* UIScrollView+ZFPlayer.h in Headers */,
@@ -4507,7 +4441,6 @@
 				6BD506E92B9576A4006E7CB0 /* downloadFileRecordCell.h in Headers */,
 				6BD506EA2B9576A4006E7CB0 /* HidenMaskSetViewController.h in Headers */,
 				6B6ABEF42BFF6B4C00480BAC /* boxSaveFileManager.h in Headers */,
-				6BC7415A2C2413B20049BA8D /* webSocketManager+upLoadFile.h in Headers */,
 				6BA08F542C01D05B00A2242D /* CWUploadTask.h in Headers */,
 				6B2C1E692C070ADE00FDCF82 /* ZFLandscapeRotationManager_iOS16.h in Headers */,
 				6B3E7A7D2C89AD5500B032C4 /* webRtcPlayerViewController+AdjustPlayerViewFrame.h in Headers */,
@@ -4541,7 +4474,6 @@
 				6BD506F32B9576A4006E7CB0 /* AJPhotoListCell.h in Headers */,
 				6B238C902C60AAE200C5AC2F /* nasDownloadManager.h in Headers */,
 				6B3AD68D2BF4AE630096D6B7 /* backupsOptionViewController.h in Headers */,
-				6BC741482C24097E0049BA8D /* webSocketManager+baseDownload.h in Headers */,
 				6BD506F42B9576A4006E7CB0 /* PlayerLoadingView.h in Headers */,
 				6B7EA79A2BF5B4A6002D5CC2 /* NASFilePicModel.h in Headers */,
 				6B7E04352C3E5A98004B4948 /* NSURLSession+customDownloadTask.h in Headers */,
@@ -4563,7 +4495,6 @@
 				6B2C1E752C070ADE00FDCF82 /* ZFLandscapeViewController.h in Headers */,
 				6B5D86752C22C63F008D25EA /* NASCommonUsedView.h in Headers */,
 				6BD506FD2B9576A4006E7CB0 /* uploadFileRecordBgScorllView.h in Headers */,
-				6BC741542C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.h in Headers */,
 				6B1F7FD82C00772500954720 /* boxDownloadFileManager.h in Headers */,
 				6B3941D12C50A7CA00C8FB28 /* queryShareReportMarkModel.h in Headers */,
 				6BD506FE2B9576A4006E7CB0 /* ComontAlretViewController.h in Headers */,
@@ -4573,7 +4504,6 @@
 				6B2C1E8D2C070ADE00FDCF82 /* ZFPlayerGestureControl.h in Headers */,
 				6BA464DA2D2384E300AD08ED /* imageVersionUpdateFailView.h in Headers */,
 				6BD507012B9576A4006E7CB0 /* GuideLastView.h in Headers */,
-				6BC741422C23DCD10049BA8D /* webSocketManager.h in Headers */,
 				6B6ABEEE2BFF5B2F00480BAC /* receiveSaveRecordTableView.h in Headers */,
 				6B5D86812C22EA5B008D25EA /* lastFileManager.h in Headers */,
 				6BD507022B9576A4006E7CB0 /* PhotoPreviewViewController.h in Headers */,
@@ -4896,7 +4826,6 @@
 				6B4C0F952C0320710070EF2E /* NSObject+Extensions.m in Sources */,
 				6BD5071C2B9576A4006E7CB0 /* backupsSetViewController.m in Sources */,
 				6BA08F0B2C0187DD00A2242D /* boxDownloadFileRecordCell.m in Sources */,
-				6BC741552C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.m in Sources */,
 				6B2C1E2F2C070ADE00FDCF82 /* ZFLoadingView.m in Sources */,
 				6BD5071D2B9576A4006E7CB0 /* diskListBgView.m in Sources */,
 				6BD5071E2B9576A4006E7CB0 /* iTools.m in Sources */,
@@ -4968,7 +4897,6 @@
 				6B7EA7A12BF5E0ED002D5CC2 /* NASMsgModel.m in Sources */,
 				6BD507412B9576A4006E7CB0 /* AudioSessionObject.m in Sources */,
 				6B6ABEDD2BFF3AA400480BAC /* receiveView.m in Sources */,
-				6BC7414F2C240A670049BA8D /* webSocketManager+downloadFile.m in Sources */,
 				6B07E0AF2C3D1ED5004A3238 /* nasLastFileViewController.m in Sources */,
 				6BD507422B9576A4006E7CB0 /* ChangeLogoViewController.m in Sources */,
 				6BD507432B9576A4006E7CB0 /* uploadFileRecordheadView.m in Sources */,
@@ -5037,7 +4965,6 @@
 				6BD507612B9576A4006E7CB0 /* FMDatabasePool.m in Sources */,
 				6BD507622B9576A4006E7CB0 /* iToast.m in Sources */,
 				6B2C1E272C070ADE00FDCF82 /* UIView+ZFFrame.m in Sources */,
-				6BC741492C24097E0049BA8D /* webSocketManager+baseDownload.m in Sources */,
 				6BD507632B9576A4006E7CB0 /* HWPageListCell.m in Sources */,
 				6BD507642B9576A4006E7CB0 /* downloadFileRecordTableView.m in Sources */,
 				6BD507652B9576A4006E7CB0 /* HWHomeListCell.m in Sources */,
@@ -5053,7 +4980,6 @@
 				6BD5076A2B9576A4006E7CB0 /* SafeForKey.m in Sources */,
 				6BD5076B2B9576A4006E7CB0 /* JSONModel.m in Sources */,
 				6BD5076D2B9576A4006E7CB0 /* WHPingTester.m in Sources */,
-				6BC741432C23DCD10049BA8D /* webSocketManager.m in Sources */,
 				6B467BB42BC7E4360039A6A6 /* addLogObject.m in Sources */,
 				6BD5076E2B9576A4006E7CB0 /* forgetPwdViewController.m in Sources */,
 				6BF558C72C45247E00701854 /* audioPlayListView.m in Sources */,
@@ -5162,7 +5088,6 @@
 				6BD507A92B9576A4006E7CB0 /* AboutViewController.m in Sources */,
 				6BD507AA2B9576A4006E7CB0 /* JSONModelArray.m in Sources */,
 				6B4C0F692C0314BA0070EF2E /* DFPlayerLyricsTableview.m in Sources */,
-				6BC7415B2C2413B20049BA8D /* webSocketManager+upLoadFile.m in Sources */,
 				6B833A852C48F3B300F9F1D0 /* customToastVew.m in Sources */,
 				6BD507AB2B9576A4006E7CB0 /* AFURLSessionManager.m in Sources */,
 				6BD507AC2B9576A4006E7CB0 /* GuideLastView.m in Sources */,
@@ -5215,7 +5140,6 @@
 				6B7E04332C3E5A98004B4948 /* customDownloadOperation.m in Sources */,
 				6B4C0F812C0314BA0070EF2E /* DFPlayerUIManager.m in Sources */,
 				6B2C1E9F2C070ADE00FDCF82 /* ZFPlayerView.m in Sources */,
-				6BC741612C24150C0049BA8D /* webSocketManager+backupsFile.m in Sources */,
 				6BD507CC2B9576A4006E7CB0 /* PlayerView.m in Sources */,
 				6BC7413D2C23C8870049BA8D /* cloudPhoneViewController.m in Sources */,
 				6BD507CD2B9576A4006E7CB0 /* HWToolBar.m in Sources */,
@@ -5234,7 +5158,6 @@
 				6BD507D62B9576A4006E7CB0 /* main.m in Sources */,
 				6BD507D72B9576A4006E7CB0 /* uploadFileRecordTableView.m in Sources */,
 				6BD507D82B9576A4006E7CB0 /* NSDictionary+Log.m in Sources */,
-				6B7E043C2C3E6BBC004B4948 /* webSocketManager+downloadNasFile.m in Sources */,
 				6BD507D92B9576A4006E7CB0 /* mySetHeadView.m in Sources */,
 				6B2C1E7B2C070ADE00FDCF82 /* ZFLandscapeWindow.m in Sources */,
 				6BD507DA2B9576A4006E7CB0 /* HWPageViewController.m in Sources */,
@@ -5274,7 +5197,6 @@
 				6B4C0F942C0320710070EF2E /* NSObject+Extensions.m in Sources */,
 				6B1FBD232B43DAD200926382 /* backupsSetViewController.m in Sources */,
 				6BA08F092C0187DD00A2242D /* boxDownloadFileRecordCell.m in Sources */,
-				6BC741532C2410CD0049BA8D /* webSocketManager+downloadThumbnailImage.m in Sources */,
 				6B2C1E2E2C070ADE00FDCF82 /* ZFLoadingView.m in Sources */,
 				6B45C50D2B5FA80E007E6911 /* diskListBgView.m in Sources */,
 				A003F6D127D8425C00715CBF /* iTools.m in Sources */,
@@ -5346,7 +5268,6 @@
 				6B7EA79F2BF5E0ED002D5CC2 /* NASMsgModel.m in Sources */,
 				6BBB35DE2AE76AD800E4A59B /* AudioSessionObject.m in Sources */,
 				6B6ABEDB2BFF3AA400480BAC /* receiveView.m in Sources */,
-				6BC7414D2C240A670049BA8D /* webSocketManager+downloadFile.m in Sources */,
 				6B07E0AC2C3D1ED5004A3238 /* nasLastFileViewController.m in Sources */,
 				181E84FC2A8F57A500292B96 /* ChangeLogoViewController.m in Sources */,
 				6B8FF6BA2B04E19600800981 /* uploadFileRecordheadView.m in Sources */,
@@ -5415,7 +5336,6 @@
 				A08A950327E9A4E400C544BB /* FMDatabasePool.m in Sources */,
 				A003F6D327D8425C00715CBF /* iToast.m in Sources */,
 				6B2C1E262C070ADE00FDCF82 /* UIView+ZFFrame.m in Sources */,
-				6BC741472C24097E0049BA8D /* webSocketManager+baseDownload.m in Sources */,
 				A08A94E027E9837600C544BB /* HWPageListCell.m in Sources */,
 				6BED888B2B4E819000F76DDC /* downloadFileRecordTableView.m in Sources */,
 				A084D69827E8657800054880 /* HWHomeListCell.m in Sources */,
@@ -5431,7 +5351,6 @@
 				183AE7C82A8CB39100B11CB0 /* SafeForKey.m in Sources */,
 				183AE6042A89CE3C00B11CB0 /* JSONModel.m in Sources */,
 				6BF52C9A2AD5546500A617DB /* WHPingTester.m in Sources */,
-				6BC741412C23DCD10049BA8D /* webSocketManager.m in Sources */,
 				6B467BB22BC7E4360039A6A6 /* addLogObject.m in Sources */,
 				6BFF268D2AF8E1C600FCB4F7 /* forgetPwdViewController.m in Sources */,
 				6BF558C52C45247E00701854 /* audioPlayListView.m in Sources */,
@@ -5540,7 +5459,6 @@
 				184C8AD62A949D5900F26650 /* AboutViewController.m in Sources */,
 				183AE6062A89CE3C00B11CB0 /* JSONModelArray.m in Sources */,
 				6B4C0F682C0314BA0070EF2E /* DFPlayerLyricsTableview.m in Sources */,
-				6BC741592C2413B20049BA8D /* webSocketManager+upLoadFile.m in Sources */,
 				6B833A822C48F3B300F9F1D0 /* customToastVew.m in Sources */,
 				183AE6562A8A2CF000B11CB0 /* AFURLSessionManager.m in Sources */,
 				1868201A2AB94877005702A6 /* GuideLastView.m in Sources */,
@@ -5593,7 +5511,6 @@
 				6B7E04322C3E5A98004B4948 /* customDownloadOperation.m in Sources */,
 				6B4C0F802C0314BA0070EF2E /* DFPlayerUIManager.m in Sources */,
 				6B2C1E9E2C070ADE00FDCF82 /* ZFPlayerView.m in Sources */,
-				6BC7415F2C24150C0049BA8D /* webSocketManager+backupsFile.m in Sources */,
 				183AE6B42A8CA00300B11CB0 /* PlayerView.m in Sources */,
 				6BC7413B2C23C8870049BA8D /* cloudPhoneViewController.m in Sources */,
 				A003F6F327D8593600715CBF /* HWToolBar.m in Sources */,
@@ -5612,7 +5529,6 @@
 				A02FF6AC27D7054700D59D3F /* main.m in Sources */,
 				6B7272602B0E240F00C03F87 /* uploadFileRecordTableView.m in Sources */,
 				6B2170992B15CD9200656670 /* NSDictionary+Log.m in Sources */,
-				6B7E043B2C3E6BBC004B4948 /* webSocketManager+downloadNasFile.m in Sources */,
 				6B05815C2AFC851E00D37290 /* mySetHeadView.m in Sources */,
 				6B2C1E7A2C070ADE00FDCF82 /* ZFLandscapeWindow.m in Sources */,
 				A08A94DB27E97DB800C544BB /* HWPageViewController.m in Sources */,