[M] sync from n3-world

This commit is contained in:
2024-08-30 10:12:40 +08:00
parent d449fee825
commit 959d7d2cce
9 changed files with 16 additions and 18 deletions

View File

@@ -245,8 +245,6 @@ public class SDKManager {
public static void UnityKnowNew(String productId, String productPrice, String productName, String productCount, String prodorderId, String appInfo, String ptype)
{
Log.e(TAG,"开始支付-----"+ "productId:" + productId+" "+ "productPrice:" + productPrice+" "+ "productName:" + productName +" "+ "prodorderId:" + prodorderId +" "+ "appInfo:" + appInfo +" "+ "ptype:" + ptype);
PayEventData.PayData payData = new PayEventData.PayData();
final PayEventData.PayReq mPayReq = new PayEventData.PayReq();
mPayReq.prodId = productId;
@@ -334,14 +332,10 @@ public class SDKManager {
public static void GAReportParams(int type, String eventstr, String paramstr)
{
Log.e(TAG,"GAReportParams : " + type + " \n" + eventstr + " \n" + paramstr);
SDKLog.i("GAReportParams : " + type + " \n" + eventstr + " \n" + paramstr);
ParamsBuilder paramsBuilder = ParamsBuilder.newInstance();
Gson gson = new Gson();
Map<String, Object> map = gson.fromJson(paramstr, new TypeToken<Map<String, Object>>(){}.getType());
for (String key : map.keySet()) {
System.out.println("Key = " + key + ", Value = " + map.get(key));
if(!TextUtils.isEmpty(key) && map.get(key) != null){
paramsBuilder.append(key, map.get(key).toString());
}

View File

@@ -146,7 +146,7 @@ namespace tysdk
public void Logout()
{
UnityEngine.Debug.Log("Logout");
if(_accountInfo != null) return;
if(_accountInfo != null)
{
UnityBridgeFunc.UnityLogOutByChannel(_accountInfo.channel);
}
@@ -396,7 +396,7 @@ namespace tysdk
string tycs = tyurl == defaultTyurl ?
"https://hwcsh.tygameworld.com /template/appCancel/note.html"
"https://hwcsh.tygameworld.com/template/appCancel/note.html"
:
"https://customermanage-feature-test-web-test.tuyougame.cn/appCancel/note.html";

View File

@@ -19,7 +19,7 @@ namespace tysdk
=================================================*/
//public async Task<PaymentInfo> Pay(string prodId, string prodPrice, string prodName, int count, string pType, string price_amount_micros =null)
public async Task<PaymentInfo> Pay(SKUDetail prod, int count)
public async Task<PaymentInfo> Pay(SKUDetail prod, int count, float usdprice)
{
if (!IsLoggedIn) return new PaymentInfo() { code = "-1", msg = "未登录" };
@@ -35,7 +35,7 @@ namespace tysdk
//to base64
extraInfo = System.Convert.ToBase64String(System.Text.Encoding.UTF8.GetBytes(extraInfo));
var prodId = prod.ProdID;
var prodPrice = prod.price;
var prodPrice = usdprice.ToString();
var prodName = prod.title;
var pType = "googleiab.global.app";

View File

@@ -137,7 +137,6 @@ namespace tysdk
public static void UnityKnowNew(string productId, string productPrice, string productName,
string productCount, string prodorderId, string appInfo,string pType)
{
Debug.LogError("[UnityKnowNew] pType:" + pType);
using(var sdkManager = new AndroidJavaClass(SDK_CLASS))
{
sdkManager.CallStatic("UnityKnowNew", productId, productPrice, productName,