소스 검색

真机开启流量网络,NAS模块传输设置未开启流量传输,选中视频进行下载,下载任务在进行中

huangxiaodong 7 달 전
부모
커밋
790bbe5845

+ 15 - 0
创维盒子/双子星云手机/NAS/nasDownloadManager/nasDownloadFileManager.m

@@ -333,6 +333,21 @@ static nasDownloadFileManager * cur_nasDownloadFileManager = nil;
             [URLEncodedStringArr addObject:requestURLEncodedString];
         }
         
+        
+        BOOL isCanUseCellular = [HWDataManager getBoolWithKey:stringKeyAddSn(Const_file_Transfe_canUse_Cellular_all)];
+        if(!isCanUseCellular){//不允许流量上传
+            //
+            if([AFNetworkReachabilityManager sharedManager].networkReachabilityStatus == AFNetworkReachabilityStatusReachableViaWWAN){
+                mainBlock(^{
+                    [[iToast makeText:NSLocalizedString(@"File_Transfer_By_Cellular_tip",nil)] show];
+                });
+                [self saveDownloadloadingTaskByNetWorkErrorFun];
+                return;
+            }
+            
+        }
+        
+        
         [[nasDownloadManager shareManager] addDownloadWithURLs:URLEncodedStringArr];
         
     }

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

@@ -206,7 +206,7 @@
                         bitrate:bitrate//3200//3000
                       cardWidth:(NSInteger)phoneSize.width//0//1080//0
                      cardHeight:(NSInteger)phoneSize.height//0//1920//0
-                    cardDensity:0
+                    cardDensity:cardDensity
                           token:@"vclusters"];
     
     HLog(@"result:%ld",result)
@@ -767,9 +767,10 @@
     BOOL fullscreenType = [HWDataManager getBoolWithKey:Consn_player_full_screen_show];
     
     CGFloat tempRate = 0.0;
+    NSInteger cardDensity = 480;
     //重新设置分辨率
     if(fullscreenType){
-        NSInteger cardDensity = 320;//380;//480;//422;//380;//460;
+        cardDensity = 320;//380;//480;//422;//380;//460;
         CGSize size = [RCCommandHelp commondToSetFullScreenPhoneSizeBySize];
         
         if(isLan){
@@ -778,7 +779,7 @@
             }
         }
         
-        [self setCardSize:size.width cardHeight:size.height cardDensity:0];
+        [self setCardSize:size.width cardHeight:size.height cardDensity:cardDensity];
         
         tempRate = (size.width *1.0)/(size.height *1.0);
     }
@@ -787,7 +788,7 @@
         if(isLan){
             size = CGSizeMake(1920.0, 1080.0);
         }
-        [self setCardSize:(NSInteger)size.width cardHeight:(NSInteger)size.height cardDensity:0];
+        [self setCardSize:(NSInteger)size.width cardHeight:(NSInteger)size.height cardDensity:cardDensity];
         
         tempRate = size.width/size.height;
     }