Skip to content

G
galaxy-iOS
Commit ecbd95be authored by David黄金龙's avatar David黄金龙
Browse files
Options

行程单 UI 完成

parent 91f67a9f
Show whitespace changes
Inline Side-by-side
Showing with 354 additions and 18 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ ecbd95be
......@@ -445,6 +445,9 @@
A59CCBD02C244B13001910FE /* YHApplyActivityResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59CCBCF2C244B13001910FE /* YHApplyActivityResultViewController.swift */; };
A59CCBD22C245B17001910FE /* YHActivityTravelViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59CCBD12C245B17001910FE /* YHActivityTravelViewController.swift */; };
A59CCBD42C252063001910FE /* YHActivityTravelCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A59CCBD32C252063001910FE /* YHActivityTravelCell.swift */; };
A5A89FD12C254B5C005A71DD /* YHActivityTravelitemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A89FD02C254B5C005A71DD /* YHActivityTravelitemView.swift */; };
A5A89FD32C25518B005A71DD /* YHActivityApplyInfoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A89FD22C25518B005A71DD /* YHActivityApplyInfoView.swift */; };
A5A89FD52C255250005A71DD /* YHActivityTwoItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5A89FD42C255250005A71DD /* YHActivityTwoItemView.swift */; };
A5ACE9282B4564F7002C94D2 /* YHSmsCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8DE2B4564F7002C94D2 /* YHSmsCodeView.swift */; };
A5ACE9292B4564F7002C94D2 /* YHSmsCodeInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8E02B4564F7002C94D2 /* YHSmsCodeInputView.swift */; };
A5ACE92C2B4564F7002C94D2 /* YHLoginStyleButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8E42B4564F7002C94D2 /* YHLoginStyleButton.swift */; };
......@@ -1000,6 +1003,9 @@
A59CCBCF2C244B13001910FE /* YHApplyActivityResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHApplyActivityResultViewController.swift; sourceTree = "<group>"; };
A59CCBD12C245B17001910FE /* YHActivityTravelViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityTravelViewController.swift; sourceTree = "<group>"; };
A59CCBD32C252063001910FE /* YHActivityTravelCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityTravelCell.swift; sourceTree = "<group>"; };
A5A89FD02C254B5C005A71DD /* YHActivityTravelitemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityTravelitemView.swift; sourceTree = "<group>"; };
A5A89FD22C25518B005A71DD /* YHActivityApplyInfoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityApplyInfoView.swift; sourceTree = "<group>"; };
A5A89FD42C255250005A71DD /* YHActivityTwoItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHActivityTwoItemView.swift; sourceTree = "<group>"; };
A5ACE8DE2B4564F7002C94D2 /* YHSmsCodeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSmsCodeView.swift; sourceTree = "<group>"; };
A5ACE8E02B4564F7002C94D2 /* YHSmsCodeInputView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSmsCodeInputView.swift; sourceTree = "<group>"; };
A5ACE8E42B4564F7002C94D2 /* YHLoginStyleButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHLoginStyleButton.swift; sourceTree = "<group>"; };
......@@ -2368,6 +2374,9 @@
A5787E3F2C23DFD000B021D7 /* YHActivityTipsItemView.swift */,
A59CCBCD2C241FCB001910FE /* YHApplyActivityAlert.swift */,
A59CCBD32C252063001910FE /* YHActivityTravelCell.swift */,
A5A89FD02C254B5C005A71DD /* YHActivityTravelitemView.swift */,
A5A89FD22C25518B005A71DD /* YHActivityApplyInfoView.swift */,
A5A89FD42C255250005A71DD /* YHActivityTwoItemView.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -3076,6 +3085,7 @@
A5EF21372BA6E2D1005027E6 /* YHQuestionAndAnswerModel.swift in Sources */,
A567E5A52BD7643D00D5D5A0 /* YHHomeCollectionLayout.swift in Sources */,
04A6715C2B9FE9EA00C1FB91 /* YHCertificateUploadContentListVC.swift in Sources */,
A5A89FD32C25518B005A71DD /* YHActivityApplyInfoView.swift in Sources */,
A592FE972BA6DB340062FACA /* YHCertificateViewModel.swift in Sources */,
045EEEF02B9F171A0022A143 /* YHChildPrimaryInfoVC.swift in Sources */,
04F5F8602C1944D5004A463C /* YHHKCenterViewController.swift in Sources */,
......@@ -3184,6 +3194,7 @@
04FD85662C2124AF00BEF9C5 /* YHMyNameCardViewController.swift in Sources */,
045EEF192B9F171A0022A143 /* YHAddressModel.swift in Sources */,
045EEEDB2B9F171A0022A143 /* YHCollegeSearchViewController.swift in Sources */,
A5A89FD52C255250005A71DD /* YHActivityTwoItemView.swift in Sources */,
045EEE982B9F171A0022A143 /* YHPreviewInfoQuestionAndAnswerItemsView.swift in Sources */,
045EEE7A2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift in Sources */,
0414BDA92BC7E81500225367 /* YHMyPermissionSettingVC.swift in Sources */,
......@@ -3254,6 +3265,7 @@
A582B2432BB95E20009D098C /* YHHKPlanCell.swift in Sources */,
045EEEC52B9F171A0022A143 /* YHOtherPickerView.swift in Sources */,
045EEE842B9F171A0022A143 /* YHPreviewBasiceInformationViewController.swift in Sources */,
A5A89FD12C254B5C005A71DD /* YHActivityTravelitemView.swift in Sources */,
A5ACE9282B4564F7002C94D2 /* YHSmsCodeView.swift in Sources */,
0499E3002C056EE30037E646 /* YHOneKeyLoginView.swift in Sources */,
043D2C8C2C0F037B00172438 /* YHServiceOrderSearchViewModel.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityTravelViewController.swift
View file @ ecbd95be
......@@ -52,6 +52,8 @@ class YHActivityTravelViewController: YHBaseViewController {
gk_navigationBar.isHidden = false
gk_navigationBar.backgroundColor = .clear
gk_navBarAlpha = 0
view.backgroundColor = UIColor.pageBkgColor
//1.
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityApplyInfoView.swift 0 → 100644
View file @ ecbd95be
//
// YHActivityApplyInfoView.swift
// galaxy
//
// Created by davidhuangA on 2024/6/21.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHActivityApplyInfoView: UIView {
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override init(frame: CGRect) {
super.init(frame: frame)
setupUI()
}
lazy var titleLable:UILabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor
label.textAlignment = .left
label.font = UIFont.PFSC_M(ofSize:17)
label.text = "报名信息"
return label
}()
lazy var nameItem:YHActivityTwoItemView = {
let view = YHActivityTwoItemView()
return view
}()
lazy var numberItem:YHActivityTwoItemView = {
let view = YHActivityTwoItemView()
return view
}()
lazy var phoneItem:YHActivityTwoItemView = {
let view = YHActivityTwoItemView()
return view
}()
}
extension YHActivityApplyInfoView {
func setupUI() {
addSubview(titleLable)
addSubview(nameItem)
addSubview(numberItem)
addSubview(phoneItem)
titleLable.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
make.height.equalTo(24)
}
nameItem.snp.makeConstraints { make in
make.top.equalTo(titleLable.snp.bottom).offset(16)
make.left.right.equalToSuperview()
}
numberItem.snp.makeConstraints { make in
make.top.equalTo(nameItem.snp.bottom).offset(16)
make.left.right.equalToSuperview()
}
phoneItem.snp.makeConstraints { make in
make.top.equalTo(numberItem.snp.bottom).offset(16)
make.left.right.equalToSuperview()
make.bottom.equalToSuperview()
}
}
}
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityTipsItemView.swift
View file @ ecbd95be
......@@ -19,6 +19,8 @@ class YHActivityTipsItemView: UIView {
setupUI()
}
var showLineFlag : Bool = true
private lazy var bottomLine : UIView = {
let view = UIView()
......@@ -46,25 +48,30 @@ class YHActivityTipsItemView: UIView {
nameLabel.numberOfLines = 0
return nameLabel
}()
}
extension YHActivityTipsItemView {
func setupUI() {
addSubview(bottomLine)
addSubview(nameLabel)
addSubview(describeLable)
override func layoutSubviews() {
super.layoutSubviews()
bottomLine.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
make.height.equalTo(1)
}
if showLineFlag {
bottomLine.isHidden = false
nameLabel.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.top.equalTo(bottomLine.snp.bottom).offset(24)
}
} else {
bottomLine.isHidden = true
nameLabel.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
}
}
describeLable.snp.makeConstraints { make in
make.left.right.equalToSuperview()
......@@ -74,3 +81,13 @@ extension YHActivityTipsItemView {
}
}
}
extension YHActivityTipsItemView {
func setupUI() {
addSubview(bottomLine)
addSubview(nameLabel)
addSubview(describeLable)
}
}
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityTravelCell.swift
View file @ ecbd95be
......@@ -44,21 +44,22 @@ class YHActivityTravelCell: UITableViewCell {
//活动名称地址
lazy var acitivityTitle:YHActivityTitleItemView = {
let view = YHActivityTitleItemView()
lazy var acitivityTitle:YHActivityTravelitemView = {
let view = YHActivityTravelitemView()
return view
}()
//活动详情
lazy var acitivityDetail:YHActivityDetailItemView = {
let view = YHActivityDetailItemView()
//报名人数
lazy var acitivityApplyNumber:YHActivityApplyInfoView = {
let view = YHActivityApplyInfoView()
return view
}()
//活动温馨提示
lazy var acitivityTips:YHActivityTipsItemView = {
let view = YHActivityTipsItemView()
view.showLineFlag = false
return view
}()
......@@ -124,7 +125,7 @@ extension YHActivityTravelCell {
contentView.addSubview(statusLable)
contentView.addSubview(acitivityTitle)
contentView.addSubview(acitivityDetail)
contentView.addSubview(acitivityApplyNumber)
contentView.addSubview(acitivityTips)
contentView.addSubview(cancelButton)
......@@ -141,18 +142,17 @@ extension YHActivityTravelCell {
}
acitivityDetail.snp.makeConstraints { make in
make.top.equalTo(acitivityTitle.snp.bottom).offset(24)
acitivityApplyNumber.snp.makeConstraints { make in
make.top.equalTo(acitivityTitle.snp.bottom).offset(32)
make.left.right.equalToSuperview()
}
acitivityTips.snp.makeConstraints { make in
make.top.equalTo(acitivityDetail.snp.bottom).offset(24)
make.top.equalTo(acitivityApplyNumber.snp.bottom).offset(32)
make.left.right.equalToSuperview()
// make.bottom.equalToSuperview().offset(-42)
}
acitivityTips.layoutIfNeeded()
cancelButton.snp.makeConstraints { make in
make.top.equalTo(acitivityTips.snp.bottom).offset(32)
......
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityTravelitemView.swift 0 → 100644
View file @ ecbd95be
//
// YHActivityTravelitemView.swift
// galaxy
//
// Created by davidhuangA on 2024/6/21.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHActivityTravelitemView: UIView {
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override init(frame: CGRect) {
super.init(frame: frame)
setupUI()
}
lazy var activityImgV:UIImageView = {
let view = UIImageView()
view.contentMode = .scaleAspectFill
view.backgroundColor = .purple
return view
}()
lazy var nameLabel:UILabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor
label.textAlignment = .left
label.font = UIFont.PFSC_M(ofSize:18)
label.text = "哈佛爸爸线下教育沙龙哈佛爸爸线下教育沙龙哈佛爸爸线下教育沙龙哈佛爸爸线下教育沙龙"
label.numberOfLines = 2
return label
}()
lazy var timeStaticLable:UILabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor50
label.textAlignment = .left
label.font = UIFont.PFSC_R(ofSize:14)
label.text = "时间"
return label
}()
lazy var timeLable:UILabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor
label.textAlignment = .left
label.font = UIFont.PFSC_R(ofSize:14)
label.text = "2024-08-06 周五 09:30"
label.numberOfLines = 0
return label
}()
lazy var addressStaticLable:UILabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor50
label.textAlignment = .left
label.font = UIFont.PFSC_R(ofSize:14)
label.text = "地址"
return label
}()
lazy var addressLable:UILabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor
label.textAlignment = .left
label.font = UIFont.PFSC_R(ofSize:14)
label.text = "深圳市本元大厦26A银河集团体验中心深圳市本元大厦26A银河集团体验中心深圳市本元大厦26A银河集团体验中心深圳市本元大厦26A银河集团体验中心深圳市本元大厦26A银河集团体验中心"
label.numberOfLines = 0
return label
}()
lazy var navAddressLable:UILabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor50
label.textAlignment = .left
label.font = UIFont.PFSC_R(ofSize:14)
label.text = "距地铁10号线亮马站D口步行62距地铁10号线亮马站D口步行62距地铁10号线亮马站D口步行62距地铁10号线亮马站D口步行62"
label.numberOfLines = 0
return label
}()
}
extension YHActivityTravelitemView {
func setupUI() {
backgroundColor = .white
layer.cornerRadius = kCornerRadius6
clipsToBounds = true
addSubview(activityImgV)
addSubview(nameLabel)
addSubview(timeStaticLable)
addSubview(timeLable)
addSubview(addressStaticLable)
addSubview(addressLable)
addSubview(navAddressLable)
activityImgV.snp.makeConstraints { make in
make.top.equalTo(20)
make.right.equalTo(-20)
make.height.width.equalTo(72)
}
nameLabel.snp.makeConstraints { make in
make.top.equalTo(24)
make.left.equalTo(20)
make.right.equalTo(activityImgV.snp.left).offset(-42)
}
timeStaticLable.snp.makeConstraints { make in
make.left.equalTo(nameLabel.snp.left)
make.top.equalTo(activityImgV.snp.bottom).offset(24)
make.height.equalTo(20)
make.width.equalTo(28)
}
timeLable.snp.makeConstraints { make in
make.left.equalTo(timeStaticLable.snp.right).offset(16)
make.top.equalTo(timeStaticLable.snp.top)
make.right.equalToSuperview().offset(-20)
}
addressStaticLable.snp.makeConstraints { make in
make.left.equalTo(timeStaticLable.snp.left)
make.top.equalTo(timeLable.snp.bottom).offset(13)
make.height.equalTo(timeStaticLable.snp.height)
make.width.equalTo(timeStaticLable.snp.width)
}
addressLable.snp.makeConstraints { make in
make.left.equalTo(timeLable.snp.left)
make.top.equalTo(addressStaticLable.snp.top)
make.right.equalToSuperview().offset(-20)
}
navAddressLable.snp.makeConstraints { make in
make.left.equalTo(addressLable.snp.left)
make.top.equalTo(addressLable.snp.bottom).offset(8)
make.right.equalToSuperview().offset(-20)
make.bottom.equalToSuperview().offset(-20)
}
}
}
galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityTwoItemView.swift 0 → 100644
View file @ ecbd95be
//
// YHActivityTwoItemView.swift
// galaxy
//
// Created by davidhuangA on 2024/6/21.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHActivityTwoItemView: UIView {
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override init(frame: CGRect) {
super.init(frame: frame)
setupUI()
}
lazy var titleLable:UILabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor50
label.textAlignment = .left
label.font = UIFont.PFSC_R(ofSize:14)
label.text = "您的姓名"
// label.numberOfLines = 0
return label
}()
lazy var detailLable:UILabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor
label.textAlignment = .right
label.font = UIFont.PFSC_R(ofSize:14)
label.text = "侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊侯林俊"
label.numberOfLines = 0
return label
}()
}
extension YHActivityTwoItemView {
func setupUI() {
addSubview(titleLable)
addSubview(detailLable)
titleLable.snp.makeConstraints { make in
make.top.left.equalToSuperview()
make.width.equalTo(56)
}
detailLable.snp.makeConstraints { make in
make.top.equalTo(titleLable.snp.top)
make.left.equalTo(titleLable.snp.right).offset(20)
make.right.equalToSuperview()
make.bottom.equalToSuperview()
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment