Skip to content

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

1、文件命名错误 

2、几个bug修改
parent 0d5f02a7
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 21 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 3d7e44bf
...@@ -417,7 +417,7 @@ ...@@ -417,7 +417,7 @@
A5D5ADEF2BB90FBC0039FA6B /* YHCheckEamilAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D5ADEE2BB90FBB0039FA6B /* YHCheckEamilAlertView.swift */; }; A5D5ADEF2BB90FBC0039FA6B /* YHCheckEamilAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D5ADEE2BB90FBB0039FA6B /* YHCheckEamilAlertView.swift */; };
A5DE0D3C2BB9016200976FE1 /* YHEmailInputAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */; }; A5DE0D3C2BB9016200976FE1 /* YHEmailInputAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DE0D3B2BB9016200976FE1 /* YHEmailInputAlertView.swift */; };
A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */; }; A5DF3D462BF72BA1003D5F03 /* YHTestViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D452BF72BA0003D5F03 /* YHTestViewController.swift */; };
A5DF3D482BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D472BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift */; }; A5DF3D482BF9A1D0003D5F03 /* YHPhoneLoginWithVideoBkgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D472BF9A1D0003D5F03 /* YHPhoneLoginWithVideoBkgViewController.swift */; };
A5DF3D4E2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D4D2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift */; }; A5DF3D4E2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5DF3D4D2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift */; };
A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; }; 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 */; }; A5EF21312BA6DF94005027E6 /* YHMineSchemeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */; };
...@@ -887,7 +887,7 @@ ...@@ -887,7 +887,7 @@
A5D5ADEE2BB90FBB0039FA6B /* YHCheckEamilAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCheckEamilAlertView.swift; sourceTree = "<group>"; }; 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>"; }; 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>"; }; 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>"; }; A5DF3D472BF9A1D0003D5F03 /* YHPhoneLoginWithVideoBkgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneLoginWithVideoBkgViewController.swift; sourceTree = "<group>"; };
A5DF3D4D2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssWithVideoBkgViewController.swift; sourceTree = "<group>"; }; A5DF3D4D2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssWithVideoBkgViewController.swift; sourceTree = "<group>"; };
A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; 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>"; }; A5EF21302BA6DF94005027E6 /* YHMineSchemeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMineSchemeViewController.swift; sourceTree = "<group>"; };
...@@ -2078,7 +2078,7 @@ ...@@ -2078,7 +2078,7 @@
0468D4252B495A5400CFB916 /* YHPickPhoneAddressViewController.swift */, 0468D4252B495A5400CFB916 /* YHPickPhoneAddressViewController.swift */,
04E86E0A2B70C13300A35F4B /* YHCodeSueecssViewController.swift */, 04E86E0A2B70C13300A35F4B /* YHCodeSueecssViewController.swift */,
04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */, 04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */,
A5DF3D472BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift */, A5DF3D472BF9A1D0003D5F03 /* YHPhoneLoginWithVideoBkgViewController.swift */,
A5DF3D4D2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift */, A5DF3D4D2BF9FDAC003D5F03 /* YHCodeSueecssWithVideoBkgViewController.swift */,
); );
path = C; path = C;
...@@ -2945,7 +2945,7 @@ ...@@ -2945,7 +2945,7 @@
045EEE822B9F171A0022A143 /* YHPersonInfoIdentityCardModel.swift in Sources */, 045EEE822B9F171A0022A143 /* YHPersonInfoIdentityCardModel.swift in Sources */,
045EEE952B9F171A0022A143 /* YHPreviewInfoCertificateInformationItemsView.swift in Sources */, 045EEE952B9F171A0022A143 /* YHPreviewInfoCertificateInformationItemsView.swift in Sources */,
044413FD2BC386DA00784A14 /* YHServiceViewController.swift in Sources */, 044413FD2BC386DA00784A14 /* YHServiceViewController.swift in Sources */,
A5DF3D482BF9A1D0003D5F03 /* YHPhoneLiginWithVideoBkgViewController.swift in Sources */, A5DF3D482BF9A1D0003D5F03 /* YHPhoneLoginWithVideoBkgViewController.swift in Sources */,
045EEEBB2B9F171A0022A143 /* YHWorkIntroductionTableViewCell.swift in Sources */, 045EEEBB2B9F171A0022A143 /* YHWorkIntroductionTableViewCell.swift in Sources */,
045EEEED2B9F171A0022A143 /* YHParentInfoVC.swift in Sources */, 045EEEED2B9F171A0022A143 /* YHParentInfoVC.swift in Sources */,
04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */, 04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHKEventViewController.swift
View file @ 3d7e44bf
...@@ -140,7 +140,7 @@ extension YHHKEventViewController { ...@@ -140,7 +140,7 @@ extension YHHKEventViewController {
YHShareManager.shared.sendLinkContent("一图看清香港办事", "", UIImage(named: "AppIcon") ?? UIImage(), link: urlString) YHShareManager.shared.sendLinkContent("一图看清香港办事", "", UIImage(named: "AppIcon") ?? UIImage(), link: urlString)
} }
} else { } else {
let vc = UINavigationController(rootVC: YHPhoneLiginWithVideoBkgViewController()) let vc = UINavigationController(rootVC: YHPhoneLoginWithVideoBkgViewController())
vc.modalPresentationStyle = .custom vc.modalPresentationStyle = .custom
self.navigationController?.present(vc, animated: true) self.navigationController?.present(vc, animated: true)
} }
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift
View file @ 3d7e44bf
...@@ -254,7 +254,7 @@ extension YHHomePageViewController : UITabBarControllerDelegate { ...@@ -254,7 +254,7 @@ extension YHHomePageViewController : UITabBarControllerDelegate {
if YHLoginManager.shared.isLogin() { if YHLoginManager.shared.isLogin() {
return true return true
} else { } else {
let vc = UINavigationController(rootVC: YHPhoneLiginWithVideoBkgViewController()) let vc = UINavigationController(rootVC: YHPhoneLoginWithVideoBkgViewController())
vc.modalPresentationStyle = .custom vc.modalPresentationStyle = .custom
UIViewController.current?.navigationController?.present(vc, animated: true) UIViewController.current?.navigationController?.present(vc, animated: true)
YHLoginManager.shared.loginSuccessActionBlock = {[weak self] in YHLoginManager.shared.loginSuccessActionBlock = {[weak self] in
......
galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift
View file @ 3d7e44bf
...@@ -80,7 +80,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -80,7 +80,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
view.likeBlock = { [weak self] flag in view.likeBlock = { [weak self] flag in
guard let self = self else { return } guard let self = self else { return }
if YHLoginManager.shared.isLogin() == false { if YHLoginManager.shared.isLogin() == false {
let vc = UINavigationController(rootVC: YHPhoneLiginWithVideoBkgViewController()) let vc = UINavigationController(rootVC: YHPhoneLoginWithVideoBkgViewController())
vc.modalPresentationStyle = .custom vc.modalPresentationStyle = .custom
self.navigationController?.present(vc, animated: true) self.navigationController?.present(vc, animated: true)
return return
...@@ -111,7 +111,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -111,7 +111,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
view.starBlock = { [weak self] flag in view.starBlock = { [weak self] flag in
guard let self = self else { return } guard let self = self else { return }
if YHLoginManager.shared.isLogin() == false { if YHLoginManager.shared.isLogin() == false {
let vc = UINavigationController(rootVC: YHPhoneLiginWithVideoBkgViewController()) let vc = UINavigationController(rootVC: YHPhoneLoginWithVideoBkgViewController())
vc.modalPresentationStyle = .custom vc.modalPresentationStyle = .custom
self.navigationController?.present(vc, animated: true) self.navigationController?.present(vc, animated: true)
return return
...@@ -244,7 +244,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD ...@@ -244,7 +244,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
task.resume() task.resume()
} }
} else { } else {
let vc = UINavigationController(rootVC: YHPhoneLiginWithVideoBkgViewController()) let vc = UINavigationController(rootVC: YHPhoneLoginWithVideoBkgViewController())
vc.modalPresentationStyle = .custom vc.modalPresentationStyle = .custom
self.navigationController?.present(vc, animated: true) self.navigationController?.present(vc, animated: true)
} }
......
galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeCollectionViewCell.swift
View file @ 3d7e44bf
...@@ -239,7 +239,7 @@ extension YHHomeCollectionViewCell { ...@@ -239,7 +239,7 @@ extension YHHomeCollectionViewCell {
} }
} }
} else { } else {
let vc = UINavigationController(rootVC: YHPhoneLiginWithVideoBkgViewController()) let vc = UINavigationController(rootVC: YHPhoneLoginWithVideoBkgViewController())
vc.modalPresentationStyle = .custom vc.modalPresentationStyle = .custom
self.parentViewController?.navigationController?.present(vc, animated: true) self.parentViewController?.navigationController?.present(vc, animated: true)
} }
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHPhoneLiginWithVideoBkgViewController.swift → galaxy/galaxy/Classes/Modules/Login(登录)/C/YHPhoneLoginWithVideoBkgViewController.swift
View file @ 3d7e44bf
...@@ -10,7 +10,7 @@ import UIKit ...@@ -10,7 +10,7 @@ import UIKit
import IQKeyboardManagerSwift import IQKeyboardManagerSwift
import AVFoundation import AVFoundation
class YHPhoneLiginWithVideoBkgViewController: YHBaseViewController { class YHPhoneLoginWithVideoBkgViewController: YHBaseViewController {
var bgImageView: UIImageView! var bgImageView: UIImageView!
var closeButton: UIButton! var closeButton: UIButton!
...@@ -76,7 +76,7 @@ class YHPhoneLiginWithVideoBkgViewController: YHBaseViewController { ...@@ -76,7 +76,7 @@ class YHPhoneLiginWithVideoBkgViewController: YHBaseViewController {
} }
extension YHPhoneLiginWithVideoBkgViewController { extension YHPhoneLoginWithVideoBkgViewController {
@objc func keyboardWillShow(notification: NSNotification) { @objc func keyboardWillShow(notification: NSNotification) {
if ((notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue) != nil { if ((notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue)?.cgRectValue) != nil {
...@@ -207,6 +207,14 @@ extension YHPhoneLiginWithVideoBkgViewController { ...@@ -207,6 +207,14 @@ extension YHPhoneLiginWithVideoBkgViewController {
} }
return view return view
}() }()
let attributes : [NSAttributedString.Key: Any] = [
.foregroundColor : UIColor(hex: 0xffffff, alpha: 0.5),
.font : UIFont(name: "DINAlternate-Bold", size: 18) as Any
]
phoneMessageView.phoneTextField.attributedPlaceholder = NSAttributedString(string: "请输入签约手机号",attributes: attributes)
contentHoldView.addSubview(phoneMessageView) contentHoldView.addSubview(phoneMessageView)
phoneMessageView.snp.makeConstraints { make in phoneMessageView.snp.makeConstraints { make in
make.left.equalTo(20) make.left.equalTo(20)
...@@ -303,7 +311,7 @@ extension YHPhoneLiginWithVideoBkgViewController { ...@@ -303,7 +311,7 @@ extension YHPhoneLiginWithVideoBkgViewController {
} }
extension YHPhoneLiginWithVideoBkgViewController { extension YHPhoneLoginWithVideoBkgViewController {
private func setupBackgroundVideo() { private func setupBackgroundVideo() {
guard let videoURL = Bundle.main.url(forResource: "loginBkg", withExtension: "mov") else { return } guard let videoURL = Bundle.main.url(forResource: "loginBkg", withExtension: "mov") else { return }
player = AVPlayer(url: videoURL) player = AVPlayer(url: videoURL)
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHPhoneMessageView.swift
View file @ 3d7e44bf
...@@ -28,7 +28,7 @@ class YHPhoneMessageView: UIView { ...@@ -28,7 +28,7 @@ class YHPhoneMessageView: UIView {
func setView() { func setView() {
messageButton = { messageButton = {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont(name: "DINAlternate-Bold", size: 18)//UIFont.PFSC_M(ofSize: 18) button.titleLabel?.font = UIFont(name: "DINAlternate-Bold", size: 18)
button.setTitle("+86", for: .normal) button.setTitle("+86", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal) button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.addTarget(self, action: #selector(messageClick), for: .touchUpInside) button.addTarget(self, action: #selector(messageClick), for: .touchUpInside)
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHPrivacyAlertView.swift
View file @ 3d7e44bf
...@@ -50,7 +50,7 @@ class YHPrivacyAlertView: UIView { ...@@ -50,7 +50,7 @@ class YHPrivacyAlertView: UIView {
messageLabel = { messageLabel = {
let label = UILabel() let label = UILabel()
label.textAlignment = .center // label.textAlignment = .center
label.numberOfLines = 0 label.numberOfLines = 0
return label return label
}() }()
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift
View file @ 3d7e44bf
...@@ -144,7 +144,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget ...@@ -144,7 +144,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
@objc func didLogoutBtnClicked() { @objc func didLogoutBtnClicked() {
YHCommonAlertView.show("", "退出登录", "取消", "确定",fullGuestureEnable: false) { YHCommonAlertView.show("", "您确定要退出登录吗？", "取消", "确定",fullGuestureEnable: false) {
} callBack: { } callBack: {
self.logout() self.logout()
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ 3d7e44bf
...@@ -154,7 +154,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget { ...@@ -154,7 +154,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
func checkLogin()->Bool { func checkLogin()->Bool {
if YHLoginManager.shared.isLogin() == false { if YHLoginManager.shared.isLogin() == false {
let vc = UINavigationController(rootVC: YHPhoneLiginWithVideoBkgViewController()) let vc = UINavigationController(rootVC: YHPhoneLoginWithVideoBkgViewController())
vc.modalPresentationStyle = .custom vc.modalPresentationStyle = .custom
self.navigationController?.present(vc, animated: true) self.navigationController?.present(vc, animated: true)
return false return false
...@@ -276,7 +276,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource { ...@@ -276,7 +276,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
//#endif //#endif
if !checkLogin() { if !checkLogin() {
let vc = UINavigationController(rootVC: YHPhoneLiginWithVideoBkgViewController()) let vc = UINavigationController(rootVC: YHPhoneLoginWithVideoBkgViewController())
vc.modalPresentationStyle = .custom vc.modalPresentationStyle = .custom
self.navigationController?.present(vc, animated: true) self.navigationController?.present(vc, animated: true)
return return
......
galaxy/galaxy/Classes/Tools/VideoPlay/YHVideoPlayerVC.swift
View file @ 3d7e44bf
...@@ -139,7 +139,7 @@ class YHVideoPlayerVC: YHBaseViewController { ...@@ -139,7 +139,7 @@ class YHVideoPlayerVC: YHBaseViewController {
guard let self = self else { return } guard let self = self else { return }
if YHLoginManager.shared.isLogin() == false { if YHLoginManager.shared.isLogin() == false {
self.player.pause() self.player.pause()
let vc = UINavigationController(rootVC: YHPhoneLiginWithVideoBkgViewController()) let vc = UINavigationController(rootVC: YHPhoneLoginWithVideoBkgViewController())
vc.modalPresentationStyle = .custom vc.modalPresentationStyle = .custom
self.navigationController?.present(vc, animated: true) self.navigationController?.present(vc, animated: true)
return return
...@@ -171,7 +171,7 @@ class YHVideoPlayerVC: YHBaseViewController { ...@@ -171,7 +171,7 @@ class YHVideoPlayerVC: YHBaseViewController {
guard let self = self else { return } guard let self = self else { return }
if YHLoginManager.shared.isLogin() == false { if YHLoginManager.shared.isLogin() == false {
self.player.pause() self.player.pause()
let vc = UINavigationController(rootVC: YHPhoneLiginWithVideoBkgViewController()) let vc = UINavigationController(rootVC: YHPhoneLoginWithVideoBkgViewController())
vc.modalPresentationStyle = .custom vc.modalPresentationStyle = .custom
self.navigationController?.present(vc, animated: true) self.navigationController?.present(vc, animated: true)
return return
...@@ -266,7 +266,7 @@ extension YHVideoPlayerVC { ...@@ -266,7 +266,7 @@ extension YHVideoPlayerVC {
if YHLoginManager.shared.isLogin() == false { if YHLoginManager.shared.isLogin() == false {
self.player.pause() self.player.pause()
let vc = UINavigationController(rootVC: YHPhoneLiginWithVideoBkgViewController()) let vc = UINavigationController(rootVC: YHPhoneLoginWithVideoBkgViewController())
vc.modalPresentationStyle = .custom vc.modalPresentationStyle = .custom
self.navigationController?.present(vc, animated: true) self.navigationController?.present(vc, animated: true)
return return
......
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