From dad69efea08159c719f86647c777257bb0b8b6eb Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期五, 21 十二月 2018 15:03:15 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/U3DRepository
---
Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/YJPlatformUtil.java | 103 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 93 insertions(+), 10 deletions(-)
diff --git a/Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/YJPlatformUtil.java b/Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/YJPlatformUtil.java
index 9e21127..1ab338e 100644
--- a/Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/YJPlatformUtil.java
+++ b/Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/YJPlatformUtil.java
@@ -87,14 +87,13 @@
USER = sfOnlineUser;
//鏍规嵁鍥炶皟鑾峰彇鐢ㄦ埛淇℃伅
- String userName = USER.getUserName();
String timestamp = USER.getToken();
String token = USER.getToken();
String userId = USER.getChannelUserId();
try
{
JSONObject _info = new JSONObject();
- _info.put("account", userName);
+ _info.put("account", userId);
_info.put("token", token);
_info.put("timeStamp", timestamp);
_info.put("account_id", userId);
@@ -129,7 +128,88 @@
SFOnlineHelper.logout(activity, "LoginOut");
}
- public void pay(final Activity activity, String productName, String productID, float price,
+ public void charge(final Activity activity, String productName, float price, String extData)
+ {
+ SFOnlineHelper.charge(activity,
+ productName,
+ (int) (price * 100),
+ 1, extData,
+ PAY_CALLBACK_URL,
+ new SFOnlinePayResultListener()
+ {
+ @Override
+ public void onFailed(String s)
+ {
+ m_Message.clear();
+ //鏍规嵁鍥炶皟鑾峰彇鏀粯璁㈠崟淇℃伅
+ LogUtil.i(TAG, "Pay Fail Info: " + s);
+ m_Message.put("code", CodeA2U.FreePlatformPayFail);
+ UniversalUtil.sendMessageToUnity(m_Message);
+ payProcessing = false;
+ }
+
+ @Override
+ public void onSuccess(String s)
+ {
+ m_Message.clear();
+ //鏍规嵁鍥炶皟鑾峰彇鏀粯璁㈠崟淇℃伅
+ LogUtil.i(TAG, "Pay Success Info: " + s);
+ m_Message.put("code", CodeA2U.FreePlatformPayOk);
+ UniversalUtil.sendMessageToUnity(m_Message);
+ payProcessing = false;
+ }
+
+ @Override
+ public void onOderNo(String s)
+ {
+ LogUtil.i(TAG, "Pay Order No: " + s);
+ }
+ });
+
+ }
+
+ public void payExtend(final Activity activity,
+ String productName,
+ String productID,
+ float price,
+ String extData)
+ {
+ SFOnlineHelper.payExtend(activity, (int)(price * 100),
+ productName, productID, extData, 1,"", PAY_CALLBACK_URL, new SFOnlinePayResultListener() {
+ @Override
+ public void onFailed(String s)
+ {
+ m_Message.clear();
+ //鏍规嵁鍥炶皟鑾峰彇鏀粯璁㈠崟淇℃伅
+ LogUtil.i(TAG, "Pay Fail Info: " + s);
+ m_Message.put("code", CodeA2U.FreePlatformPayFail);
+ UniversalUtil.sendMessageToUnity(m_Message);
+ payProcessing = false;
+ }
+
+ @Override
+ public void onSuccess(String s)
+ {
+ m_Message.clear();
+ //鏍规嵁鍥炶皟鑾峰彇鏀粯璁㈠崟淇℃伅
+ LogUtil.i(TAG, "Pay Success Info: " + s);
+ m_Message.put("code", CodeA2U.FreePlatformPayOk);
+ UniversalUtil.sendMessageToUnity(m_Message);
+ payProcessing = false;
+ }
+
+ @Override
+ public void onOderNo(String s)
+ {
+ LogUtil.i(TAG, "Pay Order No: " + s);
+ }
+ });
+ }
+
+ public void pay(final Activity activity,
+ String productName,
+ String productID,
+ float price,
String extData)
{
SFOnlineHelper.pay(activity,
@@ -179,13 +259,12 @@
String roleLevel,
String FamilyName,
String createTime,
- String levelUpTime,
String vipLevel,
String surplusMoney)
{
SFOnlineHelper.setRoleData(activity, roleID, roleName, roleLevel, serverID, serverName);
String _info = createGameData(serverID, serverName, roleID, roleName, roleLevel, FamilyName,
- createTime, levelUpTime, vipLevel, surplusMoney);
+ createTime, "", vipLevel, surplusMoney);
SFOnlineHelper.setData(activity, "createrole", _info); // 鍒涘缓鏂拌鑹叉椂璋冪敤 蹇呮帴
}
@@ -196,13 +275,11 @@
String roleName,
String roleLevel,
String FamilyName,
- String createTime,
- String levelUpTime,
String vipLevel,
String surplusMoney)
{
String _info = createGameData(serverID, serverName, roleID, roleName, roleLevel, FamilyName,
- createTime, levelUpTime, vipLevel, surplusMoney);
+ "", "", vipLevel, surplusMoney);
SFOnlineHelper.setData(activity, "enterServer", _info); // 鍒涘缓鏂拌鑹叉椂璋冪敤 蹇呮帴
}
@@ -245,8 +322,14 @@
roleInfo.put("balance", surplusMoney); //鐢ㄦ埛娓告垙甯佷綑棰濓紝蹇呴』涓烘暟瀛楋紝鑻ユ棤锛屼紶鍏�0
roleInfo.put("vip", vipLevel); //褰撳墠鐢ㄦ埛VIP绛夌骇锛屽繀椤讳负鏁板瓧锛岃嫢鏃狅紝浼犲叆1
roleInfo.put("partyName", FamilyName);//褰撳墠瑙掕壊鎵�灞炲府娲撅紝涓嶈兘涓虹┖锛屼笉鑳戒负null锛岃嫢鏃狅紝浼犲叆鈥滄棤甯淳鈥�
- roleInfo.put("roleCTime", createTime); //鍗曚綅涓虹锛屽垱寤鸿鑹茬殑鏃堕棿
- roleInfo.put("roleLevelMTime", levelUpTime); //鍗曚綅涓虹锛岃鑹茬瓑绾у彉鍖栨椂闂�
+ if (createTime.length() > 0)
+ {
+ roleInfo.put("roleCTime", createTime); //鍗曚綅涓虹锛屽垱寤鸿鑹茬殑鏃堕棿
+ }
+ if (levelUpTime.length() > 0)
+ {
+ roleInfo.put("roleLevelMTime", levelUpTime); //鍗曚綅涓虹锛岃鑹茬瓑绾у彉鍖栨椂闂�
+ }
return roleInfo.toString();
} catch (JSONException ex)
{
--
Gitblit v1.8.0