添加 日期段 选择文件

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -592,6 +592,7 @@
 		A56D2D612B62020C009C83A8 /* YHContractMainItemStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */; };
 		A5765B262C771F86002CD3C1 /* YHRangeDatePickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5765B252C771F86002CD3C1 /* YHRangeDatePickerView.swift */; };
 		A5765B282C772185002CD3C1 /* YHRangeDatePickerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5765B272C772185002CD3C1 /* YHRangeDatePickerCell.swift */; };
+		A5765B2A2C77268C002CD3C1 /* YHRangeDatePickerSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5765B292C77268C002CD3C1 /* YHRangeDatePickerSheetView.swift */; };
 		A580371E2BAD784B0031C312 /* YHMySchemeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */; };
 		A58037212BAD7B2A0031C312 /* YHMySchemeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */; };
 		A582B23D2BB944ED009D098C /* YHHKPlanDoctumentVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A582B23C2BB944ED009D098C /* YHHKPlanDoctumentVC.swift */; };
@@ -1343,6 +1344,7 @@
 		A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHContractMainItemStatusCell.swift; sourceTree = "<group>"; };
 		A5765B252C771F86002CD3C1 /* YHRangeDatePickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRangeDatePickerView.swift; sourceTree = "<group>"; };
 		A5765B272C772185002CD3C1 /* YHRangeDatePickerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRangeDatePickerCell.swift; sourceTree = "<group>"; };
+		A5765B292C77268C002CD3C1 /* YHRangeDatePickerSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRangeDatePickerSheetView.swift; sourceTree = "<group>"; };
 		A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeViewModel.swift; sourceTree = "<group>"; };
 		A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeModel.swift; sourceTree = "<group>"; };
 		A582B23C2BB944ED009D098C /* YHHKPlanDoctumentVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKPlanDoctumentVC.swift; sourceTree = "<group>"; };
@@ -3352,6 +3354,7 @@
 			children = (
 				A5765B252C771F86002CD3C1 /* YHRangeDatePickerView.swift */,
 				A5765B272C772185002CD3C1 /* YHRangeDatePickerCell.swift */,
+				A5765B292C77268C002CD3C1 /* YHRangeDatePickerSheetView.swift */,
 			);
 			path = RangeDatePicker;
 			sourceTree = "<group>";
@@ -4621,6 +4624,7 @@
 				044D0C202C22D37500C5CF5E /* YHEditHonorViewController.swift in Sources */,
 				04256DEC2C732F6900A37BA4 /* YHGrabNumberListView.swift in Sources */,
 				045EEEAC2B9F171A0022A143 /* YHWorkExperienceTableViewCell.swift in Sources */,
+				A5765B2A2C77268C002CD3C1 /* YHRangeDatePickerSheetView.swift in Sources */,
 				A5ACE93C2B4564F7002C94D2 /* UIColor+Extension.swift in Sources */,
 				A567E5A82BD7643D00D5D5A0 /* YHHomeWebBottomButton.swift in Sources */,
 				045EEEC02B9F171A0022A143 /* YHOtherInfoFillViewModel.swift in Sources */,

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

@@ -144,11 +144,16 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         view.recentScanClick = {
             [weak self] in
             guard let self = self else { return }
-            if !checkLogin() { return }
-            let vc = YHMyLikeActivityViewController()
-            vc.myDefaultNavItemIndex = 2
-            self.navigationController?.pushViewController(vc)
-            print("最近浏览")
+//            if !checkLogin() { return }
+//            let vc = YHMyLikeActivityViewController()
+//            vc.myDefaultNavItemIndex = 2
+//            self.navigationController?.pushViewController(vc)
+//            print("最近浏览")
+            
+            
+            let view = YHRangeDatePickerSheetView.sheetView()
+            view.show() //for test hjl
+            
         }
         return view
     }()

galaxy/galaxy/Classes/Tools/RangeDatePicker/YHRangeDatePickerSheetView.swift

+//
+//  YHRangeDatePickerSheetView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/8/22.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHRangeDatePickerSheetView: UIView {
+    static let contentViewH : CGFloat = YHRangeDatePickerView.viewH + 98 + 112 + 12
+    
+    lazy var blackMaskView: UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor(hex: 0x0F1214, alpha: 0.5)
+        return view
+    }()
+    
+    lazy var whiteContentView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        return view
+    }()
+    
+    
+    lazy var titleLable: UILabel = {
+        let label = UILabel()
+        label.textColor = UIColor.mainTextColor
+        label.font = UIFont.PFSC_B(ofSize:17)
+        label.text = "选择意向赴港时间"
+        label.textAlignment = .center
+        return label
+    }()
+    
+    
+    lazy var lineView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .separatorColor
+        return view
+    }()
+    
+    
+    lazy var bottomView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .clear
+        view.addSubview(self.rewardBtn)
+        self.rewardBtn.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(10)
+            make.left.equalTo(kMargin)
+            make.right.equalTo(-kMargin)
+            make.height.equalTo(44)
+        }
+        view.layer.zPosition = 10
+        return view
+    }()
+    
+    //知道了
+    lazy var rewardBtn: UIButton = {
+        let button = UIButton(type: .custom)
+        button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
+        button.contentHorizontalAlignment = .center
+        button.setTitle("确定", for: .normal)
+        button.setTitleColor(UIColor.white, for: .normal)
+        button.layer.cornerRadius = kCornerRadius3
+        button.clipsToBounds = true
+        button.addTarget(self, action: #selector(clickSureBtn), for: .touchUpInside)
+        button.backgroundColor = UIColor.brandMainColor
+        return button
+    }()
+    
+    
+    lazy var closeBtn: UIButton = {
+        let button = UIButton(type: .custom)
+        button.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
+        
+        button.setImage(UIImage(named: "work_example_close"), for: .normal)
+        button.setImage(UIImage(named: "work_example_close"), for: .selected)
+        return button
+    }()
+    
+//    lazy var myScrollView: UIScrollView = {
+//        let view = UIScrollView()
+//        view.backgroundColor = .clear
+//        view.showsVerticalScrollIndicator = false
+//        return view
+//    }()
+    
+    lazy var datePickView : YHRangeDatePickerView = {
+        let view = YHRangeDatePickerView()
+        return view
+    }()
+    
+    
+    lazy var warnImageV: UIImageView = {
+        let imageV  = UIImageView()
+        imageV.image = UIImage(named: "appoint_warm_date_picker")
+        imageV.contentMode = .scaleToFill
+        imageV.clipsToBounds = true
+        return imageV
+    }()
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupUI()
+    }
+}
+
+extension YHRangeDatePickerSheetView  {
+    
+    static func sheetView() -> YHRangeDatePickerSheetView {
+        let view = YHRangeDatePickerSheetView(frame:UIScreen.main.bounds)
+        return view
+    }
+    
+    func show() {
+        UIApplication.shared.yhKeyWindow()?.addSubview(self)
+        
+        UIView.animate(withDuration: 0.5) {
+            let whiteHeight = YHHKCardTemplateView.contentViewH
+            self.whiteContentView.frame = CGRect(x: 0, y: KScreenHeight - whiteHeight, width: KScreenWidth, height: whiteHeight)
+        }
+    }
+    
+    @objc func dismiss() {
+        removeFromSuperview()
+    }
+    
+    @objc func clickSureBtn() {
+        dismiss()
+    }
+}
+
+private extension YHRangeDatePickerSheetView {
+    
+    func setupUI() {
+        self.addSubview(blackMaskView)
+        self.addSubview(whiteContentView)
+
+        let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
+        let path = UIBezierPath(roundedRect:bounds,byRoundingCorners: corner,cornerRadii:CGSizeMake(16.0, 16.0));
+        let layer = CAShapeLayer();
+        layer.frame = whiteContentView.bounds;
+        layer.path = path.cgPath;
+        whiteContentView.layer.mask = layer;
+        whiteContentView.clipsToBounds = true
+        
+        blackMaskView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        let whiteHeight = YHHKCardTemplateView.contentViewH
+        whiteContentView.frame = CGRect(x: 0, y: KScreenHeight, width: KScreenWidth, height: whiteHeight)
+        
+        whiteContentView.addSubview(bottomView)
+        bottomView.snp.makeConstraints { make in
+            make.bottom.left.right.equalToSuperview()
+            make.height.equalTo(98)
+        }
+        
+        
+        whiteContentView.addSubview(titleLable)
+        titleLable.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(kMargin)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(24)
+        }
+        
+        
+        whiteContentView.addSubview(closeBtn)
+        closeBtn.snp.makeConstraints { make in
+            make.right.equalToSuperview().offset(-21)
+            make.height.width.equalTo(24)
+            make.centerY.equalTo(titleLable.snp.centerY)
+        }
+        
+        whiteContentView.addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.top.equalTo(titleLable.snp.bottom).offset(12)
+            make.left.equalToSuperview().offset(21)
+            make.right.equalToSuperview().offset(-21)
+            make.height.equalTo(1)
+        }
+        
+        
+        whiteContentView.addSubview(warnImageV)
+        warnImageV.snp.makeConstraints { make in
+            make.top.equalTo(lineView.snp.bottom).offset(12)
+            make.centerX.equalToSuperview()
+            make.width.equalTo(343)
+            make.height.equalTo(32)
+        }
+        
+        
+        whiteContentView.addSubview(datePickView)
+        warnImageV.snp.makeConstraints { make in
+            make.top.equalTo(titleLable.snp.bottom).offset(12)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(YHRangeDatePickerView.viewH)
+        }
+        
+        
+        
+//        whiteContentView.addSubview(myScrollView)
+//        myScrollView.snp.makeConstraints { make in
+//            make.top.equalTo(lineView.snp.bottom).offset(21)
+//            make.right.equalToSuperview().offset(-21)
+//            make.width.equalTo(KScreenWidth - 21 * 2)
+//            make.height.equalTo(whiteHeight-98 - 16 - 24 - 12 - 1 - 21)
+//        }
+//        
+//        
+//        if let tmpImage = UIImage(named:"hkCard_template") {
+//            let scale = Double(tmpImage.size.height / tmpImage.size.width)
+//            let imageH = scale * (KScreenWidth - 21 * 2)
+//            
+//            
+//            myScrollView.addSubview(bkgImageV)
+//            bkgImageV.snp.makeConstraints { make in
+//                make.top.equalToSuperview()
+//                make.left.equalToSuperview()
+//                make.width.equalTo(KScreenWidth - 21 * 2)
+//                make.height.equalTo(imageH)
+//            }
+//            myScrollView.contentSize = CGSize(width: KScreenWidth - 21 * 2, height: imageH)
+//        }
+    }
+}

galaxy/galaxy/Classes/Tools/RangeDatePicker/YHRangeDatePickerView.swift

@@ -155,7 +155,7 @@ extension YHRangeDatePickerView {
         }
         configureVisibleCells()
         
-        calendar.reloadData()//for test hjl
+        calendar.reloadData()
     }
     
     func calendar(_ calendar: FSCalendar, didDeselect date: Date, at monthPosition: FSCalendarMonthPosition) {

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/3赴港办证预约/appoint_warm_date_picker.imageset/Contents.json

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