From 79f06d344d88dda2fb467041ea47993d8aa8ec07 Mon Sep 17 00:00:00 2001
From: lwb <q3213421wrwqr>
Date: 星期三, 02 十二月 2020 14:57:37 +0800
Subject: [PATCH] 9527 港台修改
---
SdkProject/channel/GTGame/java/com/secondworld/sdk/command/CmdPlatformPay.java | 7 +++++--
SdkProject/library/src/main/java/com/secondworld/sdk/GameApp.java | 6 ++++--
SdkProject/channel/GTGame/res/values/strings.xml | 7 +++++++
SdkProject/app/build.gradle | 3 +--
SdkProject/app/src/main/java/com/secondworld/demo/MyApp.java | 7 +++++++
SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.1.jar | 0
SdkProject/channel/GTGame/java/com/secondworld/sdk/MySdkMgr.java | 1 +
SdkProject/app/src/main/java/com/secondworld/demo/MainActivity.java | 2 +-
SdkProject/channel/GTGame/res/values/yyj_sdk_strings.xml | 8 ++++----
9 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/SdkProject/app/build.gradle b/SdkProject/app/build.gradle
index 3aa19c8..e67e35d 100644
--- a/SdkProject/app/build.gradle
+++ b/SdkProject/app/build.gradle
@@ -7,12 +7,11 @@
buildToolsVersion "30.0.2"
defaultConfig {
- applicationId "com.secondworld.demo"
+ applicationId "com.sanxiagame.zmjgp"
minSdkVersion 21
targetSdkVersion 29
versionCode 1
versionName "1.0"
-
// testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/SdkProject/app/src/main/java/com/secondworld/demo/MainActivity.java b/SdkProject/app/src/main/java/com/secondworld/demo/MainActivity.java
index 1ca5252..b32cc62 100644
--- a/SdkProject/app/src/main/java/com/secondworld/demo/MainActivity.java
+++ b/SdkProject/app/src/main/java/com/secondworld/demo/MainActivity.java
@@ -58,7 +58,7 @@
JSONObject json = new JSONObject();
try {
json.put("code", CodeU2A.PlatformPay);
- json.put("cpInfo", System.currentTimeMillis()/1000+"");
+ json.put("cpInfo", "com.sanxiagame.zmjgp099");
json.put("orderId", System.currentTimeMillis()/1000+"");
json.put("sid", "1");
json.put("roleID","test_role");
diff --git a/SdkProject/app/src/main/java/com/secondworld/demo/MyApp.java b/SdkProject/app/src/main/java/com/secondworld/demo/MyApp.java
index b10123d..6af5ddc 100644
--- a/SdkProject/app/src/main/java/com/secondworld/demo/MyApp.java
+++ b/SdkProject/app/src/main/java/com/secondworld/demo/MyApp.java
@@ -6,9 +6,16 @@
public class MyApp extends GTGameApp {
@Override
+ public void onCreate() {
+ isDemo=true;
+ super.onCreate();
+ }
+
+ @Override
protected void registerProxy() {
super.registerProxy();
//涓荤晫闈唬鐞嗘敞鍐�
MainActivity.registerProxy(GTGameMain.class);
}
+
}
diff --git a/SdkProject/channel/GTGame/java/com/secondworld/sdk/MySdkMgr.java b/SdkProject/channel/GTGame/java/com/secondworld/sdk/MySdkMgr.java
index 2da680e..7df8850 100644
--- a/SdkProject/channel/GTGame/java/com/secondworld/sdk/MySdkMgr.java
+++ b/SdkProject/channel/GTGame/java/com/secondworld/sdk/MySdkMgr.java
@@ -39,6 +39,7 @@
}
case LOADING: {
Toast.makeText(GameApp.I, "姝ｅ湪鍒濆鍖栦腑锛岃绋嶇瓑", Toast.LENGTH_LONG).show();
+ break;
}
}
}
diff --git a/SdkProject/channel/GTGame/java/com/secondworld/sdk/command/CmdPlatformPay.java b/SdkProject/channel/GTGame/java/com/secondworld/sdk/command/CmdPlatformPay.java
index 731dedf..5364240 100644
--- a/SdkProject/channel/GTGame/java/com/secondworld/sdk/command/CmdPlatformPay.java
+++ b/SdkProject/channel/GTGame/java/com/secondworld/sdk/command/CmdPlatformPay.java
@@ -1,12 +1,14 @@
package com.secondworld.sdk.command;
+import android.util.Base64;
+
import com.cy.yyjia.sdk.center.SdkManager;
import com.secondworld.sdk.GameApp;
import com.secondworld.sdk.utils.CodeU2A;
import org.json.JSONObject;
-import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
public class CmdPlatformPay implements ICommand {
@Override
@@ -20,6 +22,7 @@
extraData.put("appid", GameApp.I.appId);
extraData.put("cpinfo", json.getString("cpInfo"));
extraData.put("cporderid", json.getString("orderId"));
+ byte[] bytes = extraData.toString().getBytes(StandardCharsets.UTF_8);
SdkManager.getInstance()
.pay(json.getString("sid"),//鏈嶅姟鍣ㄧ紪鍙�
json.getString("roleID"),//瑙掕壊缂栧彿
@@ -27,6 +30,6 @@
json.getString("title"),//鍟嗗搧鍚嶇О
json.getString("mount"),//鍏呭�奸噾棰�
json.getString("orderId"),//Cp璁㈠崟鍙�
- URLEncoder.encode(extraData.toString(), "utf-8"));//鎵╁睍淇℃伅
+ Base64.encodeToString(bytes,Base64.DEFAULT));//鎵╁睍淇℃伅
}
}
diff --git a/SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.0.jar b/SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.1.jar
similarity index 77%
rename from SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.0.jar
rename to SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.1.jar
index b66b199..262d2d5 100644
--- a/SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.0.jar
+++ b/SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.1.jar
Binary files differ
diff --git a/SdkProject/channel/GTGame/res/values/strings.xml b/SdkProject/channel/GTGame/res/values/strings.xml
new file mode 100644
index 0000000..14c7db1
--- /dev/null
+++ b/SdkProject/channel/GTGame/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <string name="app_name">闀囬瓟璇�</string>
+ <string name="fb_app_id">1749518565212194</string>
+ <string name="fb_app_token">1749518565212194|cNRpChqTFsbvY9yf6cHy-VqT0_k</string>
+ <string name="fb_login_protocol_scheme">fb1749518565212194</string>
+</resources>
\ No newline at end of file
diff --git a/SdkProject/channel/GTGame/res/values/yyj_sdk_strings.xml b/SdkProject/channel/GTGame/res/values/yyj_sdk_strings.xml
index 3230157..07f2ba6 100644
--- a/SdkProject/channel/GTGame/res/values/yyj_sdk_strings.xml
+++ b/SdkProject/channel/GTGame/res/values/yyj_sdk_strings.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="app_name">闀囬瓟璇�</string>
- <string name="fb_app_id">1749518565212194</string>
- <string name="fb_app_token">1749518565212194|cNRpChqTFsbvY9yf6cHy-VqT0_k</string>
- <string name="fb_login_protocol_scheme">fb1749518565212194</string>
<!--refactoring-->
<string name="yyj_sdk_net_work_error">缍茬怠閫ｆ帴瓒呮檪锛岃珛妾㈡煡缍茬怠</string>
<string name="yyj_sdk_user_name_is_empty">鐢ㄦ埗鍚嶄笉鑳界偤绌�</string>
@@ -151,5 +147,9 @@
<!-- yyj_sdk_common_account_input_tip-->
<string name="yyj_sdk_extstorage_permission">璜嬪厛鎺堟瑠瑷晱鎮ㄧ殑瀛樺劜</string>
+ <string name="yyj_sdk_gg_logining">姝ｅ湪浣跨敤Google璩櫉鐧婚寗</string>
+ <string name="yyj_sdk_fb_logining">姝ｅ湪浣跨敤Facebook璩櫉鐧婚寗</string>
+
+ <string name="yyj_sdk_cancel_login">鍙栨秷鐧婚寗</string>
</resources>
\ No newline at end of file
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/GameApp.java b/SdkProject/library/src/main/java/com/secondworld/sdk/GameApp.java
index 2386606..163abee 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/GameApp.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/GameApp.java
@@ -14,6 +14,8 @@
public String appId = "";
+ protected boolean isDemo = false;
+
@Override
public void onCreate() {
super.onCreate();
@@ -25,7 +27,7 @@
initSdk();
}
- protected void newInstance() {
+ protected void newInstance() {
I = this;
}
@@ -64,7 +66,7 @@
//鏄惁浣峝emo
public boolean isDemo() {
- return I.getPackageName().equals("com.secondworld.demo");
+ return isDemo;
}
}
--
Gitblit v1.8.0