Marino Faggiana 6 سال پیش
والد
کامیت
bb6b70e0c5
2فایلهای تغییر یافته به همراه32 افزوده شده و 3 حذف شده
  1. 6 0
      iOSClient/CCGlobal.h
  2. 26 3
      iOSClient/Main/CCMain.m

+ 6 - 0
iOSClient/CCGlobal.h

@@ -135,6 +135,12 @@
 #define k_taskStatusSuspend                             -3
 
 // Metadata : Status
+//
+// 1) wait download/upload
+// 2) in download/upload
+// 3) downloading/uploading
+// 4) done or error
+//
 #define k_metadataStatusNormal                          0
 #define k_metadataStatusHide                            1
 

+ 26 - 3
iOSClient/Main/CCMain.m

@@ -1098,7 +1098,7 @@
 
 - (void)downloadStart:(NSString *)fileID account:(NSString *)account task:(NSURLSessionDownloadTask *)task serverUrl:(NSString *)serverUrl
 {
-    [self reloadDatasource: serverUrl];
+    [self reloadDatasource:serverUrl];
     
     [appDelegate updateApplicationIconBadgeNumber];
 }
@@ -1299,7 +1299,7 @@
 
 - (void)uploadStart:(NSString *)fileID account:(NSString *)account task:(NSURLSessionUploadTask *)task serverUrl:(NSString *)serverUrl
 {
-    [self reloadDatasource: serverUrl];
+    [self reloadDatasource:serverUrl];
     
     [appDelegate updateApplicationIconBadgeNumber];
 }
@@ -4626,8 +4626,31 @@
         cell.labelTitle.textColor = [UIColor blackColor];
         cell.labelTitle.text = metadata.fileNameView;
         
-        cell.labelInfoFile.text = [CCUtility transformedSize:metadata.size];
+        // Write status on Label Info
+        NSString *statusString = @"";
+        switch (metadata.status) {
+            case 2:
+                statusString = NSLocalizedString(@"_status_wait_download_",nil);
+                break;
+            case 3:
+                statusString = NSLocalizedString(@"_status_in_download_",nil);
+                break;
+            case 4:
+                statusString = NSLocalizedString(@"_status_downloading_",nil);
+                break;
+            case 6:
+                statusString = NSLocalizedString(@"_status_wait_upload_",nil);
+                break;
+            case 7:
+                statusString = NSLocalizedString(@"_status_in_upload_",nil);
+                break;
+            case 8:
+                statusString = NSLocalizedString(@"_status_uploading_",nil);
+                break;
+        }
         
+        cell.labelInfoFile.text = [NSString stringWithFormat:@"%@ %@", [CCUtility transformedSize:metadata.size], statusString];
+
         BOOL iconFileExists = [[NSFileManager defaultManager] fileExistsAtPath:[CCUtility getDirectoryProviderStorageIconFileID:metadata.fileID fileNameView:metadata.fileNameView]];
 
         if (iconFileExists) {