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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // tag 2.3.9-3
  无状态刷新bug处理

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2944,7 +2944,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3145,7 +3145,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3187,7 +3187,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

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

@@ -120,6 +120,9 @@ extension YHFourKingViewController : UITableViewDelegate,UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        if sectionView.items.count == 1 {
+            return 0
+        }
         return 48
     }
     

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

@@ -36,7 +36,7 @@ private extension YHHomeSearchView {
         
         
         let lable = UILabel()
-        lable.text = "大家正在搜香港身份"
+        lable.text = "香港身份"
         lable.font = UIFont.PFSC_R(ofSize: 12)
         lable.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
         addSubview(lable)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServerHKLifeViewController.swift

@@ -110,9 +110,9 @@ extension YHServerHKLifeViewController {
         homeTableView.dataSource = self
         homeTableView.es.addInfiniteScrolling {[weak self] in
             guard let self = self else { return }
-            self.homeTableView.es.stopLoadingMore()
             self.homeViewModel.getList(false, self.classId) {[weak self] success, error in
                 guard let self = self else { return }
+                self.homeTableView.es.stopLoadingMore()
                 self.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
                 if self.homeViewModel.hasMoreForHomeNews == false {
                     self.homeTableView.es.noticeNoMoreData()
@@ -134,6 +134,9 @@ extension YHServerHKLifeViewController : UITableViewDelegate,UITableViewDataSour
     }
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        if sectionView.items.count == 1 {
+            return 0
+        }
         return 48
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceListViewController.swift

@@ -107,6 +107,7 @@ extension YHServiceListViewController {
                 guard let self = self else { return }
                 self.homeViewModel.getList(false, self.classId) {[weak self] success, error in
                     guard let self = self else { return }
+                    self.normalView.homeTableView.es.stopLoadingMore()
                     self.normalView.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
                     if self.homeViewModel.hasMoreForHomeNews == false {
                         self.normalView.homeTableView.es.noticeNoMoreData()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServerNoOrderView.swift

@@ -70,7 +70,6 @@ class YHServerNoOrderView: UIView {
         
         homeTableView.es.addInfiniteScrolling {[weak self] in
             guard let self = self else { return }
-            self.homeTableView.es.stopLoadingMore()
             if let block = self.loadMoreBlock {
                 block(YHClassifyModel())
             }
@@ -90,6 +89,9 @@ extension YHServerNoOrderView : UITableViewDelegate,UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        if sectionView.items.count == 1 {
+            return 0
+        }
         return 48
     }