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

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 关于
  // 二维码处理
  //  二维码

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

@@ -453,7 +453,8 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     
     @objc func didConsultViewTapped() {
         let codeUrl = self.viewModel.mainModel?.clue_classify_img_url ?? ""
-        YHConsultantQRCodeView.codeView(codeUrl).show()
+        let downloadUrl = self.viewModel.mainModel?.clue_classify_img_url_download ?? ""
+        YHConsultantQRCodeView.codeView(codeUrl, downloadUrl: downloadUrl).show()
     }
     
     @objc func loginSuccess() {

galaxy/galaxy/Classes/Modules/Home(首页)/M/YHWebModel.swift

@@ -19,4 +19,5 @@ class YHWebModel: YHBaseModel {
     var title: String = ""
     var img_url: String = ""
     var clue_classify_img_url = ""
+    var clue_classify_img_url_download = ""
 }

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

@@ -14,13 +14,21 @@ class YHConsultantQRCodeView: UIView {
     var codeUrl:String = "" {
         didSet {
             if !codeUrl.isEmpty {
-                self.qrCodeImgView.kf.setImage(with: URL(string: codeUrl), placeholder: UIImage(named: "global_default_image")) { result in
+                self.qrCodeImgView.kf.setImage(with: URL(string: codeUrl), placeholder: UIImage(named: "global_default_image"))
+            }
+        }
+    }
+    
+    var downloadUrl: String = "" {
+        didSet {
+            if !downloadUrl.isEmpty {
+                self.downloadCodeImgView.kf.setImage(with: URL(string: downloadUrl)) { result in
                     switch result {
                     case .success(let value):
-                        self.codeImage = value.image
+                        self.downloadCodeImage = value.image
                         self.saveBtn.alpha = 1.0
                         self.saveBtn.isUserInteractionEnabled = true
-                       
+                        
                     case .failure(let value):
                         self.saveBtn.alpha = 0.3
                         self.saveBtn.isUserInteractionEnabled = false
@@ -30,7 +38,7 @@ class YHConsultantQRCodeView: UIView {
         }
     }
     
-    var codeImage:UIImage? = nil
+    var downloadCodeImage:UIImage? = nil
     // 底层蒙版
     lazy var blackMaskView: UIView = {
         let view = UIView()
@@ -67,6 +75,11 @@ class YHConsultantQRCodeView: UIView {
         return view
     }()
     
+    lazy var downloadCodeImgView:UIImageView = {
+        let view = UIImageView()
+        return view
+    }()
+    
     lazy var saveBtn: UIButton = {
         let button = UIButton()
         button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
@@ -96,9 +109,10 @@ class YHConsultantQRCodeView: UIView {
         createUI()
     }
     
-    static func codeView(_ url:String) -> YHConsultantQRCodeView {
+    static func codeView(_ url: String, downloadUrl: String) -> YHConsultantQRCodeView {
         let alertView = YHConsultantQRCodeView(frame:UIScreen.main.bounds)
         alertView.codeUrl = url
+        alertView.downloadUrl = downloadUrl
         return alertView
     }
     
@@ -125,7 +139,7 @@ class YHConsultantQRCodeView: UIView {
         
         bgImgView.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
-            make.centerY.equalToSuperview()
+            make.centerY.equalToSuperview().offset(-(20.0+24.0)/2.0)
             make.width.equalTo(299.0)
             make.height.equalTo(491.0)
         }
@@ -163,7 +177,7 @@ class YHConsultantQRCodeView: UIView {
     }
     
     @objc func didSaveQRCodeBtnClicked() {
-        if let img = self.codeImage {
+        if let img = self.downloadCodeImage {
             self.saveImage(img)
         }
     }
@@ -171,7 +185,7 @@ class YHConsultantQRCodeView: UIView {
     @objc func didCloseBtnClicked() {
         self.dismiss()
     }
-    
+   
     func saveImage(_ image: UIImage) {
         // 确保应用有权访问相册
         PHPhotoLibrary.requestAuthorization { status in

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHAboutGalaxyViewController.swift

@@ -60,11 +60,17 @@ class YHAboutGalaxyViewController: YHBaseViewController {
     
     lazy var detailLabel = {
         var label = UILabel()
-        label.text = "专注海外服务17年，总部设立在深圳，现已分别在北京、上海、广州等地建立分公司，立足于香港身份规划服务，业务逐步多元化发展。".local
+//        label.text = "专注海外服务17年，总部设立在深圳，现已分别在北京、上海、广州等地建立分公司，立足于香港身份规划服务，业务逐步多元化发展。"
         label.textColor = UIColor.white
         label.textAlignment = NSTextAlignment.left
-        label.font = UIFont.PFSC_R(ofSize: 12)
+        label.font = UIFont.PFSC_R(ofSize: 13)
         label.numberOfLines = 0
+        label.lineBreakMode = .byTruncatingTail
+        let paragraphStyle = NSMutableParagraphStyle()
+        paragraphStyle.lineSpacing = 5.0 // 设置行间距
+        let attributedString = NSMutableAttributedString(string: "专注海外服务17年，总部设立在深圳，现已分别在北京、上海、广州等地建立分公司，立足于香港身份规划服务，业务逐步多元化发展。".local)
+        attributedString.addAttribute(.paragraphStyle, value: paragraphStyle, range: NSRange(location: 0, length: attributedString.length))
+        label.attributedText = attributedString
         return label
     }()
     
@@ -202,14 +208,21 @@ extension YHAboutGalaxyViewController : UITableViewDelegate, UITableViewDataSour
     }
     
     func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        if scrollView.contentOffset.y >= 12.5 {
-            self.navBar.backgroundColor = .white
-            self.statusBar.backgroundColor = .white
+        printLog("\(scrollView.contentOffset.y)")
+        var alpha = scrollView.contentOffset.y/k_Height_NavigationtBarAndStatuBar
+        if alpha > 1.0 {
+            alpha = 1.0
+        } else if alpha < 0.0 {
+            alpha = 0.0
+        }
+        
+        self.navBar.backgroundColor = UIColor.init(hex: 0xFFFFFF, alpha: alpha)
+        self.statusBar.backgroundColor = UIColor.init(hex: 0xFFFFFF, alpha: alpha)
+        
+        if scrollView.contentOffset.y > 0 {
             self.navBar.backButton.setImage(UIImage(named: "back_icon"), for: .normal)
 
         } else {
-            self.navBar.backgroundColor = .clear
-            self.statusBar.backgroundColor = .clear
             self.navBar.backButton.setImage(UIImage(named: "back_icon_for_code_input"), for: .normal)
         }
     }