فهرست منبع

New procedure Sync Cell animation

Marino Faggiana 8 سال پیش
والد
کامیت
438405caac

+ 0 - 3
iOSClient/AppDelegate.h

@@ -140,9 +140,6 @@
 // List Change Task
 @property (nonatomic, retain) NSMutableDictionary *listChangeTask;
 
-// List folder in Synchronization mode
-@property (nonatomic, retain) NSMutableArray *listFolderSynchronization;
-
 // Player Audio
 @property (nonatomic, strong) LMMediaPlayerView *player;
 

+ 28 - 29
iOSClient/AppDelegate.m

@@ -162,7 +162,6 @@
     self.listProgressMetadata = [[NSMutableDictionary alloc] init];
     self.listChangeTask = [[NSMutableDictionary alloc] init];
     self.listMainVC = [[NSMutableDictionary alloc] init];
-    self.listFolderSynchronization = [[NSMutableArray alloc] init];
     
     // Player audio
     self.player = [LMMediaPlayerView sharedPlayerView];
@@ -402,6 +401,27 @@
 {
     // BACKGROND & FOREGROUND
     
+    /* Disactive Graphics Animation Synchronization Folders */
+    
+    NSMutableOrderedSet *serversUrlDownload = [[NSMutableOrderedSet alloc] init];
+    NSMutableArray *metadatasNet = [self verifyExistsInQueuesDownloadSelector:selectorDownloadSynchronized];
+    for (CCMetadataNet *metadataNet in metadatasNet)
+        [serversUrlDownload addObject:metadataNet.serverUrl];
+    
+    NSMutableOrderedSet *synchronizationServerUrlInProgressTemp = [[NSMutableOrderedSet alloc] initWithOrderedSet:[CCSynchronization sharedSynchronization].synchronizationServerUrlInProgress copyItems:YES];
+    for (NSString *serverUrl in synchronizationServerUrlInProgressTemp) {
+        
+        if ([serversUrlDownload containsObject:serverUrl] == NO) {
+            
+            NSString *serverUrlSynchronized = [CCUtility deletingLastPathComponentFromServerUrl:serverUrl];
+            CCMain *viewController = [app.listMainVC objectForKey:serverUrlSynchronized];
+            if (viewController)
+                [viewController synchronizedFolderGraphicsCell:nil serverUrl:serverUrl animation:NO];
+            
+            // remove
+            [[CCSynchronization sharedSynchronization].synchronizationServerUrlInProgress removeObject:serversUrlDownload];
+        }
+    }
     
     // ONLY BACKGROUND
     
@@ -720,34 +740,22 @@
     
     _queueNumUpload = [[CCCoreData getTableMetadataUploadAccount:self.activeAccount] count];
     _queueNumUploadWWan = [[CCCoreData getTableMetadataUploadWWanAccount:self.activeAccount] count];
-        
-    // Clear list folder in Synchronization
-    [self.listFolderSynchronization removeAllObjects];
-        
+    
     // netQueueDownload
     for (NSOperation *operation in [app.netQueueDownload operations]) {
         
         /*** NEXTCLOUD OWNCLOUD ***/
         
-        if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud]) {
-            
+        if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud])
             if (((OCnetworking *)operation).isExecuting == NO) _queueNunDownload++;
-            
-            if ([((OCnetworking *)operation).metadataNet.selector isEqualToString:selectorDownloadSynchronized])
-                [_listFolderSynchronization addObject:((OCnetworking *)operation).metadataNet.serverUrl];
-        }
         
 #ifdef CC
         
         /*** DROPBOX ***/
 
-        if ([app.typeCloud isEqualToString:typeCloudDropbox]) {
-            
+        if ([app.typeCloud isEqualToString:typeCloudDropbox])
             if (((DBnetworking *)operation).isExecuting == NO) _queueNunDownload++;
-            
-            if ([((DBnetworking *)operation).metadataNet.selector isEqualToString:selectorDownloadSynchronized])
-                [_listFolderSynchronization addObject:((DBnetworking *)operation).metadataNet.serverUrl];
-        }
+
 #endif
     }
     
@@ -756,25 +764,16 @@
         
         /*** NEXTCLOUD OWNCLOUD ***/
         
-        if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud]) {
-            
+        if ([app.typeCloud isEqualToString:typeCloudOwnCloud] || [app.typeCloud isEqualToString:typeCloudNextcloud])
             if (((OCnetworking *)operation).isExecuting == NO) _queueNumDownloadWWan++;
-            
-            if ([((OCnetworking *)operation).metadataNet.selector isEqualToString:selectorDownloadSynchronized])
-                [_listFolderSynchronization addObject:((OCnetworking *)operation).metadataNet.serverUrl];
-        }
         
 #ifdef CC
         
         /*** DROPBOX ***/
         
-        if ([app.typeCloud isEqualToString:typeCloudDropbox]) {
-            
+        if ([app.typeCloud isEqualToString:typeCloudDropbox])
             if (((DBnetworking *)operation).isExecuting == NO) _queueNumDownloadWWan++;
-            
-            if ([((DBnetworking *)operation).metadataNet.selector isEqualToString:selectorDownloadSynchronized])
-                [_listFolderSynchronization addObject:((DBnetworking *)operation).metadataNet.serverUrl];
-        }
+
 #endif
     }
     

+ 1 - 2
iOSClient/Main/CCMain.h

@@ -82,7 +82,6 @@
 
 @property (nonatomic, weak) CCShareOC* shareOC;
 
-
 @property (nonatomic, weak) CCDetail *detailViewController;
 
 @property (nonatomic, weak) CCLoginNCOC *loginVC;
@@ -106,7 +105,7 @@
 - (void)requestSharedByServer;
 - (void)requestServerInformation;
 
-- (void)synchronizedFolderGraphicsCell:(CCCellMainTransfer *)cell serverUrl:(NSString *)serverUrl cryptated:(BOOL)cryptated;
+- (void)synchronizedFolderGraphicsCell:(CCCellMainTransfer *)cell serverUrl:(NSString *)serverUrl animation:(BOOL)animation;
 
 - (void)clearDateReadDataSource:(NSNotification *)notification;
 

+ 4 - 19
iOSClient/Main/CCMain.m

@@ -1151,15 +1151,6 @@
     // Synchronize
     if ([selector isEqualToString:selectorDownloadSynchronized]) {
         
-        NSString *serverUrlSynchronized = [CCUtility deletingLastPathComponentFromServerUrl:serverUrl];
-        CCMain *viewController = [app.listMainVC objectForKey:serverUrlSynchronized];
-        if (viewController) {
-            
-            [app updateApplicationIconBadgeNumber];
-            
-            [viewController synchronizedFolderGraphicsCell:nil serverUrl:serverUrl cryptated:NO];
-        }
-        
         [self getDataSourceWithReloadTableView:metadata.directoryID fileID:metadata.fileID selector:selector];
     }
     
@@ -5019,14 +5010,6 @@
         
         lunghezzaFile = @" ";
         
-        // ----------------------------------------------------------------------------------------------------------
-        // Synchronize
-        // ----------------------------------------------------------------------------------------------------------
-        
-        NSString *synchronizedServerUrl = [CCUtility stringAppendServerUrl:_localServerUrl addServerUrl:metadata.fileNameData];
-        if ([CCCoreData isSynchronizedDirectory:synchronizedServerUrl activeAccount:app.activeAccount])
-            [self synchronizedFolderGraphicsCell:cell serverUrl:synchronizedServerUrl cryptated:metadata.cryptated];
-
     } else {
     
         // è un file
@@ -5473,8 +5456,10 @@
 #pragma mark ===== Synchronize Cell =====
 #pragma --------------------------------------------------------------------------------------------
 
-- (void)synchronizedFolderGraphicsCell:(CCCellMainTransfer *)cell serverUrl:(NSString *)serverUrl cryptated:(BOOL)cryptated
+- (void)synchronizedFolderGraphicsCell:(CCCellMainTransfer *)cell serverUrl:(NSString *)serverUrl animation:(BOOL)animation
 {
+    BOOL cryptated = NO;
+    
     if (!cell)
         for (NSString* fileID in _sectionDataSource.allRecordsDataSource) {
         
@@ -5494,7 +5479,7 @@
     if (!cell)
         return;
     
-    if ([app.listFolderSynchronization containsObject:serverUrl]) {
+    if (animation) {
         
         NSURL *myURL;
         

+ 1 - 0
iOSClient/Synchronization/CCSynchronization.h

@@ -29,6 +29,7 @@
 @interface CCSynchronization : NSObject
 
 @property (nonatomic, strong) CCHud *hud;
+@property (nonatomic, strong) NSMutableOrderedSet *synchronizationServerUrlInProgress;
 
 + (CCSynchronization *)sharedSynchronization;
 

+ 19 - 2
iOSClient/Synchronization/CCSynchronization.m

@@ -42,6 +42,7 @@
         if (!sharedSynchronization) {
             
             sharedSynchronization = [[CCSynchronization alloc] init];
+            sharedSynchronization.synchronizationServerUrlInProgress = [[NSMutableOrderedSet alloc] init];
         }
         return sharedSynchronization;
     }
@@ -268,7 +269,6 @@
             }
             
             [metadatas addObject:metadata];
-            
         }
     }
     
@@ -333,13 +333,30 @@
                 [app addNetworkingOperationQueue:app.netQueueDownloadWWan delegate:app.activeMain metadataNet:metadataNet oneByOne:YES];
             else
                 [app addNetworkingOperationQueue:app.netQueueDownload delegate:app.activeMain metadataNet:metadataNet oneByOne:YES];
-                        
+            
+            // Insert serverUrl for check animation
+            [[CCSynchronization sharedSynchronization].synchronizationServerUrlInProgress addObject:serverUrl];
         }
     
+        /* Active Graphics Animation Synchronization Folders */
+        
+        for(NSString *serverUrl in [CCSynchronization sharedSynchronization].synchronizationServerUrlInProgress) {
+            
+            NSString *serverUrlSynchronized = [CCUtility deletingLastPathComponentFromServerUrl:serverUrl];
+            CCMain *viewController = [app.listMainVC objectForKey:serverUrlSynchronized];
+            if (viewController)
+                [viewController synchronizedFolderGraphicsCell:nil serverUrl:serverUrl animation:YES];
+        }
+         
         [app.activeMain getDataSourceWithReloadTableView:directoryID fileID:nil selector:nil];
         
         [_hud hideHud];
     });
 }
 
+- (void)cellAnimation
+{
+    
+}
+
 @end