浏览代码

dev new UI

Marino Faggiana 6 年之前
父节点
当前提交
cd540cb961

+ 2 - 3
iOSClient/Database/NCManageDatabase.swift

@@ -2526,7 +2526,7 @@ class NCManageDatabase: NSObject {
         }
     }
     
-    @objc func getTrash(filePath: String) -> tableTrash? {
+    @objc func getTrash(filePath: String) -> [tableTrash]? {
         
         guard let tableAccount = self.getAccountActive() else {
             return nil
@@ -2537,8 +2537,7 @@ class NCManageDatabase: NSObject {
         
         let results = realm.objects(tableTrash.self).filter("account = %@ AND filePath = %@", tableAccount.account, filePath)
 
-        
-        return tableTrash.init(value: results)
+        return Array(results.map { tableTrash.init(value:$0) })
     }
     
     //MARK: -

+ 23 - 0
iOSClient/Images.xcassets/rotate.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "rotate.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "rotate@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "rotate@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

二进制
iOSClient/Images.xcassets/rotate.imageset/rotate.png


二进制
iOSClient/Images.xcassets/rotate.imageset/rotate@2x.png


二进制
iOSClient/Images.xcassets/rotate.imageset/rotate@3x.png


+ 6 - 0
iOSClient/Trash/NCTrash.swift

@@ -43,6 +43,12 @@ class NCTrash: UIViewController , UICollectionViewDataSource, UICollectionViewDe
             path = k_dav + "/trashbin/" + userID! + "/trash/"
         }
         
+        let results = NCManageDatabase.sharedInstance.getTrash(filePath: path)
+        if (results != nil) {
+            datasource = results!
+            collectionView.reloadData()
+        }
+        
         let ocNetworking = OCnetworking.init(delegate: self, metadataNet: nil, withUser: appDelegate.activeUser, withUserID: appDelegate.activeUserID, withPassword: appDelegate.activePassword, withUrl: appDelegate.activeUrl)
         
         ocNetworking?.listingTrash(appDelegate.activeUrl, path:path, account: appDelegate.activeAccount, success: { (item) in