Merge branch 'main' into dev_rustore

replace tuyoosdk, implement set DNS IPs

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

@@ -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);
     }
 
@@ -666,6 +665,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]);
+        }
+    }
 }
 
 

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

@@ -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);
     }
+
 }

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

@@ -372,6 +372,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));
@@ -396,6 +403,7 @@ namespace tysdk
                 CleanLinkTempSnSInfo();
             }
         }
+#endif
 
         public void ChangeLinkAccountResult(string message)
         {