From 826fecedc2e60221a506abefc8d4fa8414a1da30 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 28 七月 2022 15:42:18 +0800
Subject: [PATCH] 0312 x7 sdk

---
 SdkProject/channel/x7bt5/AndroidManifest.xml                                    |    1 +
 SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdRoleLevelUp.java    |    2 +-
 Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar                        |    0 
 Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar                    |    0 
 SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdCreateRole.java     |    2 +-
 SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdPlatformLogout.java |    1 +
 SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdPlatformPay.java    |    4 ++--
 SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdRoleLogin.java      |    2 +-
 8 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar b/Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar
index 6db410e..e7156b5 100644
--- a/Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar
+++ b/Channel/Android/x7bt5/debug/libs/library-debug-x7bt5.aar
Binary files differ
diff --git a/Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar b/Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar
index f210268..5c0a709 100644
--- a/Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar
+++ b/Channel/Android/x7bt5/release/libs/library-release-x7bt5.aar
Binary files differ
diff --git a/SdkProject/channel/x7bt5/AndroidManifest.xml b/SdkProject/channel/x7bt5/AndroidManifest.xml
index 23b823f..a6a8a75 100644
--- a/SdkProject/channel/x7bt5/AndroidManifest.xml
+++ b/SdkProject/channel/x7bt5/AndroidManifest.xml
@@ -24,6 +24,7 @@
 
         <activity
             android:name="com.secondworld.sdk.SplashActivity"
+            android:theme="@style/DarkTheme"
             android:screenOrientation="sensorLandscape">
         </activity>
 
diff --git a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdCreateRole.java b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdCreateRole.java
index 60bd5f3..4c5c7cf 100644
--- a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdCreateRole.java
+++ b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdCreateRole.java
@@ -22,7 +22,7 @@
         roleInfo.setGame_role_id(json.getString("roleID"));
         roleInfo.setGame_role_name(json.getString("roleName").trim().replace(" ", ""));
         roleInfo.setRoleLevel(json.getString("level"));
-        roleInfo.setRoleCE("-1");
+        roleInfo.setRoleCE(json.getString("fightpower"));
         roleInfo.setRoleStage("-1");
         roleInfo.setRoleRechargeAmount("-1");
         QuickSdkMgr.I.setGameRoleInfo(roleInfo);
diff --git a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdPlatformLogout.java b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdPlatformLogout.java
index 50b87c3..1e2745a 100644
--- a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdPlatformLogout.java
+++ b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdPlatformLogout.java
@@ -15,5 +15,6 @@
     @Override
     public void process(JSONObject json) throws Exception {
         SMPlatformManager.getInstance().smExitCurrent();
+        SMPlatformManager.getInstance().loginOut();
     }
 }
diff --git a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdPlatformPay.java b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdPlatformPay.java
index 1d7e8cd..10744e8 100644
--- a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdPlatformPay.java
+++ b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdPlatformPay.java
@@ -35,9 +35,9 @@
         // 娴嬭瘯璐﹀彿锛歺7demo 瀵嗙爜锛�123456(閫夋嫨灏忓彿1杩涘叆娓告垙) 灏忓彿鍚嶇О锛氬皬鍙�1  :瀵瑰簲鐨刧ame_guid锛�2018642
         mPayInfo.setGame_guid (json.getString("game_guid"));
         mPayInfo.setGame_orderid (json.getString("orderId"));
-        mPayInfo.setGame_price (String.format("%.2f", Float.parseFloat(json.getString("mount"))));
+        mPayInfo.setGame_price (json.getString("mount"));
         mPayInfo.setNotify_id (json.getString("notify_id"));
-        mPayInfo.setSubject (json.getString("title").replace(" ",""));
+        mPayInfo.setSubject (json.getString("title"));
         mPayInfo.setGame_sign (json.getString("game_sign"));
 
         QuickSdkMgr.I.pay(mPayInfo);
diff --git a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdRoleLevelUp.java b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdRoleLevelUp.java
index a03b3d8..2e80375 100644
--- a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdRoleLevelUp.java
+++ b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdRoleLevelUp.java
@@ -21,7 +21,7 @@
         roleInfo.setGame_role_id(json.getString("roleID"));
         roleInfo.setGame_role_name(json.getString("roleName").trim().replace(" ", ""));
         roleInfo.setRoleLevel(json.getString("level"));
-        roleInfo.setRoleCE("-1");
+        roleInfo.setRoleCE(json.getString("fightpower"));
         roleInfo.setRoleStage("-1");
         roleInfo.setRoleRechargeAmount("-1");
         QuickSdkMgr.I.setGameRoleInfo(roleInfo);
diff --git a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdRoleLogin.java b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdRoleLogin.java
index cc5fea6..92fc377 100644
--- a/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdRoleLogin.java
+++ b/SdkProject/plugins/x7sm/java/com/secondworld/sdk/command/CmdRoleLogin.java
@@ -21,7 +21,7 @@
         roleInfo.setGame_role_id(json.getString("roleID"));
         roleInfo.setGame_role_name(json.getString("roleName").trim().replace(" ", ""));
         roleInfo.setRoleLevel(json.getString("level"));
-        roleInfo.setRoleCE("-1");
+        roleInfo.setRoleCE(json.getString("fightpower"));
         roleInfo.setRoleStage("-1");
         roleInfo.setRoleRechargeAmount("-1");
         QuickSdkMgr.I.setGameRoleInfo(roleInfo);

--
Gitblit v1.8.0