Commit 389a4796 authored by Steven杜宇's avatar Steven杜宇

// 更改类名和方法名

parent 07d1a9cd
......@@ -246,7 +246,7 @@
049537852BA9B28500AF7E59 /* YHCertificateTemplateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049537842BA9B28500AF7E59 /* YHCertificateTemplateCell.swift */; };
049663BA2BF6105C003C8295 /* YHRefreshHeaderAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049663B92BF6105C003C8295 /* YHRefreshHeaderAnimator.swift */; };
049663C02BF729F6003C8295 /* galaxy_refresher.gif in Resources */ = {isa = PBXBuildFile; fileRef = 049663BF2BF729F5003C8295 /* galaxy_refresher.gif */; };
0499E3002C056EE30037E646 /* YHAutoLoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0499E2FF2C056EE30037E646 /* YHAutoLoginView.swift */; };
0499E3002C056EE30037E646 /* YHOneKeyLoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0499E2FF2C056EE30037E646 /* YHOneKeyLoginView.swift */; };
0499E3042C05B91A0037E646 /* YHAppleLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0499E3032C05B91A0037E646 /* YHAppleLoginViewController.swift */; };
049A48A82B49417300D0C641 /* YHAboutUsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049A48A72B49417300D0C641 /* YHAboutUsViewController.swift */; };
049A48AA2B49536000D0C641 /* YHAboutUsAdvantageCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049A48A92B49536000D0C641 /* YHAboutUsAdvantageCell.swift */; };
......@@ -277,8 +277,7 @@
04CC2EF02BC3DDB2000305DD /* YHServiceBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */; };
04D1446D2C04359500EE3758 /* ATAuthSDK_D.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04D1446B2C04355B00EE3758 /* ATAuthSDK_D.framework */; settings = {ATTRIBUTES = (Required, ); }; };
04D1446E2C04359500EE3758 /* ATAuthSDK_D.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 04D1446B2C04355B00EE3758 /* ATAuthSDK_D.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
04D144712C04363C00EE3758 /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04D144702C04363C00EE3758 /* ATAuthSDK.bundle */; };
04D144762C0452E200EE3758 /* YHLoginMethodManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D144752C0452E200EE3758 /* YHLoginMethodManager.swift */; };
04D144762C0452E200EE3758 /* YHOneKeyLoginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D144752C0452E200EE3758 /* YHOneKeyLoginManager.swift */; };
04D5C5662B8ED92600190021 /* YHBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D5C5652B8ED92600190021 /* YHBaseModel.swift */; };
04E41DE82BD240570077EAE3 /* YHOrderDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E41DE72BD240570077EAE3 /* YHOrderDetailViewController.swift */; };
04E86E0D2B70D51D00A35F4B /* YHWebViewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */; };
......@@ -295,6 +294,7 @@
04EA37742BEA0A3400DBAF64 /* YHShareManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EA37732BEA0A3400DBAF64 /* YHShareManager.swift */; };
04F4B76B2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */; };
04FA8B2B2C06F59D00ABE43F /* YHAppleLoginManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04FA8B2A2C06F59D00ABE43F /* YHAppleLoginManager.swift */; };
04FA8B2E2C084C7E00ABE43F /* ATAuthSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */; };
6203A87EDC96313BBE789D9C /* Pods_galaxy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */; };
A51044182B493675006B60BB /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A51044172B493675006B60BB /* README.md */; };
A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51044192B495DD0006B60BB /* UIView+Extension.swift */; };
......@@ -718,7 +718,7 @@
049537842BA9B28500AF7E59 /* YHCertificateTemplateCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateTemplateCell.swift; sourceTree = "<group>"; };
049663B92BF6105C003C8295 /* YHRefreshHeaderAnimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRefreshHeaderAnimator.swift; sourceTree = "<group>"; };
049663BF2BF729F5003C8295 /* galaxy_refresher.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; path = galaxy_refresher.gif; sourceTree = "<group>"; };
0499E2FF2C056EE30037E646 /* YHAutoLoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAutoLoginView.swift; sourceTree = "<group>"; };
0499E2FF2C056EE30037E646 /* YHOneKeyLoginView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOneKeyLoginView.swift; sourceTree = "<group>"; };
0499E3032C05B91A0037E646 /* YHAppleLoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAppleLoginViewController.swift; sourceTree = "<group>"; };
049A48A72B49417300D0C641 /* YHAboutUsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutUsViewController.swift; sourceTree = "<group>"; };
049A48A92B49536000D0C641 /* YHAboutUsAdvantageCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutUsAdvantageCell.swift; sourceTree = "<group>"; };
......@@ -748,8 +748,7 @@
04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserInfoHeaderView.swift; sourceTree = "<group>"; };
04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceBannerView.swift; sourceTree = "<group>"; };
04D1446B2C04355B00EE3758 /* ATAuthSDK_D.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = ATAuthSDK_D.framework; sourceTree = "<group>"; };
04D144702C04363C00EE3758 /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = ATAuthSDK.bundle; path = "galaxy/Classes/Modules/AutoLogin(一键登录)/framework/ATAuthSDK_D.framework/ATAuthSDK.bundle"; sourceTree = "<group>"; };
04D144752C0452E200EE3758 /* YHLoginMethodManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLoginMethodManager.swift; sourceTree = "<group>"; };
04D144752C0452E200EE3758 /* YHOneKeyLoginManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOneKeyLoginManager.swift; sourceTree = "<group>"; };
04D5C5652B8ED92600190021 /* YHBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseModel.swift; sourceTree = "<group>"; };
04E41DE72BD240570077EAE3 /* YHOrderDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOrderDetailViewController.swift; sourceTree = "<group>"; };
04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHWebViewViewController.swift; sourceTree = "<group>"; };
......@@ -766,6 +765,7 @@
04EA37732BEA0A3400DBAF64 /* YHShareManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHShareManager.swift; sourceTree = "<group>"; };
04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateTemplateSheetView.swift; sourceTree = "<group>"; };
04FA8B2A2C06F59D00ABE43F /* YHAppleLoginManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAppleLoginManager.swift; sourceTree = "<group>"; };
04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = ATAuthSDK.bundle; path = "galaxy/Classes/Modules/AutoLogin(一键登录)/framework/ATAuthSDK_D.framework/ATAuthSDK.bundle"; sourceTree = "<group>"; };
19B28612265782F9DC1BE0B0 /* Pods-galaxy.testenv.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.testenv.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.testenv.xcconfig"; sourceTree = "<group>"; };
58C2405158A4A6632D0E7460 /* Pods-galaxy.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.debug.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.debug.xcconfig"; sourceTree = "<group>"; };
987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_galaxy.framework; sourceTree = BUILT_PRODUCTS_DIR; };
......@@ -1729,7 +1729,7 @@
0499E2FE2C056ECA0037E646 /* V */ = {
isa = PBXGroup;
children = (
0499E2FF2C056EE30037E646 /* YHAutoLoginView.swift */,
0499E2FF2C056EE30037E646 /* YHOneKeyLoginView.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -1858,7 +1858,7 @@
04D144722C043A3F00EE3758 /* M */ = {
isa = PBXGroup;
children = (
04D144752C0452E200EE3758 /* YHLoginMethodManager.swift */,
04D144752C0452E200EE3758 /* YHOneKeyLoginManager.swift */,
);
path = M;
sourceTree = "<group>";
......@@ -1971,7 +1971,7 @@
A5573EC52B317BFF00D98EC0 = {
isa = PBXGroup;
children = (
04D144702C04363C00EE3758 /* ATAuthSDK.bundle */,
04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */,
A5573ED02B317BFF00D98EC0 /* galaxy */,
A5573EE72B317C0100D98EC0 /* galaxyTests */,
A5573EF12B317C0100D98EC0 /* galaxyUITests */,
......@@ -2588,7 +2588,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
04D144712C04363C00EE3758 /* ATAuthSDK.bundle in Resources */,
04FA8B2E2C084C7E00ABE43F /* ATAuthSDK.bundle in Resources */,
049663C02BF729F6003C8295 /* galaxy_refresher.gif in Resources */,
045EEED42B9F171A0022A143 /* scoreOptionData.plist in Resources */,
045EEED62B9F171A0022A143 /* YHQuestionList.plist in Resources */,
......@@ -2791,7 +2791,7 @@
045EEF072B9F171A0022A143 /* YHBasicInfoFillViewModel.swift in Sources */,
045EEF212B9F171A0022A143 /* YHMainInformationTableViewCell.swift in Sources */,
A5ACE9462B4564F7002C94D2 /* YHHUDSquareBaseView.swift in Sources */,
04D144762C0452E200EE3758 /* YHLoginMethodManager.swift in Sources */,
04D144762C0452E200EE3758 /* YHOneKeyLoginManager.swift in Sources */,
A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */,
048B2A4A2BC7D9DC00A93BF0 /* YHMyLikeViewController.swift in Sources */,
A567E5AE2BD7643D00D5D5A0 /* YHHomeKingKongBlockItem.swift in Sources */,
......@@ -2829,7 +2829,7 @@
045EEEC52B9F171A0022A143 /* YHOtherPickerView.swift in Sources */,
045EEE842B9F171A0022A143 /* YHPreviewBasiceInformationViewController.swift in Sources */,
A5ACE9282B4564F7002C94D2 /* YHSmsCodeView.swift in Sources */,
0499E3002C056EE30037E646 /* YHAutoLoginView.swift in Sources */,
0499E3002C056EE30037E646 /* YHOneKeyLoginView.swift in Sources */,
0468D4262B495A5400CFB916 /* YHPickPhoneAddressViewController.swift in Sources */,
048B2A4D2BC7DAE800A93BF0 /* YHMyLikeViewModel.swift in Sources */,
04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */,
......
......@@ -47,7 +47,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
}
// 一键登录
YHLoginMethodManager.shared.configAutoLogin()
YHOneKeyLoginManager.shared.configOneKeyLogin()
YHOSSManager.share.getOSSID()
//1.设置主窗口
......
......@@ -9,15 +9,17 @@
import UIKit
import AVFoundation
class YHLoginMethodManager {
class YHOneKeyLoginManager {
static let shared = YHLoginMethodManager()
static let shared = YHOneKeyLoginManager()
// 是否加速取号成功
var isAccelerateGetPhontNumberSuccess = false
}
extension YHLoginMethodManager {
extension YHOneKeyLoginManager {
func autoLogin() {
YHLoginMethodManager.shared.checkIsSupportAutoLogin {
func oneKeyLogin() {
YHOneKeyLoginManager.shared.checkIsSupportOneKeyLogin {
support in
if !support {
YHHUD.flash(message: "不支持一键登录")
......@@ -28,7 +30,7 @@ extension YHLoginMethodManager {
return
}
// 支持一键登录
YHLoginMethodManager.shared.enterAutoLoginPage()
YHOneKeyLoginManager.shared.enterOneKeyLoginPage()
}
}
......@@ -36,14 +38,35 @@ extension YHLoginMethodManager {
return TXCommonHandler.sharedInstance().getVersion()
}
func configAutoLogin() {
func configOneKeyLogin() {
TXCommonHandler.sharedInstance().setAuthSDKInfo(YhConstant.Alipay.kAliLoginSecretKey) {
dict in
printLog(dict)
}
TXCommonHandler.sharedInstance().accelerateLoginPage(withTimeout: 10.0) {
dic in
guard let code = dic["resultCode"] as? String else {
printLog("加速取号失败")
YHOneKeyLoginManager.shared.isAccelerateGetPhontNumberSuccess = false
return
}
func checkIsSupportAutoLogin(_ support:((Bool)->())?) {
if code != PNSCodeSuccess {
printLog("加速取号失败")
YHOneKeyLoginManager.shared.isAccelerateGetPhontNumberSuccess = false
return
}
// 加速取号成功
printLog("加速取号成功")
YHOneKeyLoginManager.shared.isAccelerateGetPhontNumberSuccess = true
}
}
func checkIsSupportOneKeyLogin(_ support:((Bool)->())?) {
// 检测当前环境是否支持一键登录
TXCommonHandler.sharedInstance().checkEnvAvailable(with: .loginToken) {
dict in
......@@ -56,24 +79,9 @@ extension YHLoginMethodManager {
}
}
func enterAutoLoginPage() {
func enterOneKeyLoginPage() {
// 3. 开始一键登录流程
// 3.1 调用加速授权页弹起接口,提前获取必要参数,为后面弹起授权页加速
TXCommonHandler.sharedInstance().accelerateLoginPage(withTimeout: 10.0) {
dic in
guard let code = dic["resultCode"] as? String else {
YHHUD.flash(message: "取号,加速授权页弹起失败")
return
}
if code != PNSCodeSuccess {
YHHUD.flash(message: "取号,加速授权页弹起失败")
return
}
//3.2 调用获取登录Token接口,可以立马弹起授权页,model的创建需要放在主线程
let model = self.createLoginUIModel()
TXCommonHandler.sharedInstance().getLoginToken(withTimeout: 10.0, controller: UIViewController.current!, model: model) {
......@@ -86,8 +94,11 @@ extension YHLoginMethodManager {
if code == PNSCodeSuccess {
// 点击登录按钮获取登录Token成功回调
let token = dict["token"] as? String
guard let token = dict["token"] as? String else {
printLog("获取登录Token失败")
return
}
printLog("oneKeyLogin token: \(token)")
// 下面用Token去服务器换手机号,此处仅做参考
/*
......@@ -136,14 +147,11 @@ extension YHLoginMethodManager {
} else if code == PNSCodeLoginControllerClickProtocol {
printLog("点击了协议富文本")
} else {
printLog("获取登录Token失败")
}
}
}
}
func createLoginUIModel() -> TXCustomModel {
......@@ -198,7 +206,7 @@ extension YHLoginMethodManager {
model.loginBtnBgImgs = imgArr
// 创建视频底图View
let videoBgView = YHAutoLoginView(frame: UIScreen.main.bounds)
let videoBgView = YHOneKeyLoginView(frame: UIScreen.main.bounds)
videoBgView.closeBlock = {
TXCommonHandler.sharedInstance().cancelLoginVC(animated: true)
}
......
//
// YHAutoLoginView.swift
// YHOneKeyLoginView.swift
// galaxy
//
// Created by edy on 2024/5/28.
......@@ -9,7 +9,7 @@
import UIKit
import AVFoundation
class YHAutoLoginView: UIView {
class YHOneKeyLoginView: UIView {
var closeBlock:(()->())?
var changeLoginBlock:(()->())?
......
......@@ -140,7 +140,7 @@ extension YHHKEventViewController {
YHShareManager.shared.sendLinkContent("一图看清香港办事", "", UIImage(named: "AppIcon") ?? UIImage(), link: urlString)
}
} else {
YHLoginMethodManager.shared.autoLogin()
YHOneKeyLoginManager.shared.oneKeyLogin()
}
}
}
......
......@@ -255,7 +255,7 @@ extension YHHomePageViewController : UITabBarControllerDelegate {
if YHLoginManager.shared.isLogin() {
return true
} else {
YHLoginMethodManager.shared.autoLogin()
YHOneKeyLoginManager.shared.oneKeyLogin()
YHLoginManager.shared.loginSuccessActionBlock = {[weak self] in
guard self != nil else { return }
tabBarController.selectedIndex = index
......
......@@ -80,7 +80,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
view.likeBlock = { [weak self] flag in
guard let self = self else { return }
if YHLoginManager.shared.isLogin() == false {
YHLoginMethodManager.shared.autoLogin()
YHOneKeyLoginManager.shared.oneKeyLogin()
return
}
if flag {
......@@ -109,7 +109,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
view.starBlock = { [weak self] flag in
guard let self = self else { return }
if YHLoginManager.shared.isLogin() == false {
YHLoginMethodManager.shared.autoLogin()
YHOneKeyLoginManager.shared.oneKeyLogin()
return
}
if flag {
......@@ -240,7 +240,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
task.resume()
}
} else {
YHLoginMethodManager.shared.autoLogin()
YHOneKeyLoginManager.shared.oneKeyLogin()
}
}
......
......@@ -247,7 +247,7 @@ extension YHHomeCollectionViewCell {
}
}
} else {
YHLoginMethodManager.shared.autoLogin()
YHOneKeyLoginManager.shared.oneKeyLogin()
}
}
......
......@@ -155,7 +155,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
func checkLogin()->Bool {
if YHLoginManager.shared.isLogin() == false {
YHLoginMethodManager.shared.autoLogin()
YHOneKeyLoginManager.shared.oneKeyLogin()
return false
}
return true
......@@ -275,7 +275,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
//#endif
if !checkLogin() {
YHLoginMethodManager.shared.autoLogin()
YHOneKeyLoginManager.shared.oneKeyLogin()
return
}
......
......@@ -139,7 +139,7 @@ class YHVideoPlayerVC: YHBaseViewController {
guard let self = self else { return }
if YHLoginManager.shared.isLogin() == false {
self.player.pause()
YHLoginMethodManager.shared.autoLogin()
YHOneKeyLoginManager.shared.oneKeyLogin()
return
}
if flag {
......@@ -169,7 +169,7 @@ class YHVideoPlayerVC: YHBaseViewController {
guard let self = self else { return }
if YHLoginManager.shared.isLogin() == false {
self.player.pause()
YHLoginMethodManager.shared.autoLogin()
YHOneKeyLoginManager.shared.oneKeyLogin()
return
}
if flag {
......@@ -262,7 +262,7 @@ extension YHVideoPlayerVC {
if YHLoginManager.shared.isLogin() == false {
self.player.pause()
YHLoginMethodManager.shared.autoLogin()
YHOneKeyLoginManager.shared.oneKeyLogin()
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