3 Commits

Author SHA1 Message Date
c0509da0fc fix: correct Java types and remove unused import in SDKManager
- Replace Kotlin-style bool/string with Java boolean/String
- Remove unused kotlinx.serialization.json.Json import

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-03 22:02:36 +08:00
c9fe482c8c update tuyoosdk, set DNS IPs 2026-06-03 15:57:50 +08:00
92d04aba61 sync from ty 2026-06-03 14:54:56 +08:00
6 changed files with 35 additions and 32 deletions

View File

@@ -44,8 +44,6 @@ 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());
@@ -124,6 +122,7 @@ public class SDKManager {
public static void UnityResetServerUrl(String url) {
SDKLog.i("UnityResetServerUrl : " + url);
SetDNSIPsEnable(false);
SDKAPI.getIns().updateServer(url);
}
@@ -561,6 +560,18 @@ 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]);
}
}
}

View File

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

View File

@@ -38,8 +38,7 @@ namespace tysdk
{"google", EAccoutType.hwGoogle},
{"fb", EAccoutType.hwFacebook},
{"tyGuest", EAccoutType.hwGuest},
{"ios13", EAccoutType.Apple},
{AccountString.hwVkid, EAccoutType.hwVkid}
{"ios13", EAccoutType.Apple}
};
private static EAccoutType ConvertAccoutType(string accountType)
@@ -365,6 +364,13 @@ 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));
@@ -389,6 +395,7 @@ namespace tysdk
CleanLinkTempSnSInfo();
}
}
#endif
public void ChangeLinkAccountResult(string message)
{

View File

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

View File

@@ -7,13 +7,7 @@ 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(){}
@@ -67,6 +61,8 @@ 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
@@ -111,12 +107,10 @@ namespace tysdk
public static void UnityLogin(EAccoutType accoutType)
{
var accountInfo = EAccountTypeToStr(accoutType);
using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
{
sdkManager.CallStatic("UnityLogin",accountInfo);
sdkManager.CallStatic("UnityLogin", accoutType.ToString());
}
}
public static void UnityGetIdentityFun(string type)
@@ -130,20 +124,18 @@ namespace tysdk
public static void UnityLogOutByChannel(EAccoutType accoutType)
{
var accountInfo = EAccountTypeToStr(accoutType);
using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
{
sdkManager.CallStatic("UnityLogOutByChannel", accountInfo);
sdkManager.CallStatic("UnityLogOutByChannel", accoutType.ToString());
}
}
public static void LinkAccount(EAccoutType accoutType)
{
string userId = TYSdkFacade.TYAccountInfo.strUserId;
using (var sdkManager = new AndroidJavaClass(SDK_CLASS))
using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
{
var accountInfo = EAccountTypeToStr(accoutType);
sdkManager.CallStatic("LinkAccount",accountInfo,userId);
string userId = TYSdkFacade.TYAccountInfo.strUserId;
sdkManager.CallStatic("LinkAccount", accoutType.ToString(), userId);
}
}
@@ -159,19 +151,17 @@ namespace tysdk
public static void ChangeLinkAccount(EAccoutType accoutType, int oldUserId, int newUserId)
{
var accountInfo = EAccountTypeToStr(accoutType);
using (var sdkManager = new AndroidJavaClass(SDK_CLASS))
using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
{
sdkManager.CallStatic("ChangeLinkAccount", accountInfo, oldUserId, newUserId);
sdkManager.CallStatic("ChangeLinkAccount", accoutType.ToString(), oldUserId, newUserId);
}
}
public static void LinkCheck(EAccoutType accoutType)
{
var accountInfo = EAccountTypeToStr(accoutType);
using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
{
sdkManager.CallStatic("LinkCheck",accountInfo);
sdkManager.CallStatic("LinkCheck", accoutType.ToString());
}
}
@@ -242,7 +232,6 @@ namespace tysdk
using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
{
sdkManager.CallStatic("Review");
// sdkManager.CallStataic("RuStoreReview");
}
}