From 06a335b62a0ec36d548e6e96695ee024e9cd34a0 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 14 一月 2021 12:07:09 +0800
Subject: [PATCH] 0312 充值走ui线程
---
/dev/null | 0
Project/qkbt_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java | 15 ++++++++++++++-
Project/settings.gradle | 3 +--
ChannelDiff/Android/qkbtgame/libs/qkbt_sdk-game_qk-release.aar | 0
ChannelDiff/Android/qkbtzf/libs/qkbtzf-game_qk-release.aar | 0
Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java | 14 +++++++++++++-
6 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/ChannelDiff/Android/qkbtgame/libs/qkbt_sdk-game_qk-release.aar b/ChannelDiff/Android/qkbtgame/libs/qkbt_sdk-game_qk-release.aar
index cd15d29..597f4f7 100644
--- a/ChannelDiff/Android/qkbtgame/libs/qkbt_sdk-game_qk-release.aar
+++ b/ChannelDiff/Android/qkbtgame/libs/qkbt_sdk-game_qk-release.aar
Binary files differ
diff --git a/ChannelDiff/Android/qkbtzf/libs/qkbtzf-game_qk-release.aar b/ChannelDiff/Android/qkbtzf/libs/qkbtzf-game_qk-release.aar
index 202010f..08eb8bf 100644
--- a/ChannelDiff/Android/qkbtzf/libs/qkbtzf-game_qk-release.aar
+++ b/ChannelDiff/Android/qkbtzf/libs/qkbtzf-game_qk-release.aar
Binary files differ
diff --git a/Project/qkbt_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java b/Project/qkbt_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java
index ecefa4b..7d8cf1a 100644
--- a/Project/qkbt_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java
+++ b/Project/qkbt_sdk/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java
@@ -180,7 +180,8 @@
//orderInfo.setPrice(0.1);
orderInfo.setExtrasParams(
URLEncoder.encode(_extraData.toString(), "utf-8"));
- Payment.getInstance().pay(_activity, orderInfo, roleInfo3);
+ //Payment.getInstance().pay(_activity, orderInfo, roleInfo3);
+ PayEx(_activity, orderInfo, roleInfo3);
} catch (UnsupportedEncodingException e)
{
@@ -447,6 +448,18 @@
});
}
+ public static void PayEx(final Activity activity, final OrderInfo orderInfo, final GameRoleInfo roleInfo)
+ {
+ activity.runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ Payment.getInstance().pay(activity, orderInfo, roleInfo);
+ }
+ });
+ }
+
public static void CopyContent(final Activity activity, final String content)
{
diff --git a/Project/qkbtzf/consumer-rules.pro b/Project/qkbtzf/consumer-rules.pro
deleted file mode 100644
index e69de29..0000000
--- a/Project/qkbtzf/consumer-rules.pro
+++ /dev/null
diff --git a/Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java b/Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java
index 660d14c..0365715 100644
--- a/Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java
+++ b/Project/qkbtzf/src/game_qk/java/com/secondworld/universalsdk/H2EngineSDK.java
@@ -180,7 +180,8 @@
//orderInfo.setPrice(0.1);
orderInfo.setExtrasParams(
URLEncoder.encode(_extraData.toString(), "utf-8"));
- Payment.getInstance().pay(_activity, orderInfo, roleInfo3);
+ //Payment.getInstance().pay(_activity, orderInfo, roleInfo3);
+ PayEx(_activity, orderInfo, roleInfo3);
} catch (UnsupportedEncodingException e)
{
@@ -447,6 +448,17 @@
});
}
+ public static void PayEx(final Activity activity, final OrderInfo orderInfo, final GameRoleInfo roleInfo)
+ {
+ activity.runOnUiThread(new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ Payment.getInstance().pay(activity, orderInfo, roleInfo);
+ }
+ });
+ }
public static void CopyContent(final Activity activity, final String content)
{
diff --git a/Project/settings.gradle b/Project/settings.gradle
index 4138038..fb78183 100644
--- a/Project/settings.gradle
+++ b/Project/settings.gradle
@@ -1,3 +1,2 @@
-include ':qkbtzf'
-include ':app', ':mr_sdk', ':sp_sdk', ':js_sdk', ':yj_sdk', ':quicksdk_sdk', ':yl_sdk', ':xn_sdk', ':sd_sdk', ':ky_sdk', ':qk_sdk', ':qkcw2_sdk', ':qkbt_sdk'
+include ':app', ':mr_sdk', ':sp_sdk', ':js_sdk', ':yj_sdk', ':quicksdk_sdk', ':yl_sdk', ':xn_sdk', ':sd_sdk', ':ky_sdk', ':qk_sdk', ':qkcw2_sdk', ':qkbt_sdk', ':qkbtzf'
include ':sp_common_sdk'
--
Gitblit v1.8.0