1.首页UI修改

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

@@ -532,6 +532,10 @@
 		6B5D867A2C22D6E9008D25EA /* NASLastFileView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B5D86772C22D6E9008D25EA /* NASLastFileView.h */; };
 		6B5D867B2C22D6E9008D25EA /* NASLastFileView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B5D86772C22D6E9008D25EA /* NASLastFileView.h */; };
 		6B5D867C2C22D6E9008D25EA /* NASLastFileView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B5D86782C22D6E9008D25EA /* NASLastFileView.m */; };
+		6B5D867F2C22EA5B008D25EA /* lastFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B5D867E2C22EA5B008D25EA /* lastFileManager.m */; };
+		6B5D86802C22EA5B008D25EA /* lastFileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B5D867D2C22EA5B008D25EA /* lastFileManager.h */; };
+		6B5D86812C22EA5B008D25EA /* lastFileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B5D867D2C22EA5B008D25EA /* lastFileManager.h */; };
+		6B5D86822C22EA5B008D25EA /* lastFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B5D867E2C22EA5B008D25EA /* lastFileManager.m */; };
 		6B63179C2BFD8CA000FF4FB4 /* videoPlayByAVPlayerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B63179B2BFD8CA000FF4FB4 /* videoPlayByAVPlayerViewController.m */; };
 		6B63179D2BFD8CA000FF4FB4 /* videoPlayByAVPlayerViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B63179A2BFD8CA000FF4FB4 /* videoPlayByAVPlayerViewController.h */; };
 		6B63179E2BFD8CA000FF4FB4 /* videoPlayByAVPlayerViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B63179A2BFD8CA000FF4FB4 /* videoPlayByAVPlayerViewController.h */; };
@@ -1604,6 +1608,8 @@
 		6B5D86722C22C63F008D25EA /* NASCommonUsedView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NASCommonUsedView.m; sourceTree = "<group>"; };
 		6B5D86772C22D6E9008D25EA /* NASLastFileView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NASLastFileView.h; sourceTree = "<group>"; };
 		6B5D86782C22D6E9008D25EA /* NASLastFileView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = NASLastFileView.m; sourceTree = "<group>"; };
+		6B5D867D2C22EA5B008D25EA /* lastFileManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = lastFileManager.h; sourceTree = "<group>"; };
+		6B5D867E2C22EA5B008D25EA /* lastFileManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = lastFileManager.m; sourceTree = "<group>"; };
 		6B63179A2BFD8CA000FF4FB4 /* videoPlayByAVPlayerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = videoPlayByAVPlayerViewController.h; sourceTree = "<group>"; };
 		6B63179B2BFD8CA000FF4FB4 /* videoPlayByAVPlayerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = videoPlayByAVPlayerViewController.m; sourceTree = "<group>"; };
 		6B6317A02BFD9DB500FF4FB4 /* ZFCustomControlView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZFCustomControlView.h; sourceTree = "<group>"; };
@@ -2787,6 +2793,8 @@
 				6B5D866A2C22AE0B008D25EA /* view */,
 				6B5D86642C227C71008D25EA /* NASViewController.h */,
 				6B5D86652C227C71008D25EA /* NASViewController.m */,
+				6B5D867D2C22EA5B008D25EA /* lastFileManager.h */,
+				6B5D867E2C22EA5B008D25EA /* lastFileManager.m */,
 			);
 			path = NAS;
 			sourceTree = "<group>";
@@ -3507,6 +3515,7 @@
 				6B2C1E8C2C070ADE00FDCF82 /* ZFPlayerGestureControl.h in Headers */,
 				186820192AB94877005702A6 /* GuideLastView.h in Headers */,
 				6B6ABEEC2BFF5B2F00480BAC /* receiveSaveRecordTableView.h in Headers */,
+				6B5D86802C22EA5B008D25EA /* lastFileManager.h in Headers */,
 				6B0582632AFF4B7D00D37290 /* PhotoPreviewViewController.h in Headers */,
 				6B34DC6D2BF2070D002DD1EF /* titleLabelReusableView.h in Headers */,
 				6B304E982BEF6058004F5580 /* customShareManageTool.h in Headers */,
@@ -3731,6 +3740,7 @@
 				6B2C1E8D2C070ADE00FDCF82 /* ZFPlayerGestureControl.h in Headers */,
 				6BD507012B9576A4006E7CB0 /* GuideLastView.h in Headers */,
 				6B6ABEEE2BFF5B2F00480BAC /* receiveSaveRecordTableView.h in Headers */,
+				6B5D86812C22EA5B008D25EA /* lastFileManager.h in Headers */,
 				6BD507022B9576A4006E7CB0 /* PhotoPreviewViewController.h in Headers */,
 				6B34DC6F2BF2070D002DD1EF /* titleLabelReusableView.h in Headers */,
 				6B304E992BEF6058004F5580 /* customShareManageTool.h in Headers */,
@@ -4218,6 +4228,7 @@
 				6BD507432B9576A4006E7CB0 /* uploadFileRecordheadView.m in Sources */,
 				6BD507442B9576A4006E7CB0 /* HWAgreementViewController.m in Sources */,
 				6BD507452B9576A4006E7CB0 /* UIImageView+AFNetworking.m in Sources */,
+				6B5D86822C22EA5B008D25EA /* lastFileManager.m in Sources */,
 				6B4C0F652C0314BA0070EF2E /* DFPlayerFileManager.m in Sources */,
 				6B1F7FDF2C00ABAB00954720 /* downStatusModel.m in Sources */,
 				6B7EA7BF2BF759AC002D5CC2 /* shareSecretTableViewCell.m in Sources */,
@@ -4524,6 +4535,7 @@
 				6B8FF6BA2B04E19600800981 /* uploadFileRecordheadView.m in Sources */,
 				A031DD7F27EC78C800909527 /* HWAgreementViewController.m in Sources */,
 				183AE64F2A8A2CF000B11CB0 /* UIImageView+AFNetworking.m in Sources */,
+				6B5D867F2C22EA5B008D25EA /* lastFileManager.m in Sources */,
 				6B4C0F642C0314BA0070EF2E /* DFPlayerFileManager.m in Sources */,
 				6B1F7FDD2C00ABAB00954720 /* downStatusModel.m in Sources */,
 				6B7EA7BD2BF759AC002D5CC2 /* shareSecretTableViewCell.m in Sources */,

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

@@ -271,95 +271,97 @@
     [boxDownloadFileManager shareInstance];
     
     //获取NAS相关信息
-    [self getNASMsgFun];
+//    [self getNASMsgFun];
+//    
+//    [self initMainTabbarFun];
+//    
+//    return;
     
-    [self initMainTabbarFun];
+    if(_curPlayerVC){
+        //[_curPlayerVC disconnectVideoServer];
+        
+        _curPlayerVC.isNeedRecyclResource = YES;
+        [_curPlayerVC recyclResource];
+        
+        _curPlayerVC.liveStreamManager = nil;
+        _curPlayerVC.commandChannelManager = nil;
+        [_curPlayerVC.navigationController popViewControllerAnimated:NO];
+        _curPlayerVC = nil;
+    }
     
-    return;
+    //每次进入
+    PlayerViewController *playerRootVC = [[PlayerViewController alloc] init];
+    if(self.isLoginAgainType){
+        playerRootVC.isLoginAgainType = self.isLoginAgainType;
+    }
+    playerRootVC.isPwdVCShow = YES;
+    _curPlayerVC = playerRootVC;
     
-//    if(_curPlayerVC){
-//        //[_curPlayerVC disconnectVideoServer];
-//        
-//        _curPlayerVC.isNeedRecyclResource = YES;
-//        [_curPlayerVC recyclResource];
-//        
-//        _curPlayerVC.liveStreamManager = nil;
-//        _curPlayerVC.commandChannelManager = nil;
-//        [_curPlayerVC.navigationController popViewControllerAnimated:NO];
-//        _curPlayerVC = nil;
-//    }
-//    
-//    //每次进入
-//    PlayerViewController *playerRootVC = [[PlayerViewController alloc] init];
-//    if(self.isLoginAgainType){
-//        playerRootVC.isLoginAgainType = self.isLoginAgainType;
-//    }
-//    playerRootVC.isPwdVCShow = YES;
-//    _curPlayerVC = playerRootVC;
-//    
-////    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:playerRootVC];
-////    self.window.rootViewController = playerNav;
-//    
-//    UIViewController *vc = [UIViewController new];
-//
-//    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:vc];
-//    [playerNav pushViewController:playerRootVC animated:NO];
+//    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:playerRootVC];
 //    self.window.rootViewController = playerNav;
-//    
-//    _preRootPlayerNav = playerNav;
-//    
-//    self.isLoginAgainType = NO;
-//    
-//    __block BOOL isPrivacyMode = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
-//    
-//    KWeakSelf
-//    if(!_isQRCodeType){
-//        
-//        if(isPrivacyMode)
-//        {
-//            [playerRootVC setShowImgAndVoiceTypeFun:NO];
-//            [self showCalculatorVC];
-//        }
-//        else{
-//            [self HandleEnterNotPrivacyModeFun];
-//            
-//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//                mainBlock(^{
-//                        [connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
-//                        playerRootVC.isPwdVCShow = NO;
-//                        [playerRootVC setShowImgAndVoiceTypeFun:YES];
-//                        //[weakSelf shareAwakenAppBy:weakSelf.getShareStr];
-//                    
-//                        if(self->_session && self->_connectionOptions){
-//                            [self scene:self->_session openURLContexts:self->_connectionOptions.URLContexts];
-//                        }
-//                });
-//            });
-//        }
-//        
-//        //_isQRCodeType = NO;
-//    }
-//    else{
-//        if(isPrivacyMode)
-//        {
-//            [playerRootVC setShowImgAndVoiceTypeFun:NO];
-//            [self showCalculatorVC];
-//        }
-//        else{
-//            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-//                mainBlock(^{
-//                    playerRootVC.isPwdVCShow = NO;
-//                    [playerRootVC setShowImgAndVoiceTypeFun:YES];
-//                });
-//            });
-//        }
-//        
-//    }
-//    
-//    _isQRCodeType = NO;
-//    
-//    //获取NAS相关信息
-//    [self getNASMsgFun];
+    
+    UIViewController *vc = [UIViewController new];
+
+    BaseNavigationController *playerNav = [[BaseNavigationController alloc] initWithRootViewController:vc];
+    [playerNav pushViewController:playerRootVC animated:NO];
+    self.window.rootViewController = playerNav;
+    
+    _preRootPlayerNav = playerNav;
+    
+    self.isLoginAgainType = NO;
+    
+    __block BOOL isPrivacyMode = [connectDeviceManager shareInstance].DeviceThirdIdMod.data.isPrivacyMode;
+    
+    KWeakSelf
+    if(!_isQRCodeType){
+        
+        if(isPrivacyMode)
+        {
+            [playerRootVC setShowImgAndVoiceTypeFun:NO];
+            [self showCalculatorVC];
+        }
+        else{
+            [self HandleEnterNotPrivacyModeFun];
+            
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                mainBlock(^{
+                        [connectDeviceManager shareInstance].isFirstInputPwdDone = YES;
+                        playerRootVC.isPwdVCShow = NO;
+                        [playerRootVC setShowImgAndVoiceTypeFun:YES];
+                        //[weakSelf shareAwakenAppBy:weakSelf.getShareStr];
+                    
+                        if(self->_session && self->_connectionOptions){
+                            [self scene:self->_session openURLContexts:self->_connectionOptions.URLContexts];
+                        }
+                });
+            });
+        }
+        
+        //_isQRCodeType = NO;
+    }
+    else{
+        if(isPrivacyMode)
+        {
+            [playerRootVC setShowImgAndVoiceTypeFun:NO];
+            [self showCalculatorVC];
+        }
+        else{
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                mainBlock(^{
+                    playerRootVC.isPwdVCShow = NO;
+                    [playerRootVC setShowImgAndVoiceTypeFun:YES];
+                });
+            });
+        }
+        
+    }
+    
+    _isQRCodeType = NO;
+    
+    //获取NAS相关信息
+    [self getNASMsgFun];
+    
+    [self initMainTabbarFun];
 }
 
 #pragma mark 1.4.1 新增tabbar

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

@@ -10,6 +10,15 @@
 #import "NASCommonUsedView.h"
 #import "shareSecretTableViewCell.h"
 #import "NASLastFileView.h"
+#import "previewImageOrVideoViewController.h"
+#import "previewAudioOrDocumentViewController.h"
+#import "previewFileAndFolderViewController.h"
+#import "shareRecordViewController.h"
+#import "backupsOptionViewController.h"
+#import "fileTransfeSetViewController.h"
+#import "uploadFileRecordViewController.h"
+#import "previewToUploadFileView.h"
+
 
 @interface NASViewController ()<UITableViewDelegate,UITableViewDataSource>
 @property (nonatomic,strong)UITableView*tableView;
@@ -86,6 +95,8 @@
     //添加按钮
     UIButton *addButton = [[UIButton alloc] init];
     [addButton setBackgroundImage:[UIImage imageNamed:@"nas_add_icon"] forState:UIControlStateNormal];
+    addButton.tag = 1;
+    [addButton addTarget:self action:@selector(didClickHeadButtonFun:) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:addButton];
     
     [addButton mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -98,7 +109,8 @@
     UIButton *rightTransferListButton = [[UIButton alloc] init];
     //[rightTransferListButton setImage:[UIImage imageNamed:@"icon_file_transfer"] forState:UIControlStateNormal];
     [rightTransferListButton setBackgroundImage:[UIImage imageNamed:@"icon_file_transfer"] forState:UIControlStateNormal];
-    //[rightTransferListButton addTarget:self action:@selector(didiClikRightButGotoTransferListFun:) forControlEvents:UIControlEventTouchUpInside];
+    rightTransferListButton.tag = 2;
+    [rightTransferListButton addTarget:self action:@selector(didClickHeadButtonFun:) forControlEvents:UIControlEventTouchUpInside];
     [self.view addSubview:rightTransferListButton];
     
     [rightTransferListButton mas_makeConstraints:^(MASConstraintMaker *make) {
@@ -145,6 +157,19 @@
         make.height.mas_equalTo(120);
     }];
     
+    
+    KWeakSelf
+    _NASMySpaceV.didClickButtonFun = ^(NSInteger tag) {
+        [weakSelf didClickMySpaceFunBy:tag];
+    };
+    
+    _NASCommonUsedV.didClickButtonFun = ^(NSInteger tag) {
+        [weakSelf didClickCommonUsedFunBy:tag];
+    };
+    
+    self.NASLastFileV.didClickButtonFun = ^(NSInteger tag) {
+        [weakSelf didClickLastFileFunBy:tag];
+    };
 }
 
 #pragma mark - 懒加载
@@ -238,4 +263,157 @@
 - (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section{
     return 60.0;
 }
+
+#pragma mark 点击头部
+- (void)didClickHeadButtonFun:(UIButton*)but
+{
+    NSInteger tag = but.tag;
+    
+    switch (tag) {
+        case 1:
+        {
+            [self userDidClickUploadViewFun];
+        }
+            break;
+        case 2:
+        {
+            uploadFileRecordViewController *vc = [uploadFileRecordViewController new];
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+            
+        default:
+            break;
+    }
+}
+
+
+#pragma mark 点击我的空间模块
+- (void)didClickMySpaceFunBy:(NSInteger)tag
+{
+    switch (tag)
+    {
+        case 1:
+            HLog(@"我的空间")
+            break;
+        case 10:{
+            previewImageOrVideoViewController *vc = [previewImageOrVideoViewController new];
+            vc.isPhotoType = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case 11:{
+            previewImageOrVideoViewController *vc = [previewImageOrVideoViewController new];
+            vc.isPhotoType = NO;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case 12:{
+            previewAudioOrDocumentViewController *vc = [previewAudioOrDocumentViewController new];
+            vc.isAudioType = YES;
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case 13:{
+            previewFileAndFolderViewController *vc = [previewFileAndFolderViewController new];
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+            
+        default:
+            break;
+    }
+}
+#pragma mark 点击常用模块模块
+- (void)didClickCommonUsedFunBy:(NSInteger)tag
+{
+    switch (tag)
+    {
+        case 10:{
+            backupsOptionViewController *vc = [backupsOptionViewController new];
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+        case 11:
+        {
+                if(!ksharedAppDelegate.isWebSockLinkOKAginType){
+                    [[iToast makeText:NSLocalizedString(@"check_could_phone_state",nil)] show];
+                    return;
+                }
+
+                fileTransfeSetViewController *nextVC = [fileTransfeSetViewController new];
+                [self.navigationController pushViewController:nextVC animated:YES];
+            }
+            break;
+        case 12:{
+            shareRecordViewController *vc = [shareRecordViewController new];
+            [self.navigationController pushViewController:vc animated:YES];
+        }
+            break;
+       
+        default:
+            break;
+    }
+}
+#pragma mark 点击最近文件模块
+- (void)didClickLastFileFunBy:(NSInteger)tag
+{
+    
+}
+
+#pragma mark 用户点击上传文件
+- (void)userDidClickUploadViewFun
+{
+    previewToUploadFileView *previewToUploadFileV = [[previewToUploadFileView alloc] init];
+    [self.view addSubview:previewToUploadFileV];
+    
+    [previewToUploadFileV mas_makeConstraints:^(MASConstraintMaker *make) {
+        make.left.mas_equalTo(0);
+        make.right.mas_equalTo(0);
+        make.bottom.mas_equalTo(-TABBARHEIGHT);
+        make.top.mas_equalTo(0);
+    }];
+    
+    KWeakSelf
+    previewToUploadFileV.didClickButtonFun = ^(NSInteger tag) {
+        [weakSelf gotoUploadFileFunWith:tag];
+    };
+}
+
+#pragma mark 调整文件上传
+- (void)gotoUploadFileFunWith:(NSInteger)tag
+{
+    uploadImageOrVideoViewController *vc = [uploadImageOrVideoViewController new];
+    if(tag ==10){
+        vc.isPhotoType = YES;
+    }
+    else{
+        vc.isPhotoType = NO;
+    }
+    [self.navigationController pushViewController:vc animated:YES];
+}
+
+- (void)viewWillAppear:(BOOL)animated{
+    [super viewWillAppear:animated];
+    
+    [self showTabbarFun];
+}
+
+- (void)viewWillDisappear:(BOOL)animated{
+    [super viewWillDisappear:animated];
+    
+    [self hideTabbarFun];
+}
+
+- (void)showTabbarFun
+{
+    // 显示 tab bar
+    self.tabBarController.tabBar.hidden = NO;
+}
+
+- (void)hideTabbarFun
+{
+    // 隐藏 tab bar
+    self.tabBarController.tabBar.hidden = YES;
+}
 @end

创维盒子/双子星云手机/NAS/lastFileManager.h

@@ -0,0 +1,16 @@
+//
+//  lastFileManager.h
+//  双子星云手机
+//
+//  Created by xd h on 2024/6/19.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface lastFileManager : NSObject
+
+@end
+
+NS_ASSUME_NONNULL_END

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

@@ -0,0 +1,12 @@
+//
+//  lastFileManager.m
+//  双子星云手机
+//
+//  Created by xd h on 2024/6/19.
+//
+
+#import "lastFileManager.h"
+
+@implementation lastFileManager
+
+@end

创维盒子/双子星云手机/NAS/view/NASCommonUsedView.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface NASCommonUsedView : UIView
-
+@property (nonatomic,copy) void (^didClickButtonFun)(NSInteger tag);
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -122,6 +122,10 @@
 {
     NSInteger tag = but.tag;
     HLog(@"%ld",tag);
+    
+    if(_didClickButtonFun){
+        _didClickButtonFun(tag);
+    }
 }
 @end
 

创维盒子/双子星云手机/NAS/view/NASLastFileView.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface NASLastFileView : UIView
-
+@property (nonatomic,copy) void (^didClickButtonFun)(NSInteger tag);
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -127,6 +127,10 @@
 {
     NSInteger tag = but.tag;
     HLog(@"%ld",tag);
+    
+    if(_didClickButtonFun){
+        _didClickButtonFun(tag);
+    }
 }
 @end
 

创维盒子/双子星云手机/NAS/view/NASMySpaceView.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface NASMySpaceView : UIView
-
+@property (nonatomic,copy) void (^didClickButtonFun)(NSInteger tag);
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -197,5 +197,9 @@
 {
     NSInteger tag = but.tag;
     HLog(@"%ld",tag);
+    
+    if(_didClickButtonFun){
+        _didClickButtonFun(tag);
+    }
 }
 @end