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/H2EngineSDK.java | 54 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/H2EngineSDK.java
index 2b37fe2..5e8c1a6 100644
--- a/Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/yj_sdk/src/game_yj/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -15,6 +15,7 @@
import android.provider.Settings;
import android.widget.Toast;
+import com.snowfish.cn.ganga.helper.SFOnlineExitListener;
import com.snowfish.cn.ganga.helper.SFOnlineHelper;
import com.unity3d.player.UnityPlayer;
@@ -109,20 +110,26 @@
// (float) _json.getDouble("mount"),
// URLEncoder.encode(_extraData.toString(),
// "utf-8"));
- if(_yjAppID.contains("mzgame"))
+ if (_yjAppID.contains("mzgame")
+ || _yjAppID.contains("ucgame")
+ || _yjAppID.contains("yybgame"))
{
YJPlatformUtil.getInstance().pay(_activity,
_json.getString("title"),
_json.getString("cpInfo"),
(float) _json.getDouble("mount"),
- URLEncoder.encode(_extraData.toString(),
- "utf-8"));
- }else{
+ URLEncoder.encode(
+ _extraData.toString(),
+ "utf-8"));
+ }
+ else
+ {
YJPlatformUtil.getInstance().charge(_activity,
- _json.getString("title"),
- (float) _json.getDouble("mount"),
- URLEncoder.encode(_extraData.toString(),
- "utf-8"));
+ _json.getString("title"),
+ (float) _json.getDouble("mount"),
+ URLEncoder.encode(
+ _extraData.toString(),
+ "utf-8"));
}
} catch (UnsupportedEncodingException e)
@@ -187,6 +194,9 @@
break;
case CodeU2A.JPushRemoveLocalMessage:
removeNotification(_activity, _json.getInt("id"));
+ break;
+ case CodeU2A.TencentLogin:
+ YJPlatformUtil.getInstance().loginTencent(_activity, _json.getString("param"));
break;
}
@@ -396,9 +406,11 @@
_msgStruct.clear();
_msgStruct.put("code", CodeA2U.SdkInitComplete);
_msgStruct.put("channelPlatform", "yj");
- _msgStruct.put("yj_appid", UniversalUtil.getMetaString(activity, "yj_appid"));
+ String _appid = UniversalUtil.getMetaString(activity, "yj_appid");
+ _msgStruct.put("yj_appid", _appid);
_msgStruct.put("yj_spid", UniversalUtil.getMetaString(activity, "yj_spid"));
_msgStruct.put("yj_branch", UniversalUtil.getMetaInt(activity, "yj_branch"));
+ _msgStruct.put("banhao", activity.getResources().getString(R.string.banhao));
UniversalUtil.sendMessageToUnity(_msgStruct);
LogUtil.i(TAG, "鍒濆鍖栨墽琛屽畬姣�");
@@ -416,20 +428,23 @@
public static void onWindowFocusChanged(boolean b)
{
-// if (MrPlatformUtil.getInstance().payProcessing)
-// {
-// if (b)
-// {
-// Map<String, Object> _msgStruct = new HashMap<>();
-// _msgStruct.put("code", CodeA2U.FreePlatformPayCancel);
-// UniversalUtil.sendMessageToUnity(_msgStruct);
-// MrPlatformUtil.getInstance().payProcessing = false;
-// }
-// }
+ if (b)
+ {
+ if (YJPlatformUtil.getInstance().payProcessing)
+ {
+ Map<String, Object> _msgStruct = new HashMap<>();
+ _msgStruct.put("code", CodeA2U.FreePlatformPayCancel);
+ UniversalUtil.sendMessageToUnity(_msgStruct);
+ YJPlatformUtil.getInstance().payProcessing = false;
+ }
+ }
+
+ m_IsFocus = b;
}
public static void onNewIntent(final Activity activity, final Intent intent)
{
+ SFOnlineHelper.onNewIntent(activity, intent);
}
public static void onActivityResult(int requestCode,
@@ -437,6 +452,7 @@
final Intent data,
final Activity activity)
{
+ SFOnlineHelper.onActivityResult(activity, requestCode, resultCode, data);
}
public static void onConfigurationChanged(final Configuration newConfig) {}
--
Gitblit v1.8.0