Merge branch 'develop'

* develop:
  修改版本号 0.5.0
  删除 加载状态
  消息跳转签字返回的问题
  修改一处色值
  待开始  色值
  UI走查修改
  修改 首页一处空间
  兼容处理首页 total不一致的bug

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2985,7 +2985,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3010,7 +3010,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.10;
+				MARKETING_VERSION = 0.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3191,7 +3191,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3216,7 +3216,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.10;
+				MARKETING_VERSION = 0.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3239,7 +3239,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3264,7 +3264,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.10;
+				MARKETING_VERSION = 0.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/Classes/Base/C/YHBaseViewController.swift

@@ -28,7 +28,7 @@ class YHBaseViewController: UIViewController {
 #if DEBUG
         IQKeyboardManager.shared.enable = true
 #endif
-        navigationController?.interactivePopGestureRecognizer?.delegate = self
+//        navigationController?.interactivePopGestureRecognizer?.delegate = self
     }
     
     override var prefersStatusBarHidden: Bool {
@@ -75,10 +75,10 @@ class YHBaseViewController: UIViewController {
     }
 }
 
-extension YHBaseViewController: UIGestureRecognizerDelegate {
-    // 这个方法是在手势将要激活前调用
-    // 返回YES允许右滑手势的激活，返回NO不允许右滑手势的激活
-    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        return true
-    }
-}
+//extension YHBaseViewController: UIGestureRecognizerDelegate {
+////     这个方法是在手势将要激活前调用
+////     返回YES允许右滑手势的激活，返回NO不允许右滑手势的激活
+//    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+//        return true
+//    }
+//}

galaxy/galaxy/Classes/Base/C/YHNavigationController.swift

@@ -10,7 +10,7 @@ import UIKit
 class YHNavigationController: UINavigationController {
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.interactivePopGestureRecognizer?.delegate = self
+//        self.interactivePopGestureRecognizer?.delegate = self
     }
 
     override func pushViewController(_ viewController: UIViewController, animated: Bool) {
@@ -22,22 +22,22 @@ class YHNavigationController: UINavigationController {
     }
 }
 
-extension YHNavigationController: UIGestureRecognizerDelegate {
-    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
-        if self.viewControllers.count <= 1 {
-            return false
-        }
-        return true
-    }
-    
-    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
-        if touch.view == gestureRecognizer.view {
-            return true
-        }
-        return false
-    }
-    
-    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
-        return false
-    }
-}
+//extension YHNavigationController: UIGestureRecognizerDelegate {
+//    func gestureRecognizerShouldBegin(_ gestureRecognizer: UIGestureRecognizer) -> Bool {
+//        if self.viewControllers.count <= 1 {
+//            return false
+//        }
+//        return true
+//    }
+//    
+//    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+//        if touch.view == gestureRecognizer.view {
+//            return true
+//        }
+//        return false
+//    }
+//    
+//    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldRecognizeSimultaneouslyWith otherGestureRecognizer: UIGestureRecognizer) -> Bool {
+//        return false
+//    }
+//}

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

@@ -8,7 +8,7 @@
 
 import UIKit
 class YHHomeHeadView: UIView {
-    static let viewH : CGFloat = (20 + YHHomeBannerView.viewH) + (20 + YHHkLifeAndIdView.viewH) + (20 + YHHomeKingKongBlockView.viewH) + 31 + 31
+    static let viewH : CGFloat = (20 + YHHomeBannerView.viewH) + (20 + YHHkLifeAndIdView.viewH) + (20 + YHHomeKingKongBlockView.viewH) + 21 + 21
     
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -67,7 +67,7 @@ private extension YHHomeHeadView {
         line.backgroundColor = UIColor(hex: 0xF0F3F7, alpha: 1.0)
         addSubview(line)
         line.snp.makeConstraints { make in
-            make.top.equalTo(homeKingKongBlock.snp.bottom).offset(31)
+            make.top.equalTo(homeKingKongBlock.snp.bottom).offset(21)
             make.left.right.equalToSuperview()
             make.height.equalTo(1)
         }

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -85,12 +85,16 @@ extension YHHomePageViewModel {
                     self.arrHomeNewsData?.append(contentsOf: result.data)
                 }
                 
-                if let count = self.arrHomeNewsData?.count {
-                    if count >= self.totalCount {
-                        self.hasMoreForHomeNews = false
-                    } else {
-                        self.hasMoreForHomeNews = true
+                if result.data.count >= page_Size {
+                    if let count = self.arrHomeNewsData?.count {
+                        if count >= self.totalCount {
+                            self.hasMoreForHomeNews = false
+                        } else {
+                            self.hasMoreForHomeNews = true
+                        }
                     }
+                } else {
+                    self.hasMoreForHomeNews = false
                 }
                 
                 callBackBlock(true, nil)

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

@@ -356,7 +356,8 @@ extension YHServiceCenterMainViewController {
         //配置指示器
         let indicator = JXSegmentedIndicatorLineView()
         indicator.indicatorWidth = 16
-        indicator.indicatorColor = .blue
+        indicator.indicatorColor = UIColor.brandMainColor
+        indicator.indicatorCornerRadius = 0
         segmentedView.indicators = [indicator]
         segmentedView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1)
         

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

@@ -113,7 +113,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
 
 
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 144
+        return 128
     }
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {

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

@@ -45,7 +45,7 @@ class YHProgressView: UIView {
          progressLayer.strokeColor = UIColor(hex: 0x00BF60).cgColor // 进度条颜色
          progressLayer.fillColor = UIColor.clear.cgColor
          progressLayer.lineWidth = lineWidth // 进度条宽度
-         progressLayer.lineCap = .round
+         progressLayer.lineCap = .square
          
          // 设置初始进度
          progressLayer.strokeEnd = 0

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

@@ -50,10 +50,10 @@ extension YHServiceOrderProgressTableViewCell {
         messageLabel.text = "您还有" + "\(model.num)" + "份信息待填写哦~"
         // 0未知 1待开始 2进行中 3 已完成
         if model.status == 1 {
-            titleLabel.textColor = UIColor(hex: 0x121a26)
-            messageLabel.textColor = UIColor(hex: 0x94a3b8)
+            titleLabel.textColor = UIColor(hex: 0x121a26,transparency: 0.3)
+            messageLabel.textColor = UIColor(hex: 0x94a3b8,transparency: 0.3)
             buttonLabel.text = "待开始"
-            buttonLabel.backgroundColor = UIColor(hex: 0xb8babe)
+            buttonLabel.backgroundColor = UIColor(hex: 0xb8babe,transparency: 0.3)
             progressImageView.image = UIImage(named: "service_progress_normal")
             // 1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
             if model.type == 1 {
@@ -79,7 +79,7 @@ extension YHServiceOrderProgressTableViewCell {
                 titleLabel.text = "我的文书"
                 messageLabel.text = "您的文书还没确认哦~"
             }
-            let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor(hex: 0x121a26)))
+            let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor(hex: 0x121a26).withAlphaComponent(0.3)))
             let bb: ASAttributedString = .init("%", .font(UIFont.PFSC_M(ofSize: 10)),.foreground(UIColor(hex: 0x121a26).withAlphaComponent(0.3)))
             progressLabel.attributed.text = b + bb
         }

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift

@@ -119,10 +119,8 @@ class YHMessageDetailListVC: YHBaseViewController {
     }
     
     func getMsgList() {
-        YHHUD.show(.progress(message: "加载中..."))
         self.viewModel.getMsgDetailList(type: self.type) {
             [weak self] success, error in
-            YHHUD.hide()
             guard let self = self else { return }
             msgArr.removeAll()
             msgArr.append(contentsOf: self.viewModel.msgDetailList)