Forráskód Böngészése

1.改走frpc方案 获取备份备份文件夹列表

huangxiaodong 9 hónapja%!(EXTRA string=óta)
szülő
commit
21c9644f3c

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

@@ -238,6 +238,10 @@
 		6B238C952C60AF6A00C5AC2F /* nasDownloadFileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B238C922C60AF6A00C5AC2F /* nasDownloadFileManager.h */; };
 		6B238C962C60AF6A00C5AC2F /* nasDownloadFileManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B238C922C60AF6A00C5AC2F /* nasDownloadFileManager.h */; };
 		6B238C972C60AF6A00C5AC2F /* nasDownloadFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B238C932C60AF6A00C5AC2F /* nasDownloadFileManager.m */; };
+		6B257E9F2C95964E00CBB70A /* backupPathListModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B257E9D2C95964E00CBB70A /* backupPathListModel.h */; };
+		6B257EA02C95964E00CBB70A /* backupPathListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B257E9E2C95964E00CBB70A /* backupPathListModel.m */; };
+		6B257EA12C95964E00CBB70A /* backupPathListModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B257E9D2C95964E00CBB70A /* backupPathListModel.h */; };
+		6B257EA22C95964E00CBB70A /* backupPathListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B257E9E2C95964E00CBB70A /* backupPathListModel.m */; };
 		6B2C1E1C2C070ADE00FDCF82 /* ZFAVPlayerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B2C1DCC2C070ADE00FDCF82 /* ZFAVPlayerManager.h */; };
 		6B2C1E1D2C070ADE00FDCF82 /* ZFAVPlayerManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B2C1DCC2C070ADE00FDCF82 /* ZFAVPlayerManager.h */; };
 		6B2C1E1E2C070ADE00FDCF82 /* ZFAVPlayerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B2C1DCD2C070ADE00FDCF82 /* ZFAVPlayerManager.m */; };
@@ -1694,6 +1698,8 @@
 		6B238C8D2C60AAE200C5AC2F /* nasDownloadManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = nasDownloadManager.m; sourceTree = "<group>"; };
 		6B238C922C60AF6A00C5AC2F /* nasDownloadFileManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = nasDownloadFileManager.h; sourceTree = "<group>"; };
 		6B238C932C60AF6A00C5AC2F /* nasDownloadFileManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = nasDownloadFileManager.m; sourceTree = "<group>"; };
+		6B257E9D2C95964E00CBB70A /* backupPathListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = backupPathListModel.h; sourceTree = "<group>"; };
+		6B257E9E2C95964E00CBB70A /* backupPathListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = backupPathListModel.m; sourceTree = "<group>"; };
 		6B2C1DCC2C070ADE00FDCF82 /* ZFAVPlayerManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZFAVPlayerManager.h; sourceTree = "<group>"; };
 		6B2C1DCD2C070ADE00FDCF82 /* ZFAVPlayerManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ZFAVPlayerManager.m; sourceTree = "<group>"; };
 		6B2C1DCF2C070ADE00FDCF82 /* UIImageView+ZFCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+ZFCache.h"; sourceTree = "<group>"; };
@@ -2855,6 +2861,15 @@
 			path = nasDownloadManager;
 			sourceTree = "<group>";
 		};
+		6B257E9C2C95962B00CBB70A /* model */ = {
+			isa = PBXGroup;
+			children = (
+				6B257E9D2C95964E00CBB70A /* backupPathListModel.h */,
+				6B257E9E2C95964E00CBB70A /* backupPathListModel.m */,
+			);
+			path = model;
+			sourceTree = "<group>";
+		};
 		6B2C1DCE2C070ADE00FDCF82 /* AVPlayer */ = {
 			isa = PBXGroup;
 			children = (
@@ -3158,6 +3173,7 @@
 		6B5B60622B3D5F72009A2AE2 /* fileTransfeSet */ = {
 			isa = PBXGroup;
 			children = (
+				6B257E9C2C95962B00CBB70A /* model */,
 				6B5B60672B3D6795009A2AE2 /* view */,
 				6B5B60632B3D5FD8009A2AE2 /* fileTransfeSetViewController.h */,
 				6B5B60642B3D5FD8009A2AE2 /* fileTransfeSetViewController.m */,
@@ -4011,6 +4027,7 @@
 				6BC7415E2C24150C0049BA8D /* webSocketManager+backupsFile.h in Headers */,
 				6BEA31752BB65606005167AA /* clearCacheAlretViewController.h in Headers */,
 				6B4C0F842C0315880070EF2E /* audioPlayerViewController.h in Headers */,
+				6B257E9F2C95964E00CBB70A /* backupPathListModel.h in Headers */,
 				6B5D866E2C22AE2B008D25EA /* NASMySpaceView.h in Headers */,
 				6BB481CF2C52481E00C21921 /* backupsOptionTipView.h in Headers */,
 				6B467BB32BC7E4360039A6A6 /* addLogObject.h in Headers */,
@@ -4297,6 +4314,7 @@
 				6BC741602C24150C0049BA8D /* webSocketManager+backupsFile.h in Headers */,
 				6BEA31782BB65606005167AA /* clearCacheAlretViewController.h in Headers */,
 				6B4C0F872C0315880070EF2E /* audioPlayerViewController.h in Headers */,
+				6B257EA12C95964E00CBB70A /* backupPathListModel.h in Headers */,
 				6B5D866F2C22AE2B008D25EA /* NASMySpaceView.h in Headers */,
 				6BB481D12C52481E00C21921 /* backupsOptionTipView.h in Headers */,
 				6B467BB52BC7E4360039A6A6 /* addLogObject.h in Headers */,
@@ -5053,6 +5071,7 @@
 				6BD5074D2B9576A4006E7CB0 /* downloadThumbnailManager.m in Sources */,
 				6BD5074E2B9576A4006E7CB0 /* couldPhoneBaseInfoModel.m in Sources */,
 				6BD5074F2B9576A4006E7CB0 /* uploadFileBottomView.m in Sources */,
+				6B257EA22C95964E00CBB70A /* backupPathListModel.m in Sources */,
 				6B97739E2C637C4800213317 /* nasUploadManager.m in Sources */,
 				6BD507502B9576A4006E7CB0 /* LogoSelectView.m in Sources */,
 				6B679DED2C252A4E00D0DC03 /* NASMySpaceViewController.m in Sources */,
@@ -5421,6 +5440,7 @@
 				6B5D40382B4BEEF8000965CF /* downloadThumbnailManager.m in Sources */,
 				6B7272582B0DAF7600C03F87 /* couldPhoneBaseInfoModel.m in Sources */,
 				6B0581B32AFE02B100D37290 /* uploadFileBottomView.m in Sources */,
+				6B257EA02C95964E00CBB70A /* backupPathListModel.m in Sources */,
 				6B97739B2C637C4800213317 /* nasUploadManager.m in Sources */,
 				181E85012A8F6B1800292B96 /* LogoSelectView.m in Sources */,
 				6B679DEB2C252A4E00D0DC03 /* NASMySpaceViewController.m in Sources */,

+ 85 - 1
创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/fileTransferPathCheckViewController.m

@@ -10,6 +10,7 @@
 #import "filePathCreatPopView.h"
 #import "IQKeyboardManager.h"
 #import "couldPhoneFolderListModel.h"
+#import "backupPathListModel.h"
 
 @interface fileTransferPathCheckViewController ()<UITableViewDelegate,UITableViewDataSource>
 @property (nonatomic, strong) UITableView *tableView;
@@ -46,7 +47,33 @@
 
 - (void)getFolderListFun
 {
-    [[webRtcManager shareManager] getBackupFolderListFun];
+    //原来走通道
+    //[[webRtcManager shareManager] getBackupFolderListFun];
+    
+    //改走frpc方案
+    [self getBackupPathListFun];
+}
+
+#pragma mark 改走frpc方案 取备份备份文件夹列表
+- (void)getBackupPathListFun
+{
+    NSMutableDictionary*paraDict = [NSMutableDictionary new];
+    
+    KWeakSelf
+    [[netWorkManager shareInstance] cloudPhoneGETCallBackCode:@"backupPath" Parameters:paraDict success:^(id  _Nonnull responseObject) {
+        
+        backupPathListModel *model = [[backupPathListModel alloc] initWithDictionary:responseObject error:nil];
+        if(model && model.status == 0){
+            [weakSelf getFolderListDoneWith:model];
+        }
+        else{
+            
+        }
+    } failure:^(NSError * _Nonnull error) {
+        
+       
+    }];
+    
 }
 
 - (void)drawAnyView{
@@ -350,6 +377,7 @@
     
 }
 
+#pragma mark 信令通道 或者webrtc通道获取备份文件夹列表的响应 弃用!!!!
 - (void)getFolderListDoneNotFun:(NSNotification *)notification
 {
     NSDictionary *dataDict = [notification object];
@@ -408,4 +436,60 @@
     });
     
 }
+
+#pragma mark frp通道获取备份文件夹列表的响应 正在使用!!!!
+- (void)getFolderListDoneWith:(backupPathListModel*)model
+{
+    if(model){
+        [_folderListArr removeAllObjects];
+        
+        [_folderListArr addObjectsFromArray:model.data.path];
+        
+        NSString * backupsDefaultPath = [HWDataManager getStringWithKey:stringKeyAddSn(Const_photo_backups_default_path)];
+        
+        if(_curType == 1){
+            backupsDefaultPath = [HWDataManager getStringWithKey:stringKeyAddSn(Const_photo_upload_default_path)];
+        }
+        else if(_curType == 3){
+            backupsDefaultPath = [HWDataManager getStringWithKey:stringKeyAddSn(Const_box_save_default_path)];
+        }
+        
+        NSString *lastbackupsStr = [backupsDefaultPath substringFromIndex:backupsDefaultPath.length -1];
+        
+        BOOL needAddHadDefaultPath = YES;
+
+        for (int i=0; i<_folderListArr.count; i++) {
+            NSString * curPathStr = _folderListArr[i];
+            
+            NSString *lastStr = [curPathStr substringFromIndex:curPathStr.length -1];
+            
+            if([lastStr isEqualToString:@"/"]
+               && ![lastbackupsStr isEqualToString:@"/"]){
+                curPathStr = [curPathStr substringToIndex:curPathStr.length -1];
+            }
+            
+            if([curPathStr isEqualToString:@"sdcard/Download/"]){
+                curPathStr = @"/sdcard/Download/";
+            }
+            
+            if([curPathStr isEqualToString:backupsDefaultPath]){
+                needAddHadDefaultPath = NO;
+                _selectIndex = i;
+                break;
+            }
+        }
+
+//        if(needAddHadDefaultPath){
+//            [_folderListArr insertObject:backupsDefaultPath atIndex:0];
+//            _selectIndex = 0;
+//        }
+        
+    }
+    
+    KWeakSelf
+    mainBlock(^{
+        [weakSelf.tableView reloadData];
+    });
+    
+}
 @end

+ 20 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/model/backupPathListModel.h

@@ -0,0 +1,20 @@
+//
+//  backupPathListModel.h
+//  双子星云手机
+//
+//  Created by xd h on 2024/9/14.
+//
+
+#import "SuperModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface couldPhoneFolderListDataModel : SuperModel
+@property (nonatomic, strong) NSArray* path;
+@end
+
+@interface backupPathListModel : SuperModel
+@property (nonatomic, strong) couldPhoneFolderListDataModel*data;
+@end
+
+NS_ASSUME_NONNULL_END

+ 16 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/fileTransfeSet/model/backupPathListModel.m

@@ -0,0 +1,16 @@
+//
+//  backupPathListModel.m
+//  双子星云手机
+//
+//  Created by xd h on 2024/9/14.
+//
+
+#import "backupPathListModel.h"
+
+@implementation couldPhoneFolderListDataModel
+
+@end
+
+@implementation backupPathListModel
+
+@end