修复一键登录偶尔失败的问题 ,网络库的appid偶尔变的问题

张旭
1 parent 85d03d84
Showing 2 changed files with 50 additions and 19 deletions
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/LoginPage/ViewModel/CNLiveLoginViewModel.swift
@@ -708,21 +708,32 @@ extension CNLiveLoginViewController {
                     TXCommonHandler.sharedInstance().cancelLoginVC(animated: true) {}
                     CNLiveLoginViewModel.oneClickLogin(accessToken: token, frmld: "apple") { result, status in
                         if status == .success{//result:UserInfoModel
-                            //成功
-                            NotificationCenter.default.post(name: Notification.Name.LoginManage.CNLiveLoginSuccessNotification, object: nil)
-                            metaAppDelegate.isLogin = true
-                            if self.navBackButton.isHidden{
-                                //退出登录后->登录
-                                let window = UIApplication.shared.delegate?.window
-                                window??.rootViewController = CNLiveBaseTabBarViewController.init()
-                            }else{
-                                //未登录push过来的
-                                self.navigationController?.popViewController(animated: true)
+                            if let res = result as? UserInfoModel{
+                                UserInfoManager.cacheUserInfo(userInfo: res)
+                                if var userDic = UserDefaults.standard.dictionary(forKey: UserInfoManager.shared.userInfo.uid){
+                                    
+                                }else{
+                                    let tempDic = NSMutableDictionary()
+                                    UserDefaults.standard.setValue(tempDic, forKey: UserInfoManager.shared.userInfo.uid)
+                                    UserDefaults.standard.synchronize()
+                                }
+                                //成功
+                                NotificationCenter.default.post(name: Notification.Name.LoginManage.CNLiveLoginSuccessNotification, object: nil)
+                                metaAppDelegate.isLogin = true
+                                if self.navBackButton.isHidden{
+                                    //退出登录后->登录
+                                    let window = UIApplication.shared.delegate?.window
+                                    window??.rootViewController = CNLiveBaseTabBarViewController.init()
+                                }else{
+                                    //未登录push过来的
+                                    self.navigationController?.popViewController(animated: true)
+                                }
                             }
-                        }else{
-                            let window = UIApplication.shared.delegate?.window
-                            window??.rootViewController = CNLiveBaseTabBarViewController.init()
                         }
+//                        else{
+//                            let window = UIApplication.shared.delegate?.window
+//                            window??.rootViewController = CNLiveBaseTabBarViewController.init()
+//                        }
  
                     }
                 }else if PNSCodeLoginControllerSuspendDisMissVC == resultCode{
@@ -20,7 +20,7 @@ typealias resultLoginBlock = () -&gt; Void
 typealias endRefreshBlock = () -> Void
  
  
-class CNLiveLoginViewModel : NSObject {
+class CNLiveLoginViewModel : NSObject,URLSessionTaskDelegate {
  
     /// 获取验证码
     /// - Parameters:
@@ -355,14 +355,13 @@ class CNLiveLoginViewModel : NSObject {
         }
     }
  
-    
     /**
      *  @abstract App 一键登录
      *
      *  @param accessToken 阿里云号码认证token
      *  @param block 回调
      */
-    static func oneClickLogin(accessToken: String, frmld:String, resultBlock: @escaping downSlideResultBlock) {
+    class func oneClickLogin(accessToken: String, frmld:String, resultBlock: @escaping downSlideResultBlock) {
         showLoading(message: "")
  
         // 获取当前时间戳（自1970年以来的秒数）
@@ -377,17 +376,25 @@ class CNLiveLoginViewModel : NSObject {
         param.setValue(CNLiveBusinessTools.getUidForStat(Date()), forKey: "uuid")
         param.setValue(frmld, forKey: "frmId")
         param.setValue("i", forKey: "clientPlat")
-        param.setValue(CNLiveMCEnvironmentManager.shared.appId, forKey: "appId")
+        let appIdStr = CNLiveMCEnvironmentManager.shared.appId_wjj
+        param.setValue(appIdStr, forKey: "appId")
         param.setValue("i", forKey: "plat")
         param.setValue(shortVersion, forKey: "ver")
         param.setValue(bundleIdentifier, forKey: "platform_id")
         param.setValue(timeString, forKey: "timestamp")
  
         let signStr = CNLiveBusinessTools.signvalue(param as! [AnyHashable : Any])
-        let string1 = "\(signStr)&key=\(CNLiveMCEnvironmentManager.shared.appKey)"
+        let appkeyStr = CNLiveMCEnvironmentManager.shared.appKey_wjj
+        let string1 = "\(signStr)&key=\(appkeyStr)"
         let signString1 = CNLiveBusinessTools.sha1(string1).uppercased()
         param.setValue(signString1, forKey: "sign")
+        let custom_param = NSMutableDictionary()
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appId_wjj, forKey: "appId")
+        custom_param.setValue(CNLiveMCEnvironmentManager.shared.appKey_wjj, forKey: "appKey")
+        CNLiveNetworking.setupCustomParam(custom_param as? [String : String])
  
+        CNLiveNetworking.setAllowRequestDefaultArgument(false)
+        CNLiveNetworking.setupShowDataResult(false)
         CNLiveNetworking.requestNetwork(with: .POST, urlString: APPLoginHost+"/open/api2/user/getMobileAndLoginApp", param: param as! [String : String], cacheType: .networkOnly) { task, result, error in
             hiddenLoading()
             if (error == nil) {
@@ -407,15 +414,28 @@ class CNLiveLoginViewModel : NSObject {
                     if errorCode as? String == "42013"{
                         resultBlock(errorCode ?? "", .failed)
                     }else{
+                        showMessage(message: "登录失败,请重试")
                         resultBlock(NSNull(), .failed)
                     }
                 }
             } else {
-                showMessage(message: "登录失败")
+                showMessage(message: "登录失败,请重试")
                 resultBlock(NSNull(), .failed)
             }
  
         }
     }
+    func urlSession(_ session: URLSession, task: URLSessionTask, willPerformHTTPRedirection response: HTTPURLResponse, newRequest request: URLRequest, completionHandler: @escaping (URLRequest?) -> Void) {
+        print("\(response.statusCode)") // 302
+        print("\(response.allHeaderFields["Location"] as? String ?? "无重定向地址")") // 重定向地址URL
+        
+        // 根据业务需求决定是否使用新的请求继续任务
+        // completionHandler(request) // 使用新的请求继续任务
+        // completionHandler(nil) // 不使用新的请求，取消重定向
+        
+        // 在这个例子中，我们简单地取消重定向（即不使用新的请求）
+        completionHandler(nil)
+    }
+
  
 }