From bd0ba263761a866ca0d698169d2d83b6a11c35e7 Mon Sep 17 00:00:00 2001
From: CoderM <coderm@qq.com>
Date: Thu, 10 Dec 2020 17:04:37 +0800
Subject: [PATCH] CoderM: 增加SDKJSON处理

---
 Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs |   67 +++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
index d8fcdf7..38af7bf 100644
--- a/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
+++ b/Assets/Scripts/GameAnalytics_SDK/UI/LoginUI.cs
@@ -53,36 +53,51 @@
 
         //transform.Find("Panel/Button (1)").GetComponent<Button>().onClick.AddListener(OnClickResetBtn);
 
-        if (Application.platform == RuntimePlatform.Android)
-        {
-            //GetetDeviceIMEI();//获取安卓手机IMEI
-            imei0 = TDAA_SDKManager.Ins.GetDeviceId();//使用设备ID
-        }
-        else if (Application.platform == RuntimePlatform.WindowsEditor)
-        {
-            imei0 = "MyTestGemBattle123";
-        }
-
-        GameConfig.PlayerName = imei0;
-
-        versionTxt.text = "版本号:" + Application.version;
-        //resVersion.text 暂时没有使用
-        transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + imei0;
+        
+        
 
 
         if (!GameConfig.isFirstStart)//后续直接加载
         {
             waitTime = 2f;
 
-            OnClickLoginBtn();
+            loginNext();
         }
         else
         {
             waitTime = 0f;
             //第一次启动,初始化并且埋点
-            TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
-            TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
+            //TDAA_SDKManager.Ins.SDKInit(ChannelID.Gm.ToString());
+            //TDAA_SDKManager.Ins.Statistics(1);//成功加载登陆界面的人数
         }
+    }
+
+    void loginNext()
+    {
+        //if (Application.platform == RuntimePlatform.Android)
+        //{
+        //    //GetetDeviceIMEI();//获取安卓手机IMEI
+        //    imei0 = TDAA_SDKManager.Ins.GetDeviceId();//使用设备ID
+        //}
+        //else if (Application.platform == RuntimePlatform.WindowsEditor)
+        //{
+        //    imei0 = "MyTestGemBattle123";
+        //}
+
+        GameConfig.PlayerName = SDKManager.ins.sdk.uid;
+
+        versionTxt.text = "版本号:" + Application.version;
+        //resVersion.text 暂时没有使用
+        transform.Find("Panel/PlayerID").GetComponent<Text>().text = "玩家ID:" + SDKManager.ins.sdk.uid;
+
+        progressSlider.gameObject.SetActive(true);
+        startBtn.gameObject.SetActive(false);
+
+        AudioSourceManager.Ins.Play(AudioEnum.UI);
+        TDAA_SDKManager.Ins.Statistics(2);//埋点
+
+        GameConfig.isFirstStart = false;
+        StartCoroutine(loginMy());
     }
 
     float waitTime;
@@ -129,14 +144,18 @@
     {
         if (!isLogining)
         {
-            progressSlider.gameObject.SetActive(true);
-            startBtn.gameObject.SetActive(false);
+            // CoderM: 在这里要使用SDK来进行登录了
+            SDKCallBack.ins.setNextAction("login", loginNext);
+            SDKManager.ins.sdk.login();
 
-            AudioSourceManager.Ins.Play(AudioEnum.UI);
-            TDAA_SDKManager.Ins.Statistics(2);//埋点
+            //progressSlider.gameObject.SetActive(true);
+            //startBtn.gameObject.SetActive(false);
 
-            GameConfig.isFirstStart = false;
-            StartCoroutine(loginMy());
+            //AudioSourceManager.Ins.Play(AudioEnum.UI);
+            //TDAA_SDKManager.Ins.Statistics(2);//埋点
+
+            //GameConfig.isFirstStart = false;
+            //StartCoroutine(loginMy());
         }
         else
         {

--
Gitblit v1.9.1