处理 首页刷新的问题

galaxy/fastlane/Fastfile

@@ -17,7 +17,7 @@ platform :ios do
   youhua_branch = "youhua-dev"
   
   #打包正使用的分支
-  myPack_branch = "main"
+  myPack_branch = "630-dev"
 
   # 打adhoc包 执行命令 fastlane galaxyTest
   lane :galaxyTest do 
@@ -27,9 +27,9 @@ platform :ios do
      # 拉取最新代码
      sh "git pull origin #{myPack_branch}"
      # 显示git当前分支最新submit id
-     sh "git rev-parse HEAD"
+     # sh "git rev-parse HEAD"
      # 更新pod第三方库
-     cocoapods(use_bundle_exec: true)
+     # cocoapods(use_bundle_exec: true)
 
     gym(
     workspace: 'galaxy.xcworkspace',

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3732,7 +3732,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3936,7 +3936,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3982,7 +3982,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift

@@ -209,7 +209,7 @@ extension YHActivityListViewController {
             
             self.tableView.reloadData()
             self.emptyDataTipsView.isHidden = self.viewModel.arrActivityListData.count > 0 ? true : false
-            DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
+//            DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
                 self.tableView.es.stopPullToRefresh()
                 self.emptyDataTipsView.isHidden = self.viewModel.arrActivityListData.count > 0 ? true : false
 
@@ -221,7 +221,7 @@ extension YHActivityListViewController {
                         self.tableView.footer?.alpha = 0
                     }
                 }
-            })
+//            })
         }
     }
 }

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

@@ -292,7 +292,7 @@ private extension YHHomePageViewController {
                     UserDefaults.standard.synchronize()
                 }
                 
-                DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
+//                DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
                     self.homeCollectView.es.stopPullToRefresh()
                     
                     
@@ -305,8 +305,13 @@ private extension YHHomePageViewController {
                     self.homeCollectView.reloadData()
                     CATransaction.commit()
                     
-//                    self.requestOrder()
-                })
+                    
+                    DispatchQueue.main.asyncAfter(wallDeadline: .now() + 0.25, execute: {
+                        self.requestOrder()
+                    })
+                    
+                    
+//                })
             }
     }
     
@@ -413,8 +418,18 @@ extension YHHomePageViewController: UICollectionViewDelegate, UICollectionViewDa
 
 extension YHHomePageViewController : CollectionViewWaterfallLayoutDelegate {
     func collectionView(_ collectionView: UICollectionView, layout: UICollectionViewLayout, sizeForItemAtIndexPath indexPath: NSIndexPath) -> CGSize {
-        guard let model = self.viewModel.arrHomeNewsData?[indexPath.row] else { return CGSize.zero }
-        return CGSize(width: model.img_width_cell, height: model.img_height_cell)
+        
+        let count = self.viewModel.arrHomeNewsData?.count ?? 0
+        
+        if indexPath.row < count {
+            guard let model = self.viewModel.arrHomeNewsData?[indexPath.row] else { return CGSize.zero }
+            return CGSize(width: model.img_width_cell, height: model.img_height_cell)
+        }
+        
+        let width = (KScreenWidth - 47) / 2
+        return CGSize(width: width, height: 140.0)
+        
+        
     }
 }
 

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

@@ -270,9 +270,9 @@ class YHSearchInfomationVC: YHBaseViewController {
             emptyDataTipsView.isHidden = (items.count > 0)
             searchHistoryView.isHidden = true
             self.tableView.reloadData()
-            DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
-                self.tableView.es.stopPullToRefresh()
-            })
+//            DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
+            self.tableView.es.stopPullToRefresh()
+//            })
             // 只有一页的时候不展示没有更多数据了
             if self.viewModel.totalCount < self.viewModel.searchPageSize { // 不足一页
                 tableView.footer?.isHidden = true