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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -313,6 +313,7 @@
 		04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; };
 		04C693642B723B56004C1758 /* YHMySettingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693632B723B56004C1758 /* YHMySettingCell.swift */; };
 		04C85DDF2C364FE9008B20D6 /* YHAboutUsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C85DDE2C364FE9008B20D6 /* YHAboutUsCell.swift */; };
+		04C85DE12C3677CB008B20D6 /* YHConsultantQRCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C85DE02C3677CB008B20D6 /* YHConsultantQRCodeView.swift */; };
 		04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */; };
 		04CC2EF02BC3DDB2000305DD /* YHServiceBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */; };
 		04CE1ACF2C2AD91F001CB80A /* YHActivityViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CE1AB72C2AD91F001CB80A /* YHActivityViewModel.swift */; };
@@ -889,6 +890,7 @@
 		04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
 		04C693632B723B56004C1758 /* YHMySettingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingCell.swift; sourceTree = "<group>"; };
 		04C85DDE2C364FE9008B20D6 /* YHAboutUsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutUsCell.swift; sourceTree = "<group>"; };
+		04C85DE02C3677CB008B20D6 /* YHConsultantQRCodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHConsultantQRCodeView.swift; sourceTree = "<group>"; };
 		04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserInfoHeaderView.swift; sourceTree = "<group>"; };
 		04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceBannerView.swift; sourceTree = "<group>"; };
 		04CE1AB72C2AD91F001CB80A /* YHActivityViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHActivityViewModel.swift; sourceTree = "<group>"; };
@@ -2540,6 +2542,7 @@
 				A5EE41EE2C21387C005BBA5D /* YHAiRadarAreaView.swift */,
 				A566A7992C219FA400980D06 /* YHHomeSalonAreaView.swift */,
 				A566A79B2C227C9B00980D06 /* YHOrderTipsItemView.swift */,
+				04C85DE02C3677CB008B20D6 /* YHConsultantQRCodeView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -3458,6 +3461,7 @@
 				045EEE8A2B9F171A0022A143 /* YHPreviewOtherInformationViewController.swift in Sources */,
 				A5FD63C72B638CA000D1D9DA /* YHSubmintAllInfoSuccessTipView.swift in Sources */,
 				043D2C8A2C0EEF3F00172438 /* YHOrderSearchViewController.swift in Sources */,
+				04C85DE12C3677CB008B20D6 /* YHConsultantQRCodeView.swift in Sources */,
 				A567E5A32BD7643D00D5D5A0 /* YHHomeBannerView.swift in Sources */,
 				A5ACE9402B4564F7002C94D2 /* String+Extension.swift in Sources */,
 				045EEEE42B9F171A0022A143 /* YHMySignatureDetailModel.swift in Sources */,

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

@@ -40,6 +40,35 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         return view
     }()
     
+    lazy var consultView:UIView = {
+        let view = UIView(frame: CGRect(x: 0, y: 10, width: 34.0+10.0+60.0, height: 34.0))
+        
+        let headImgView = UIImageView(image: UIImage(named: "home_web_consult_avatar"))
+        view.addSubview(headImgView)
+        
+        let label = UILabel()
+        label.text = "咨询顾问".local
+        label.textColor = UIColor.mainTextColor
+        label.textAlignment = NSTextAlignment.left
+        label.font = UIFont.PFSC_M(ofSize: 14)
+        view.addSubview(label)
+        
+        let tap = UITapGestureRecognizer(target: self, action: #selector(didConsultViewTapped))
+        view.addGestureRecognizer(tap)
+        
+        headImgView.snp.makeConstraints { make in
+            make.width.height.equalTo(34)
+            make.left.equalToSuperview()
+            make.centerY.equalToSuperview()
+        }
+        label.snp.makeConstraints { make in
+            make.height.equalTo(20)
+            make.left.equalTo(headImgView.snp.right).offset(10)
+            make.centerY.equalToSuperview()
+        }
+        return view
+    }()
+    
     //有些界面需要保存图片的功能
     var showSavePicBottomFlag : Bool = false
     
@@ -93,6 +122,13 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         
         bottomView = {
             let view = YHHomeWebBottomView()
+            view.addSubview(self.consultView)
+            self.consultView.snp.makeConstraints { make in
+                make.left.equalTo(20.0)
+                make.top.equalTo(12.5)
+                make.width.equalTo(105.0)
+                make.height.equalTo(34.0)
+            }
             view.likeBlock = { [weak self] flag in
                 guard let self = self else { return }
                 if YHLoginManager.shared.isLogin() == false {
@@ -415,6 +451,10 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         task.resume()
     }
     
+    @objc func didConsultViewTapped() {
+        YHConsultantQRCodeView.codeView().show()
+    }
+    
     @objc func loginSuccess() {
         printLog("登录成功，进行相应的 UI刷新操作")
         getData()

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

+//
+//  YHConsultantQRCodeView.swift
+//  galaxy
+//
+//  Created by edy on 2024/7/4.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHConsultantQRCodeView: UIView {
+
+    // 底层蒙版
+    lazy var blackMaskView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .alertMaskColor
+        return view
+    }()
+    
+    lazy var bgImgView: UIImageView = {
+        let view = UIImageView(image: UIImage(named: "home_web_consult_bg"))
+        view.isUserInteractionEnabled = true
+        return view
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.text = "专属顾问".local
+        label.textColor = UIColor.mainTextColor
+        label.textAlignment = .center
+        label.font = UIFont.PFSC_B(ofSize: 22)
+        return label
+    }()
+    
+    lazy var detailLabel: UILabel = {
+        let label = UILabel()
+        label.text = "微信扫码添加专属顾问".local
+        label.textColor = UIColor.mainTextColor70
+        label.textAlignment = .center
+        label.font = UIFont.PFSC_R(ofSize: 15)
+        return label
+    }()
+    
+    lazy var qrCodeImgView:UIImageView = {
+        let view = UIImageView(image: UIImage(named: ""))
+        view.backgroundColor = .red
+        return view
+    }()
+    
+    lazy var saveBtn: UIButton = {
+        let button = UIButton()
+        button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
+        button.setTitle("保存到相册", for: .normal)
+        button.setTitleColor( UIColor.white, for: .normal)
+        button.backgroundColor = UIColor.brandMainColor
+        button.addTarget(self, action: #selector(didSaveQRCodeBtnClicked), for: .touchUpInside)
+        button.layer.cornerRadius = 3
+        return button
+    }()
+    
+    lazy var closeBtn:UIButton = {
+        let btn = UIButton()
+        btn.setImage(UIImage(named: "update_close"), for: .normal)
+        btn.addTarget(self, action: #selector(didCloseBtnClicked), for: .touchUpInside)
+        return btn
+    }()
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        createUI()
+    }
+    
+    static func codeView() -> YHConsultantQRCodeView {
+        let alertView = YHConsultantQRCodeView(frame:UIScreen.main.bounds)
+        return alertView
+    }
+    
+    @objc func show() {
+        UIApplication.shared.yhKeyWindow()?.addSubview(self)
+    }
+    
+    @objc func dismiss() {
+        self.removeFromSuperview()
+    }
+    
+    func createUI() {
+        self.addSubview(blackMaskView)
+        self.addSubview(bgImgView)
+        bgImgView.addSubview(titleLabel)
+        bgImgView.addSubview(detailLabel)
+        bgImgView.addSubview(qrCodeImgView)
+        bgImgView.addSubview(saveBtn)
+        self.addSubview(closeBtn)
+
+        blackMaskView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        bgImgView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.centerY.equalToSuperview()
+            make.width.equalTo(KScreenWidth-38.0*2)
+            make.height.equalTo(bgImgView.snp.width).multipliedBy(491.0/299.0)
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(129.0)
+            make.height.equalTo(30.0)
+            make.centerX.equalToSuperview()
+        }
+        
+        detailLabel.snp.makeConstraints { make in
+            make.top.equalTo(titleLabel.snp.bottom).offset(2.0)
+            make.height.equalTo(20.0)
+            make.centerX.equalToSuperview()
+        }
+        
+        qrCodeImgView.snp.makeConstraints { make in
+            make.top.equalTo(detailLabel.snp.bottom).offset(20.0)
+            make.width.height.equalTo(192.0)
+            make.centerX.equalToSuperview()
+        }
+        
+        saveBtn.snp.makeConstraints { make in
+            make.left.equalTo(24.0)
+            make.right.equalTo(-24.0)
+            make.top.equalTo(qrCodeImgView.snp.bottom).offset(28.0)
+            make.height.equalTo(45.0)
+        }
+        
+        closeBtn.snp.makeConstraints { make in
+            make.width.height.equalTo(24)
+            make.top.equalTo(bgImgView.snp.bottom).offset(20)
+            make.centerX.equalToSuperview()
+        }
+    }
+    
+    @objc func didSaveQRCodeBtnClicked() {
+        
+    }
+    
+    @objc func didCloseBtnClicked() {
+        self.dismiss()
+    }
+}

galaxy/galaxy/Res/Assets.xcassets/Home/home_web_consult_avatar.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "头像@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "头像@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/Home/home_web_consult_bg.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "资讯弹窗2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "咨询弹窗3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}