// 一键登录

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

@@ -51,14 +51,22 @@ extension YHOneKeyLoginManager {
     
     func configOneKeyLogin() {
         
-        TXCommonHandler.sharedInstance().setAuthSDKInfo(YhConstant.Alipay.kAliLoginSecretKey) {
-            dict in
-            printLog("设置secretKey结果：\(dict)")
+        self.viewModel.getSecretKeyInfo {
+            secretKey in
             
-            // 进行加速登录 方便点击登录时提速
-            TXCommonHandler.sharedInstance().accelerateLoginPage(withTimeout: 5.0) {
-                dic in
-                printLog("加速登录结果: \(dic)")
+            var targetKey = secretKey
+            if secretKey.isEmpty {
+                targetKey = YhConstant.Alipay.kAliLoginDefaultSecretKey
+            }
+            printLog("onekey login secretKey: \(targetKey)")
+            TXCommonHandler.sharedInstance().setAuthSDKInfo(targetKey) {
+                dict in
+                printLog("设置secretKey结果：\(dict)")
+                // 进行加速登录 方便点击登录时提速
+                TXCommonHandler.sharedInstance().accelerateLoginPage(withTimeout: 5.0) {
+                    dic in
+                    printLog("加速登录结果: \(dic)")
+                }
             }
         }
     }
@@ -78,6 +86,33 @@ extension YHOneKeyLoginManager {
         }
     }
     
+    func requestOneKeyLogin(token:String) {
+        YHHUD.show(.progress(message: "登录中..."))
+        let deviceId = YHLoginManager.shared.deviceTokenModel.registerId
+        printLog("oneKey Login deviceId: \(deviceId)")
+        printLog("oneKey Login token: \(token)")
+        
+        self.viewModel.oneKeyLogin(authToken: token) {
+            success, error in
+            DispatchQueue.main.async {
+                YHHUD.hide()
+                if success {
+                    YHLoginManager.shared.loginSuccessActionBlock?()
+                    YHHUD.flash(message: "登录成功")
+                    TXCommonHandler.sharedInstance().cancelLoginVC(animated: true)
+                    return
+                }
+                if let err = error {
+                    var msg = err.errorMsg
+                    if msg.isEmpty {
+                        msg = "登录失败"
+                    }
+                    YHHUD.flash(message: msg)
+                }
+            }
+        }
+    }
+    
     func enterOneKeyLoginPage() {
         
         // 3. 开始一键登录流程
@@ -100,53 +135,22 @@ extension YHOneKeyLoginManager {
                 if code == PNSCodeSuccess {
                     // 点击登录按钮获取登录Token成功回调
                     guard let token = dict["token"] as? String, !token.isEmpty else {
-                        printLog("获取登录Token失败")
-                        
+                        YHHUD.flash(message: "获取token失败")
                         return
                     }
                     printLog("oneKeyLogin token: \(token)")
-                    // 下面用Token去服务器换手机号，此处仅做参考
-                    
+                    // 下面用Token去服务器登录
                     YHHUD.show(.progress(message: "登录中..."))
-                    self.viewModel.oneKeyLogin(authToken: token) {
-                        success, error in
-                        
-                        DispatchQueue.main.async {
+                    if YHLoginManager.shared.deviceTokenModel.registerId.isEmpty {
+                        JPUSHService.registrationIDCompletionHandler {
+                            resCode, registrationID in
                             YHHUD.hide()
+                            YHLoginManager.shared.deviceTokenModel.registerId = registrationID ?? ""
+                            self.requestOneKeyLogin(token: token)
                         }
-                        
-                        if success {
-                            
-                            return
-                        }
-                        if let err = error {
-                            var msg = err.errorMsg
-                            if msg.isEmpty {
-                                msg = "登录失败"
-                            }
-                            YHHUD.flash(message: msg)
-                        }
-                        
+                    } else {
+                        self.requestOneKeyLogin(token: token)
                     }
-                    /*
-                     
-                     [PNSVerifyTopRequest requestLoginWithToken:token complete:^(BOOL isSuccess, NSString * _Nonnull msg, NSDictionary * _Nonnull data) {
-                                     NSString *popCode = [data objectForKey:@"code"];
-                                     NSDictionary *module = [data objectForKey:@"module"];
-                                     NSString *mobile = module[@"mobile"];
-                                     if ([popCode isEqualToString:@"OK"] && mobile.length > 0) {
-                                         [ProgressHUD showSuccess:@"一键登录成功"];
-                                     } else {
-                                         [ProgressHUD showSuccess:@"一键登录失败"];
-                                     }
-                                     dispatch_async(dispatch_get_main_queue(), ^{
-                                         [[TXCommonHandler sharedInstance] cancelLoginVCAnimated:YES complete:nil];
-                                     });
-                                     [weakSelf showResult:data];
-                                 }];
-                     
-                     */
-                    
                     return
                 }
                 

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -181,7 +181,9 @@ extension YhConstant {
     // MARK: - 支付宝
     struct Alipay {
         // MARK: - 阿里云 手机号一键登录 秘钥信息
-        static let kAliLoginSecretKey = "MuKKbWPm4DRHmZpgASqjI3L1HtiOlxyKWmocGnJhbiibdfaKlwYUj8ISgOexPHLAUAhdo6NNIGOi8oCAeqA1PO9b4ea3YwHXKnIa2u7BCTkd5L4IswsGgljfBeGIyRhoFCnCibix7RwQEqhrkdZ2KMsE/NtPrXfi+EU3oAnO9tXIztzvpAe75Pna2mUKMvO1qt4SSmPe4VnEOX5LCdbn7sGAvOLN8/l/fcCdEU7FA+AGLTY+547jlwan3wyJYJn0Sc8qnEW9LBxRwTDpEZPqyg=="
+        static let kAliLoginDefaultSecretKey = "y4uQwHhb6PBfQVKlHou8SINaWIFHkovMalxWpiSjmV7iree+qKEEZHunaf5VN7d+YmHZIu8th0V1mM+JUCSNqrTT1s/rN1KCu5tWtABgzYuIhHoUtzPMB2NbRoQUF/cJj2DAjpvRQwWibWONTVyvtKUVUqhiL+fbYXM4OzXETetCAykppYUQt2Tzob9Jwz2RwOC7WrU4QyOyoa5dbavOysUjo2yv3oTRVFQbE1wdZBczDWpiqHfqUArZ4py7Q5sVuGvCoCvRcAE="
+        
+        
     }
     
     // MARK: -  通知相关 名称