// 更改类名和方法名

galaxy/galaxy/AppDelegate.swift

@@ -47,7 +47,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
         }
         
         // 一键登录
-        YHLoginMethodManager.shared.configAutoLogin()
+        YHOneKeyLoginManager.shared.configOneKeyLogin()
         
         YHOSSManager.share.getOSSID()
         //1.设置主窗口

galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/M/YHLoginMethodManager.swift → galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/M/YHOneKeyLoginManager.swift

@@ -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
+            }
+            
+            if code != PNSCodeSuccess {
+                printLog("加速取号失败")
+                YHOneKeyLoginManager.shared.isAccelerateGetPhontNumberSuccess = false
+                return
+            }
+            // 加速取号成功
+            printLog("加速取号成功")
+            YHOneKeyLoginManager.shared.isAccelerateGetPhontNumberSuccess = true
+
+        }
     }
     
-    func checkIsSupportAutoLogin(_ support:((Bool)->())?) {
+    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去服务器换手机号，此处仅做参考
                     /*
                      
@@ -135,15 +146,12 @@ 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)
         }

galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/V/YHAutoLoginView.swift → galaxy/galaxy/Classes/Modules/AutoLogin(一键登录)/V/YHOneKeyLoginView.swift

 //
-//  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:(()->())?

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHKEventViewController.swift

@@ -140,7 +140,7 @@ extension YHHKEventViewController {
                 YHShareManager.shared.sendLinkContent("一图看清香港办事", "", UIImage(named: "AppIcon") ?? UIImage(), link: urlString)
             }
         } else {
-            YHLoginMethodManager.shared.autoLogin()
+            YHOneKeyLoginManager.shared.oneKeyLogin()
         }
     }
 }

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -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

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift

@@ -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()
         }
     }
     

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeCollectionViewCell.swift

@@ -247,7 +247,7 @@ extension YHHomeCollectionViewCell {
                 }
             }
         } else {
-            YHLoginMethodManager.shared.autoLogin()
+            YHOneKeyLoginManager.shared.oneKeyLogin()
         }
     }
     

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -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
         }
         

galaxy/galaxy/Classes/Tools/VideoPlay/YHVideoPlayerVC.swift

@@ -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
         }