huangxiaodong преди 1 година
родител
ревизия
3f7d286cfb

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

@@ -192,6 +192,8 @@
 		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 */; };
+		6B45C4FD2B57BC87007E6911 /* cloudPhoneExtraFileListModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B45C4FB2B57BC87007E6911 /* cloudPhoneExtraFileListModel.h */; };
+		6B45C4FE2B57BC87007E6911 /* cloudPhoneExtraFileListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B45C4FC2B57BC87007E6911 /* cloudPhoneExtraFileListModel.m */; };
 		6B4D23B12B33DDBC005B718A /* imageVersionRenewTipView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B4D23AF2B33DDBB005B718A /* imageVersionRenewTipView.h */; };
 		6B4D23B22B33DDBC005B718A /* imageVersionRenewTipView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B4D23B02B33DDBB005B718A /* imageVersionRenewTipView.m */; };
 		6B5B60602B3BC8DE009A2AE2 /* fileTransferPopView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B5B605E2B3BC8DE009A2AE2 /* fileTransferPopView.h */; };
@@ -623,6 +625,8 @@
 		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>"; };
+		6B45C4FB2B57BC87007E6911 /* cloudPhoneExtraFileListModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cloudPhoneExtraFileListModel.h; sourceTree = "<group>"; };
+		6B45C4FC2B57BC87007E6911 /* cloudPhoneExtraFileListModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = cloudPhoneExtraFileListModel.m; sourceTree = "<group>"; };
 		6B4D23AF2B33DDBB005B718A /* imageVersionRenewTipView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = imageVersionRenewTipView.h; sourceTree = "<group>"; };
 		6B4D23B02B33DDBB005B718A /* imageVersionRenewTipView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = imageVersionRenewTipView.m; sourceTree = "<group>"; };
 		6B5B605E2B3BC8DE009A2AE2 /* fileTransferPopView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = fileTransferPopView.h; sourceTree = "<group>"; };
@@ -942,6 +946,8 @@
 				6B5D40192B4A9850000965CF /* couldPhoneFolderListModel.m */,
 				6B5D40252B4BC402000965CF /* couldPhoneFileListModel.h */,
 				6B5D40262B4BC402000965CF /* couldPhoneFileListModel.m */,
+				6B45C4FB2B57BC87007E6911 /* cloudPhoneExtraFileListModel.h */,
+				6B45C4FC2B57BC87007E6911 /* cloudPhoneExtraFileListModel.m */,
 			);
 			path = Model;
 			sourceTree = "<group>";
@@ -1904,6 +1910,7 @@
 				6B21709C2B15CDB600656670 /* NSArray+Log.h in Headers */,
 				184C8AD02A94980D00F26650 /* CustomerWebViewController.h in Headers */,
 				6BFF26992AFA16DA00FCB4F7 /* forgetSecretKeyViewController.h in Headers */,
+				6B45C4FD2B57BC87007E6911 /* cloudPhoneExtraFileListModel.h in Headers */,
 				6BFF26912AF9D88200FCB4F7 /* AuthCodeTextField.h in Headers */,
 				6B5D403B2B4BFEB9000965CF /* PlayerViewController+downloadThumbnailImage.h in Headers */,
 				184C8ADA2A949DAC00F26650 /* HaveNewVersionView.h in Headers */,
@@ -2312,6 +2319,7 @@
 				183AE6502A8A2CF000B11CB0 /* UIButton+AFNetworking.m in Sources */,
 				6B1FBD3B2B467A8000926382 /* backupsFilerecordTableView.m in Sources */,
 				A084D68E27E859D300054880 /* HWToolListCell.m in Sources */,
+				6B45C4FE2B57BC87007E6911 /* cloudPhoneExtraFileListModel.m in Sources */,
 				183AE6512A8A2CF000B11CB0 /* UIActivityIndicatorView+AFNetworking.m in Sources */,
 				A003F6A627D841C800715CBF /* BaseViewController.m in Sources */,
 				6B1FBD332B455DBD00926382 /* PlayerViewController+upLoadFile.m in Sources */,

BIN
创维盒子/双子星云手机.xcworkspace/xcuserdata/xdh.xcuserdatad/UserInterfaceState.xcuserstate


+ 26 - 10
创维盒子/双子星云手机.xcworkspace/xcuserdata/xdh.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -96,7 +96,7 @@
             endingColumnNumber = "9223372036854775807"
             startingLineNumber = "439"
             endingLineNumber = "439"
-            landmarkName = "-opencommandChannelManagerrc_openURL"
+            landmarkName = "-viewDidAppear:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -302,9 +302,9 @@
             filePath = "&#x53cc;&#x5b50;&#x661f;&#x4e91;&#x624b;&#x673a;/CloudPlayer/PlayerViewController.mm"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1597"
-            endingLineNumber = "1597"
-            landmarkName = "-UTCOffset"
+            startingLineNumber = "1600"
+            endingLineNumber = "1600"
+            landmarkName = "-startForceStartTimerFun"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -318,9 +318,9 @@
             filePath = "&#x53cc;&#x5b50;&#x661f;&#x4e91;&#x624b;&#x673a;/CloudPlayer/PlayerViewController.mm"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1586"
-            endingLineNumber = "1586"
-            landmarkName = "-getPreferredLanguage"
+            startingLineNumber = "1589"
+            endingLineNumber = "1589"
+            landmarkName = "-needToResetFun"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -350,9 +350,9 @@
             filePath = "&#x53cc;&#x5b50;&#x661f;&#x4e91;&#x624b;&#x673a;/CloudPlayer/PlayerViewController.mm"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "1225"
-            endingLineNumber = "1225"
-            landmarkName = "-liveStreamManager:didReceiveEvent:"
+            startingLineNumber = "1228"
+            endingLineNumber = "1228"
+            landmarkName = "-openVideForLiveStreamManager:needPost:"
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
@@ -404,5 +404,21 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            uuid = "89E051DD-18A6-44D5-BA27-8DD5E0A5EB1F"
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "&#x53cc;&#x5b50;&#x661f;&#x4e91;&#x624b;&#x673a;/CloudPlayer/PlayerViewController+otherDelegate.mm"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "364"
+            endingLineNumber = "364"
+            landmarkName = "-getExtraFilesResponseFun:"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>

+ 22 - 0
创维盒子/双子星云手机/CloudPlayer/Model/cloudPhoneExtraFileListModel.h

@@ -0,0 +1,22 @@
+//
+//  cloudPhoneExtraFileListModel.h
+//  隐私保护
+//
+//  Created by xd h on 2024/1/17.
+//
+
+#import "SuperModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface cloudPhoneExtraFileModel : SuperModel
+@property (nonatomic, copy) NSString * extraPath;
+@property (nonatomic, assign) long  extraSize;
+@end
+
+@protocol cloudPhoneExtraFileModel;
+@interface cloudPhoneExtraFileListModel : SuperModel
+@property (nonatomic, strong) NSArray<cloudPhoneExtraFileModel>* data;
+@end
+
+NS_ASSUME_NONNULL_END

+ 16 - 0
创维盒子/双子星云手机/CloudPlayer/Model/cloudPhoneExtraFileListModel.m

@@ -0,0 +1,16 @@
+//
+//  cloudPhoneExtraFileListModel.m
+//  隐私保护
+//
+//  Created by xd h on 2024/1/17.
+//
+
+#import "cloudPhoneExtraFileListModel.h"
+
+@implementation cloudPhoneExtraFileModel
+
+@end
+
+@implementation cloudPhoneExtraFileListModel
+
+@end

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

@@ -37,6 +37,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)handleDownloadResponseFunBy:(id)message;
 
 - (void)checkAllTaskFun;
+- (void)getExtraFilesResponseFun:(NSDictionary *)dataDict;
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -18,6 +18,7 @@
 #import "PlayerViewController+downloadFile.h"
 #import "downloadManager.h"
 #import "uploadFileManager.h"
+#import "cloudPhoneExtraFileListModel.h"
 
 @implementation PlayerViewController (otherDelegate)
 
@@ -356,4 +357,11 @@
     [[downloadManager shareInstance] checkReDownloadFileFun];
 }
 
+- (void)getExtraFilesResponseFun:(NSDictionary *)dataDict
+{
+    cloudPhoneExtraFileListModel *model = [[cloudPhoneExtraFileListModel alloc] initWithDictionary:dataDict error:nil];
+    
+    HLog(@"333");
+}
+
 @end

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

@@ -759,6 +759,9 @@ ComontAlretViewControllerDelegate>
             else if ([messageType isEqualToString:@"search"]){/*创建文件夹*/
                 [weakSelf searchFileListResponseFun:dataDict];
             }
+            else if ([messageType isEqualToString:@"getExtraFiles"]){/*创建文件夹*/
+                [weakSelf getExtraFilesResponseFun:dataDict];
+            }
         } failure:^(NSError *error) {
             [self showNetErrorAlertFun:2];
         }];
@@ -1654,6 +1657,10 @@ NSDate *lastVideoTome;/*上一帧数据时间*/
     
     //处理相册备份
     [[backupsFileManager shareInstance] AutohandlePhotosBackupsFun];
+    
+    //获取磁盘外挂
+    NSString *ExtraCommondStr  = [RCCommandHelp getExtraFilesList];
+    [self send_data:ExtraCommondStr];
 }
 
 #pragma mark 盒子第一次连接成功  给ws发送信息 单点登录 把其他账号挤下去

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

@@ -232,6 +232,13 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (NSString *)applyForDownloadFileBy:(NSString *)taskUid withFilePath:(NSString *)filePath withPosition:(long)position;
 
+/**
+ * @brief 获取外挂磁盘接口
+ *
+ 
+ */
++ (NSString *)getExtraFilesList;
+
 @end
 
 NS_ASSUME_NONNULL_END

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

@@ -1078,4 +1078,20 @@
     return dataStr;
 }
 
++ (NSString *)getExtraFilesList
+{
+    NSString *dataStr = @"{\"data\":{},\"type\":\"getExtraFiles\"}";
+    
+    if (USENEWCONTROLLCOMMONDNO500)
+    {
+//        dataStr = [self commondAppendingHeadAndEndStrWithSourStr:dataStr];
+    }
+    else
+    {
+        dataStr = [self commandAppending00StringWithSourStr:dataStr];
+    }
+    
+    return dataStr;
+}
+
 @end

+ 1 - 1
创维盒子/双子星云手机/CloudPlayer/View/PlayerView.m

@@ -71,7 +71,7 @@ ShowImageViewDelegate>{
                   inRect:CGRectMake(0, 0, glkshowImageView.drawableWidth, glkshowImageView.drawableHeight)
                 fromRect:[ciImage extent]];
     
-    [self->glkshowImageView display];
+    //[self->glkshowImageView display];
 }
 
 - (void)showIMage