Merge commit 'd638dbad' into xiezhaolin

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

@@ -27,12 +27,11 @@ class YHHomePageViewController: YHBaseViewController {
         flowLayout.scrollDirection = .vertical
         
         let collectinoView = UICollectionView(frame: .zero, collectionViewLayout: flowLayout)
-//        collectinoView.contentInset = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
         collectinoView.backgroundColor = .white
-        collectinoView.register(YHAboutUsAdvantageCell.self, forCellWithReuseIdentifier:YHAboutUsAdvantageCell.cellReuseIdentifier)
         collectinoView.register(YHDavidTestCollectionViewCell.self, forCellWithReuseIdentifier:YHDavidTestCollectionViewCell.cellReuseIdentifier)
         collectinoView.delegate = self
         collectinoView.dataSource = self
+        collectinoView.showsVerticalScrollIndicator = false
         
         collectinoView.translatesAutoresizingMaskIntoConstraints = false
         collectinoView.alwaysBounceVertical = true
@@ -77,7 +76,6 @@ private extension YHHomePageViewController {
         
         homeHeaderView.frame = CGRect(x: 0, y: -YHHomeHeadView.viewH, width: KScreenWidth - 40, height: YHHomeHeadView.viewH)
         homeCollectView.addSubview(homeHeaderView)
-//        homeHeaderView.backgroundColor = UIColor.red //for test hjl
         homeCollectView.contentInset = UIEdgeInsets(top: YHHomeHeadView.viewH, left: 20, bottom: 20, right: 20)
         
         

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

@@ -14,7 +14,7 @@ import ESTabBarController_swift
 
 class YHStartPageViewController: UIViewController {
     
-    private var MaxTime : Int = 50 //for test hjl
+    private var MaxTime : Int = 3
     private var timer : Timer?
     
     lazy var imagV: UIImageView = {

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

+//
+//  YHHkLifeAndIdItemView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/4/8.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+enum HkLifeItemType : Int {
+    case unknow = -1 //未知
+    case hkID = 0    //香港身份
+    case hklife = 1  //香港生活
+}
+
+class YHHkLifeAndIdItemView: UIView {
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        initView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    
+    lazy var bkgImagV: UIImageView = {
+        let imageV = UIImageView()
+        imageV.contentMode = .scaleAspectFill
+        return imageV
+    }()
+    
+    lazy var iconV: UIImageView = {
+        let imageV = UIImageView()
+        imageV.contentMode = .scaleAspectFill
+        return imageV
+    }()
+    
+    lazy var titleLable : UILabel = {
+        let label = UILabel()
+        label.text = "香港身份"
+        label.textColor = UIColor.mainTextColor
+        label.font = UIFont.PFSC_M(ofSize: 17)
+        label.lineBreakMode = .byTruncatingMiddle
+        return label
+    }()
+    
+    
+    lazy var subtitleLable:UILabel = {
+        let label = UILabel()
+        label.text = "去香港"
+        label.textColor = UIColor(hex: 0x94A3B8, alpha: 1.0)
+        label.font = UIFont.PFSC_R(ofSize: 11)
+        label.lineBreakMode = .byTruncatingMiddle
+        return label
+    }()
+    
+    
+    var itemType : HkLifeItemType = .unknow {
+        didSet {
+            updateUI()
+        }
+    }
+}
+
+private extension YHHkLifeAndIdItemView {
+    func initView() {
+        addSubview(bkgImagV)
+        bkgImagV.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        addSubview(iconV)
+        iconV.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(kMargin)
+            make.width.height.equalTo(34)
+        }
+        
+        
+        addSubview(titleLable)
+        titleLable.snp.makeConstraints { make in
+            make.top.equalTo(iconV.snp.top).offset(-3)
+            make.left.equalTo(iconV.snp.right).offset(kMargin)
+            make.height.equalTo(24)
+            make.right.equalTo(-10)
+        }
+        
+        
+        addSubview(subtitleLable)
+        subtitleLable.snp.makeConstraints { make in
+            make.top.equalTo(titleLable.snp.bottom).offset(2)
+            make.left.equalTo(titleLable.snp.left)
+            make.height.equalTo(16)
+            make.right.equalTo(titleLable.snp.right)
+        }
+    }
+    
+    
+    func updateUI() {
+        if itemType == .hkID {
+            bkgImagV.image = UIImage(named: "hklife_bkg_0")
+            iconV.image = UIImage(named: "hklife_icon_0")
+            titleLable.text = "香港身份"
+            subtitleLable.text = "去香港"
+        } else if itemType == .hklife {
+            bkgImagV.image = UIImage(named: "hklife_bkg_1")
+            iconV.image = UIImage(named: "hklife_icon_1")
+            titleLable.text = "香港生活"
+            subtitleLable.text = "在香港"
+        } else {
+            printLog("errorr:未处理")
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHkLiftAndIdView.swift → galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHkLifeAndIdView.swift

 //
-//  YHHkLiftAndIdView.swift
+//  YHHkLifeAndIdView.swift
 //  galaxy
 //
 //  Created by davidhuangA on 2024/4/8.
@@ -7,19 +7,45 @@
 //
 
 import UIKit
-
 /*
  香港身份 香港生活
  */
-class YHHkLiftAndIdView: UIView {
+class YHHkLifeAndIdView: UIView {
     static let viewH : CGFloat = 74.0
     
     override init(frame: CGRect) {
         super.init(frame: frame)
-//        initView()
+        initView()
     }
     
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 }
+
+
+private extension YHHkLifeAndIdView {
+    func initView() {
+        
+        let itemW : CGFloat = (KScreenWidth - 20 * 2 - 12) / 2.0
+        
+        let item0 = YHHkLifeAndIdItemView()
+        item0.itemType = .hkID
+        addSubview(item0)
+        item0.snp.makeConstraints { make in
+            make.top.left.equalToSuperview()
+            make.height.equalTo(YHHkLifeAndIdView.viewH)
+            make.width.equalTo(itemW)
+        }
+        
+        let item1 = YHHkLifeAndIdItemView()
+        item1.itemType = .hklife
+        addSubview(item1)
+        item1.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.left.equalTo(item0.snp.right).offset(12)
+            make.height.equalTo(YHHkLifeAndIdView.viewH)
+            make.width.equalTo(itemW)
+        }
+    }
+}

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 + YHHkLiftAndIdView.viewH) + (20 + YHHomeKingKongBlockView.viewH) + 31
+    static let viewH : CGFloat = (20 + YHHomeBannerView.viewH) + (20 + YHHkLifeAndIdView.viewH) + (20 + YHHomeKingKongBlockView.viewH) + 31
     
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -26,8 +26,8 @@ class YHHomeHeadView: UIView {
     }()
     
     //2.香港身份 香港生活
-    lazy var homeHkLife : YHHkLiftAndIdView = {
-        let view = YHHkLiftAndIdView()
+    lazy var homeHkLife : YHHkLifeAndIdView = {
+        let view = YHHkLifeAndIdView()
         return view
     }()
     
@@ -49,15 +49,15 @@ private extension YHHomeHeadView {
             make.height.equalTo(YHHomeBannerView.viewH)
         }
         
-        homeBannerView.backgroundColor = .red
+//        homeBannerView.backgroundColor = .red
         
         addSubview(homeHkLife)
         homeHkLife.snp.makeConstraints { make in
             make.top.equalTo(homeBannerView.snp.bottom).offset(20)
             make.left.right.equalToSuperview()
-            make.height.equalTo(YHHkLiftAndIdView.viewH)
+            make.height.equalTo(YHHkLifeAndIdView.viewH)
         }
-        homeHkLife.backgroundColor = .yellow
+//        homeHkLife.backgroundColor = .yellow
         
         addSubview(homeKingKongBlock)
         homeKingKongBlock.snp.makeConstraints { make in

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

@@ -14,9 +14,16 @@ class YHHomeKingKongBlockView: UIView {
     
     override init(frame: CGRect) {
         super.init(frame: frame)
+        initView()
     }
     
     required init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 }
+
+private extension YHHomeKingKongBlockView {
+    func initView() {
+        
+    }
+}

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

-//
-//  BsPageContentView.swift
-//  GDKit
-//
-//  Created by GDKit on 01/11/2022.
-//  Copyright (c) 2022 GDKit. All rights reserved.
-//
-
-import UIKit
-
-@objc public protocol YHPageContentViewDelegate : AnyObject {
-    func pageContentView(_ contentView : YHPageContentView, progress : CGFloat, sourceIndex : Int, targetIndex : Int)
-}
-
-private let ContentCellID = "BsContentCellID"
-
-open class YHPageContentView: UIView {
-    
-    // MARK: - 定义属性
-    fileprivate var childVcs : [UIViewController]
-    fileprivate weak var parentVC : UIViewController?
-    fileprivate var startOffsetX : CGFloat = 0
-    fileprivate var isForbidScrollDelegate : Bool = false
-    @objc public weak var delegate : YHPageContentViewDelegate?
-    
-    public var isScrollEnabled: Bool? {
-        didSet {
-            if let isScrollEnabled = isScrollEnabled {
-                collectionView.isScrollEnabled = isScrollEnabled
-            }
-        }
-    }
-    
-    @objc public func banScrollEnabled() {
-//        collectionView.isScrollEnabled = false
-        collectionView.isScrollEnabled = true
-    }
-    
-    fileprivate func getLayout() -> UICollectionViewFlowLayout {
-        let layout = UICollectionViewFlowLayout()
-        layout.itemSize = self.bounds.size
-        layout.minimumLineSpacing = 0
-        layout.minimumInteritemSpacing = 0
-        layout.scrollDirection = .horizontal
-        return layout
-    }
-    
-    // MARK: - 懒加载属性
-    fileprivate lazy var collectionView : UICollectionView = {[weak self] in
-        // 1.创建layout
-        let layout = self?.getLayout() ?? UICollectionViewFlowLayout()
-        
-        // 2.创建UICollectionView
-        let collectionView = UICollectionView(frame: CGRect.zero, collectionViewLayout: layout)
-        collectionView.backgroundColor = .clear//groupTableViewBackground
-        collectionView.showsHorizontalScrollIndicator = false
-        collectionView.isPagingEnabled = true
-        collectionView.bounces = false
-        collectionView.dataSource = self
-        collectionView.delegate = self
-        collectionView.scrollsToTop = false
-        collectionView.register(UICollectionViewCell.self, forCellWithReuseIdentifier: ContentCellID)
-        
-        return collectionView
-    }()
-    
-    // MARK: - 自定义构造函数
-    @objc public init(frame: CGRect, childVcs : [UIViewController], parentViewController : UIViewController?) {
-        self.childVcs = childVcs
-        self.parentVC = parentViewController
-        
-        super.init(frame: frame)
-        
-        // 设置UI
-        setupUI()
-    }
-    
-    public required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-}
-
-// MARK: - 设置UI界面
-extension YHPageContentView {
-    fileprivate func setupUI() {
-        // 1.将所有的子控制器添加父控制器中
-//        for childVc in childVcs {
-//            parentVC?.addChild(childVc)
-//        }
-        
-        // 2.添加UICollectionView,用于在Cell中存放控制器的View
-        addSubview(collectionView)
-        collectionView.frame = bounds
-    }
-    
-    public func refreshRect() {
-        collectionView.frame = bounds
-        collectionView.collectionViewLayout = self.getLayout()
-    }
-    
-}
-
-
-
-// MARK: - 遵守UICollectionViewDataSource
-extension YHPageContentView : UICollectionViewDataSource {
-    public func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return childVcs.count
-    }
-    
-    public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        // 1.创建Cell
-        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: ContentCellID, for: indexPath)
-        
-        // 2.给Cell设置内容
-        for view in cell.contentView.subviews {
-            view.removeFromSuperview()
-        }
-        
-        let childVc = childVcs[(indexPath as NSIndexPath).item]
-        childVc.view.frame = cell.contentView.bounds
-        cell.contentView.addSubview(childVc.view)
-        
-        return cell
-    }
-}
-
-// MARK: - 遵守UICollectionViewDelegate
-extension YHPageContentView : UICollectionViewDelegate {
-    
-    public func scrollViewWillBeginDragging(_ scrollView: UIScrollView) {
-        
-        isForbidScrollDelegate = false
-        
-        startOffsetX = scrollView.contentOffset.x
-    }
-    
-    public func scrollViewDidScroll(_ scrollView: UIScrollView) {
-        
-        // 0.判断是否是点击事件
-        if isForbidScrollDelegate { return }
-        
-        // 1.定义获取需要的数据
-        var progress : CGFloat = 0
-        var sourceIndex : Int = 0
-        var targetIndex : Int = 0
-        
-        // 2.判断是左滑还是右滑
-        let currentOffsetX = scrollView.contentOffset.x
-        let scrollViewW = scrollView.bounds.width
-        if currentOffsetX > startOffsetX { // 左滑
-            // 1.计算progress
-            progress = currentOffsetX / scrollViewW - floor(currentOffsetX / scrollViewW)
-            
-            // 2.计算sourceIndex
-            sourceIndex = Int(currentOffsetX / scrollViewW)
-            
-            // 3.计算targetIndex
-            targetIndex = sourceIndex + 1
-            if targetIndex >= childVcs.count {
-                targetIndex = childVcs.count - 1
-            }
-            
-            // 4.如果完全划过去
-            if currentOffsetX - startOffsetX == scrollViewW {
-                progress = 1
-                targetIndex = sourceIndex
-            }
-        } else { // 右滑
-            // 1.计算progress
-            progress = 1 - (currentOffsetX / scrollViewW - floor(currentOffsetX / scrollViewW))
-            
-            // 2.计算targetIndex
-            targetIndex = Int(currentOffsetX / scrollViewW)
-            
-            // 3.计算sourceIndex
-            sourceIndex = targetIndex + 1
-            if sourceIndex >= childVcs.count {
-                sourceIndex = childVcs.count - 1
-            }
-        }
-        
-        // 3.将progress/sourceIndex/targetIndex传递给titleView
-        delegate?.pageContentView(self, progress: progress, sourceIndex: sourceIndex, targetIndex: targetIndex)
-    }
-}
-
-
-// MARK: - 对外暴露的方法
-extension YHPageContentView {
-    @objc public func setCurrentIndex(_ currentIndex : Int) {
-        
-        // 1.记录需要进制执行代理方法
-        isForbidScrollDelegate = true
-        
-        // 2.滚动正确的位置
-        let offsetX = CGFloat(currentIndex) * collectionView.frame.width
-        collectionView.setContentOffset(CGPoint(x: offsetX, y: 0), animated: false)
-    }
-}
-
-
-
-

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/View/YHSchemeTableViewCell.swift

@@ -168,7 +168,7 @@ class YHSchemeTableViewCell: UITableViewCell {
         mainMessageLabel.attributedText = newString
         
         let paragraphStyle = NSMutableParagraphStyle()
-        paragraphStyle.lineSpacing = 10 // 设置行间距
+        paragraphStyle.lineSpacing = 4 // 设置行间距
         let attributes: [NSAttributedString.Key: Any] = [
             .paragraphStyle: paragraphStyle,
             .font: UIFont.PFSC_R(ofSize: 14)

galaxy/galaxy/Res/Assets.xcassets/Home/hklife/Contents.json

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/Home/hklife/hklife_bkg_0.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/Home/hklife/hklife_bkg_1.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/Home/hklife/hklife_icon_0.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/hklife/hklife_icon_1.imageset/Contents.json

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