hch
2024-09-10 c980798a4eb2b9f8196516cc22375bc77059134b
0312 英文正式sdk
14个文件已修改
1个文件已删除
1个文件已添加
138 ■■■■ 已修改文件
Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/hyyngame/AndroidManifest.xml 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/hyyngame/java/com/secondworld/sdk/GTGameApp.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/hyyngame/java/com/secondworld/sdk/MySdkMgr.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdCreateRole.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdPlatformPay.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLevelUp.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogin.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/hyyngame/java/com/secondworld/sdk/command/CmdRoleLogout.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/hyyngame/res/values/strings.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/build.gradle 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/google-services.json 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/libs/ald_v.aar 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/src/main/assets/aldsdkconf.ini 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/src/main/assets/vndjgpsdkconf.ini 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Channel/Android/hyyngame/debug/libs/library-debug-hyyngame.aar
Binary files differ
Channel/Android/hyyngame/release/libs/library-release-hyyngame.aar
Binary files differ
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>
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() {
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(); //作为唯一标示
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
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"));//游戏角色名称
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
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
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
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>
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'  //不加了log会报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'
}
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": {
SdkProject/library/libs/ald_v.aar
Binary files differ
SdkProject/library/src/main/assets/aldsdkconf.ini
File was deleted
SdkProject/library/src/main/assets/vndjgpsdkconf.ini
New file
@@ -0,0 +1,22 @@
;**************游戏相关配置, 游戏需要根据各自情况修改 START **********
;游戏的CHANNELID
GAME_CHANNELID=331
;游戏的APPID
GAME_APPID=92
;游戏的GAMEID
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