marinofaggiana 4 年之前
父节点
当前提交
81276bf121

+ 10 - 8
iOSClient/EmptyView/NCEmptyDataSet.swift

@@ -17,12 +17,13 @@ class NCEmptyDataSet: NSObject {
         super.init()
         super.init()
 
 
         self.collectionView = collectionView
         self.collectionView = collectionView
+        
         if let emptyView = UINib(nibName: "NCEmptyView", bundle: nil).instantiate(withOwner: self, options: nil).first as? NCEmptyView {
         if let emptyView = UINib(nibName: "NCEmptyView", bundle: nil).instantiate(withOwner: self, options: nil).first as? NCEmptyView {
         
         
             self.emptyView = emptyView
             self.emptyView = emptyView
             
             
             emptyView.frame =  CGRect(x:0, y: 0, width:300, height:300)
             emptyView.frame =  CGRect(x:0, y: 0, width:300, height:300)
-            //emptyView.isHidden = true
+            emptyView.isHidden = true
             emptyView.translatesAutoresizingMaskIntoConstraints = false
             emptyView.translatesAutoresizingMaskIntoConstraints = false
 
 
             emptyView.emptyImage.image = image
             emptyView.emptyImage.image = image
@@ -31,19 +32,20 @@ class NCEmptyDataSet: NSObject {
                        
                        
             collectionView.addSubview(emptyView)
             collectionView.addSubview(emptyView)
 
 
-            emptyView.centerXAnchor.constraint(equalTo: collectionView.centerXAnchor, constant: 0).isActive = true
-            emptyView.topAnchor.constraint(equalTo: collectionView.topAnchor).isActive = true
+            let constantY: CGFloat = (collectionView.frame.height - emptyView.frame.height) / 2 - 100
+            
+            emptyView.centerXAnchor.constraint(equalTo: collectionView.centerXAnchor).isActive = true
+            emptyView.topAnchor.constraint(equalTo: collectionView.topAnchor, constant: constantY).isActive = true
             
             
-            emptyView.layoutIfNeeded()
+            //emptyView.layoutIfNeeded()
         }
         }
     }
     }
     
     
-    func reload() {
-        let items = collectionView?.numberOfItems(inSection: 0)
-        if items == 0 {
+    func numberOfItemsInSection(_ numberItems: Int) {
+        if numberItems == 0 {
             emptyView?.isHidden = false
             emptyView?.isHidden = false
         } else {
         } else {
-            //emptyView?.isHidden = true
+            emptyView?.isHidden = true
         }
         }
     }
     }
 }
 }

+ 1 - 3
iOSClient/Files/NCFiles.swift

@@ -79,9 +79,7 @@ class NCFiles: NCCollectionViewCommon  {
             
             
             DispatchQueue.main.async {
             DispatchQueue.main.async {
                 self.refreshControl.endRefreshing()
                 self.refreshControl.endRefreshing()
-                self.collectionView.reloadData()
-                
-                self.empty?.reload()
+                self.collectionView.reloadData()                
             }
             }
         }
         }
     }
     }

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

@@ -116,6 +116,8 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
         
         
         // Empty
         // Empty
         emptyDataSet = NCEmptyDataSet.init(collectionView: collectionView, image: emptyImage, title: emptyTitle, description: emptyDescription)
         emptyDataSet = NCEmptyDataSet.init(collectionView: collectionView, image: emptyImage, title: emptyTitle, description: emptyDescription)
+        //collectionView.emptyDataSetDelegate = self
+        //collectionView.emptyDataSetSource = self
         
         
         // 3D Touch peek and pop
         // 3D Touch peek and pop
         if traitCollection.forceTouchCapability == .available {
         if traitCollection.forceTouchCapability == .available {
@@ -1324,7 +1326,9 @@ extension NCCollectionViewCommon: UICollectionViewDataSource {
     }
     }
     
     
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return dataSource.numberOfItems()
+        let numberItems = dataSource.numberOfItems()
+        emptyDataSet?.numberOfItemsInSection(numberItems)
+        return numberItems
     }
     }
     
     
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {