Merge branch 'main' of 192.168.9.102:tysdk-intergration

# Conflicts:
#	sdk-intergration/Assets/Scripts/SDKTest.cs
#	sdk-intergration/Packages/tysdk/Runtime/TYSdkFacade_Pay.cs
#	sdk-intergration/Packages/tysdk/Runtime/TYSdkModel.cs
This commit is contained in:
LYP
2024-08-09 11:48:57 +08:00
18 changed files with 556 additions and 21 deletions

View File

@@ -93,7 +93,7 @@ namespace tysdk
}
// Get Pay list
public async Task<ProductListInfo> ThirdExtend()
public async Task<ProductListInfo> GetSKUList()
{
if (!IsLoggedIn) return new ProductListInfo() { code = -1, msg = "未登录" };
@@ -104,7 +104,7 @@ namespace tysdk
return result;
#elif UNITY_ANDROID
var taskSource = new TaskCompletionSource<ProductListInfo>();
callbacks.Add("PayTypeResult", (ITYSdkCallback callback) =>
callbacks.Add("SKUListResult", (ITYSdkCallback callback) =>
{
taskSource.SetResult((ProductListInfo) callback);
});
@@ -118,8 +118,9 @@ namespace tysdk
}
//商品列表的回调
public void PayTypeResult(string json)
public void SKUListResult(string json)
{
Debug.Log("[TYSdkFacade] GetSKUList callback:");
var result = new ProductListInfo();
var jresult = JObject.Parse(json);
int code = int.Parse(jresult["code"].ToString());
@@ -131,10 +132,10 @@ namespace tysdk
result.products = jsonObjList;
}
if (callbacks.TryGetValue("PayTypeResult", out var action))
if (callbacks.TryGetValue("SKUListResult", out var action))
{
action.Invoke(result);
callbacks.Remove("PayTypeResult");
callbacks.Remove("SKUListResult");
}
}
}

View File

@@ -31,7 +31,7 @@ namespace tysdk
string productCount, string prodorderId, string appInfo){}
//获取商品列表
public static void ThirdExtend() { }
public static void GetSKUList() { }
//打点
public static void SetGaUserInfo(string userId){}
@@ -148,7 +148,7 @@ namespace tysdk
}
//获取商品列表
public static void ThirdExtend()
public static void GetSKUList()
{
using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
{
@@ -243,6 +243,10 @@ namespace tysdk
public static extern void UnityKnow(string userId, string productId, string productPrice, string productName,
string productCount, string prodorderId, string appInfo);
//获取商品列表
[DllImport("__Internal")]
public static extern void GetSKUList();
//打点
[DllImport("__Internal")]
public static extern void SetGaUserInfo(string userId);