fixed 猫耳SDK修改

client_Hale

2018-09-07 84c77e1df6f361c41083c0e1dea14fb845c86a64

fixed 猫耳SDK修改

 ChannelDiff/498mrgame/AndroidManifest.xml

 ChannelDiff/498mrgame/libs/app-game_498mrgame-release.aar

Binary files differ

 Project/app/build.gradle

@@ -25,7 +25,7 @@

    flavorDimensions "default"
    productFlavors {
        game_498_mrgame {
        game_498mrgame {
            dimension "default"
            manifestPlaceholders.put("appId", "com.ziyouyouxi08.snxxz")
            manifestPlaceholders.put("JpushAppKey", "803d5cb73efe51a59968bf52")
@@ -150,18 +150,18 @@
    implementation files('libs/buglyagent.jar')
}

task autoCopy_498_mrgame_Manifest(type: Copy) {
    dependsOn 'assembleGame_498_mrgameRelease'
    from zipTree("build/outputs/aar/app-game_498_mrgame-release.aar")
task autoCopy_498mrgame_Manifest(type: Copy) {aa
    dependsOn 'assembleGame_498mrgameRelease'
    from zipTree("build/outputs/aar/app-game_498mrgame-release.aar")
    include "AndroidManifest.xml"
    into "C:\\Unity3D_SDK\\ChannelDiff\\498_mrgame\\"
    into "C:\\Unity3D_SDK\\ChannelDiff\\498mrgame\\"
}

task autoCopy_498_mrgame(type: Copy) {
    dependsOn autoCopy_498_mrgame_Manifest
task autoCopy_498mrgame(type: Copy) {
    dependsOn autoCopy_498mrgame_Manifest
    from "build/outputs/aar/"
    include "app-game_498_mrgame-release.aar"
    into "C:\\Unity3D_SDK\\ChannelDiff\\498_mrgame\\libs\\"
    include "app-game_498mrgame-release.aar"
    into "C:\\Unity3D_SDK\\ChannelDiff\\498mrgame\\libs\\"
}

task autoCopy_815035853_Manifest(type: Copy) {

 Project/app/src/game_498mrgame/AndroidManifest.xml

 Project/app/src/game_498mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java

File was renamed from Project/app/src/game_498_mrgame/java/com/secondworld/univeralsdk/H2EngineSDK.java
@@ -105,7 +105,8 @@
                    _extraData.put("cpinfo", _json.getString("cpInfo"));
                    _extraData.put("cporderid", _json.getString("orderId"));

                    LogUtil.i(TAG, "=========================: " + _extraData.toString());
                    LogUtil.i(TAG, "1 =========================: " + _json.toString());
                    LogUtil.i(TAG, "2 =========================: " + _extraData.toString());

                    MrPlatformUtil.getInstance().pay(_activity,
                                                     _json.getString("cpInfo"),
@@ -114,7 +115,8 @@
                                                     _json.getString("level"),
                                                     _extraData.toString(),
                                                     _json.getString("sid"),
                                                     _json.getString("orderId"));
                                                     _json.getString("orderId"),
                                                     _json.getString("notifyurl"));
                    break;
                case CodeU2A.PayFinished:
                    break;
@@ -340,6 +342,7 @@

                _msgStruct.clear();
                _msgStruct.put("code", CodeA2U.SdkInitComplete);
                _msgStruct.put("channelPlatform","mr");
                UniversalUtil.sendMessageToUnity(_msgStruct);

                LogUtil.i(TAG, "初始化执行完毕");

 Project/app/src/game_498mrgame/java/com/secondworld/univeralsdk/MrPlatformUtil.java

File was renamed from Project/app/src/game_498_mrgame/java/com/secondworld/univeralsdk/MrPlatformUtil.java
@@ -113,13 +113,14 @@
                        responseLoginData.getUserType(),
                        responseLoginData.getPhone(),
                        responseLoginData.isRT()));

                try
                {
                    m_Message.clear();
                    JSONObject _info = new JSONObject();
                    _info.put("account", responseLoginData.getUsername());
                    _info.put("token", responseLoginData.getLoginToken());
                    _info.put("accountID", responseLoginData.getUid());
                    _info.put("account", responseLoginData.getUid());
                    _info.put("token", responseLoginData.getVsign());
                    _info.put("account_id", responseLoginData.getUid());
                    m_Message.put("code", CodeA2U.FreePlatformLoginOk);
                    m_Message.put("info", _info);
                    UniversalUtil.sendMessageToUnity(m_Message);
@@ -168,7 +169,8 @@
                    String level,
                    String extraData,
                    String serverID,
                    String orderID)
                    String orderID,
                    String notifyUrl)
    {
        final MrPayEntity _entity = new MrPayEntity();
        _entity.setProductid(productID);
@@ -179,6 +181,7 @@
        _entity.setServerid(serverID);
        _entity.setGamecno(orderID);
        _entity.setChannel("1");
        _entity.setNotifyurl(notifyUrl);

        CommonMrSdk.getInstance().pay(activity, _entity, new MrCallback<Void>()
        {

 Project/app/src/game_498mrgame/res/anim/dialog_enter_anim.xml

 Project/app/src/game_498mrgame/res/anim/dialog_exit_anim.xml

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_common_header_close.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_common_icon_back.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_customer_service.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_game_cdk_end_time.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_game_cdk_start_time.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_game_gifts.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_game_new_gifts.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_game_right.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_gift_bg.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_has_new_gift.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_head_portrait.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_id_card_num.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_real_name.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_real_name_close.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_red_dot.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_right_icon.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_splash_land_bg.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_splash_port_bg.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_user_center.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_user_center_back.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_user_center_gift_off.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_user_center_gift_on.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_user_center_lock.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_user_center_phone_num.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_user_center_validate_code.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_vip_back.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_vip_hidden.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_vip_icon.png

 Project/app/src/game_498mrgame/res/drawable-xhdpi/mr_vip_open.png

 Project/app/src/game_498mrgame/res/drawable/mr.png

 Project/app/src/game_498mrgame/res/drawable/mr_back.png

 Project/app/src/game_498mrgame/res/drawable/mr_broadcast_content_bg.9.png

 Project/app/src/game_498mrgame/res/drawable/mr_broadcast_dialog_bg.9.png

 Project/app/src/game_498mrgame/res/drawable/mr_check.png

 Project/app/src/game_498mrgame/res/drawable/mr_checked.png

 Project/app/src/game_498mrgame/res/drawable/mr_close.png

 Project/app/src/game_498mrgame/res/drawable/mr_code.png

 Project/app/src/game_498mrgame/res/drawable/mr_code_btn_bg.xml

 Project/app/src/game_498mrgame/res/drawable/mr_container_bg.xml

 Project/app/src/game_498mrgame/res/drawable/mr_copy_cdk_btn_selector.xml

 Project/app/src/game_498mrgame/res/drawable/mr_corner_circle.xml

 Project/app/src/game_498mrgame/res/drawable/mr_dot.png

 Project/app/src/game_498mrgame/res/drawable/mr_down_icon.png

 Project/app/src/game_498mrgame/res/drawable/mr_gift_cb_selector.xml

 Project/app/src/game_498mrgame/res/drawable/mr_hidden_password.png

 Project/app/src/game_498mrgame/res/drawable/mr_login_btn_bg.xml

 Project/app/src/game_498mrgame/res/drawable/mr_login_btn_clicked.xml

 Project/app/src/game_498mrgame/res/drawable/mr_login_btn_def.xml

 Project/app/src/game_498mrgame/res/drawable/mr_logo.png

 Project/app/src/game_498mrgame/res/drawable/mr_ok.png

 Project/app/src/game_498mrgame/res/drawable/mr_password_checkbox_selector.xml

 Project/app/src/game_498mrgame/res/drawable/mr_phone.png

 Project/app/src/game_498mrgame/res/drawable/mr_pwd.png

 Project/app/src/game_498mrgame/res/drawable/mr_real_name_dialog_shape.xml

 Project/app/src/game_498mrgame/res/drawable/mr_register.png

 Project/app/src/game_498mrgame/res/drawable/mr_register_btn_bg.xml

 Project/app/src/game_498mrgame/res/drawable/mr_register_btn_bgimg.xml

 Project/app/src/game_498mrgame/res/drawable/mr_register_btn_bgimg_disable.png

 Project/app/src/game_498mrgame/res/drawable/mr_register_btn_bgimg_enable.png

 Project/app/src/game_498mrgame/res/drawable/mr_register_btn_clicked.xml

 Project/app/src/game_498mrgame/res/drawable/mr_register_btn_def.xml

 Project/app/src/game_498mrgame/res/drawable/mr_show_password.png

 Project/app/src/game_498mrgame/res/drawable/mr_union.png

 Project/app/src/game_498mrgame/res/drawable/mr_user.png

 Project/app/src/game_498mrgame/res/drawable/mr_user_center_mine_item.xml

 Project/app/src/game_498mrgame/res/drawable/mr_warning.png

 Project/app/src/game_498mrgame/res/drawable/mr_wechat.png

 Project/app/src/game_498mrgame/res/drawable/mr_wrong.png

 Project/app/src/game_498mrgame/res/layout-land/mr_splash_dialog_layout.xml

 Project/app/src/game_498mrgame/res/layout-land/mr_term.xml

 Project/app/src/game_498mrgame/res/layout-port/mr_splash_dialog_layout.xml

 Project/app/src/game_498mrgame/res/layout-port/mr_term.xml

 Project/app/src/game_498mrgame/res/layout/mr_account_register.xml

 Project/app/src/game_498mrgame/res/layout/mr_bind.xml

 Project/app/src/game_498mrgame/res/layout/mr_broadcast_dialog.xml

 Project/app/src/game_498mrgame/res/layout/mr_custom_edittext.xml

 Project/app/src/game_498mrgame/res/layout/mr_custom_term.xml

 Project/app/src/game_498mrgame/res/layout/mr_custom_text.xml

 Project/app/src/game_498mrgame/res/layout/mr_custom_title.xml

 Project/app/src/game_498mrgame/res/layout/mr_customer_service_view.xml

 Project/app/src/game_498mrgame/res/layout/mr_edit_password.xml

 Project/app/src/game_498mrgame/res/layout/mr_edit_spinner.xml

 Project/app/src/game_498mrgame/res/layout/mr_find_pwd.xml

 Project/app/src/game_498mrgame/res/layout/mr_floating_window_big_view.xml

 Project/app/src/game_498mrgame/res/layout/mr_floating_window_small_view.xml

 Project/app/src/game_498mrgame/res/layout/mr_game_cdk_detail.xml

 Project/app/src/game_498mrgame/res/layout/mr_game_cdk_item.xml

 Project/app/src/game_498mrgame/res/layout/mr_game_cdk_list.xml

 Project/app/src/game_498mrgame/res/layout/mr_game_gift_item.xml

 Project/app/src/game_498mrgame/res/layout/mr_game_gifts_list.xml

 Project/app/src/game_498mrgame/res/layout/mr_login.xml

 Project/app/src/game_498mrgame/res/layout/mr_phone_register.xml

 Project/app/src/game_498mrgame/res/layout/mr_real_name_authentication.xml

 Project/app/src/game_498mrgame/res/layout/mr_recent_login_item.xml

 Project/app/src/game_498mrgame/res/layout/mr_switchbyphone.xml

 Project/app/src/game_498mrgame/res/layout/mr_user_center_authentication.xml

 Project/app/src/game_498mrgame/res/layout/mr_user_center_bind.xml

 Project/app/src/game_498mrgame/res/layout/mr_user_center_contact_us.xml

 Project/app/src/game_498mrgame/res/layout/mr_user_center_logout.xml

 Project/app/src/game_498mrgame/res/layout/mr_user_center_mine.xml

 Project/app/src/game_498mrgame/res/layout/mr_user_center_modify_password.xml

 Project/app/src/game_498mrgame/res/layout/mr_user_center_real_name_authentication.xml

 Project/app/src/game_498mrgame/res/layout/mr_user_center_real_name_success.xml

 Project/app/src/game_498mrgame/res/layout/mr_user_center_view.xml

 Project/app/src/game_498mrgame/res/layout/mr_webview_page.xml

 Project/app/src/game_498mrgame/res/values/mr_login_string.xml

 Project/app/src/game_498mrgame/res/values/mr_login_styles.xml