update:更新sdk 脚本

Made-with: Cursor

sdk-intergration/Packages/tysdk/Plugins/Android/SDKManager.java

@@ -44,6 +44,8 @@ import org.json.JSONObject;
 import java.util.HashMap;
 import java.util.Map;
 
+import kotlinx.serialization.json.Json;
+
 public class SDKManager {
 
     private final static Handler handler = new Handler(Looper.getMainLooper());
@@ -122,7 +124,6 @@ public class SDKManager {
 
     public static void UnityResetServerUrl(String url) {
         SDKLog.i("UnityResetServerUrl : " + url);
-        SetDNSIPsEnable(false);
         SDKAPI.getIns().updateServer(url);
     }
 
@@ -560,18 +561,6 @@ public class SDKManager {
         }
     }
 
-    public static void SetDNSIPsEnable(boolean enable) {
-        SDKAPI.enableDoh(enable);
-        if(enable) {
-            SDKAPI.setHttpDnsIps(new String[]{
-                "34.111.1.231",
-                "2600:1901:0:c31b::"
-            });
-        }
-        else{
-            SDKAPI.setHttpDnsIps(new String[0]);
-        }
-    }
 }
 
 

sdk-intergration/Packages/tysdk/Plugins/Android/TYApp.java

@@ -12,7 +12,6 @@ public class TYApp extends Application {
     public void onCreate() {
         super.onCreate();
         SDKAPI.getIns().onApplicationCreate(this);
-        SDKManager.SetDNSIPsEnable(true);
     }
 
     @Override
@@ -20,5 +19,4 @@ public class TYApp extends Application {
         super.attachBaseContext(base);
         SDKAPI.getIns().onAttachBaseContext(base, this);
     }
-
 }

sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade.cs

@@ -38,7 +38,8 @@ namespace tysdk
                 {"google", EAccoutType.hwGoogle},
                 {"fb", EAccoutType.hwFacebook},
                 {"tyGuest", EAccoutType.hwGuest},
-                {"ios13", EAccoutType.Apple}
+                {"ios13", EAccoutType.Apple},
+                {AccountString.hwVkid, EAccoutType.hwVkid}
             };
 
             private static EAccoutType ConvertAccoutType(string accountType)
@@ -364,13 +365,6 @@ namespace tysdk
             UnityBridgeFunc.CleanLinkTmpSnsInfo();
         }
 
-#if UNITY_EDITOR
-        public async Task<ChangeLinkResult> ChangeLinkAccount(EAccoutType accoutType, int oldUserId, int newUserId)
-        {
-            await Task.Delay(300);
-            return new ChangeLinkResult(){code = 1};
-        }
-#elif UNITY_IOS || UNITY_ANDROID
         public async Task<ChangeLinkResult> ChangeLinkAccount(EAccoutType accoutType, int oldUserId, int newUserId)
         {
             var task = TYSDKCallbackManager.Instance.RegisterCallback<ChangeLinkResult>(TimeSpan.FromSeconds(30));
@@ -395,7 +389,6 @@ namespace tysdk
                 CleanLinkTempSnSInfo();
             }
         }
-#endif
 
         public void ChangeLinkAccountResult(string message)
         {

sdk-intergration/Packages/tysdk/Runtime/TYSdkModel.cs

@@ -14,6 +14,12 @@ namespace tysdk
         none
     }
 
+    public static class AccountString
+    {
+        public const string hwVkid = "vk.global.app";
+    }
+    
+
     public class LoginInfo
     {
         public bool isSuccess;

sdk-intergration/Packages/tysdk/Runtime/UnityBridgeFunc.cs

@@ -7,7 +7,13 @@ namespace tysdk
 
     public static class UnityBridgeFunc
     {
-        
+#if UNITY_EDITOR || UNITY_ANDROID
+        private static string EAccountTypeToStr(EAccoutType accountType)
+        {
+            return accountType == EAccoutType.hwVkid ? AccountString.hwVkid : accountType.ToString();
+        }
+
+#endif
 #if UNITY_EDITOR 
         //初始化sdk
         public static void InitSDK(){}
@@ -61,8 +67,6 @@ namespace tysdk
 
         public static void FBShareLink(string title, string content, string url) { }
         public static void MessengerShareLink(string title, string content, string url) { }
-        
-        
 
 #elif UNITY_ANDROID
 
@@ -107,10 +111,12 @@ namespace tysdk
 
         public static void UnityLogin(EAccoutType accoutType)
         {
+            var accountInfo = EAccountTypeToStr(accoutType);
             using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
             {
-                sdkManager.CallStatic("UnityLogin", accoutType.ToString());
+                sdkManager.CallStatic("UnityLogin",accountInfo);
             }
+            
         }
 
         public static void UnityGetIdentityFun(string type)
@@ -124,18 +130,20 @@ namespace tysdk
         public static void UnityLogOutByChannel(EAccoutType accoutType)
         {
 
+            var accountInfo = EAccountTypeToStr(accoutType);
             using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
             {
-                sdkManager.CallStatic("UnityLogOutByChannel", accoutType.ToString());
+                sdkManager.CallStatic("UnityLogOutByChannel", accountInfo);
             }
         }
 
         public static void LinkAccount(EAccoutType accoutType)
         {
-            using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
+            string userId = TYSdkFacade.TYAccountInfo.strUserId;
+            using (var sdkManager = new AndroidJavaClass(SDK_CLASS))
             {
-                string userId = TYSdkFacade.TYAccountInfo.strUserId;
-                sdkManager.CallStatic("LinkAccount", accoutType.ToString(), userId);
+                var accountInfo = EAccountTypeToStr(accoutType);
+                sdkManager.CallStatic("LinkAccount",accountInfo,userId);
             }
         }
 
@@ -151,17 +159,19 @@ namespace tysdk
 
         public static void ChangeLinkAccount(EAccoutType accoutType, int oldUserId, int newUserId)
         {
-            using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
+            var accountInfo = EAccountTypeToStr(accoutType);
+            using (var sdkManager = new AndroidJavaClass(SDK_CLASS))
             {
-                sdkManager.CallStatic("ChangeLinkAccount", accoutType.ToString(), oldUserId, newUserId);
+                sdkManager.CallStatic("ChangeLinkAccount", accountInfo, oldUserId, newUserId);
             }
         }
 
         public static void LinkCheck(EAccoutType accoutType)
         {
+            var accountInfo = EAccountTypeToStr(accoutType);
             using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
             {
-                sdkManager.CallStatic("LinkCheck", accoutType.ToString());
+                sdkManager.CallStatic("LinkCheck",accountInfo);
             }
         }
 
@@ -232,6 +242,7 @@ namespace tysdk
             using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
             {
                 sdkManager.CallStatic("Review");
+                // sdkManager.CallStataic("RuStoreReview");
             }
         }