Skip to content

G
galaxy-iOS
Commit 65998571 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

调整正式批大屏逻辑

parent c452ce02
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 26 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 65998571
......@@ -47,6 +47,7 @@
0425E6442BA95FE100A5E763 /* YHSchemeTableHeadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E6432BA95FE100A5E763 /* YHSchemeTableHeadView.swift */; };
0425E6462BA9678E00A5E763 /* YHSchemeHeadTotalScoreView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E6452BA9678E00A5E763 /* YHSchemeHeadTotalScoreView.swift */; };
0425E6482BA96B4100A5E763 /* YHSchemeHeadScoreItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E6472BA96B4100A5E763 /* YHSchemeHeadScoreItemView.swift */; };
0430E63B2C6DA106000511E2 /* CGFloat+Extention.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0430E63A2C6DA106000511E2 /* CGFloat+Extention.swift */; };
0435FA7F2BA178C100024EAE /* YHCommonAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */; };
0435FA812BA186D600024EAE /* YHMyFileMethodTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */; };
0435FA832BA2DEB100024EAE /* YHCardButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0435FA822BA2DEB100024EAE /* YHCardButton.swift */; };
......@@ -699,6 +700,7 @@
0425E6432BA95FE100A5E763 /* YHSchemeTableHeadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSchemeTableHeadView.swift; sourceTree = "<group>"; };
0425E6452BA9678E00A5E763 /* YHSchemeHeadTotalScoreView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSchemeHeadTotalScoreView.swift; sourceTree = "<group>"; };
0425E6472BA96B4100A5E763 /* YHSchemeHeadScoreItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSchemeHeadScoreItemView.swift; sourceTree = "<group>"; };
0430E63A2C6DA106000511E2 /* CGFloat+Extention.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CGFloat+Extention.swift"; sourceTree = "<group>"; };
0435FA7E2BA178C100024EAE /* YHCommonAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCommonAlertView.swift; sourceTree = "<group>"; };
0435FA802BA186D600024EAE /* YHMyFileMethodTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileMethodTableViewCell.swift; sourceTree = "<group>"; };
0435FA822BA2DEB100024EAE /* YHCardButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCardButton.swift; sourceTree = "<group>"; };
......@@ -3100,6 +3102,7 @@
A5ACE9042B4564F7002C94D2 /* Array+Extension.swift */,
04754A942B96FF3D00F8ADCA /* UITextField+Extension.swift */,
A5B6ED772C27FC0B001B6732 /* Int+Extension.swift */,
0430E63A2C6DA106000511E2 /* CGFloat+Extention.swift */,
);
path = Extention;
sourceTree = "<group>";
......@@ -3772,6 +3775,7 @@
A5DE0D3C2BB9016200976FE1 /* YHEmailInputAlertView.swift in Sources */,
A5ACE9512B4564F7002C94D2 /* YhConstant.swift in Sources */,
04FD85662C2124AF00BEF9C5 /* YHNameCardViewController.swift in Sources */,
0430E63B2C6DA106000511E2 /* CGFloat+Extention.swift in Sources */,
045EEF192B9F171A0022A143 /* YHAddressModel.swift in Sources */,
045EEEDB2B9F171A0022A143 /* YHCollegeSearchViewController.swift in Sources */,
04C85DE72C36ADAE008B20D6 /* YHMyFileListHeaderView.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApproval(正式批)/C/YHOfficialApprovalResultVC.swift
View file @ 65998571
......@@ -280,9 +280,9 @@ private extension YHOfficialApprovalResultVC {
view.addSubview(paperImageV)
paperImageV.snp.makeConstraints { make in
make.left.equalToSuperview()
make.top.equalToSuperview().offset(200)
make.width.equalTo(294)
make.height.equalTo(530)
make.top.equalToSuperview().offset(CGFloat(200).scaleSizeFrom375px(size: 200))
make.width.equalTo(CGFloat(294).scaleSizeFrom375px(size: 294))
make.height.equalTo(CGFloat(530).scaleSizeFrom375px(size: 530))
}
paperImageV.layer.zPosition = 0
......@@ -290,27 +290,27 @@ private extension YHOfficialApprovalResultVC {
view.addSubview(docImageV)
docImageV.snp.makeConstraints { make in
make.right.equalToSuperview()
make.top.equalToSuperview().offset(64)
make.width.equalTo(294)
make.height.equalTo(530)
make.top.equalToSuperview().offset(CGFloat(64).scaleSizeFrom375px(size: 64))
make.width.equalTo(CGFloat(294).scaleSizeFrom375px(size: 294))
make.height.equalTo(CGFloat(530).scaleSizeFrom375px(size: 530))
}
docImageV.layer.zPosition = 1
docImageV.addSubview(contentView)
contentView.snp.makeConstraints { make in
make.left.equalTo(50)
make.top.equalTo(140)
make.width.equalTo(294)
make.height.equalTo(530)
make.left.equalTo(CGFloat(50).scaleSizeFrom375px(size: 50))
make.top.equalTo(CGFloat(140).scaleSizeFrom375px(size: 140))
make.width.equalTo(CGFloat(294).scaleSizeFrom375px(size: 294))
make.height.equalTo(CGFloat(530).scaleSizeFrom375px(size: 530))
}
contentView.transform = rotatedTransform()
docImageV.addSubview(penImageV)
penImageV.snp.makeConstraints { make in
make.top.equalToSuperview().offset(204)
make.top.equalToSuperview().offset(CGFloat(204).scaleSizeFrom375px(size: 204))
make.right.equalToSuperview()
make.width.equalTo(67)
make.height.equalTo(141)
make.width.equalTo(CGFloat(67).scaleSizeFrom375px(size: 67))
make.height.equalTo(CGFloat(141).scaleSizeFrom375px(size: 141))
}
penImageV.layer.zPosition = 1
......@@ -328,7 +328,7 @@ private extension YHOfficialApprovalResultVC {
view.addSubview(lightImageV)
lightImageV.snp.makeConstraints { make in
make.top.right.left.equalToSuperview()
make.height.equalTo(543)
make.height.equalTo(CGFloat(543).scaleSizeFrom375px(size: 543))
}
lightImageV.layer.zPosition = 3
......@@ -344,7 +344,7 @@ private extension YHOfficialApprovalResultVC {
bottomContentView.addSubview(tipsLabel)
tipsLabel.snp.makeConstraints { make in
make.bottom.equalToSuperview().offset(-50)
make.bottom.equalToSuperview().offset(CGFloat(-50).scaleSizeFrom375px(size: -50))
make.centerX.equalToSuperview()
}
......@@ -353,23 +353,23 @@ private extension YHOfficialApprovalResultVC {
indicatorView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.height.equalTo(2)
make.bottom.equalTo(tipsLabel.snp.top).offset(-20)
make.bottom.equalTo(tipsLabel.snp.top).offset(CGFloat(-20).scaleSizeFrom375px(size: -20))
}
bottomContentView.addSubview(bannerView)
bannerView.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.height.equalTo(148)
make.bottom.equalTo(indicatorView.snp.top).offset(-16)
make.height.equalTo(CGFloat(148).scaleSizeFrom375px(size: 148))
make.bottom.equalTo(indicatorView.snp.top).offset(CGFloat(-16).scaleSizeFrom375px(size: -16))
make.top.equalToSuperview().offset(20)
make.top.equalToSuperview().offset(CGFloat(20).scaleSizeFrom375px(size: 20))
}
bannerView.layer.zPosition = 10
// let transform = CGAffineTransform(scaleX: 0.6, y: 0.75)
bannerView.transformer = FSPagerViewTransformer(type:.linear)
// bannerView.transformer = FSPagerViewTransformer(type:.linear)
// bannerView.itemSize = CGSize(width: 268, height: 148).applying(transform)
bannerView.reloadData()
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/OfficialApproval(正式批)/V/YHOffivialApprovalSuccessView.swift
View file @ 65998571
......@@ -42,7 +42,7 @@ class YHOffivialApprovalSuccessView: UIView {
make.left.equalTo(5)
make.top.equalTo(0)
make.right.equalTo(-5)
make.height.equalTo(42)
make.height.equalTo(CGFloat(42).scaleSizeFrom375px(size: 42))
}
}
......@@ -64,18 +64,18 @@ class YHOffivialApprovalSuccessView: UIView {
}
addSubview(label)
label.snp.makeConstraints { make in
make.left.equalTo(5)
make.top.equalTo(h)
make.left.equalTo(CGFloat(5).scaleSizeFrom375px(size: 5))
make.top.equalTo(CGFloat(h).scaleSizeFrom375px(size: CGFloat(h)))
make.right.equalTo(-5)
make.height.equalTo(26)
make.height.equalTo(CGFloat(26).scaleSizeFrom375px(size: 26))
}
let line = UIView()
line.backgroundColor = UIColor(hex: 0x881000).withAlphaComponent(0.15)
addSubview(line)
line.snp.makeConstraints { make in
make.left.equalTo(5)
make.top.equalTo(h + 26 + 2)
make.width.equalTo(234)
make.top.equalTo(CGFloat(h + 26 + 2).scaleSizeFrom375px(size: CGFloat(h + 26 + 2)))
make.width.equalTo(CGFloat(234).scaleSizeFrom375px(size: 234))
make.height.equalTo(1)
}
h = h + 26 + 10
......
galaxy/galaxy/Classes/Tools/Extention/CGFloat+Extention.swift 0 → 100644
View file @ 65998571
//
// CGFloat+Extention.swift
// galaxy
//
// Created by EDY on 2024/8/15.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
extension CGFloat {
public func scaleSizeFrom375px(size: CGFloat) -> CGFloat {
let screenWidth = UIScreen.main.bounds.width
// 假设设计稿基于375pt宽度，iPhone 6的屏幕宽度
let baseWidth: CGFloat = 375
// 计算换算比例
let scale = screenWidth / baseWidth
// 应用换算比例
return size * scale
}
}
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