Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/HotUpdate/Platform/QDHYKBManager.cs

@@ -1,17 +1,16 @@
-using System;
-using com.m3839.sdk;
+using com.m3839.sdk;
 using com.m3839.sdk.login;
 using com.m3839.sdk.login.bean;
 using com.m3839.sdk.login.listener;
 using ET;
-using TapTap.Bootstrap;
-using UnityEngine;
 
 namespace GFGGame
 {
     public class QDHYKBManager : SingletonBase<QDHYKBManager>
     {
 
+        public string UserId;
+
         public void InitSDK()
         {
             // 游戏屏幕方向 （Game Screen Orientation）
@@ -28,6 +27,7 @@ namespace GFGGame
         /// </summary>
         public void Login()
         {
+            QDHYKBManager.Instance.UserId = null;
             ViewManager.Show<ModalStatusView>("登录中...");
             HykbUser user = HykbLogin.GetUser();
             Log.Debug($"sdk manager Login {user == null}");
@@ -124,7 +124,8 @@ namespace GFGGame
         public override void OnLoginSucceed(HykbUser user)
         {
             Log.Debug("OnLoginSucceed");
-            EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, user.getUserId());
+            QDHYKBManager.Instance.UserId = user.getUserId();
+             EventAgent.DispatchEvent(ConstMessage.ON_PLATFORM_SDK_LOGINED, user.getUserId());
         }
 
         public override void OnSwitchUser(HykbUser user)

GameClient/Assets/Game/HotUpdate/Views/Login/LoginView.cs

@@ -15,6 +15,7 @@ namespace GFGGame
         private GameObject _scenePrefab;
         private GameObject _sceneObject;
 
+
         public override void Dispose()
         {
 
@@ -147,7 +148,8 @@ namespace GFGGame
                 _ui.m_btnTapLogin.visible = false;
                 if(QDManager.IsHYKB)
                 {
-                    Timers.inst.Add(1, 1, (a) => { LoginController.LoginTest(account).Coroutine(); });
+                    //好游快爆因为SDK的防沉迷会使游戏失去焦点，需要检测焦点
+                    Timers.inst.AddUpdate(CheckHykbLoginServer);
                 }
                 else
                 {
@@ -162,6 +164,15 @@ namespace GFGGame
             }
         }
 
+        private void CheckHykbLoginServer(object p)
+        {
+            if(Application.isFocused)
+            {
+                LoginController.LoginTest(QDHYKBManager.Instance.UserId).Coroutine();
+                Timers.inst.Remove(CheckHykbLoginServer);
+            }
+        }
+
         private void OnLoginSuccess(EventContext context)
         {
             _ui.m_btnLogout.visible = true;