client_Hale
2018-09-07 dc98e220c1b09daa15d562d0b3ae887e81c2c0c9
Fixed 猫耳SDK取消支付逻辑
4个文件已修改
21 ■■■■ 已修改文件
ChannelDiff/498mrgame/libs/app-game_498mrgame-release.aar 补丁 | 查看 | 原始文档 | blame | 历史
Project/app/build.gradle 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/app/src/game_498mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/app/src/game_498mrgame/java/com/secondworld/univeralsdk/MrPlatformUtil.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ChannelDiff/498mrgame/libs/app-game_498mrgame-release.aar
Binary files differ
Project/app/build.gradle
@@ -150,7 +150,7 @@
    implementation files('libs/buglyagent.jar')
}
task autoCopy_498mrgame_Manifest(type: Copy) {aa
task autoCopy_498mrgame_Manifest(type: Copy) {
    dependsOn 'assembleGame_498mrgameRelease'
    from zipTree("build/outputs/aar/app-game_498mrgame-release.aar")
    include "AndroidManifest.xml"
Project/app/src/game_498mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -105,9 +105,6 @@
                    _extraData.put("cpinfo", _json.getString("cpInfo"));
                    _extraData.put("cporderid", _json.getString("orderId"));
                    LogUtil.i(TAG, "1 =========================: " + _json.toString());
                    LogUtil.i(TAG, "2 =========================: " + _extraData.toString());
                    MrPlatformUtil.getInstance().pay(_activity,
                                                     _json.getString("cpInfo"),
                                                     _json.getString("roleID"),
@@ -117,8 +114,12 @@
                                                     _json.getString("sid"),
                                                     _json.getString("orderId"),
                                                     _json.getString("notifyurl"));
                    MrPlatformUtil.getInstance().payProcessing = true;
                    break;
                case CodeU2A.PayFinished:
                    MrPlatformUtil.getInstance().payProcessing = false;
                    break;
                case CodeU2A.CreateRole:
                    MrPlatformUtil.getInstance().createRole(_activity,
@@ -390,6 +391,14 @@
    public static void onResume(final Activity activity)
    {
        CommonMrSdk.getInstance().onResume(activity);
        if(MrPlatformUtil.getInstance().payProcessing)
        {
            Map<String, Object> _msgStruct = new HashMap<>();
            _msgStruct.put("code", CodeA2U.FreePlatformPayCancel);
            UniversalUtil.sendMessageToUnity(_msgStruct);
            MrPlatformUtil.getInstance().payProcessing = false;
        }
    }
    public static void onStop(final Activity activity)
Project/app/src/game_498mrgame/java/com/secondworld/univeralsdk/MrPlatformUtil.java
@@ -37,6 +37,8 @@
        return s_Instance;
    }
    public boolean payProcessing = false;
    private Map<String, Object> m_Message = new HashMap<>();
    public void init(final Activity activity)
@@ -191,6 +193,7 @@
                m_Message.clear();
                m_Message.put("code", CodeA2U.FreePlatformPayOk);
                UniversalUtil.sendMessageToUnity(m_Message);
                payProcessing = false;
            }
            @Override
@@ -199,6 +202,7 @@
                m_Message.clear();
                m_Message.put("code", CodeA2U.FreePlatformPayFail);
                UniversalUtil.sendMessageToUnity(m_Message);
                payProcessing = false;
            }
        });
    }