1.nas下载关联完成

创维盒子/双子星云手机.xcodeproj/project.pbxproj

@@ -415,10 +415,6 @@
 		6B3F96342AD2A15A008E349E /* netWorkManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3F96322AD2A15A008E349E /* netWorkManager.h */; };
 		6B3F96352AD2A15A008E349E /* netWorkManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B3F96332AD2A15A008E349E /* netWorkManager.m */; };
 		6B3F963A2AD2AD0B008E349E /* newWorkInterface.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B3F96392AD2AD0B008E349E /* newWorkInterface.h */; };
-		6B41C3522C09E55700DFDADC /* PlayerViewController+downloadNasFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B41C3502C09E55600DFDADC /* PlayerViewController+downloadNasFile.h */; };
-		6B41C3532C09E55700DFDADC /* PlayerViewController+downloadNasFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B41C3512C09E55600DFDADC /* PlayerViewController+downloadNasFile.m */; };
-		6B41C3542C09E55700DFDADC /* PlayerViewController+downloadNasFile.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B41C3512C09E55600DFDADC /* PlayerViewController+downloadNasFile.m */; };
-		6B41C3552C09E55700DFDADC /* PlayerViewController+downloadNasFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B41C3502C09E55600DFDADC /* PlayerViewController+downloadNasFile.h */; };
 		6B42C1572C2A6C2700936268 /* SYJUISwitch.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B42C1542C2A6C2600936268 /* SYJUISwitch.h */; };
 		6B42C1582C2A6C2700936268 /* SYJUISwitch.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B42C1542C2A6C2600936268 /* SYJUISwitch.h */; };
 		6B42C1592C2A6C2700936268 /* SYJUISwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B42C1552C2A6C2600936268 /* SYJUISwitch.m */; };
@@ -630,6 +626,10 @@
 		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 */; };
 		6B7EA7982BF5B4A6002D5CC2 /* NASFilePicModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B7EA7962BF5B4A6002D5CC2 /* NASFilePicModel.h */; };
 		6B7EA7992BF5B4A6002D5CC2 /* NASFilePicModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B7EA7972BF5B4A6002D5CC2 /* NASFilePicModel.m */; };
 		6B7EA79A2BF5B4A6002D5CC2 /* NASFilePicModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B7EA7962BF5B4A6002D5CC2 /* NASFilePicModel.h */; };
@@ -1603,8 +1603,6 @@
 		6B3F96322AD2A15A008E349E /* netWorkManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = netWorkManager.h; sourceTree = "<group>"; };
 		6B3F96332AD2A15A008E349E /* netWorkManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = netWorkManager.m; sourceTree = "<group>"; };
 		6B3F96392AD2AD0B008E349E /* newWorkInterface.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = newWorkInterface.h; sourceTree = "<group>"; };
-		6B41C3502C09E55600DFDADC /* PlayerViewController+downloadNasFile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "PlayerViewController+downloadNasFile.h"; sourceTree = "<group>"; };
-		6B41C3512C09E55600DFDADC /* PlayerViewController+downloadNasFile.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "PlayerViewController+downloadNasFile.m"; sourceTree = "<group>"; };
 		6B42C1542C2A6C2600936268 /* SYJUISwitch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SYJUISwitch.h; sourceTree = "<group>"; };
 		6B42C1552C2A6C2600936268 /* SYJUISwitch.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SYJUISwitch.m; sourceTree = "<group>"; };
 		6B45C4FB2B57BC87007E6911 /* cloudPhoneExtraFileListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cloudPhoneExtraFileListModel.h; sourceTree = "<group>"; };
@@ -1756,6 +1754,8 @@
 		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>"; };
 		6B7EA7962BF5B4A6002D5CC2 /* NASFilePicModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NASFilePicModel.h; sourceTree = "<group>"; };
 		6B7EA7972BF5B4A6002D5CC2 /* NASFilePicModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NASFilePicModel.m; sourceTree = "<group>"; };
 		6B7EA79C2BF5E0ED002D5CC2 /* NASMsgModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NASMsgModel.h; sourceTree = "<group>"; };
@@ -2328,8 +2328,6 @@
 				18FCE5472AD15E750020F623 /* PlayerViewController+AppDelegate.m */,
 				6B7B65562AD9227700BE8CB3 /* PlayerViewController+otherDelegate.h */,
 				6B7B65572AD9227700BE8CB3 /* PlayerViewController+otherDelegate.mm */,
-				6B41C3502C09E55600DFDADC /* PlayerViewController+downloadNasFile.h */,
-				6B41C3512C09E55600DFDADC /* PlayerViewController+downloadNasFile.m */,
 				183AE6B12A8C9F5800B11CB0 /* View */,
 			);
 			path = CloudPlayer;
@@ -3010,6 +3008,8 @@
 				6BC741572C2413B20049BA8D /* webSocketManager+upLoadFile.m */,
 				6BC7415C2C24150C0049BA8D /* webSocketManager+backupsFile.h */,
 				6BC7415D2C24150C0049BA8D /* webSocketManager+backupsFile.m */,
+				6B7E04382C3E6BBC004B4948 /* webSocketManager+downloadNasFile.h */,
+				6B7E04392C3E6BBC004B4948 /* webSocketManager+downloadNasFile.m */,
 			);
 			path = websocket;
 			sourceTree = "<group>";
@@ -3646,6 +3646,7 @@
 				18FCE53F2AD136670020F623 /* PlayerViewController+TouchPointXD.h in Headers */,
 				6B679DFE2C255DC900D0DC03 /* MineCommonUsedView.h in Headers */,
 				18FCE53E2AD136670020F623 /* PlayerViewController+AdjustBtnFrame.h in Headers */,
+				6B7E043A2C3E6BBC004B4948 /* webSocketManager+downloadNasFile.h in Headers */,
 				6B5BE5812BFC81E300A1B9B3 /* NASFileAndFolderModel.h in Headers */,
 				6B7EA7BC2BF759AC002D5CC2 /* shareSecretTableViewCell.h in Headers */,
 				6B2C1E362C070ADE00FDCF82 /* ZFPlayerControlView.h in Headers */,
@@ -3726,7 +3727,6 @@
 				6B2C1E962C070ADE00FDCF82 /* ZFPlayerMediaPlayback.h in Headers */,
 				6B6ABEDA2BFF3AA400480BAC /* receiveView.h in Headers */,
 				18BB18412AC417CB00A36F63 /* RYShearDeviceUDPManager.h in Headers */,
-				6B41C3522C09E55700DFDADC /* PlayerViewController+downloadNasFile.h in Headers */,
 				6B9354952BF33F2700AA8D31 /* editShareView.h in Headers */,
 				184C8AD52A949D5900F26650 /* AboutViewController.h in Headers */,
 				6B34DC672BF1FFB1002DD1EF /* imageCollectionViewCell.h in Headers */,
@@ -3891,6 +3891,7 @@
 				6BD506CA2B9576A4006E7CB0 /* PlayerViewController+TouchPointXD.h in Headers */,
 				6B679E002C255DC900D0DC03 /* MineCommonUsedView.h in Headers */,
 				6BD506CB2B9576A4006E7CB0 /* PlayerViewController+AdjustBtnFrame.h in Headers */,
+				6B7E043D2C3E6BBC004B4948 /* webSocketManager+downloadNasFile.h in Headers */,
 				6B5BE5832BFC81E300A1B9B3 /* NASFileAndFolderModel.h in Headers */,
 				6B7EA7BE2BF759AC002D5CC2 /* shareSecretTableViewCell.h in Headers */,
 				6B2C1E372C070ADE00FDCF82 /* ZFPlayerControlView.h in Headers */,
@@ -3971,7 +3972,6 @@
 				6B2C1E972C070ADE00FDCF82 /* ZFPlayerMediaPlayback.h in Headers */,
 				6B6ABEDC2BFF3AA400480BAC /* receiveView.h in Headers */,
 				6BD506F12B9576A4006E7CB0 /* RYShearDeviceUDPManager.h in Headers */,
-				6B41C3552C09E55700DFDADC /* PlayerViewController+downloadNasFile.h in Headers */,
 				6B9354962BF33F2700AA8D31 /* editShareView.h in Headers */,
 				6BD506F22B9576A4006E7CB0 /* AboutViewController.h in Headers */,
 				6B34DC692BF1FFB1002DD1EF /* imageCollectionViewCell.h in Headers */,
@@ -4634,7 +4634,6 @@
 				6BD507952B9576A4006E7CB0 /* UIProgressView+AFNetworking.m in Sources */,
 				6B2C1E772C070ADE00FDCF82 /* ZFLandscapeViewController.m in Sources */,
 				6B2C1E5B2C070ADE00FDCF82 /* UIViewController+ZFPlayerRotation.m in Sources */,
-				6B41C3542C09E55700DFDADC /* PlayerViewController+downloadNasFile.m in Sources */,
 				6BD507962B9576A4006E7CB0 /* HWAddFolderViewController.m in Sources */,
 				6BD507972B9576A4006E7CB0 /* QRCodeScanViewController.m in Sources */,
 				6B2C1E392C070ADE00FDCF82 /* ZFPlayerControlView.m in Sources */,
@@ -4734,6 +4733,7 @@
 				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 */,
@@ -4961,7 +4961,6 @@
 				183AE64C2A8A2CF000B11CB0 /* UIProgressView+AFNetworking.m in Sources */,
 				6B2C1E762C070ADE00FDCF82 /* ZFLandscapeViewController.m in Sources */,
 				6B2C1E5A2C070ADE00FDCF82 /* UIViewController+ZFPlayerRotation.m in Sources */,
-				6B41C3532C09E55700DFDADC /* PlayerViewController+downloadNasFile.m in Sources */,
 				A031DD7527EC507000909527 /* HWAddFolderViewController.m in Sources */,
 				186820222AB98600005702A6 /* QRCodeScanViewController.m in Sources */,
 				6B2C1E382C070ADE00FDCF82 /* ZFPlayerControlView.m in Sources */,
@@ -5061,6 +5060,7 @@
 				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 */,

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

@@ -1292,22 +1292,14 @@
     uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
     vc.isReceiveType = type;
     
-    if(_curPlayerVC){
-        
-        NSArray *vcArr = _curPlayerVC.navigationController.viewControllers;
-        UIViewController *lastVC = vcArr.lastObject;
-        
-//        if([lastVC isKindOfClass:[PlayerViewController class]]){
-//            [[UIApplication sharedApplication] setStatusBarHidden:NO];
-//        }
-//        else if([lastVC isKindOfClass:[uploadFileRecordViewController class]]){
-//            [_curPlayerVC.navigationController popViewControllerAnimated:NO];
-//            //[[UIApplication sharedApplication] setStatusBarHidden:NO];
-//        }
-        
-        [_curPlayerVC.navigationController pushViewController:vc animated:YES];
-        _curPlayerVC.isNeedRecyclResource = NO;
+    BaseNavigationController*mainNav =  ksharedAppDelegate.mainTabBar.selectedViewController;
+    
+    if([mainNav isKindOfClass:[BaseNavigationController class]]){
+        [mainNav pushViewController:vc animated:YES];
         [[UIApplication sharedApplication] setStatusBarHidden:NO];
     }
+    
+    
+    
 }
 @end

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

@@ -358,6 +358,8 @@ static boxDownloadFileManager * cur_boxDownloadFileShareInstance = nil;
     
     dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
         [[NSNotificationCenter defaultCenter] postNotificationName:nasDownloadTaskFinishedNotification object:model];
+        
+        [[webSocketManager shareInstance] NasDownloadTaskFinishedNoti:model];
     });
 }
 
@@ -642,7 +644,8 @@ static boxDownloadFileManager * cur_boxDownloadFileShareInstance = nil;
             }
             else{//存在 通知保存流程
                 dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-                    [[NSNotificationCenter defaultCenter] postNotificationName:nasDownloadTaskFinishedNotification object:model];
+                    //[[NSNotificationCenter defaultCenter] postNotificationName:nasDownloadTaskFinishedNotification object:model];
+                    [[webSocketManager shareInstance] NasDownloadTaskFinishedNoti:model];
                 });
                 break;
             }

创维盒子/双子星云手机/CloudPlayer/PlayerViewController+downloadNasFile.h

@@ -1,17 +0,0 @@
-//
-//  PlayerViewController+downloadNasFile.h
-//  双子星云手机
-//
-//  Created by xd h on 2024/5/31.
-//
-
-#import "PlayerViewController.h"
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface PlayerViewController (downloadNasFile)
-#pragma mark 下载完成
-- (void)downloadTaskFinishedNoti:(NSNotification *)notification;
-@end
-
-NS_ASSUME_NONNULL_END

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

@@ -2184,9 +2184,6 @@ BOOL inReconnect = NO;
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setShowPwdVCTypeFun) name:ShowPwdVCNotification object:nil];
     
-    //某一个YCDownloadItem下载成功通知
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(downloadTaskFinishedNoti:) name:nasDownloadTaskFinishedNotification object:nil];
-    
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(setPlayerFullScreenNotFun)  name:setPlayerFullScreenNotification  object:nil];
 }
 

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

@@ -536,7 +536,7 @@
 - (void)pushViewController:(UIViewController*)vc animated:(BOOL)animated
 {
     [self.navigationController pushViewController:vc animated:animated];
-    [self hideTabbarFun];
+    //[self hideTabbarFun];
 }
 - (void)showTabbarFun
 {

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

@@ -236,6 +236,7 @@
     // 设置模态弹出方式
     documentPickerVC.modalPresentationStyle = UIModalPresentationFormSheet;
     //[self.navigationController presentViewController:documentPickerVC animated:YES completion:nil];
+    [ksharedAppDelegate.window.rootViewController presentViewController:documentPickerVC animated:YES completion:nil];
 }
  
 

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

@@ -0,0 +1,17 @@
+//
+//  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

创维盒子/双子星云手机/CloudPlayer/PlayerViewController+downloadNasFile.m

@@ -1,22 +1,22 @@
 //
-//  PlayerViewController+downloadNasFile.m
+//  webSocketManager+downloadNasFile.m
 //  双子星云手机
 //
-//  Created by xd h on 2024/5/31.
+//  Created by xd h on 2024/7/10.
 //
 
-#import "PlayerViewController+downloadNasFile.h"
+#import "webSocketManager+downloadNasFile.h"
 
-@implementation PlayerViewController (downloadNasFile)
+@implementation webSocketManager (downloadNasFile)
 #pragma mark 下载完成
-- (void)downloadTaskFinishedNoti:(NSNotification *)notification
+- (void)NasDownloadTaskFinishedNoti:(customDownloadOperation *)nasDownloadOperation
 {
     if(self.nasFullPath && self.nasFullPath.length >0){
         HLog(@"前面一个保存流程没走完")
         return;
     }
     
-    curDownloadmodel = notification.object;
+    curDownloadmodel = nasDownloadOperation;
     KWeakSelf
     if (curDownloadmodel.downloadState == customDownloadStateCompleted) {
         mainBlock(^{
@@ -155,7 +155,8 @@
     documentPickerVC.delegate = self;
     // 设置模态弹出方式
     documentPickerVC.modalPresentationStyle = UIModalPresentationFormSheet;
-    [self.navigationController presentViewController:documentPickerVC animated:YES completion:nil];
+    //[self.navigationController presentViewController:documentPickerVC animated:YES completion:nil];
+    [ksharedAppDelegate.window.rootViewController presentViewController:documentPickerVC animated:YES completion:nil];
 }
  
 //同文件 有了代理 走了 downloadFile 里面的 UIDocumentPickerDelegate
@@ -202,3 +203,4 @@
 //    }
 //}
 @end
+

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

@@ -27,6 +27,11 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface webSocketManager : NSObject
+{
+    //下载nas相关
+    customDownloadOperation* curDownloadmodel;
+}
+
 +(webSocketManager *)shareInstance;
 @property (nonatomic, strong) RCCommandChannelManager *commandChannelManager;//指令通道
 
@@ -104,7 +109,8 @@ NS_ASSUME_NONNULL_BEGIN
 //下载
 - (void)begindownloadFileFunBy:(couldPhoneFileModel *)couldPhoneFileMod;
 
-
+#pragma mark nas下载完成
+- (void)NasDownloadTaskFinishedNoti:(customDownloadOperation *)nasDownloadOperation;
 
 - (void)handleDownloadResponseFunBy:(id)message;
 - (void)downloadFileFunServiceResponseFun:(NSData *)fileData with:(BOOL)isDownloadDone;

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

@@ -440,7 +440,6 @@
 - (void)pushViewController:(UIViewController*)vc animated:(BOOL)animated
 {
     [self.navigationController pushViewController:vc animated:animated];
-   
 }
 
 @end