소스 검색

1.后台传输任务优化

huangxiaodong 10 달 전
부모
커밋
3a3cd28c86

+ 0 - 1
创维盒子/双子星云手机/CloudPlayer/PlayerViewController+AppDelegate.m

@@ -13,7 +13,6 @@
 #import "ShortcutManager.h"
 #import <objc/runtime.h>
 #import "RCCommandHelp.h"
-#import "AudioSessionObject.h"
 #import "PlayerViewController+otherDelegate.h"
 
 //@interface PlayerViewController(AppDelegate)

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

@@ -26,7 +26,6 @@
 #import "couldPhoneFileListModel.h"
 #import "cloudPhoneCommonModel.h"
 #import "ComontAlretViewController.h"
-#import "AudioSessionObject.h"
 #import "addLogObject.h"
 #import "ComontAlretType2ViewController.h"
 #import "customDownloadManager.h"

+ 3 - 0
创维盒子/双子星云手机/NAS/nasUploadManager/nasMixUploadManager.h

@@ -29,6 +29,9 @@ NS_ASSUME_NONNULL_BEGIN
 #pragma mark 取消任务
 - (void)cancelUploadTaskFunWith:(uploadFileDataModel*)fileModel;
 - (void)cancelUploadAllTaskFun;
+
+#pragma mark 判断是否在上传中
+- (BOOL)checkUploadTaskDoingFun;
 @end
 
 NS_ASSUME_NONNULL_END

+ 12 - 1
创维盒子/双子星云手机/NAS/nasUploadManager/nasMixUploadManager.m

@@ -35,7 +35,7 @@
 - (instancetype)init {
 
     if (self = [super init]) {
-        _maxUploadLoadCount = 2;
+        _maxUploadLoadCount = 1;
         
        if ([connectDeviceManager shareInstance].isPingOk)
        {
@@ -806,6 +806,17 @@ didReceiveResponse:(NSURLResponse *)response
     }
 }
 
+
+#pragma mark 判断是否在上传中
+- (BOOL)checkUploadTaskDoingFun
+{
+    if(_uploadWaitingUrlArr.count >0 || _uploadingOperationArr.count>0){
+        return YES;
+    }
+    
+    return NO;
+}
+
 #pragma mark - lazy load
 - (NSMutableArray *)uploadWaitingUrlArr {
     

+ 7 - 3
创维盒子/双子星云手机/cloudPhone/websocket/webSocketManager.m

@@ -15,6 +15,7 @@
 #import "errorAlertTool.h"
 #import "RcGameWQKeyChain.h"
 #import "USBInsertPopView.h"
+#import "nasMixUploadManager.h"
 
 @interface webSocketManager ()
 {
@@ -435,11 +436,14 @@ static webSocketManager *webSocketManagerInstance = nil;
 {
     
    BOOL isBackupsingType = [[backupsFileManager shareInstance] checkBackupsingFun];
-   BOOL isUploadingType = [[uploadFileManager shareInstance] checkUploadingFun];
-   BOOL isDownloadingType = [[downloadManager shareInstance] checkDownloadingFun];
-   BOOL isBackground = [HWDataManager getBoolWithKey:stringKeyAddSn(Const_file_Transfe_working_background)];
+   //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"];