From c980798a4eb2b9f8196516cc22375bc77059134b Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 10 九月 2024 17:37:15 +0800
Subject: [PATCH] 0312 英文正式sdk
---
Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar | 0
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java | 3
Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar | 0
SdkProject/library/build.gradle | 17 ++++-
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java | 4 -
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java | 3
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java | 3
SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java | 6 +-
/dev/null | 21 -------
SdkProject/channel/hyyngame/AndroidManifest.xml | 17 +----
SdkProject/library/libs/ald_v.aar | 0
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java | 4
SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java | 20 +++---
SdkProject/library/src/main/assets/vndjgpsdkconf.ini | 22 +++++++
SdkProject/library/google-services.json | 12 ++--
SdkProject/channel/hyyngame/res/values/strings.xml | 6 +-
16 files changed, 67 insertions(+), 71 deletions(-)
diff --git a/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar b/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar
index f98847d..a007f9f 100644
--- a/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar
+++ b/Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar
Binary files differ
diff --git a/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar b/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar
index a1c1f60..615ca00 100644
--- a/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar
+++ b/Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar
Binary files differ
diff --git a/SdkProject/channel/hyyngame/AndroidManifest.xml b/SdkProject/channel/hyyngame/AndroidManifest.xml
index fab8593..73a8326 100644
--- a/SdkProject/channel/hyyngame/AndroidManifest.xml
+++ b/SdkProject/channel/hyyngame/AndroidManifest.xml
@@ -17,24 +17,15 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.CAMERA" />
+ <!--闃叉瀹夊崜9.0涓婄綉缁滃嚭閿欑殑閰嶇疆-->
<uses-feature
android:name="org.apache.http.legacy"
android:required="false" />
<application
-
- android:name=".GTGameApp"
- android:requestLegacyExternalStorage="true"
- android:usesCleartextTraffic="false"
- android:supportsPictureInPicture= "true"
- android:resizeableActivity="true"
- android:exported="false"
- android:extractNativeLibs="true"
android:networkSecurityConfig="@xml/network_security_config"
- tools:replace="android:name">
-
-
- <!--SDK end-->
-
+ android:usesCleartextTraffic="false"
+ android:requestLegacyExternalStorage="true">
</application>
+
</manifest>
\ No newline at end of file
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java
index 8cbcc09..de714b8 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java
@@ -1,9 +1,9 @@
package com.secondworld.sdk;
-import com.ald.sdk.AldGameManger;
-import com.ald.sdk.AldSPApplication;
-public class GTGameApp extends AldSPApplication {
+import com.vndjgp.sdk.VndjgpApplication;
+
+public class GTGameApp extends VndjgpApplication {
@Override
public void onCreate() {
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java
index 9c39b7f..1860201 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java
@@ -4,13 +4,13 @@
import android.content.Intent;
import android.widget.Toast;
-import com.ald.common.callback.ExtendCallBack;
-import com.ald.sdk.AldGameManger;
-import com.ald.sdk.Extend;
-import com.ald.sdk.FuncType;
-import com.ald.sdk.model.AldUserData;
+import com.vndjgp.sdk.Extend;
+import com.vndjgp.sdk.ExtendCallBack;
+import com.vndjgp.sdk.FuncType;
+import com.vndjgp.sdk.OrderInfo;
+import com.vndjgp.sdk.UserData;
+import com.vndjgp.sdk.VndjgpGameManger;
-import com.ald.sdk.model.OrderInfo;
import com.secondworld.sdk.utils.CodeA2U;
import com.secondworld.sdk.utils.LogUtil;
@@ -21,13 +21,13 @@
private static final String TAG = MySdkMgr.class.getSimpleName();
public static MySdkMgr I = new MySdkMgr();
public static String uid;
- public static AldGameManger manger = AldGameManger.getInstance();
+ public static VndjgpGameManger manger = VndjgpGameManger.getInstance();
public void init(Activity activity) {
sdkInitState = SdkInitState.LOADING;
- manger = AldGameManger.getInstance();
+ manger = VndjgpGameManger.getInstance();
//sdk鍒濆鍖栵紝鍒濆鍖栫粨鏋滃洖璋冮噷闈㈡父鎴忛渶鑷繁澶勭悊璺宠浆閫昏緫
- manger.init(activity, new AldGameManger.SDKCallback() {
+ manger.init(activity, new VndjgpGameManger.SDKCallback() {
@Override
public void onInitFinished(boolean isSuccess) {
@@ -47,7 +47,7 @@
}
@Override
- public void onLoginFinished(boolean status, AldUserData userData) {
+ public void onLoginFinished(boolean status, UserData userData) {
if (status) {
//鐧诲叆鎴愬姛
uid = userData.getUserId(); //浣滀负鍞竴鏍囩ず
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java
index 4b1f09d..661d2f8 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java
@@ -1,9 +1,10 @@
package com.secondworld.sdk.command;
-import com.ald.sdk.model.RoleData;
+
import com.secondworld.sdk.GTGameMain;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
+import com.vndjgp.sdk.RoleData;
import org.json.JSONObject;
@@ -18,7 +19,6 @@
RoleData data = new RoleData();
data.setRoleId(json.getString("roleID"));// 瑙掕壊id
- data.setUid(MySdkMgr.I.uid);//鐧诲綍鏃惰幏鍙栫殑sdk uid
data.setRoleName(json.getString("roleName"));// 瑙掕壊鍚�
data.setRoleLevel(json.getString("level"));// 瑙掕壊绛夌骇
data.setServerId(json.getString("sid"));// 鎵�鍦ㄦ湇id
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java
index 907835b..97b3cce 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java
@@ -1,8 +1,8 @@
package com.secondworld.sdk.command;
-import com.ald.sdk.model.OrderInfo;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
+import com.vndjgp.sdk.OrderInfo;
import org.json.JSONObject;
@@ -19,7 +19,6 @@
OrderInfo payInfo = new OrderInfo();
payInfo.setServerId(json.getString("sid"));//鎵�鍦ㄦ湇鍔″櫒ID
- payInfo.setUid(MySdkMgr.I.uid);//鐧诲綍鏃惰幏鍙栫殑sdk uid
payInfo.setServerName(json.getString("serverName"));//鎵�鍦ㄦ湇鍔″櫒鍚嶇О
payInfo.setRoleId(json.getString("roleID"));//娓告垙瑙掕壊ID
payInfo.setRoleName(json.getString("roleName"));//娓告垙瑙掕壊鍚嶇О
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java
index ba4e021..8e6d31c 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java
@@ -1,10 +1,10 @@
package com.secondworld.sdk.command;
-import com.ald.sdk.model.RoleData;
import com.secondworld.sdk.GTGameMain;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
+import com.vndjgp.sdk.RoleData;
import org.json.JSONObject;
@@ -19,7 +19,6 @@
//涓婃姤瑙掕壊淇℃伅
RoleData data = new RoleData();
data.setRoleId(json.getString("roleID"));// 瑙掕壊id
- data.setUid(MySdkMgr.I.uid);//鐧诲綍鏃惰幏鍙栫殑sdk uid
data.setRoleName(json.getString("roleName"));// 瑙掕壊鍚�
data.setRoleLevel(json.getString("level"));// 瑙掕壊绛夌骇
data.setServerId(json.getString("sid"));// 鎵�鍦ㄦ湇id
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java
index af39183..9756605 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java
@@ -1,9 +1,9 @@
package com.secondworld.sdk.command;
-import com.ald.sdk.model.RoleData;
import com.secondworld.sdk.GTGameMain;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
+import com.vndjgp.sdk.RoleData;
import org.json.JSONObject;
@@ -19,7 +19,6 @@
//涓婃姤瑙掕壊淇℃伅
RoleData data = new RoleData();
data.setRoleId(json.getString("roleID"));// 瑙掕壊id
- data.setUid(MySdkMgr.I.uid);//鐧诲綍鏃惰幏鍙栫殑sdk uid
data.setRoleName(json.getString("roleName"));// 瑙掕壊鍚�
data.setRoleLevel(json.getString("level"));// 瑙掕壊绛夌骇
data.setServerId(json.getString("sid"));// 鎵�鍦ㄦ湇id
diff --git a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java
index e63c196..d221022 100644
--- a/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java
+++ b/SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java
@@ -1,10 +1,9 @@
package com.secondworld.sdk.command;
-import com.ald.sdk.model.RoleData;
import com.secondworld.sdk.GTGameMain;
import com.secondworld.sdk.MySdkMgr;
import com.secondworld.sdk.utils.CodeU2A;
-
+import com.vndjgp.sdk.RoleData;
import org.json.JSONObject;
public class CmdRoleLogout implements ICommand{
@@ -19,7 +18,6 @@
//涓婃姤瑙掕壊淇℃伅
RoleData data = new RoleData();
data.setRoleId(json.getString("roleID"));// 瑙掕壊id
- data.setUid(MySdkMgr.I.uid);//鐧诲綍鏃惰幏鍙栫殑sdk uid
data.setRoleName(json.getString("roleName"));// 瑙掕壊鍚�
data.setRoleLevel(json.getString("level"));// 瑙掕壊绛夌骇
data.setServerId(json.getString("sid"));// 鎵�鍦ㄦ湇id
diff --git a/SdkProject/channel/hyyngame/res/values/strings.xml b/SdkProject/channel/hyyngame/res/values/strings.xml
index c43e973..0c3b1fc 100644
--- a/SdkProject/channel/hyyngame/res/values/strings.xml
+++ b/SdkProject/channel/hyyngame/res/values/strings.xml
@@ -1,6 +1,6 @@
<resources>
- <string name="facebook_app_id">377129091673449</string>
- <string name="fb_login_protocol_scheme">fb377129091673449</string>
- <string name="facebook_client_token">dc263970f9b4718c30685995d64a73f1</string>
+ <string name="facebook_app_id">1022827596209744</string>
+ <string name="fb_login_protocol_scheme">fb1022827596209744</string>
+ <string name="facebook_client_token">f8714dde12fe88ba3529642e31e1b946</string>
</resources>
\ No newline at end of file
diff --git a/SdkProject/library/build.gradle b/SdkProject/library/build.gradle
index f324c84..49a1fc8 100644
--- a/SdkProject/library/build.gradle
+++ b/SdkProject/library/build.gradle
@@ -204,19 +204,28 @@
implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
//firebase
implementation 'com.google.firebase:firebase-analytics'
- implementation platform('com.google.firebase:firebase-bom:31.2.2') {
+ implementation 'com.google.firebase:firebase-crashlytics'
+// implementation 'com.google.firebase:firebase-messaging' //涓嶅姞浜唋og浼氭姤FirebaseMessagingService缂哄け鎻愮ず锛屼絾鏄苟涓嶅奖鍝嶄笂鎶�
+ implementation platform('com.google.firebase:firebase-bom:33.1.1') {
exclude group: 'com.android.support', module: 'support-compat'
}
//base theme
api 'androidx.appcompat:appcompat:1.2.0'
//ald ui鐢�
api 'androidx.cardview:cardview:1.0.0'
+ implementation('androidx.browser:browser:1.5.0')
//rustore
implementation 'org.jetbrains:annotations:15.0'
implementation("ru.rustore.sdk:billingclient:6.0.0")
- //paypal
- //implementation('com.paypal.checkout:android-sdk:1.3.0')
- implementation('androidx.browser:browser:1.5.0')
+ //璋锋瓕鑳藉姏
+ implementation 'com.google.android.gms:play-services-auth:20.1.0' //google鏈嶅姟
+ implementation("com.android.billingclient:billing:7.0.0") // google鍐呰喘
+ implementation 'androidx.percentlayout:percentlayout:1.0.0' //google鎻愪緵鐨勬敮鎸佸簱
+ implementation 'com.google.android.play:review:2.0.1' //google璇勪环
+
+ //facebook鑳藉姏
+ implementation 'com.facebook.android:facebook-login:latest.release'
+ implementation 'com.facebook.android:facebook-share:latest.release'
}
diff --git a/SdkProject/library/google-services.json b/SdkProject/library/google-services.json
index 6ef0dab..a1de6d7 100644
--- a/SdkProject/library/google-services.json
+++ b/SdkProject/library/google-services.json
@@ -1,21 +1,21 @@
{
"project_info": {
- "project_number": "572611835891",
- "project_id": "djmx-yn",
- "storage_bucket": "djmx-yn.appspot.com"
+ "project_number": "375557197914",
+ "project_id": "djmx-eng",
+ "storage_bucket": "djmx-eng.appspot.com"
},
"client": [
{
"client_info": {
- "mobilesdk_app_id": "1:572611835891:android:19da7dc5865854da3dc486",
+ "mobilesdk_app_id": "1:375557197914:android:3d95564e01a49149e3c863",
"android_client_info": {
- "package_name": "com.secondworld.sdk"
+ "package_name": "com.sjcsen.gp"
}
},
"oauth_client": [],
"api_key": [
{
- "current_key": "AIzaSyAx9QSSg4YnYu7eLDhoYbR7gpXWd21NipQ"
+ "current_key": "AIzaSyDxFV-Si-ePkbHA_6tMOgxK1urcfdWGCYs"
}
],
"services": {
diff --git a/SdkProject/library/libs/ald_v.aar b/SdkProject/library/libs/ald_v.aar
index 033424b..1384706 100644
--- a/SdkProject/library/libs/ald_v.aar
+++ b/SdkProject/library/libs/ald_v.aar
Binary files differ
diff --git a/SdkProject/library/src/main/assets/aldsdkconf.ini b/SdkProject/library/src/main/assets/aldsdkconf.ini
deleted file mode 100644
index 6bfd5af..0000000
--- a/SdkProject/library/src/main/assets/aldsdkconf.ini
+++ /dev/null
@@ -1,21 +0,0 @@
-锘�;**************娓告垙鐩稿叧閰嶇疆, 娓告垙闇�瑕佹牴鎹悇鑷儏鍐典慨鏀� START **********
-;娓告垙鐨凜HANNELID
-GAME_CHANNELID=331
-
-;娓告垙鐨凙PPID
-GAME_APPID=92
-
-;娓告垙鐨凣AMEID
-GAME_GAMEID=1141
-
-SDK_LOG_SWITCH=true
-
-SDK_URL=https://api.aldgames.com/
-
-;************** 绗笁鏂圭浉鍏抽厤缃」,娓告垙闇�瑕佹牴鎹垜鏂硅繍钀ユ彁渚涘弬鏁版儏鍐典慨鏀� END **************
-;璋锋瓕ID锛屼笂璋锋瓕蹇呭～
-google-signin-client_id=172660406541-f7uugubkoh88vcl8bbl9bq99u5vrhq23.apps.googleusercontent.com
-;鏁版嵁涓婃姤寮�鍏筹紙appsflyer,firebase锛夛紝闄よ胺姝岄渶姹傚寘浠ュ閮藉叧
-ADVERT_REPORT_SWITCH=true
-;af鐨刱ey
-APPSFLYER_KEY=u4xXAnH8AjyycX6eAQAmBS
\ No newline at end of file
diff --git a/SdkProject/library/src/main/assets/vndjgpsdkconf.ini b/SdkProject/library/src/main/assets/vndjgpsdkconf.ini
new file mode 100644
index 0000000..d54baf6
--- /dev/null
+++ b/SdkProject/library/src/main/assets/vndjgpsdkconf.ini
@@ -0,0 +1,22 @@
+锘�;**************娓告垙鐩稿叧閰嶇疆, 娓告垙闇�瑕佹牴鎹悇鑷儏鍐典慨鏀� START **********
+;娓告垙鐨凜HANNELID
+GAME_CHANNELID=331
+
+;娓告垙鐨凙PPID
+GAME_APPID=92
+
+;娓告垙鐨凣AMEID
+GAME_GAMEID=1141
+;***************娓告垙閰嶇疆椤�, 娓告垙闇�瑕佹牴鎹悇鑷儏鍐典慨鏀� END **************
+
+;************* SDK鐩稿叧閰嶇疆椤�,娓告垙闇�瑕佹牴鎹悇鑷儏鍐典慨鏀� START **********
+;姝ｅ紡鐜
+SDK_URL=https://api.tywininter.com/
+
+;************** 绗笁鏂圭浉鍏抽厤缃」,娓告垙闇�瑕佹牴鎹垜鏂硅繍钀ユ彁渚涘弬鏁版儏鍐典慨鏀� END **************
+;璋锋瓕ID
+google-signin-client_id=375557197914-vuavn0pr2h94aes3it5lmlorevui4gee.apps.googleusercontent.com
+
+;骞垮憡涓婃姤寮�鍏筹紙appsflyer,firebase锛�
+ADVERT_REPORT_SWITCH=true
+APPSFLYER_KEY=u4xXAnH8AjyycX6eAQAmBS
\ No newline at end of file
--
Gitblit v1.8.0