Browse Source

1.下载获取列表没有返回

huangxiaodong 1 year ago
parent
commit
4a3ff83a42

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

@@ -212,6 +212,8 @@
 		6B5D40162B47F27A000965CF /* couldPhoneCommonModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B5D40142B47F27A000965CF /* couldPhoneCommonModel.m */; };
 		6B5D401A2B4A9850000965CF /* couldPhoneFolderListModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B5D40182B4A9850000965CF /* couldPhoneFolderListModel.h */; };
 		6B5D401B2B4A9850000965CF /* couldPhoneFolderListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B5D40192B4A9850000965CF /* couldPhoneFolderListModel.m */; };
+		6B5D40232B4AA7BF000965CF /* downLoadPreviewViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B5D40212B4AA7BF000965CF /* downLoadPreviewViewController.h */; };
+		6B5D40242B4AA7BF000965CF /* downLoadPreviewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B5D40222B4AA7BF000965CF /* downLoadPreviewViewController.m */; };
 		6B72724B2B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B7272492B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.h */; };
 		6B72724C2B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B72724A2B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.m */; };
 		6B72724F2B0B58E500C03F87 /* uploadFileRecordEditBottomView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B72724D2B0B58E500C03F87 /* uploadFileRecordEditBottomView.h */; };
@@ -625,6 +627,8 @@
 		6B5D40142B47F27A000965CF /* couldPhoneCommonModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = couldPhoneCommonModel.m; sourceTree = "<group>"; };
 		6B5D40182B4A9850000965CF /* couldPhoneFolderListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = couldPhoneFolderListModel.h; sourceTree = "<group>"; };
 		6B5D40192B4A9850000965CF /* couldPhoneFolderListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = couldPhoneFolderListModel.m; sourceTree = "<group>"; };
+		6B5D40212B4AA7BF000965CF /* downLoadPreviewViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = downLoadPreviewViewController.h; sourceTree = "<group>"; };
+		6B5D40222B4AA7BF000965CF /* downLoadPreviewViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = downLoadPreviewViewController.m; sourceTree = "<group>"; };
 		6B7272492B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = uploadFileRecordTableViewHeadView.h; sourceTree = "<group>"; };
 		6B72724A2B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = uploadFileRecordTableViewHeadView.m; sourceTree = "<group>"; };
 		6B72724D2B0B58E500C03F87 /* uploadFileRecordEditBottomView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = uploadFileRecordEditBottomView.h; sourceTree = "<group>"; };
@@ -1269,6 +1273,7 @@
 		6B05815D2AFCD0A900D37290 /* uploadFile */ = {
 			isa = PBXGroup;
 			children = (
+				6B5D401C2B4AA70C000965CF /* downLoadFile */,
 				6B5D40172B4A70AB000965CF /* uploadFileView */,
 				6B5B60622B3D5F72009A2AE2 /* fileTransfeSet */,
 				6B0582822B0457A000D37290 /* uploadFileManager */,
@@ -1406,6 +1411,15 @@
 			path = uploadFileView;
 			sourceTree = "<group>";
 		};
+		6B5D401C2B4AA70C000965CF /* downLoadFile */ = {
+			isa = PBXGroup;
+			children = (
+				6B5D40212B4AA7BF000965CF /* downLoadPreviewViewController.h */,
+				6B5D40222B4AA7BF000965CF /* downLoadPreviewViewController.m */,
+			);
+			path = downLoadFile;
+			sourceTree = "<group>";
+		};
 		6BBB35D42AE7645200E4A59B /* BackgroundKeepAlive */ = {
 			isa = PBXGroup;
 			children = (
@@ -1845,6 +1859,7 @@
 				181E85002A8F6B1800292B96 /* LogoSelectView.h in Headers */,
 				6B5B60762B3E665E009A2AE2 /* filePathCreatPopView.h in Headers */,
 				18BA24872AA5C57900BA01EE /* RSATool.h in Headers */,
+				6B5D40232B4AA7BF000965CF /* downLoadPreviewViewController.h in Headers */,
 				6B3F963A2AD2AD0B008E349E /* newWorkInterface.h in Headers */,
 				6B0581B22AFE02B100D37290 /* uploadFileBottomView.h in Headers */,
 				18F9CAFC2ABD35C4003FF71A /* ModifyPWDFirstViewController.h in Headers */,
@@ -2335,6 +2350,7 @@
 				A08A94FB27E9A4E400C544BB /* BGDB.m in Sources */,
 				A003F6B427D841EE00715CBF /* UITextfield+NLLimit.m in Sources */,
 				6B1FBD3F2B46875300926382 /* backupsFileRecordCell.m in Sources */,
+				6B5D40242B4AA7BF000965CF /* downLoadPreviewViewController.m in Sources */,
 				6BFF26892AF8949F00FCB4F7 /* playerShowSecretkeyView.m in Sources */,
 				6B8FF6C22B05B24D00800981 /* uploadFileRecordCell.m in Sources */,
 				A003F6A727D841C800715CBF /* BaseNavigationController.m in Sources */,

+ 5 - 0
创维盒子/双子星云手机/AppDelegate/Config/Notification.h

@@ -86,6 +86,11 @@
 /* 获取文件夹完成通知*/
 #define getFolderListDoneNotification                 @"getFolderListDoneNot"
 
+/* 搜索云机对应文件*/
+#define searchFileListBeginNotification                 @"searchFileListBeginNot"
+/* 搜索云机对应文件*/
+#define searchFileListDoneNotification                 @"searchFileListDoneNoti"
+
 /*获取云机基本信息通知*/
 #define getCouldPhoneBaseInfoNotification                 @"getCouldPhoneBaseInfoNot"
 

+ 13 - 0
创维盒子/双子星云手机/Class/Set/MySetViewController.m

@@ -30,6 +30,7 @@
 #import "fileTransferPopView.h"
 #import "fileTransfeSetViewController.h"
 #import "backupsSetViewController.h"
+#import "downLoadPreviewViewController.h"
 
 @interface MySetViewController ()<HelpDownScrollViewDelegate,UITableViewDelegate,UITableViewDataSource,ComontAlretViewControllerDelegate>
 {
@@ -269,6 +270,18 @@
         }
         [self.navigationController pushViewController:vc animated:YES];
     }
+    else if(tag == 12 ||tag == 22){
+        
+        
+        downLoadPreviewViewController *vc = [downLoadPreviewViewController new];
+        if(tag ==12){
+            vc.isPhotoType = YES;
+        }
+        else{
+            vc.isPhotoType = NO;
+        }
+        [self.navigationController pushViewController:vc animated:YES];
+    }
 }
 
 - (UIView *)tableFoorView{

+ 16 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/downLoadPreviewViewController.h

@@ -0,0 +1,16 @@
+//
+//  downLoadPreviewViewController.h
+//  隐私保护
+//
+//  Created by xd h on 2024/1/7.
+//
+
+#import "BaseViewController.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface downLoadPreviewViewController : BaseViewController
+@property (nonatomic,assign) BOOL isPhotoType;//是否为选择图片类型
+@end
+
+NS_ASSUME_NONNULL_END

+ 42 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/downLoadFile/downLoadPreviewViewController.m

@@ -0,0 +1,42 @@
+//
+//  downLoadPreviewViewController.m
+//  隐私保护
+//
+//  Created by xd h on 2024/1/7.
+//
+
+#import "downLoadPreviewViewController.h"
+
+@interface downLoadPreviewViewController ()
+
+@end
+
+@implementation downLoadPreviewViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    
+    self.titleLabel.text = NSLocalizedString(@"my_set_no_File_Transfer_List",nil) ;
+    
+    [self.toolBar setHidden:YES];
+    [self.navigationBar setHidden:YES];
+    [self.navBarBGView setHidden:NO];
+    self.navBarBGView.backgroundColor = [UIColor whiteColor];
+    [self.view setBackgroundColor:[UIColor whiteColor]];
+}
+
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    [self searchFileListFun];
+}
+
+- (void)searchFileListFun
+{
+    NSNumber *curNum = [NSNumber numberWithBool:_isPhotoType];
+    [[NSNotificationCenter defaultCenter] postNotificationName:searchFileListBeginNotification object:curNum];/*发送通知*/
+}
+
+@end

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

@@ -30,6 +30,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)getFolderListBeginNotFun:(NSNotification *)notification;
 - (void)getFolderListResponseFun:(NSDictionary *)dataDict;
+
+- (void)searchFileListBeginFun:(NSNotification *)notification;
+- (void)searchFileListResponseFun:(NSDictionary *)dataDict;
+
 @end
 
 NS_ASSUME_NONNULL_END

+ 19 - 0
创维盒子/双子星云手机/CloudPlayer/PlayerViewController+otherDelegate.mm

@@ -233,4 +233,23 @@
     [[NSNotificationCenter defaultCenter] postNotificationName:getFolderListDoneNotification object:dataDict];/*发送通知*/
 }
 
+
+- (void)searchFileListBeginFun:(NSNotification *)notification
+{
+    NSNumber *curNum = [notification object];
+    
+    NSString *fileType = @"video";
+    
+    if(curNum.boolValue)
+    {
+        fileType = @"jpg";
+    }
+    
+    NSString * commandStr = [RCCommandHelp searchCouldPhoneFilewithType:fileType];
+    [self.commandChannelManager rc_sendData:commandStr];
+}
+- (void)searchFileListResponseFun:(NSDictionary *)dataDict
+{
+    
+}
 @end

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

@@ -2309,6 +2309,8 @@ BOOL inReconnect = NO;
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(createFolderBeginNotFun:) name:createFolderBeginNotification object:nil];
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(getFolderListBeginNotFun:) name:getFolderListBeginNotification object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(searchFileListBeginFun:) name:searchFileListBeginNotification object:nil];
 }
 
 - (void)removeNSNotification

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

@@ -214,10 +214,16 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * @brief 获取创建的文件夹(备份)
  *
- * @param
+ 
  */
 + (NSString *)getCreateFolderList;
 
+/**
+ * @brief 搜索文件
+ *
+ * @param fileType  文件类型 jpg 图片 audio 音频 video 视频 apk 应用 doc 文档 other 其他文件 dir 文件夹
+ */
++ (NSString *)searchCouldPhoneFilewithType:(NSString *)fileType;
 @end
 
 NS_ASSUME_NONNULL_END

+ 18 - 0
创维盒子/双子星云手机/CloudPlayer/RCCommandHelp.m

@@ -1045,4 +1045,22 @@
     
     return dataStr;
 }
+
++ (NSString *)searchCouldPhoneFilewithType:(NSString *)fileType
+{
+    NSString *dataStr =[NSString stringWithFormat:@"{\"data\":{\"fileType\":\"%@\"},\"type\":\"search\"}",fileType];
+    
+    if (USENEWCONTROLLCOMMONDNO500)
+    {
+//        dataStr = [self commondAppendingHeadAndEndStrWithSourStr:dataStr];
+    }
+    else
+    {
+        dataStr = [self commandAppending00StringWithSourStr:dataStr];
+    }
+    
+    return dataStr;
+}
+
+
 @end