lwb
2020-12-02 79f06d344d88dda2fb467041ea47993d8aa8ec07
9527 港台修改
7个文件已修改
1 文件已重命名
1个文件已添加
41 ■■■■ 已修改文件
SdkProject/app/build.gradle 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/app/src/main/java/com/secondworld/demo/MainActivity.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/app/src/main/java/com/secondworld/demo/MyApp.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/GTGame/java/com/secondworld/sdk/MySdkMgr.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/GTGame/java/com/secondworld/sdk/command/CmdPlatformPay.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.1.jar 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/GTGame/res/values/strings.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/channel/GTGame/res/values/yyj_sdk_strings.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SdkProject/library/src/main/java/com/secondworld/sdk/GameApp.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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"
    }
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");
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);
    }
}
SdkProject/channel/GTGame/java/com/secondworld/sdk/MySdkMgr.java
@@ -39,6 +39,7 @@
            }
            case LOADING: {
                Toast.makeText(GameApp.I, "正在初始化中,请稍等", Toast.LENGTH_LONG).show();
                break;
            }
        }
    }
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));//扩展信息
    }
}
SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.1.jar
Binary files differ
SdkProject/channel/GTGame/res/values/strings.xml
New file
@@ -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>
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>
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 @@
    //是否位demo
    public boolean isDemo() {
        return I.getPackageName().equals("com.secondworld.demo");
        return isDemo;
    }
}