From 862a13b78b82b425638aea5280d0b31a76c3bbe1 Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期三, 05 九月 2018 19:10:58 +0800
Subject: [PATCH] Fixed sdk逻辑修改
---
Project/app/src/game_822055139/java/com/secondworld/univeralsdk/FreePlatformUtil.java | 4 ++++
ChannelDiff/822055139/libs/app-game_822055139-release.aar | 0
Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java | 15 ++++++++++++---
3 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/ChannelDiff/822055139/libs/app-game_822055139-release.aar b/ChannelDiff/822055139/libs/app-game_822055139-release.aar
index 5017825..db6aaf4 100644
--- a/ChannelDiff/822055139/libs/app-game_822055139-release.aar
+++ b/ChannelDiff/822055139/libs/app-game_822055139-release.aar
Binary files differ
diff --git a/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/FreePlatformUtil.java b/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/FreePlatformUtil.java
index 69fe5a0..ecbde5c 100644
--- a/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/FreePlatformUtil.java
+++ b/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/FreePlatformUtil.java
@@ -26,6 +26,7 @@
private static FreePlatformUtil s_Instance;
private boolean m_Init = false;
+ public boolean payProcessing = false;
public static FreePlatformUtil getInstace()
{
@@ -121,14 +122,17 @@
case FreeCallbackCode.PAY_SUCCESS:
m_Message.put("code", CodeA2U.FreePlatformPayOk);
UniversalUtil.sendMessageToUnity(m_Message);
+ payProcessing = false;
break;
case FreeCallbackCode.PAY_FAIL:
m_Message.put("code", CodeA2U.FreePlatformPayFail);
UniversalUtil.sendMessageToUnity(m_Message);
+ payProcessing = false;
break;
case FreeCallbackCode.PAY_CANCEL:
m_Message.put("code", CodeA2U.FreePlatformPayCancel);
UniversalUtil.sendMessageToUnity(m_Message);
+ payProcessing = false;
break;
}
}
diff --git a/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java b/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java
index a021aca..9a191c8 100644
--- a/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java
+++ b/Project/app/src/game_822055139/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -99,6 +99,7 @@
_json.getString("orderId"),
(float) _json.getDouble("mount"),
_json.getString("cpInfo"));
+ FreePlatformUtil.getInstace().payProcessing = true;
break;
case CodeU2A.PayFinished:
Tracking.setPayment(_json.getString("orderID"),
@@ -116,6 +117,9 @@
_json.getString("moneyType"),
true,
_money);
+
+ FreePlatformUtil.getInstace().payProcessing = false;
+
break;
case CodeU2A.ClientPackage:
// 鍒濆鍖栫儹浜�
@@ -300,9 +304,6 @@
// ------------------------------- 鑷敱SDK -------------------------------
FreePlatformUtil.getInstace().init(activity);
-
- // ------------------------------- 鐚�砈DK -------------------------------
- FreePlatformUtil.getInstace().init(activity);
// ------------------------------- 鏋佸厜鎺ㄩ�� -------------------------------
JPushInterface.setDebugMode(true);
JPushInterface.init(activity);
@@ -387,6 +388,14 @@
{
FreePlatform.getInstance().onResume();
TeaAgent.onResume(activity);
+
+ if(FreePlatformUtil.getInstace().payProcessing)
+ {
+ Map<String, Object> _msgStruct = new HashMap<>();
+ _msgStruct.put("code", CodeA2U.FreePlatformPayCancel);
+ UniversalUtil.sendMessageToUnity(_msgStruct);
+ FreePlatformUtil.getInstace().payProcessing = false;
+ }
}
public static void onStop(final Activity activity)
--
Gitblit v1.8.0