Merge commit 'fc80aa04' into xiezhaolin

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/Modules/Home(首页)/C/YHHKEventViewController.swift

@@ -114,7 +114,7 @@ extension YHHKEventViewController {
 
 extension YHHKEventViewController {
     func saveImageToPhotoLib() {
-        var urlString  = self.picUrl
+        let urlString  = self.picUrl
         guard let url = URL(string: urlString) else {
             YHHUD.flash(message: "参数错误,保存失败")
             return

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

@@ -172,6 +172,12 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         } else {
             bottomViewForSavePic.isHidden = true
         }
+        
+        if id > 0 {
+            //资讯详情 不展示title
+            gk_navTitle = ""
+            
+        }
         getData()
     }
     
@@ -200,11 +206,9 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     
     // MARK: - WKNavigationDelegate
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        
-        
-        if vcTitle == nil {
-            gk_navTitle = webview.title
-        }
+//        if vcTitle == nil {
+//            gk_navTitle = webview.title
+//        }
     }
     
     // MARK: - WKUIDelegate

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,6 +85,7 @@ extension YHHomePageViewModel {
                     self.arrHomeNewsData?.append(contentsOf: result.data)
                 }
                 
+                if result.data.count >= page_Size {
                     if let count = self.arrHomeNewsData?.count {
                         if count >= self.totalCount {
                             self.hasMoreForHomeNews = false
@@ -92,6 +93,9 @@ extension YHHomePageViewModel {
                             self.hasMoreForHomeNews = true
                         }
                     }
+                } else {
+                    self.hasMoreForHomeNews = false
+                }
                 
                 callBackBlock(true, nil)
             } else {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateEntryCell.swift

@@ -60,7 +60,7 @@ extension YHCertificateEntryCell {
         var color : UIColor = .failColor
         if dataModel.checkStatus == 0 {
             title = "审核中"
-            color = UIColor.labelTextColor2
+            color = UIColor.warnColor
         } else if dataModel.checkStatus == 1 {
             title = "已完成"
             color = UIColor.labelTextColor2

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScore(我的评分)/V/YHScorePersonInfoCell.swift

@@ -218,11 +218,9 @@ extension YHScorePersonInfoCell {
             self.requestVM.getPublicImageUrl(url) {[weak self] success, error in
                 guard let self = self else { return }
                 guard success != nil else { return }
-//                self.headImagV.kf.setImage(with: URL(string: success))
                 self.headImagV.kf.setImage(with: URL(string: success), placeholder: UIImage(named: "global_default_image"))
 
             }
         }
     }
-    
 }

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)