marinofaggiana 4 년 전
부모
커밋
b5a3571202
3개의 변경된 파일11개의 추가작업 그리고 13개의 파일을 삭제
  1. 2 4
      iOSClient/Data/NCDataSource.swift
  2. 5 5
      iOSClient/Main/Colleaction Common/NCCollectionViewCommon.swift
  3. 4 4
      iOSClient/Select/NCSelect.swift

+ 2 - 4
iOSClient/Data/NCDataSource.swift

@@ -27,7 +27,7 @@ class NCDataSource: NSObject {
     
     public var metadatas: [tableMetadata] = []
     public var metadataShare: [String:tableShare] = [:]
-    public var metadataLocalImage: [String:String] = [:]
+    public var metadataOffLine: [String] = []
 
     private var ascending: Bool = true
     private var sort: String = ""
@@ -122,9 +122,7 @@ class NCDataSource: NSObject {
                         NCManageDatabase.sharedInstance.addLocalFile(metadata: metadata)
                     }
                     if tableLocalFile?.offline ?? false {
-                        metadataLocalImage[metadata.ocId] = "offlineFlag"
-                    } else {
-                        metadataLocalImage[metadata.ocId] = "local"
+                        metadataOffLine.append(metadata.ocId)
                     }
                 }
             }

+ 5 - 5
iOSClient/Main/Colleaction Common/NCCollectionViewCommon.swift

@@ -1397,11 +1397,11 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                 }
                 
                 cell.labelInfo.text = CCUtility.dateDiff(metadata.date as Date) + " · " + CCUtility.transformedSize(metadata.size)
-                
+                                
                 // image local
-                if dataSource.metadataLocalImage[metadata.ocId] == "offlineFlag" {
+                if dataSource.metadataOffLine.contains(metadata.ocId) {
                     cell.imageLocal.image = NCCollectionCommon.images.cellOfflineFlag
-                } else if dataSource.metadataLocalImage[metadata.ocId] == "local" {
+                } else if CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
                     cell.imageLocal.image = NCCollectionCommon.images.cellLocal
                 }
             }
@@ -1580,9 +1580,9 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
                 }
                 
                 // image Local
-                if dataSource.metadataLocalImage[metadata.ocId] == "offlineFlag" {
+                if dataSource.metadataOffLine.contains(metadata.ocId) {
                     cell.imageLocal.image = NCCollectionCommon.images.cellOfflineFlag
-                } else if dataSource.metadataLocalImage[metadata.ocId] == "local" {
+                } else if CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
                     cell.imageLocal.image = NCCollectionCommon.images.cellLocal
                 }
             }

+ 4 - 4
iOSClient/Select/NCSelect.swift

@@ -544,9 +544,9 @@ extension NCSelect: UICollectionViewDataSource {
                 cell.labelInfo.text = CCUtility.dateDiff(metadata.date as Date) + " · " + CCUtility.transformedSize(metadata.size)
                 
                 // image local
-                if dataSource.metadataLocalImage[metadata.ocId] == "offlineFlag" {
+                if dataSource.metadataOffLine.contains(metadata.ocId) {
                     cell.imageLocal.image = NCCollectionCommon.images.cellOfflineFlag
-                } else if dataSource.metadataLocalImage[metadata.ocId] == "local" {
+                } else if CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
                     cell.imageLocal.image = NCCollectionCommon.images.cellLocal
                 }
             }
@@ -671,9 +671,9 @@ extension NCSelect: UICollectionViewDataSource {
                 }
                 
                 // image Local
-                if dataSource.metadataLocalImage[metadata.ocId] == "offlineFlag" {
+                if dataSource.metadataOffLine.contains(metadata.ocId) {
                     cell.imageLocal.image = NCCollectionCommon.images.cellOfflineFlag
-                } else if dataSource.metadataLocalImage[metadata.ocId] == "local" {
+                } else if CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
                     cell.imageLocal.image = NCCollectionCommon.images.cellLocal
                 }
             }