Bladeren bron

1.修改下载空间不足的bug
2.发现单点登录消息改为1分钟一次

huangxiaodong 1 jaar geleden
bovenliggende
commit
f2f661100c

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

@@ -244,8 +244,6 @@
 		6B7B65592AD9227700BE8CB3 /* PlayerViewController+otherDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 6B7B65572AD9227700BE8CB3 /* PlayerViewController+otherDelegate.mm */; };
 		6B8FF6B92B04E19600800981 /* uploadFileRecordheadView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B8FF6B72B04E19600800981 /* uploadFileRecordheadView.h */; };
 		6B8FF6BA2B04E19600800981 /* uploadFileRecordheadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B8FF6B82B04E19600800981 /* uploadFileRecordheadView.m */; };
-		6B8FF6BD2B04EB7100800981 /* uploadFileRecordBodyView.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B8FF6BB2B04EB7100800981 /* uploadFileRecordBodyView.h */; };
-		6B8FF6BE2B04EB7100800981 /* uploadFileRecordBodyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B8FF6BC2B04EB7100800981 /* uploadFileRecordBodyView.m */; };
 		6B8FF6C12B05B24D00800981 /* uploadFileRecordCell.h in Headers */ = {isa = PBXBuildFile; fileRef = 6B8FF6BF2B05B24D00800981 /* uploadFileRecordCell.h */; };
 		6B8FF6C22B05B24D00800981 /* uploadFileRecordCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 6B8FF6C02B05B24D00800981 /* uploadFileRecordCell.m */; };
 		6BA533382B16E65500D1CB5C /* TvStatusModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 6BA533362B16E65500D1CB5C /* TvStatusModel.h */; };
@@ -693,8 +691,6 @@
 		6B7B65702ADEAE3D00BE8CB3 /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
 		6B8FF6B72B04E19600800981 /* uploadFileRecordheadView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = uploadFileRecordheadView.h; sourceTree = "<group>"; };
 		6B8FF6B82B04E19600800981 /* uploadFileRecordheadView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = uploadFileRecordheadView.m; sourceTree = "<group>"; };
-		6B8FF6BB2B04EB7100800981 /* uploadFileRecordBodyView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = uploadFileRecordBodyView.h; sourceTree = "<group>"; };
-		6B8FF6BC2B04EB7100800981 /* uploadFileRecordBodyView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = uploadFileRecordBodyView.m; sourceTree = "<group>"; };
 		6B8FF6BF2B05B24D00800981 /* uploadFileRecordCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = uploadFileRecordCell.h; sourceTree = "<group>"; };
 		6B8FF6C02B05B24D00800981 /* uploadFileRecordCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = uploadFileRecordCell.m; sourceTree = "<group>"; };
 		6BA533362B16E65500D1CB5C /* TvStatusModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TvStatusModel.h; sourceTree = "<group>"; };
@@ -1350,8 +1346,6 @@
 				6B05826E2AFF692700D37290 /* photoPreViewBottomView.m */,
 				6B8FF6B72B04E19600800981 /* uploadFileRecordheadView.h */,
 				6B8FF6B82B04E19600800981 /* uploadFileRecordheadView.m */,
-				6B8FF6BB2B04EB7100800981 /* uploadFileRecordBodyView.h */,
-				6B8FF6BC2B04EB7100800981 /* uploadFileRecordBodyView.m */,
 			);
 			path = photoView;
 			sourceTree = "<group>";
@@ -1956,7 +1950,6 @@
 				6B1FBD2A2B452B3800926382 /* backupsFileManager.h in Headers */,
 				6B5B60652B3D5FD8009A2AE2 /* fileTransfeSetViewController.h in Headers */,
 				6B4D23B12B33DDBC005B718A /* imageVersionRenewTipView.h in Headers */,
-				6B8FF6BD2B04EB7100800981 /* uploadFileRecordBodyView.h in Headers */,
 				6B0582892B045E0B00D37290 /* uploadFileDataModel.h in Headers */,
 				6BF52C972AD5546500A617DB /* SimplePing.h in Headers */,
 				6B3F96342AD2A15A008E349E /* netWorkManager.h in Headers */,
@@ -2377,7 +2370,6 @@
 				183AE7C82A8CB39100B11CB0 /* SafeForKey.m in Sources */,
 				183AE6042A89CE3C00B11CB0 /* JSONModel.m in Sources */,
 				18FCE5492AD15E750020F623 /* PlayerViewController+AppDelegate.m in Sources */,
-				6B8FF6BE2B04EB7100800981 /* uploadFileRecordBodyView.m in Sources */,
 				6BF52C9A2AD5546500A617DB /* WHPingTester.m in Sources */,
 				6BFF268D2AF8E1C600FCB4F7 /* forgetPwdViewController.m in Sources */,
 				6B72724C2B0AF59200C03F87 /* uploadFileRecordTableViewHeadView.m in Sources */,

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

@@ -31,6 +31,7 @@
     [self.view setBackgroundColor:HWF5F7FAColor];
     
     _folderListArr = [NSMutableArray new];
+    _selectIndex = -1;
     
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(createFolderDoneNotFun:) name:createFolderDoneNotification object:nil];
     

+ 34 - 0
创维盒子/双子星云手机/Class/Set/uploadFile/uploadFileManager/downloadManager.m

@@ -7,6 +7,9 @@
 
 #import "downloadManager.h"
 #import "cachesFileManager.h"
+#import <sys/mount.h>
+#include <sys/param.h>
+
 @interface downloadManager ()
 /**检测任务10s后 无反馈重新开始 */
 @property (nonatomic, assign) NSInteger  taskRenewTime; //
@@ -164,6 +167,22 @@ static downloadManager * cur_downloadManager = nil;
     [self beginDownloadFileFun];
 }
 
+
+- (BOOL)checkFreeDiskSpaceInBytesIsOK:(long)fileByte{
+    struct statfs buf;
+    unsigned long long freeSpace = -1;
+    if (statfs("/var", &buf) >= 0) {
+        freeSpace = (unsigned long long)(buf.f_bsize * buf.f_bavail);
+    }
+    
+    long space = freeSpace - fileByte;
+    if( space/fileByte < 2.0 || space < 500*1024*1024){
+        return NO;
+    }
+    
+    return YES;
+}
+
 - (void)beginDownloadFileFun
 {
     if(_downLoadFileModelDataArr.count == 0)
@@ -191,6 +210,13 @@ static downloadManager * cur_downloadManager = nil;
         return;
     }
     
+    if(![self checkFreeDiskSpaceInBytesIsOK:_curDownloadFileModel.length]){
+        mainBlock(^{
+            [[iToast makeText:NSLocalizedString(@"phone_space_Insufficient",nil)] show];
+        });
+        return;
+    }
+    
     _curDownloadFileModel.curDownloadStateType = downloadStateUploading;
     
     [[NSNotificationCenter defaultCenter] postNotificationName:downloadFileBeginNotification object:_curDownloadFileModel];
@@ -424,6 +450,14 @@ static downloadManager * cur_downloadManager = nil;
         return;
     }
     
+    if(![self checkFreeDiskSpaceInBytesIsOK:_curDownloadFileModel.length]){
+        mainBlock(^{
+            [[iToast makeText:NSLocalizedString(@"phone_space_Insufficient",nil)] show];
+        });
+        _curDownloadFileModel = nil;
+        return;
+    }
+    
     [[NSNotificationCenter defaultCenter] postNotificationName:downloadFileBeginNotification object:_curDownloadFileModel];
 }
 @end

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

@@ -144,6 +144,9 @@ ComontAlretViewControllerDelegate>
 @property (nonatomic, assign) NSInteger          currentTime;
 /**定时器计数*/
 @property (nonatomic, assign) NSInteger          webSocketTime;
+/**定时器计数*/
+@property (nonatomic, assign) NSInteger          offlineNotTime;
+
 /**定时器计数 任务检测*/
 @property (nonatomic, assign) NSInteger          webSocketTaskTime;
 
@@ -199,6 +202,7 @@ ComontAlretViewControllerDelegate>
     outputVolumeKVO = NO;
     
     rbdNotification = 0;
+    _offlineNotTime = 0;
     
     // 初始化
     self.isNeedRecyclResource = YES;
@@ -2828,6 +2832,7 @@ static int  couneeee = 0;
     }
 }
 
+
 - (void)timerChange {
     
     self.currentTime++;// 0、定时器计数
@@ -2853,8 +2858,12 @@ static int  couneeee = 0;
         self.webSocketTaskTime = 0;
         [self checkAllTaskFun];
         
-        NSString *commondStr  = @"{\"type\":\"forwardMsg\",\"data\":\"offline_notification\"}";
-        [self send_data:commondStr];
+        _offlineNotTime ++;
+        if(_offlineNotTime > 6){
+            NSString *commondStr  = @"{\"type\":\"forwardMsg\",\"data\":\"offline_notification\"}";
+            [self send_data:commondStr];
+            _offlineNotTime = 0;
+        }
     }
     
     //HLog(@"webSocketTime %ld",self.webSocketTaskTime);

+ 1 - 0
创维盒子/双子星云手机/en.lproj/Localizable.strings

@@ -368,3 +368,4 @@
 "File_upload_Record_download_fail"   = "download failed";
 "File_Record_backups_set_close_tip"   = "Backup settings are turned off";
 "File_Record_backups_photo_close_tip"   = "Album permission has been turned off";
+"phone_space_Insufficient"   = "Insufficient phone space";

+ 1 - 0
创维盒子/双子星云手机/ja.lproj/Localizable.strings

@@ -367,3 +367,4 @@
 "File_upload_Record_download_fail"   = "ダウンロードに失敗しました";
 "File_Record_backups_set_close_tip"   = "バックアップ設定がオフになっています";
 "File_Record_backups_photo_close_tip"   = "アルバムの許可がオフになっています";
+"phone_space_Insufficient"   = "携帯電話のスペースが不足している";

+ 1 - 0
创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -367,3 +367,4 @@
 "File_upload_Record_download_fail"   = "下载失败";
 "File_Record_backups_set_close_tip"   = "备份设置已关闭";
 "File_Record_backups_photo_close_tip"   = "相册权限已关闭";
+"phone_space_Insufficient"   = "手机空间不足";

+ 1 - 0
创维盒子/双子星云手机/zh-Hant.lproj/Localizable.strings

@@ -367,3 +367,4 @@
 "File_upload_Record_download_fail"   = "下載失敗";
 "File_Record_backups_set_close_tip"   = "備份設定已關閉";
 "File_Record_backups_photo_close_tip"   = "相簿權限已關閉";
+"phone_space_Insufficient"   = "手機空間不足";