Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -55,9 +55,8 @@ class YHHomePageViewController: YHBaseViewController {
         return view
     }()
     
-
-    var tapTimestamp : CFAbsoluteTime = -10.0
     
+    var tapTimestamp : CFAbsoluteTime = -10.0
 }
 
 private extension YHHomePageViewController {
@@ -68,24 +67,31 @@ private extension YHHomePageViewController {
     
     func getData() {
         self.homeHeaderView.homeBannerView.dataArr = [YHBannerModel.localDefaultItem()]
-        loadFirstData()
-        
-        viewModel.getHomeBanner(0) {[weak self] success, error in
-            guard let self = self else { return }
-            self.homeHeaderView.homeBannerView.dataArr = self.viewModel.banners ?? [YHBannerModel.localDefaultItem()]
+        DispatchQueue.global().async {
+            self.loadFirstData()
+            self.viewModel.getHomeBanner(0) {[weak self] success, error in
+                guard let self = self else { return }
+                DispatchQueue.main.async {
+                    self.homeHeaderView.homeBannerView.dataArr = self.viewModel.banners ?? [YHBannerModel.localDefaultItem()]
+                }
+            }
         }
+        
     }
     
     func loadMoreData() {
         viewModel.getHomeNewsList(firstPageFlag : false) {[weak self] success, error in
             guard let self = self else { return }
-            homeCollectView.es.stopLoadingMore()
-            
-            if self.viewModel.hasMoreForHomeNews == false {
-                homeCollectView.es.noticeNoMoreData()
-            }
-            self.homeCollectView.reloadItems(at: [IndexPath(index: 0)])
-
+            DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.35, execute: {
+                CATransaction.setDisableActions(true)
+                self.homeCollectView.reloadData()
+                CATransaction.commit()
+                
+                self.homeCollectView.es.stopLoadingMore()
+                if self.viewModel.hasMoreForHomeNews == false {
+                    self.homeCollectView.es.noticeNoMoreData()
+                }
+            })
         }
     }
     
@@ -93,11 +99,18 @@ private extension YHHomePageViewController {
         viewModel.getHomeNewsList(firstPageFlag : true) {[weak self] success, error in
             guard let self = self else { return }
             homeCollectView.es.stopPullToRefresh()
-
+            
             if self.viewModel.hasMoreForHomeNews == false {
                 homeCollectView.es.noticeNoMoreData()
             }
-            self.homeCollectView.reloadItems(at: [IndexPath(index: 0)])
+            
+            DispatchQueue.main.async {
+                CATransaction.setDisableActions(true)
+                self.homeCollectView.reloadData()
+                CATransaction.commit()
+            }
+            
+            
         }
     }
     
@@ -136,6 +149,8 @@ private extension YHHomePageViewController {
         r.origin.y = r.origin.y - YHHomeHeadView.viewH
         tmpHeadView.frame = r
         
+        homeCollectView.showsHorizontalScrollIndicator = false
+        homeCollectView.showsVerticalScrollIndicator = false
         homeCollectView.es.addInfiniteScrolling {
             self.loadMoreData()
         }
@@ -218,7 +233,7 @@ extension YHHomePageViewController : UITabBarControllerDelegate {
             UIApplication.shared.applicationIconBadgeNumber = 0
         }
     }
-
+    
     
     func tabBarController(_ tabBarController: UITabBarController, shouldSelect viewController: UIViewController) -> Bool {
         guard let index = tabBarController.viewControllers?.firstIndex(of: viewController) else {

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerCollectionViewCell.swift

@@ -27,6 +27,7 @@ class YHHomeBannerCollectionViewCell: FSPagerViewCell {
         let imagV : UIImageView = UIImageView()
         imagV.contentMode = .scaleAspectFill
         imagV.clipsToBounds = true
+        imagV.image = UIImage(named: "global_default_image")
         return imagV
     }()
     
@@ -86,9 +87,9 @@ private extension YHHomeBannerCollectionViewCell {
             effectV.isHidden = false
             
             if let url = URL(string: model.img_url) {
-//                bannerImagV.kf.setImage(with: url)
                 bannerImagV.kf.setImage(with: url, placeholder: UIImage(named: "global_default_image"))
-
+            } else {
+                bannerImagV.image = UIImage(named: "global_default_image")
             }
             bannerTitleLable.text = model.name
         }