1.websocket剥离中

创维盒子/双子星云手机/AppDelegate/Config/Notification.h

@@ -62,29 +62,23 @@
 /*主动上锁通知*/
 #define lockBypwdNotification                 @"lockBypwdNot"
 
-/* 上传文件通知*/
-#define uploadFileBeginNotification                 @"uploadFileBeginNot"
+
 /*上传文件更新通知*/
 #define uploadFileRefreshNotification                 @"uploadFileRefreshNot"
-/* 上传文件暂停通知*/
-#define uploadFileSuspendNotification                 @"uploadFileSuspendNot"
+
 /* 上传文件暂停全部通知*/
 #define uploadFileSuspendAllNotification                 @"uploadFileSuspendAllNot"
 /* 上传文件通知*/
 #define uploadFileAllTaskDoneNotification                 @"uploadFileAllTaskDoneNot"
 
-/* 上传备份通知*/
-#define backupsFileBeginNotification                 @"backupsFileBeginNot"
 /*备份文件更新通知*/
 #define backupsFileRefreshNotification                 @"backupsFileRefreshNot"
 
-/* 下载缩略图通知*/
-#define downloadThumbnailBeginNotification                 @"downloadThumbnailBeginNot"
+
 /* 下载完成一张缩略图通知*/
 #define downloadThumbnailDoneOneNotification                 @"downloadThumbnailDoneOneNot"
 
-/* 下载文件通知*/
-#define downloadFileBeginNotification                 @"downloadFileBeginNot"
+
 /*下载文件更新通知*/
 #define downloadFileRefreshNotification                 @"downloadFileRefreshNot"
 
@@ -115,9 +109,7 @@
 
 #define PlayerViewControlBtnTouchBeganNotification        @"PlayerViewControlBtnTouchBeganNotification"        // 云手机推流界面 控制按钮开始点击
 #define PlayerViewControlBtnTouchEndNotification          @"PlayerViewControlBtnTouchEndNotification"        /// // 云手机推流界面 控制按钮结束点击
-///
-#pragma mark 正在超分设置
-#define GetRbdDeviceNotification   @"GetRbdDeviceNotification"
+
 
 /*系统音量变化*/
 #define AVSystemController_SystemVolumeDidChangeNotification   @"AVSystemController_SystemVolumeDidChangeNotification"
@@ -139,8 +131,6 @@
 //显示密码页面  即不可展示图片和声音
 #define ShowPwdVCNotification                 @"ShowPwdVCNot"
 
-/* 获取云机基本通知*/
-#define getbaseInfoBeginNotification                 @"etbaseInfoBeginNot"
 
 #pragma mark 下载其它类型文件完成
 //#define NotLoadOtherDataFinished  @"loadOtherDataFinished"

创维盒子/双子星云手机/Class/Set/MySetViewController.h

@@ -28,8 +28,6 @@ NS_ASSUME_NONNULL_BEGIN
 //恢复出厂盒子 时间到了
 @property (nonatomic,copy) void (^needToResetAndOk)(void);
 
-//获取云机剩余空间
-@property (nonatomic,copy) void (^getBaseInfo)(void);
 
 //获取版本信息空间
 @property (nonatomic,copy) void (^getSysInfo)(void);

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

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

创维盒子/双子星云手机/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];
-    [[NSNotificationCenter defaultCenter] postNotificationName:backupsFileBeginNotification object:_curPhotosBackupsTaskMod];
+    [[webSocketManager shareInstance] beginGotoBackupsFileFunBy:_curPhotosBackupsTaskMod];
     [self RefreshDatabaseFun];
     [self changeBackupsFileStateFun];
 }
@@ -406,8 +406,7 @@ static backupsFileManager * cur_backupsFileShareInstance = nil;
     }
     
     
-    
-    [[NSNotificationCenter defaultCenter] postNotificationName:backupsFileBeginNotification object:_curPhotosBackupsTaskMod];
+    [[webSocketManager shareInstance] beginGotoBackupsFileFunBy:_curPhotosBackupsTaskMod];
     [self RefreshDatabaseFun];
     [self changeBackupsFileStateFun];
 }

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/downloadManager.m

@@ -267,7 +267,7 @@ static downloadManager * cur_downloadManager = nil;
     
     _curDownloadFileModel.curDownloadStateType = downloadStateUploading;
     
-    [[NSNotificationCenter defaultCenter] postNotificationName:downloadFileBeginNotification object:_curDownloadFileModel];
+    [[webSocketManager shareInstance] begindownloadThumbnailImageFunBy:_curDownloadFileModel];
 }
 
 - (void)DownloadFileDoneOneFileFun
@@ -569,7 +569,7 @@ static downloadManager * cur_downloadManager = nil;
         return;
     }
     
-    [[NSNotificationCenter defaultCenter] postNotificationName:downloadFileBeginNotification object:_curDownloadFileModel];
+    [[webSocketManager shareInstance] begindownloadThumbnailImageFunBy:_curDownloadFileModel];
 }
 
 - (BOOL)checkDownloadingFun

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/downloadThumbnailManager.m

@@ -128,8 +128,7 @@ static downloadThumbnailManager * cur_downloadFileShareInstance = nil;
     }
     
     self.taskRenewTime = [iTools getNowTimeStamp];
-    [[NSNotificationCenter defaultCenter] postNotificationName:downloadThumbnailBeginNotification object:_curDownloadFileModel];
-    //[_downloadingTaskArr removeObject:_curDownloadFileModel];
+    [[webSocketManager shareInstance] begindownloadThumbnailImageFunBy:_curDownloadFileModel];
 }
 
 - (void)DownloadFileDoneOneFileFun

创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/uploadFileManager.m

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

创维盒子/双子星云手机/Class/Set/uploadFile/uploadImageOrVideoViewController.m

@@ -70,7 +70,7 @@
     }
     [self checkVideoAccessFun];
     
-    [[NSNotificationCenter defaultCenter] postNotificationName:getbaseInfoBeginNotification object:nil];
+    [[webSocketManager shareInstance] getBaseInfoFun];
 }
 
 - (void)initBaselUIFun

创维盒子/双子星云手机/CloudPlayer/PlayerViewController.mm

@@ -138,7 +138,6 @@ UIDocumentPickerDelegate>
 @property (nonatomic, copy)   NSTimer            *timer; // 定时器-控制按钮
 /**30s后 渲染时间戳无更新 自动断开链接*/
 @property (nonatomic, assign) NSInteger          concentTime; // 拉流数据 渲染更新时间戳
-@property (nonatomic, assign) NSInteger          webSocketConcentTime;
 
 /**定时器计数*/
 @property (nonatomic, assign) NSInteger          currentTime;
@@ -296,9 +295,6 @@ UIDocumentPickerDelegate>
     [hidenTextField resignFirstResponder];
     hidenTextField.text = @"";
     hidenTextFieldOldStr = nil;
-    
-    self.webSocketConcentTime = 0;
-    
 
 }
 
@@ -1286,11 +1282,6 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
             [weakSelf startCheckThridRuiYunTimerFun];
         };
         
-#pragma mark 获取云机剩余空间
-    nextVC.getBaseInfo = ^{
-        [weakSelf getBaseInfoFun];
-    };
-    
     
 #pragma mark 获取云机版本信息
     nextVC.getSysInfo = ^{
@@ -1305,12 +1296,7 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     };
 }
 
-#pragma mark 获取云机剩余空间
-- (void)getBaseInfoFun
-{
-    NSString *commondStr  = @"{\"type\":\"getBaseInfo\"}";
-    [self send_data:commondStr];
-}
+
 
 
 - (void)needToRebootFun
@@ -2035,8 +2021,7 @@ BOOL inReconnect = NO;
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationWillResignActive:) name:UIApplicationWillResignActiveNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidEnterBackground:) name:UIApplicationDidEnterBackgroundNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(volumeChanged:)               name:AVSystemController_SystemVolumeDidChangeNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(extensionRBDGetRbdDeviceNotification:)  name:GetRbdDeviceNotification  object:nil];
-    
+
     outputVolumeKVO = YES;
     [[AVAudioSession sharedInstance] addObserver:self forKeyPath:@"outputVolume" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionOld context:(void *)[AVAudioSession sharedInstance]];
     
@@ -2048,18 +2033,6 @@ BOOL inReconnect = NO;
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setShowPwdVCTypeFun) name:ShowPwdVCNotification object:nil];
     
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(beginGotoUploadFileFun:) name:uploadFileBeginNotification object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(suspendUploadFileFun:) name:uploadFileSuspendNotification object:nil];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(beginGotoBackupsFileFun:) name:backupsFileBeginNotification object:nil];
-    
-
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(begindownloadThumbnailImageFun:) name:downloadThumbnailBeginNotification object:nil];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(begindownloadFileFun:) name:downloadFileBeginNotification object:nil];
-    
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(getBaseInfoFun) name:getbaseInfoBeginNotification object:nil];
-    
     //某一个YCDownloadItem下载成功通知
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(downloadTaskFinishedNoti:) name:nasDownloadTaskFinishedNotification object:nil];
 }
@@ -2074,8 +2047,7 @@ BOOL inReconnect = NO;
     [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationWillResignActiveNotification object:nil];
     [[NSNotificationCenter defaultCenter] removeObserver:self name:UIApplicationDidEnterBackgroundNotification object:nil];
 
-    [[NSNotificationCenter defaultCenter] removeObserver:self name:uploadFileBeginNotification     object:nil];
-    
+   
     if (outputVolumeKVO)
     {
         [[AVAudioSession sharedInstance] removeObserver:self forKeyPath:@"outputVolume" context:(void *)[AVAudioSession sharedInstance]];
@@ -2572,14 +2544,14 @@ static int  couneeee = 0;
              [self showNewIndicator];
              [self tryAgain];
         }
-        else if(self.webSocketConcentTime > 0){
-            //后续要跟进
-            
-            if(_isFirstEnterPhone){
-                HLog(@"\n\n\n\n\n 云手机30s 无渲染数据 要跟进 \n\n\n\n\n");
-                [self showNetErrorAlertFun:3];
-            }
-        }
+//        else if(self.webSocketConcentTime > 0){
+//            //后续要跟进
+//            
+//            if(_isFirstEnterPhone){
+//                HLog(@"\n\n\n\n\n 云手机30s 无渲染数据 要跟进 \n\n\n\n\n");
+//                [self showNetErrorAlertFun:3];
+//            }
+//        }
        
         
         /*弹窗提示*/

创维盒子/双子星云手机/cloudPhone/webSocketManager+backupsFile.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface webSocketManager (backupsFile)
-- (void)beginGotoBackupsFileFun:(NSNotification *)notification;
+- (void)beginGotoBackupsFileFunBy:(photosBackupsTaskModel *)photosBackupsTaskMod;
 - (void)applyBackupsFileServiceResponseFun:(NSDictionary *)dataDict;
 - (void)backupsFileFunServiceResponseFun:(NSDictionary *)dataDict;
 @end

创维盒子/双子星云手机/cloudPhone/webSocketManager+backupsFile.m

@@ -9,15 +9,13 @@
 
 @implementation webSocketManager (backupsFile)
 /*****************备份相关**********************************/
-- (void)beginGotoBackupsFileFun:(NSNotification *)notification
+- (void)beginGotoBackupsFileFunBy:(photosBackupsTaskModel *)photosBackupsTaskMod
 {
-    photosBackupsTaskModel *uploadFileDataMod = [notification object];
     //HLog(@"%@",uploadFileDataMod);
     
+    self.curPhotosBackupsTaskMod = photosBackupsTaskMod;
     
-    self.curPhotosBackupsTaskMod = uploadFileDataMod;
-    
-    if(![uploadFileDataMod isKindOfClass:[photosBackupsTaskModel class]]){
+    if(![photosBackupsTaskMod isKindOfClass:[photosBackupsTaskModel class]]){
         HLog(@"备份的文件类型不对");
         return;
     }

创维盒子/双子星云手机/cloudPhone/webSocketManager+downloadFile.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface webSocketManager (downloadFile)
-- (void)begindownloadFileFun:(NSNotification *)notification;
+- (void)begindownloadFileFunBy:(couldPhoneFileModel *)couldPhoneFileMod;
 - (void)downloadFileFunServiceResponseFun:(NSData *)fileData with:(BOOL)isDownloadDone;
 - (void)documentPicker:(UIDocumentPickerViewController *)controller didPickDocumentsAtURLs:(NSArray<NSURL *> *)urls;
 @end

创维盒子/双子星云手机/cloudPhone/webSocketManager+downloadFile.m

@@ -11,9 +11,9 @@
 #import "downloadManager.h"
 
 @implementation webSocketManager (downloadFile)
-- (void)begindownloadFileFun:(NSNotification *)notification
+- (void)begindownloadFileFunBy:(couldPhoneFileModel *)couldPhoneFileMod
 {
-    self.curDownloadFileModel = [notification object];
+    self.curDownloadFileModel = couldPhoneFileMod;
     
     if(!self.curDownloadFileModel
        || ![self.curDownloadFileModel isKindOfClass:[couldPhoneFileModel class]]){

创维盒子/双子星云手机/cloudPhone/webSocketManager+downloadThumbnailImage.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface webSocketManager (downloadThumbnailImage)
-- (void)begindownloadThumbnailImageFun:(NSNotification *)notification;
+- (void)begindownloadThumbnailImageFunBy:(couldPhoneFileModel *)couldPhoneFileMod;
 - (void)downloadThumbnailFileFunServiceResponseFun:(NSData *)fileData with:(BOOL)isDownloadDone;
 @end
 

创维盒子/双子星云手机/cloudPhone/webSocketManager+downloadThumbnailImage.m

@@ -8,9 +8,9 @@
 #import "webSocketManager+downloadThumbnailImage.h"
 
 @implementation webSocketManager (downloadThumbnailImage)
-- (void)begindownloadThumbnailImageFun:(NSNotification *)notification
+- (void)begindownloadThumbnailImageFunBy:(couldPhoneFileModel *)couldPhoneFileMod
 {
-    self.curDownloadThumbnailModel = [notification object];
+    self.curDownloadThumbnailModel = couldPhoneFileMod;
     
     if(!self.curDownloadThumbnailModel
        || ![self.curDownloadThumbnailModel isKindOfClass:[couldPhoneFileModel class]]){

创维盒子/双子星云手机/cloudPhone/webSocketManager+upLoadFile.h

@@ -10,8 +10,8 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface webSocketManager (upLoadFile)
-- (void)beginGotoUploadFileFun:(NSNotification *)notification;
-- (void)suspendUploadFileFun:(NSNotification *)notification;
+- (void)beginGotoUploadFileFunBy:(uploadFileDataModel *)uploadFileDataMod;
+- (void)suspendUploadFileFun;
 
 - (void)applyUploadFileServiceResponseFun:(NSDictionary *)dataDict;
 - (void)upLoadFileFunServiceResponseFun:(NSDictionary *)dataDict;

创维盒子/双子星云手机/cloudPhone/webSocketManager+upLoadFile.m

@@ -9,17 +9,12 @@
 
 @implementation webSocketManager (upLoadFile)
 #pragma mark 监听文件开始的的通知
-- (void)beginGotoUploadFileFun:(NSNotification *)notification
+- (void)beginGotoUploadFileFunBy:(uploadFileDataModel *)uploadFileDataMod
 {
     self.isSuspendUploadType = NO;
     
-    uploadFileDataModel *uploadFileDataMod = [notification object];
     //HLog(@"%@",uploadFileDataMod);
-    
-//    if(self.curUploadFileDataMod && uploadFileDataMod.bg_id.integerValue == self.curUploadFileDataMod.bg_id.integerValue){
-//        return;
-//    }
-    
+
     self.curUploadFileDataMod = uploadFileDataMod;
     
     if(![uploadFileDataMod isKindOfClass:[uploadFileDataMod class]]){
@@ -665,7 +660,7 @@
     //HLog(@"文件上传sendData %@",sendData);
 }
 
-- (void)suspendUploadFileFun:(NSNotification *)notification
+- (void)suspendUploadFileFun
 {
     self.isSuspendUploadType = YES;
 }

创维盒子/双子星云手机/cloudPhone/webSocketManager.h

@@ -71,6 +71,20 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)getBackupFolderListFun;
 - (void)searchFileListBeginFun:(NSMutableDictionary *)dict;
 
+#pragma mark 获取云机剩余空间
+- (void)getBaseInfoFun;
+
+
+//上传
+- (void)beginGotoUploadFileFunBy:(uploadFileDataModel *)uploadFileDataMod;
+- (void)suspendUploadFileFun;
+//备份
+- (void)beginGotoBackupsFileFunBy:(photosBackupsTaskModel *)photosBackupsTaskMod;
+//下载缩略图
+- (void)begindownloadThumbnailImageFunBy:(couldPhoneFileModel *)couldPhoneFileMod;
+//下载
+- (void)begindownloadFileFunBy:(couldPhoneFileModel *)couldPhoneFileMod;
+
 
 
 - (void)handleDownloadResponseFunBy:(id)message;

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

@@ -473,8 +473,6 @@ static webSocketManager *webSocketManagerInstance = nil;
     
     //获取磁盘外挂
     [self getExtraFilesListFun];
-    
-    //self.webSocketConcentTime  = [iTools getNowTimeStamp];
 }
 
 #pragma mark 盒子第一次连接成功  给ws发送信息 单点登录 把其他账号挤下去
@@ -850,4 +848,11 @@ static webSocketManager *webSocketManagerInstance = nil;
     [self.commandChannelManager rc_sendData:commandStr];
 }
 
+
+#pragma mark 获取云机剩余空间
+- (void)getBaseInfoFun
+{
+    NSString *commondStr  = @"{\"type\":\"getBaseInfo\"}";
+    [self send_data:commondStr];
+}
 @end