ソースを参照

走frp方案 获取云机磁盘信息

huangxiaodong 9 ヶ月 前
コミット
0e82e117e3

+ 27 - 3
创维盒子/双子星云手机/NAS/NASMySpaceViewController.m

@@ -109,17 +109,41 @@
 #pragma mark 获取到云机基本新
 - (void)getExtraFilesDoneFun:(NSNotification*)not
 {
-    _allDataArr = ksharedAppDelegate.cloudPhoneExtraFileListMod.data;
-    [_tableView reloadData];
+//    _allDataArr = ksharedAppDelegate.cloudPhoneExtraFileListMod.data;
+//    [_tableView reloadData];
+    
+    [self getExtraFilesByFrpHttpFun];
 }
 
+
+#pragma mark 走frp方案 获取云机信息
+- (void)getExtraFilesByFrpHttpFun
+{
+    NSMutableDictionary*paraDict = [NSMutableDictionary new];
+
+    KWeakSelf
+    [[netWorkManager shareInstance] cloudPhoneGETCallBackCode:@"getExtra" Parameters:paraDict success:^(id  _Nonnull responseObject) {
+        
+        cloudPhoneExtraFileListModel *model = [[cloudPhoneExtraFileListModel alloc] initWithDictionary:responseObject error:nil];
+        if(model && model.status == 0){
+            ksharedAppDelegate.cloudPhoneExtraFileListMod = model;
+            weakSelf.allDataArr = ksharedAppDelegate.cloudPhoneExtraFileListMod.data;
+            [weakSelf.tableView reloadData];
+        }
+    } failure:^(NSError * _Nonnull error) {
+        
+    }];
+}
+
+
 - (void)viewWillAppear:(BOOL)animated
 {
     [super viewWillAppear:animated];
     
     if(!ksharedAppDelegate.cloudPhoneExtraFileListMod.data){
         _allDataArr = @[];
-        [[webRtcManager shareManager] getExtraFilesListFun];
+        //[[webRtcManager shareManager] getExtraFilesListFun];
+        [self getExtraFilesByFrpHttpFun];
     }
     else{
         _allDataArr = ksharedAppDelegate.cloudPhoneExtraFileListMod.data;

+ 25 - 4
创维盒子/双子星云手机/NAS/NASViewController.m

@@ -630,9 +630,29 @@
 #pragma mark 获取到云机磁盘相关信息
 - (void)getExtraFilesDoneFun:(NSNotification*)not
 {
-    mainBlock(^{
-        [self setMySpaceDataFun];
-    });
+//    mainBlock(^{
+//        [self setMySpaceDataFun];
+//    });
+    
+    [self getExtraFilesByFrpHttpFun];
+}
+
+#pragma mark 走frp方案 获取云机磁盘信息
+- (void)getExtraFilesByFrpHttpFun
+{
+    NSMutableDictionary*paraDict = [NSMutableDictionary new];
+    
+    KWeakSelf
+    [[netWorkManager shareInstance] cloudPhoneGETCallBackCode:@"getExtra" Parameters:paraDict success:^(id  _Nonnull responseObject) {
+        
+        cloudPhoneExtraFileListModel *model = [[cloudPhoneExtraFileListModel alloc] initWithDictionary:responseObject error:nil];
+        if(model && model.status == 0){
+            ksharedAppDelegate.cloudPhoneExtraFileListMod = model;
+            [weakSelf setMySpaceDataFun];
+        }
+    } failure:^(NSError * _Nonnull error) {
+        
+    }];
     
 }
 
@@ -644,7 +664,8 @@
     }
     else{
         dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(3 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-            [self setMySpaceDataFun];
+            //[self setMySpaceDataFun];
+            [self getExtraFilesByFrpHttpFun];
         });
     }
 }

+ 5 - 2
创维盒子/双子星云手机/webRtc/webRtcManager/webRtcManager.m

@@ -384,8 +384,11 @@
 #pragma mark 获取云机以及外挂磁盘
 - (void)getExtraFilesListFun
 {
-    NSString *ExtraCommondStr  = [RCCommandHelp getExtraFilesList];
-    [self send_data:ExtraCommondStr];
+//    NSString *ExtraCommondStr  = [RCCommandHelp getExtraFilesList];
+//    [self send_data:ExtraCommondStr];
+    
+    //改走http方案
+    [[NSNotificationCenter defaultCenter] postNotificationName:getExtraFilesDoneNotification object:nil];/*发送通知*/
 }
 
 #pragma mark 获取到云机以及外挂磁盘信息