Skip to content

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

登录 注册页面 添加视频播放

parent 181cc9c6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 224 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ b62b5389
......@@ -212,7 +212,6 @@
045EEF232B9F171A0022A143 /* YHItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE762B9F171A0022A143 /* YHItemView.swift */; };
045EEF242B9F171A0022A143 /* YHStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE772B9F171A0022A143 /* YHStepView.swift */; };
045EEF252B9F171A0022A143 /* YHMainInformationCardTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE782B9F171A0022A143 /* YHMainInformationCardTableViewCell.swift */; };
0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; };
0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; };
0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; };
0468D4262B495A5400CFB916 /* YHPickPhoneAddressViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4252B495A5400CFB916 /* YHPickPhoneAddressViewController.swift */; };
......@@ -418,6 +417,8 @@
A5D5ADEF2BB90FBC0039FA6B /* YHCheckEamilAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D5ADEE2BB90FBB0039FA6B /* YHCheckEamilAlertView.swift */; };
A5DE0D3C2BB9016200976FE1 /* YHEmailInputAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */; };
A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */; };
A5DF3D482BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D472BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift */; };
A5DF3D4C2BF9A348003D5F03 /* loginBkg.mov in Resources */ = {isa = PBXBuildFile; fileRef = A5DF3D4B2BF9A348003D5F03 /* loginBkg.mov */; };
A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
A5EF21312BA6DF94005027E6 /* YHMineSchemeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */; };
A5EF21332BA6E030005027E6 /* YHFileListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21322BA6E030005027E6 /* YHFileListViewController.swift */; };
......@@ -671,7 +672,6 @@
045EEE762B9F171A0022A143 /* YHItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHItemView.swift; sourceTree = "<group>"; };
045EEE772B9F171A0022A143 /* YHStepView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHStepView.swift; sourceTree = "<group>"; };
045EEE782B9F171A0022A143 /* YHMainInformationCardTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHMainInformationCardTableViewCell.swift; sourceTree = "<group>"; };
0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; };
0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; };
0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; };
0468D4252B495A5400CFB916 /* YHPickPhoneAddressViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPickPhoneAddressViewController.swift; sourceTree = "<group>"; };
......@@ -887,6 +887,8 @@
A5D5ADEE2BB90FBB0039FA6B /* YHCheckEamilAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCheckEamilAlertView.swift; sourceTree = "<group>"; };
A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEmailInputAlertView.swift; sourceTree = "<group>"; };
A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTestViewController.swift; sourceTree = "<group>"; };
A5DF3D472BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneLiginWithVideoBkgViewController.swift; sourceTree = "<group>"; };
A5DF3D4B2BF9A348003D5F03 /* loginBkg.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; path = loginBkg.mov; sourceTree = "<group>"; };
A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMineSchemeViewController.swift; sourceTree = "<group>"; };
A5EF21322BA6E030005027E6 /* YHFileListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListViewController.swift; sourceTree = "<group>"; };
......@@ -2072,12 +2074,12 @@
A5ACE8DA2B4564F7002C94D2 /* C */ = {
isa = PBXGroup;
children = (
0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */,
0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */,
0468D4252B495A5400CFB916 /* YHPickPhoneAddressViewController.swift */,
04E86E082B707ACE00A35F4B /* YHPhoneLoginViewController.swift */,
04E86E0A2B70C13300A35F4B /* YHCodeSueecssViewController.swift */,
04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */,
A5DF3D472BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift */,
);
path = C;
sourceTree = "<group>";
......@@ -2223,9 +2225,8 @@
A5ACE9142B4564F7002C94D2 /* Res */ = {
isa = PBXGroup;
children = (
04EA2E6D2BF74FA200AE80B0 /* shipin.json */,
04EA2E6E2BF74FA200AE80B0 /* shouye.json */,
04EA2E6F2BF74FA200AE80B0 /* zixun.json */,
A5DF3D4A2BF9A304003D5F03 /* jsons */,
A5DF3D492BF9A2E4003D5F03 /* videos */,
A5E69D4F2BA304D400411932 /* Font */,
A5C5B2ED2B4F9B8800A7C5D1 /* Localizable.xcstrings */,
04808C022B4686510056D53C /* Frameworks */,
......@@ -2371,6 +2372,24 @@
path = V;
sourceTree = "<group>";
};
A5DF3D492BF9A2E4003D5F03 /* videos */ = {
isa = PBXGroup;
children = (
A5DF3D4B2BF9A348003D5F03 /* loginBkg.mov */,
);
path = videos;
sourceTree = "<group>";
};
A5DF3D4A2BF9A304003D5F03 /* jsons */ = {
isa = PBXGroup;
children = (
04EA2E6D2BF74FA200AE80B0 /* shipin.json */,
04EA2E6F2BF74FA200AE80B0 /* zixun.json */,
04EA2E6E2BF74FA200AE80B0 /* shouye.json */,
);
path = jsons;
sourceTree = "<group>";
};
A5E69D4F2BA304D400411932 /* Font */ = {
isa = PBXGroup;
children = (
......@@ -2500,6 +2519,7 @@
04EA2E712BF74FA200AE80B0 /* shouye.json in Resources */,
A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */,
04EA2E702BF74FA200AE80B0 /* shipin.json in Resources */,
A5DF3D4C2BF9A348003D5F03 /* loginBkg.mov in Resources */,
047619ED2BA9B9C900F45358 /* area.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
......@@ -2580,7 +2600,6 @@
A592FE972BA6DB340062FACA /* YHCertificateViewModel.swift in Sources */,
045EEEF02B9F171A0022A143 /* YHChildPrimaryInfoVC.swift in Sources */,
A5D001212BAA9D99001F003C /* YHChoiceButtonHoldView.swift in Sources */,
0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */,
045EEEF62B9F171A0022A143 /* YHSpousePrimaryInfoVC.swift in Sources */,
044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */,
045EEF002B9F171A0022A143 /* YHFormItemEnterDetailCell.swift in Sources */,
......@@ -2926,6 +2945,7 @@
045EEE822B9F171A0022A143 /* YHPersonInfoIdentityCardModel.swift in Sources */,
045EEE952B9F171A0022A143 /* YHPreviewInfoCertificateInformationItemsView.swift in Sources */,
044413FD2BC386DA00784A14 /* YHServiceViewController.swift in Sources */,
A5DF3D482BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift in Sources */,
045EEEBB2B9F171A0022A143 /* YHWorkIntroductionTableViewCell.swift in Sources */,
045EEEED2B9F171A0022A143 /* YHParentInfoVC.swift in Sources */,
04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift
View file @ b62b5389
......@@ -253,7 +253,8 @@ extension YHHomePageViewController : UITabBarControllerDelegate {
if YHLoginManager.shared.isLogin() {
return true
} else {
let vc = UINavigationController(rootVC: YHPhoneLoginViewController())
// let vc = UINavigationController(rootVC: YHPhoneLoginViewController())
let vc = UINavigationController(rootVC: YHPhoneLiginWithVideoBkgViewController())
vc.modalPresentationStyle = .custom
UIViewController.current?.navigationController?.present(vc, animated: true)
YHLoginManager.shared.loginSuccessActionBlock = {[weak self] in
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHPhoneLoginViewController.swift
View file @ b62b5389
......@@ -138,7 +138,7 @@ class YHPhoneLoginViewController: YHBaseViewController {
make.left.equalTo(20)
make.right.equalTo(-20)
make.top.equalTo(300)
make.height.equalTo(56)
make.height.equalTo(44)
}
getCodeButton = {
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHVerificationCodeLoginController.swift deleted 100644 → 0
View file @ 181cc9c6
//
// YHVerificationCodeLoginController.swift
// galaxy
//
// Created by EDY on 2024/1/6.
// Copyright © 2024 www.davidhuang.com. All rights reserved.
//
import UIKit
class YHVerificationCodeLoginController: YHBaseViewController {
var bgImageView: UIImageView!
var loginTitleLabel: UILabel!
var loginSubTitleLabel: UILabel!
var phoneLabel: UILabel!
var phoneMessageView: YHPhoneMessageView!
var getCodeButton: UIButton!
var emailButton: UIButton!
var centerLine: UIView!
var centerImageView: UIImageView!
var promptsLabel: UILabel!
var wxButton: UIButton!
var privacyView: YHLoginPrivacyView!
override func viewDidLoad() {
super.viewDidLoad()
setView()
// Do any additional setup after loading the view.
}
func setView() {
bgImageView = {
let imageView = UIImageView()
imageView.image = UIImage(named: "login_bg_image")
return imageView
}()
view.addSubview(bgImageView)
bgImageView.snp.makeConstraints { make in
make.left.right.top.bottom.equalTo(view)
}
loginTitleLabel = {
let label = UILabel()
label.text = "登录后更精彩"
label.font = UIFont.PFSC_M(ofSize: 32)
label.textColor = UIColor(hex:0xffffff)
return label
}()
view.addSubview(loginTitleLabel)
loginTitleLabel.snp.makeConstraints { make in
make.left.equalTo(14)
make.right.equalTo(-14)
make.top.equalTo(111)
make.height.equalTo(39)
}
loginSubTitleLabel = {
let label = UILabel()
label.text = "香港美好生活期待与你的相遇"
label.font = UIFont.PFSC_R(ofSize: 20)
label.textColor = UIColor(hex:0xffffff)
return label
}()
view.addSubview(loginSubTitleLabel)
loginSubTitleLabel.snp.makeConstraints { make in
make.left.equalTo(14)
make.right.equalTo(-14)
make.top.equalTo(159)
make.height.equalTo(24)
}
phoneLabel = {
let label = UILabel()
label.text = "未注册手机验证后完成注册"
label.font = UIFont.PFSC_M(ofSize: 17)
label.textAlignment = .left
label.textColor = UIColor(hex:0xffffff)
return label
}()
view.addSubview(phoneLabel)
phoneLabel.snp.makeConstraints { make in
make.left.equalTo(33)
make.right.equalTo(-33)
make.top.equalTo(242)
make.height.equalTo(22)
}
phoneMessageView = {
let view = YHPhoneMessageView()
view.backgroundColor = UIColor(hex:0xffffff)
view.layer.cornerRadius = 24
view.block = { [weak self] in
guard let self = self else { return }
let vc = YHPickPhoneAddressViewController()
self.navigationController?.pushViewController(vc)
}
return view
}()
view.addSubview(phoneMessageView)
phoneMessageView.snp.makeConstraints { make in
make.left.equalTo(33)
make.right.equalTo(-33)
make.top.equalTo(278)
make.height.equalTo(48)
}
getCodeButton = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0xd8d8d8).withAlphaComponent(0.8)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center
button.setTitle("获取验证码", for: .normal)
button.setTitleColor( UIColor(hex:0x979797), for: .normal)
button.layer.cornerRadius = 24
button.addTarget(self, action: #selector(getCode), for: .touchUpInside)
return button
}()
view.addSubview(getCodeButton)
getCodeButton.snp.makeConstraints { make in
make.left.equalTo(33)
make.right.equalTo(-33)
make.top.equalTo(348)
make.height.equalTo(48)
}
emailButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.setTitle("邮箱登录", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
return button
}()
view.addSubview(emailButton)
emailButton.snp.makeConstraints { make in
make.left.equalTo(33)
make.top.equalTo(424)
make.height.equalTo(20)
make.width.equalTo(68)
}
centerImageView = {
let imageView = UIImageView()
imageView.image = UIImage(named: "login_center_image")
return imageView
}()
view.addSubview(centerImageView)
centerImageView.snp.makeConstraints { make in
make.centerX.equalTo(view)
make.width.equalTo(153)
make.height.equalTo(108)
make.bottom.equalTo(-188)
}
promptsLabel = {
let label = UILabel()
label.text = "其他登录方式（第三方账号注册需绑定手机号）"
label.font = UIFont.PFSC_R(ofSize: 12)
label.textColor = UIColor(hex:0xffffff)
label.textAlignment = .center
return label
}()
view.addSubview(promptsLabel)
promptsLabel.snp.makeConstraints { make in
make.left.equalTo(14)
make.right.equalTo(-14)
make.bottom.equalTo(-89)
make.height.equalTo(20)
}
wxButton = {
let button = UIButton(type: .custom)
button.setBackgroundImage(UIImage(named: "login_style_wx"), for: .normal)
return button
}()
view.addSubview(wxButton)
wxButton.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.bottom.equalTo(-59)
make.height.equalTo(18)
make.width.equalTo(21)
}
privacyView = {
let view = YHLoginPrivacyView()
return view
}()
view.addSubview(privacyView)
privacyView.snp.makeConstraints { make in
make.bottom.equalTo(-24)
make.centerX.equalToSuperview()
make.height.equalTo(20)
make.width.equalTo(308)
}
}
@objc func getCode() {
let vc = YHCodeResultViewController()
self.navigationController?.pushViewController(vc)
}
}
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHPhoneMessageView.swift
View file @ b62b5389
......@@ -28,16 +28,19 @@ class YHPhoneMessageView: UIView {
func setView() {
messageButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.titleLabel?.font = UIFont(name: "DINAlternate-Bold", size: 18)//UIFont.PFSC_M(ofSize: 18)
button.setTitle("+86", for: .normal)
button.setTitleColor( UIColor(hex:0x000000), for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.addTarget(self, action: #selector(messageClick), for: .touchUpInside)
button.titleLabel?.textAlignment = .left
return button
}()
addSubview(messageButton)
messageButton.snp.makeConstraints { make in
make.top.bottom.equalToSuperview()
make.left.equalToSuperview().offset(16)
make.left.equalToSuperview()
make.width.equalTo(30)
make.height.equalTo(20)
}
pointImageView = {
......@@ -48,16 +51,16 @@ class YHPhoneMessageView: UIView {
addSubview(pointImageView)
pointImageView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.left.equalToSuperview().offset(60)
make.width.equalTo(5)
make.height.equalTo(2.83)
make.left.equalTo(messageButton.snp.right).offset(8)
make.width.equalTo(12)
make.height.equalTo(12)
}
phoneTextField = {
let text = UITextField()
text.placeholder = "请输入签约手机号"
text.font = UIFont.PFSC_R(ofSize: 16)
text.textColor = UIColor(hex:0x000000)
text.font = UIFont(name: "DINAlternate-Bold", size: 18)
text.textColor = UIColor(hex:0xffffff)
text.textAlignment = .left
text.keyboardType = .phonePad
text.clearButtonMode = .always
......@@ -68,8 +71,18 @@ class YHPhoneMessageView: UIView {
addSubview(phoneTextField)
phoneTextField.snp.makeConstraints { make in
make.top.bottom.equalToSuperview()
make.left.equalTo(70)
make.right.equalTo(-22.5)
make.left.equalTo(pointImageView.snp.right).offset(16)
make.height.equalTo(20)
make.right.equalToSuperview()
}
let line = UIView()
line.backgroundColor = UIColor(hex: 0xffffff, alpha: 0.8)
addSubview(line)
line.snp.makeConstraints { make in
make.bottom.left.right.equalToSuperview()
make.height.equalTo(0.5)
}
}
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ b62b5389
......@@ -268,11 +268,11 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
if (indexPath.row >= items.count) { return }
#if DEBUG
let vc = YHTestViewController()
self.navigationController?.pushViewController(vc)
return
#endif
//#if DEBUG
// let vc = YHTestViewController()
// self.navigationController?.pushViewController(vc)
// return
//#endif
if !checkLogin() {
let vc = UINavigationController(rootVC: YHPhoneLoginViewController())
......
galaxy/galaxy/Res/Assets.xcassets/Login/login_close.imageset/Contents.json
View file @ b62b5389
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "login_close@2x.png",
"filename" : "关闭@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "login_close@3x.png",
"filename" : "关闭@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/Login/login_icon.imageset/Contents.json
View file @ b62b5389
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "48@2x.png",
"filename" : "yinhe-1@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "48@3x.png",
"filename" : "yinhe-1@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/Login/login_phone_point.imageset/Contents.json
View file @ b62b5389
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "login_phone_point@2x.png",
"filename" : "Group 2033194733@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "login_phone_point@3x.png",
"filename" : "Group 2033194733@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
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