From ac4cd9dae58bc753609aebd35ccda8785b806e3e Mon Sep 17 00:00:00 2001
From: 蔡瀚 <339726288@qq.com>
Date: 星期三, 23 一月 2019 12:01:10 +0800
Subject: [PATCH] Merge commit '1506bbf613d88c9c83179ef30c8a0a9da1ccaa3a'
---
Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/YJPlatformUtil.java | 107 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 64 insertions(+), 43 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 1ab338e..dcda166 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
@@ -1,8 +1,9 @@
package com.secondworld.univeralsdk;
import android.app.Activity;
+import android.content.Context;
+import android.content.SharedPreferences;
import android.os.Bundle;
-import android.util.Log;
import com.snowfish.cn.ganga.helper.SFOnlineHelper;
import com.snowfish.cn.ganga.helper.SFOnlineInitListener;
@@ -13,13 +14,6 @@
import org.json.JSONException;
import org.json.JSONObject;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
@@ -120,7 +114,30 @@
public void login(final Activity activity)
{
- SFOnlineHelper.login(activity, "Login");
+ String _appid = UniversalUtil.getMetaString(activity, "yj_appid");
+ if (_appid.equals("yybgame"))
+ {
+ SharedPreferences _sp = activity.getPreferences(Context.MODE_PRIVATE);
+ String _loginType = _sp.getString(StaticDefine.LS_KEY_TENCENT_LOGINPARAM, "");
+ if(_loginType.length() > 0)
+ {
+ SFOnlineHelper.login(activity, _loginType);
+ }
+ }
+ else
+ {
+ SFOnlineHelper.login(activity, "Login");
+ }
+ }
+
+ public void loginTencent(final Activity activity, String param)
+ {
+ SFOnlineHelper.login(activity, param);
+
+ SharedPreferences _sp = activity.getPreferences(Context.MODE_PRIVATE);
+ SharedPreferences.Editor _editor = _sp.edit();
+ _editor.putString(StaticDefine.LS_KEY_TENCENT_LOGINPARAM, param);
+ _editor.apply();
}
public void logout(final Activity activity)
@@ -165,45 +182,48 @@
LogUtil.i(TAG, "Pay Order No: " + s);
}
});
-
+ payProcessing = true;
}
public void payExtend(final Activity activity,
- String productName,
- String productID,
- float price,
- String extData)
+ 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;
- }
+ 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 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);
- }
- });
+ @Override
+ public void onOderNo(String s)
+ {
+ LogUtil.i(TAG, "Pay Order No: " + s);
+ }
+ });
+ payProcessing = true;
}
public void pay(final Activity activity,
@@ -262,7 +282,7 @@
String vipLevel,
String surplusMoney)
{
- SFOnlineHelper.setRoleData(activity, roleID, roleName, roleLevel, serverID, serverName);
+ SFOnlineHelper.setRoleData(activity, roleID, roleName, roleLevel, "1", "榛樿鍒嗗尯");
String _info = createGameData(serverID, serverName, roleID, roleName, roleLevel, FamilyName,
createTime, "", vipLevel, surplusMoney);
SFOnlineHelper.setData(activity, "createrole", _info); // 鍒涘缓鏂拌鑹叉椂璋冪敤 蹇呮帴
@@ -278,6 +298,7 @@
String vipLevel,
String surplusMoney)
{
+ SFOnlineHelper.setRoleData(activity, roleID, roleName, roleLevel, "1", "榛樿鍒嗗尯");
String _info = createGameData(serverID, serverName, roleID, roleName, roleLevel, FamilyName,
"", "", vipLevel, surplusMoney);
SFOnlineHelper.setData(activity, "enterServer", _info); // 鍒涘缓鏂拌鑹叉椂璋冪敤 蹇呮帴
--
Gitblit v1.8.0