Skip to content

G
galaxy-iOS
Commit 6ce1b13d authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

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

parents 8e3dd755 43daaa3d
Hide whitespace changes
Inline Side-by-side
Showing with 484 additions and 35 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 6ce1b13d
......@@ -356,6 +356,7 @@
A5573EF32B317C0100D98EC0 /* galaxyUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573EF22B317C0100D98EC0 /* galaxyUITests.swift */; };
A5573EF52B317C0100D98EC0 /* galaxyUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573EF42B317C0100D98EC0 /* galaxyUITestsLaunchTests.swift */; };
A566A79A2C219FA400980D06 /* YHHomeSalonAreaView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A566A7992C219FA400980D06 /* YHHomeSalonAreaView.swift */; };
A566A79C2C227C9B00980D06 /* YHOrderTipsItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A566A79B2C227C9B00980D06 /* YHOrderTipsItemView.swift */; };
A567E5922BD7643D00D5D5A0 /* YHHomeWebViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A567E5682BD7643D00D5D5A0 /* YHHomeWebViewModel.swift */; };
A567E5932BD7643D00D5D5A0 /* YHHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A567E5692BD7643D00D5D5A0 /* YHHomePageViewModel.swift */; };
A567E5942BD7643D00D5D5A0 /* YHHomeListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A567E56B2BD7643D00D5D5A0 /* YHHomeListModel.swift */; };
......@@ -881,6 +882,7 @@
A5573EF22B317C0100D98EC0 /* galaxyUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = galaxyUITests.swift; sourceTree = "<group>"; };
A5573EF42B317C0100D98EC0 /* galaxyUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = galaxyUITestsLaunchTests.swift; sourceTree = "<group>"; };
A566A7992C219FA400980D06 /* YHHomeSalonAreaView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeSalonAreaView.swift; sourceTree = "<group>"; };
A566A79B2C227C9B00980D06 /* YHOrderTipsItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOrderTipsItemView.swift; sourceTree = "<group>"; };
A567E5682BD7643D00D5D5A0 /* YHHomeWebViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHHomeWebViewModel.swift; sourceTree = "<group>"; };
A567E5692BD7643D00D5D5A0 /* YHHomePageViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHHomePageViewModel.swift; sourceTree = "<group>"; };
A567E56B2BD7643D00D5D5A0 /* YHHomeListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHHomeListModel.swift; sourceTree = "<group>"; };
......@@ -1163,6 +1165,8 @@
044D0BE82C2019AC00C5CF5E /* Community(社区) */ = {
isa = PBXGroup;
children = (
A566A79E2C228CE800980D06 /* Connection(人脉) */,
A566A79D2C228C8C00980D06 /* Activity(活动) */,
04F957492C2032A0003C631C /* V */,
044D0BE92C2019AC00C5CF5E /* VM */,
044D0BEA2C2019AC00C5CF5E /* M */,
......@@ -1191,7 +1195,6 @@
isa = PBXGroup;
children = (
044D0BED2C2019C100C5CF5E /* YHCommunityViewController.swift */,
044D0BEF2C2025FF00C5CF5E /* YHActivityViewController.swift */,
044D0BF12C20262100C5CF5E /* YHPeopleViewController.swift */,
04F957462C203033003C631C /* YHMyGoodFriendsVC.swift */,
04FD85652C2124AF00BEF9C5 /* YHMyNameCardViewController.swift */,
......@@ -2191,6 +2194,37 @@
path = galaxyUITests;
sourceTree = "<group>";
};
A566A79D2C228C8C00980D06 /* Activity(活动) */ = {
isa = PBXGroup;
children = (
A566A7A02C228DDE00980D06 /* V */,
A566A79F2C228DB500980D06 /* C */,
);
path = "Activity(活动)";
sourceTree = "<group>";
};
A566A79E2C228CE800980D06 /* Connection(人脉) */ = {
isa = PBXGroup;
children = (
);
path = "Connection(人脉)";
sourceTree = "<group>";
};
A566A79F2C228DB500980D06 /* C */ = {
isa = PBXGroup;
children = (
044D0BEF2C2025FF00C5CF5E /* YHActivityViewController.swift */,
);
path = C;
sourceTree = "<group>";
};
A566A7A02C228DDE00980D06 /* V */ = {
isa = PBXGroup;
children = (
);
path = V;
sourceTree = "<group>";
};
A567E5662BD7643D00D5D5A0 /* Home(首页) */ = {
isa = PBXGroup;
children = (
......@@ -2273,6 +2307,7 @@
A567E5912BD7643D00D5D5A0 /* YHSearchItemLayout.swift */,
A5EE41EE2C21387C005BBA5D /* YHAiRadarAreaView.swift */,
A566A7992C219FA400980D06 /* YHHomeSalonAreaView.swift */,
A566A79B2C227C9B00980D06 /* YHOrderTipsItemView.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -3232,6 +3267,7 @@
044D0C022C216AAF00C5CF5E /* YHInformationAuthorizeViewModel.swift in Sources */,
A5ACE9572B4564F7002C94D2 /* YHBasicContentView.swift in Sources */,
A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */,
A566A79C2C227C9B00980D06 /* YHOrderTipsItemView.swift in Sources */,
A517A4E52BB6C4BB000DEECD /* YHDocumentFileItemView.swift in Sources */,
045EEEFE2B9F171A0022A143 /* YHFormItemInputTextCell.swift in Sources */,
045EEEDD2B9F171A0022A143 /* YHCollegeNameCell.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeHeadView.swift
View file @ 6ce1b13d
......@@ -92,6 +92,16 @@ class YHHomeHeadView: UIView {
self.layoutIfNeeded()
}
}
override func layoutSubviews() {
super.layoutSubviews()
// orderTipsView.snp.makeConstraints { make in
// make.top.equalTo(bannerLineTop.snp.bottom).offset(20)
// make.left.right.equalToSuperview()
// make.height.equalTo(YHOrderTipsView.viewH)
// }
}
}
private extension YHHomeHeadView {
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsItemView.swift 0 → 100644
View file @ 6ce1b13d
//
// YHOrderTipsItemView.swift
// galaxy
//
// Created by davidhuangA on 2024/6/19.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import AttributedString
class YHOrderTipsItemView: UIView {
static let viewH = 52.0
override init(frame: CGRect) {
super.init(frame: frame)
setupUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
//文书定稿
lazy var lableMyOrder: UILabel = {
let lable : UILabel = UILabel()
lable.text = "文书定稿"
lable.font = UIFont.PFSC_R(ofSize: 13)
lable.textColor = UIColor.yhGreyColor
return lable
}()
//分割线
lazy var segmentationView: UIView = {
let view : UIView = UIView()
view.backgroundColor = UIColor.mainTextColor18
return view
}()
//右箭头
lazy var rightIconImageV: UIImageView = {
let imgV : UIImageView = UIImageView()
imgV.contentMode = .scaleAspectFill
imgV.image = UIImage(named: "home_order_tips_right_arrow")
return imgV
}()
//您有2份证件需要签...
lazy var lableName: UILabel = {
let lable : UILabel = UILabel()
lable.text = "您有2份证件需要签"
lable.font = UIFont.PFSC_R(ofSize: 13)
lable.textColor = UIColor.mainTextColor70
lable.lineBreakMode = .byTruncatingTail
return lable
}()
//20分钟前
lazy var lableTime: UILabel = {
let lable : UILabel = UILabel()
lable.text = "20分钟前"
lable.font = UIFont.PFSC_R(ofSize: 12)
lable.textColor = UIColor.mainTextColor
lable.textAlignment = .right
return lable
}()
}
extension YHOrderTipsItemView {
@objc func tapButton(gestureRecognizer:UITapGestureRecognizer) {
goTabBarBy(tabType: .community) //for test hjl
}
func setupUI() {
backgroundColor = UIColor.white
addSubview(lableMyOrder)
lableMyOrder.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.left.equalTo(12)
make.height.equalTo(18)
make.width.lessThanOrEqualTo(60)
}
addSubview(segmentationView)
segmentationView.snp.makeConstraints { make in
make.left.equalTo(lableMyOrder.snp.right).offset(8)
make.height.equalTo(10)
make.width.equalTo(1)
make.centerY.equalToSuperview()
}
addSubview(rightIconImageV)
rightIconImageV.snp.makeConstraints { make in
make.right.equalTo(-12)
make.centerY.equalToSuperview()
make.width.height.equalTo(12)
}
addSubview(lableTime)
lableTime.snp.makeConstraints { make in
make.right.equalTo(rightIconImageV.snp.left)
make.centerY.equalTo(rightIconImageV)
make.height.equalTo(18)
make.width.lessThanOrEqualTo(60)
}
// lableTime.backgroundColor = .red//for test hjl
addSubview(lableName)
lableName.snp.makeConstraints { make in
make.left.equalTo(segmentationView.snp.right).offset(8)
make.height.equalTo(18)
make.centerY.equalToSuperview()
make.right.equalTo(lableTime.snp.left).offset(-12)
}
let aa: ASAttributedString = .init("您有", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor70))
let bb: ASAttributedString = .init("3", .font(UIFont.PFSC_B(ofSize: 13)),.foreground(UIColor.brandMainColor))
let cc: ASAttributedString = .init("份证件需要上传份证件需要上传份证件需要上传", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor70))
lableName.attributed.text = aa+bb+cc
}
}
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsView.swift
View file @ 6ce1b13d
......@@ -11,59 +11,227 @@ import AttributedString
class YHOrderTipsView: UIView {
static let viewH = 65.0
// static let viewH = 91.0
static let viewH = 226.0
static let viewH2 = 162.0
static let viewH3 = 226.0
override init(frame: CGRect) {
super.init(frame: frame)
setupUI()
let tap : UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(tapButton(gestureRecognizer:)))
addGestureRecognizer(tap)
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
@objc func didLookOrderBtnClicked() {
lazy var bkgImageV: UIImageView = {
let imgV : UIImageView = UIImageView()
imgV.contentMode = .scaleAspectFill
imgV.image = UIImage(named: "home_order_tips_bkg")
return imgV
}()
lazy var topImageV: UIImageView = {
let imgV : UIImageView = UIImageView()
imgV.contentMode = .scaleAspectFill
imgV.image = UIImage(named: "home_order_tips_top_bkg")
return imgV
}()
lazy var iconImageV: UIImageView = {
let imgV : UIImageView = UIImageView()
imgV.contentMode = .scaleAspectFill
imgV.image = UIImage(named: "home_order_tips_icon")
return imgV
}()
override func layoutSubviews() {
super.layoutSubviews()
// addSubview(bkgImageV)
// bkgImageV.snp.updateConstraints { make in
// make.edges.equalToSuperview()
// }
}
//智能助理
lazy var lableTip: UILabel = {
let lable : UILabel = UILabel()
return lable
}()
//我的订单
lazy var lableMyOrder: UILabel = {
let lable : UILabel = UILabel()
lable.text = "我的订单"
lable.font = UIFont.PFSC_R(ofSize: 13)
lable.textColor = UIColor.yhGreyColor
return lable
}()
//右箭头
lazy var rightIconImageV: UIImageView = {
let imgV : UIImageView = UIImageView()
imgV.contentMode = .scaleAspectFill
imgV.image = UIImage(named: "home_order_tips_right_arrow")
return imgV
}()
//上午好！张先生
lazy var lableName: UILabel = {
let lable : UILabel = UILabel()
lable.text = "上午好！张先生"
lable.font = UIFont.PFSC_R(ofSize: 12)
lable.textColor = UIColor.mainTextColor50
return lable
}()
//分割线
lazy var segmentationView: UIView = {
let view : UIView = UIView()
view.backgroundColor = UIColor.mainTextColor18
return view
}()
//银河港生活陪伴您的第190天
lazy var lableDays: UILabel = {
let lable : UILabel = UILabel()
lable.text = "银河港生活陪伴您的第190天"
lable.font = UIFont.PFSC_R(ofSize: 12)
lable.textColor = UIColor.mainTextColor50
return lable
}()
lazy var firstItem: YHOrderTipsItemView = {
let itemView : YHOrderTipsItemView = YHOrderTipsItemView()
return itemView
}()
lazy var secondItem: YHOrderTipsItemView = {
let itemView : YHOrderTipsItemView = YHOrderTipsItemView()
return itemView
}()
}
extension YHOrderTipsView {
@objc func tapButton(gestureRecognizer:UITapGestureRecognizer) {
goTabBarBy(tabType: .service)
}
func setupUI() {
self.backgroundColor = UIColor(hex: 0xF8FAFB)
let imgView = UIImageView(image: UIImage(named: "home_tips_order"))
addSubview(imgView)
imgView.snp.makeConstraints { make in
make.width.height.equalTo(31)
make.centerY.equalToSuperview()
make.left.equalTo(14)
backgroundColor = UIColor(hex: 0xF8FAFB)
// addSubview(bkgImageV)
// bkgImageV.snp.makeConstraints { make in
// make.left.top.equalToSuperview()
// make.width.equalTo(KScreenWidth - 40)
// make.height.equalTo(YHOrderTipsView.viewH)
// }
addSubview(topImageV)
topImageV.snp.makeConstraints { make in
// 182 99
make.top.left.equalToSuperview()
make.width.equalTo(182)
make.height.equalTo(99)
}
let label = UILabel()
label.textAlignment = .left
let aa: ASAttributedString = .init("您有", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
let bb: ASAttributedString = .init("1", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.brandMainColor))
let cc: ASAttributedString = .init("个服务中的优才订单", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
label.attributed.text = aa+bb+cc
addSubview(label)
label.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.left.equalTo(imgView.snp.right).offset(6)
//智能头像
addSubview(iconImageV)
iconImageV.snp.makeConstraints { make in
make.top.equalTo(18)
make.left.equalTo(kMargin)
make.width.height.equalTo(27)
}
let btn = UIButton()
btn.setTitle("查看进度", for: .normal)
btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor.brandMainColor
btn.titleLabel?.font = .PFSC_R(ofSize: 12)
btn.addTarget(self, action: #selector(didLookOrderBtnClicked), for: .touchUpInside)
addSubview(btn)
btn.snp.makeConstraints { make in
make.width.equalTo(72)
make.height.equalTo(33)
make.centerY.equalToSuperview()
make.left.equalTo(label.snp.right).offset(16)
make.right.equalTo(-16)
addSubview(lableTip)
lableTip.snp.makeConstraints { make in
make.centerY.equalTo(iconImageV)
make.left.equalTo(iconImageV.snp.right).offset(6)
}
let aa: ASAttributedString = .init("智能", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor(hex: 0x2465DE, alpha: 1.0)))
let bb: ASAttributedString = .init("客服", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.mainTextColor))
lableTip.attributed.text = aa+bb
addSubview(rightIconImageV)
rightIconImageV.snp.makeConstraints { make in
make.right.equalTo(-20)
make.top.equalTo(23)
make.width.height.equalTo(12)
}
addSubview(lableMyOrder)
lableMyOrder.snp.makeConstraints { make in
make.right.equalTo(rightIconImageV.snp.left)
make.centerY.equalTo(rightIconImageV)
make.height.equalTo(18)
}
addSubview(lableName)
lableName.snp.makeConstraints { make in
make.top.equalTo(iconImageV.snp.bottom).offset(9)
make.left.equalTo(iconImageV.snp.left)
make.height.equalTo(17)
}
addSubview(segmentationView)
segmentationView.snp.makeConstraints { make in
make.left.equalTo(lableName.snp.right).offset(8)
make.height.equalTo(10)
make.width.equalTo(1)
make.centerY.equalTo(lableName.snp.centerY)
}
addSubview(lableDays)
lableDays.snp.makeConstraints { make in
make.left.equalTo(segmentationView.snp.right).offset(8)
make.height.equalTo(17)
make.centerY.equalTo(segmentationView.snp.centerY)
// make.right.equalTo(-kMargin)
}
addSubview(firstItem)
firstItem.snp.makeConstraints { make in
make.top.equalTo(lableName.snp.bottom).offset(20)
make.left.equalTo(kMargin)
make.right.equalTo(-kMargin)
make.height.equalTo(YHOrderTipsItemView.viewH)
}
addSubview(secondItem)
secondItem.snp.makeConstraints { make in
make.top.equalTo(firstItem.snp.bottom).offset(12)
make.left.equalTo(kMargin)
make.right.equalTo(-kMargin)
make.height.equalTo(YHOrderTipsItemView.viewH)
}
}
}
galaxy/galaxy/Res/Assets.xcassets/Home/orderTips/Contents.json 0 → 100644
View file @ 6ce1b13d
{
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/Home/orderTips/home_order_tips_bkg.imageset/Contents.json 0 → 100644
View file @ 6ce1b13d
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Rectangle 346240924@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Rectangle 346240924@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/Home/orderTips/home_order_tips_icon.imageset/Contents.json 0 → 100644
View file @ 6ce1b13d
{
"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/orderTips/home_order_tips_right_arrow.imageset/Contents.json 0 → 100644
View file @ 6ce1b13d
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Group 33334424@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Group 33334424@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/Home/orderTips/home_order_tips_top_bkg.imageset/Contents.json 0 → 100644
View file @ 6ce1b13d
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Mask group@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Mask group@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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