client_Hale
2019-05-06 b9cbcaa35e5515925c7e3b3620967cc8dc16b40a
382 易乐相关修改
9个文件已修改
67个文件已删除
3个文件已添加
3679 ■■■■■ 已修改文件
ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aar 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/build.gradle 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/libs/alipaySdk-20180403.jar 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/libs/aoyou_sdk1.0.jar 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/AndroidManifest.xml 151 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-hdpi-v4/ipay_checkbox_normal.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-hdpi-v4/ipay_checkbox_pressed.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-hdpi-v4/ipay_dropdown_bg.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-hdpi-v4/ipay_loading_img.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-hdpi-v4/ipay_scrollbar.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-hdpi/main_login.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_common_back_normal.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_common_back_press.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_common_slash.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_dialog_close.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_aibeibi.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_alipay.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_gamecard.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_phonecard.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_qq.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_tenpay.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_unionpay.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_weixin.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_ui_checked.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_ui_person_center_back.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_ui_right_arrow.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_ui_scrollbar.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_ui_unchecked.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_account_common_btn_text_color.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_account_smscode_btn_text_color.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg_4_1.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg_btn_color_2.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg_charge_input_color_stroke_2.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg_charge_input_color_stroke_7.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg_select_charge_color_7.xml 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg_select_charge_item_color_1.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_border_style.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_bg.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_btn_bg_color.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_btn_disable.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_btn_normal.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_btn_pressed.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_btn_text_color.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_checkbox_selector.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_slash_bg.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_edit_cursor_color_bottom.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_edit_cursor_color_top.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_fillet_border_color_8.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_loading.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_recharge_bg_style.xml 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_ui_back_selector.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_ui_title_right_button_selector.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ttw_register_topleft_select.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/drawable/ttw_register_topright_select.xml 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_common_webview_layout.xml 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_layout_common_alert_dialog.xml 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_layout_dialog_bg_round_rectangle.xml 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_layout_person_center.xml 217 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_loading_dialog.xml 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_single_select_dialog.xml 58 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_single_select_dialog_item.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_sub_game_pay_common_layout.xml 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_sub_game_pay_v.xml 108 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_charge_layout.xml 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_charge_type_item.xml 140 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_login_layout.xml 791 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_pay_hub_layout_h.xml 282 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_pay_hub_layout_v.xml 288 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_pay_type_item.xml 95 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_select_amount_item.xml 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_select_amount_layout.xml 130 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_title_bar_normal.xml 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/main_login.xml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/main_register.xml 88 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/main_register_dialog.xml 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/layout/ttw_alipay_pay.xml 302 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/game_ylgame/res/values/values.xml 256 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/yl_sdk/src/main/AndroidManifest.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ChannelDiff/Android/yilegame/libs/yl_sdk-game_ylgame-release.aar
Binary files differ
Project/yl_sdk/build.gradle
@@ -69,10 +69,10 @@
    implementation files('libs/libammsdk.jar')
    implementation files('libs/aoyou_sdk1.0.jar')
    implementation files('libs/android-support-v4.jar')
    implementation files('libs/iapppay_plugin.jar')
    dependencies {
        implementation(name: 'applog-release', ext: 'aar')
    }
    implementation files('libs/alipaySdk-20180403.jar')
}
task autoCopy_ylgame_Manifest(type: Copy) {
Project/yl_sdk/libs/alipaySdk-20180403.jar
Binary files differ
Project/yl_sdk/libs/aoyou_sdk1.0.jar
Binary files differ
Project/yl_sdk/src/game_ylgame/AndroidManifest.xml
@@ -9,25 +9,40 @@
        android:minSdkVersion="16"
        android:targetSdkVersion="22" />
    <!-- WIFI INTERNET -->
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <uses-permission android:name="android.permission.RECORD_AUDIO" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.VIBRATE" />
    <uses-permission android:name="android.permission.GET_TASKS" />
    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
    <uses-permission android:name="android.permission.READ_LOGS" />
    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
    <uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
    <!-- 唤醒 -->
    <!-- <uses-permission android:name="android.permission.WAKE_LOCK" /> -->
    <!-- 弹窗 特殊权限 -->
    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
    <uses-permission android:name="android.permission.SYSTEM_OVERLAY_WINDOW" />
    <!-- 获取近期任务 -->
    <uses-permission android:name="android.permission.GET_TASKS" />
    <!-- 危险权限 -->
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <!-- 在SDCard中创建与删除文件权限  危险 -->
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
    <!-- 在SDCard中创建与删除文件权限 -->
    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
    <!-- 存储权限 6.0以后过时,MODE_PRIVATE -->
    <uses-permission android:name="android.permission.MODE_WORLD_READABLE" />
    <!-- 接收短信验证码 -->
    <uses-permission android:name="android.permission.RECEIVE_SMS" />
    <!-- 支付必要权限 -->
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
    <uses-permission-sdk-23 android:name="android.permission.CHANGE_CONFIGURATION" />
    <application
        android:allowBackup="true"
        android:icon="@drawable/app_icon"
@@ -67,50 +82,45 @@
                android:resource="@xml/file_paths" />
        </provider>
        <!--<meta-data-->
            <!--android:name="TrackAppID"-->
            <!--android:value="${TrackAppID}" />-->
        <!--<meta-data-->
            <!--android:name="TrackChannelID"-->
            <!--android:value="${TrackChannelID}" />-->
        <activity
            android:name="com.aoyou.sdk.ui.LoginActivity"
            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:launchMode="singleTask"
            android:screenOrientation="sensor"
            android:configChanges="orientation|keyboardHidden|screenSize">
            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" >
        </activity>
        <!-- 忘记密码php页面 -->
        <activity
            android:name="com.aoyou.sdk.floatwindow.FloatWebActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:screenOrientation="sensor"
            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen"
            android:configChanges="orientation|keyboardHidden|screenSize">
            android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" >
        </activity>
        <activity
            android:name="com.aoyou.sdk.ui.ChargeActivity"
            android:theme="@android:style/Theme.Light.NoTitleBar"
            android:screenOrientation="sensor"
            android:launchMode="singleTask"
            android:configChanges="orientation|keyboardHidden|screenSize|navigation"
            />
            android:launchMode="singleTask"
            android:screenOrientation="sensor"
            android:theme="@android:style/Theme.Light.NoTitleBar" />
        <service android:name="com.aoyou.sdk.SDKAppService">
            <intent-filter android:priority="1000">
        <service android:name="com.aoyou.sdk.SDKAppService" >
            <intent-filter android:priority="1000" >
                <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
            </intent-filter>
        </service>
        <activity
            android:name="com.tencent.tauth.AuthActivity"
            android:noHistory="true"
            android:launchMode="singleTask" >
            android:launchMode="singleTask"
            android:noHistory="true" >
            <intent-filter>
                <action   android:name="android.intent.action.VIEW" />
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
                <category android:name="android.intent.category.BROWSABLE" />
                <data     android:scheme="tencent"/>
                <data android:scheme="tencent" />
            </intent-filter>
        </activity>
        <activity
@@ -121,9 +131,8 @@
        </activity>
        <activity
            android:name="com.tencent.connect.common.AssistActivity"
            android:theme="@android:style/Theme.Translucent.NoTitleBar"
            android:configChanges="orientation|keyboardHidden|screenSize"
            />
            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
        <!-- alipay sdk begin -->
        <activity
@@ -133,26 +142,47 @@
            android:screenOrientation="behind"
            android:windowSoftInputMode="adjustResize|stateHidden" >
        </activity>
        <activity
            android:name="com.aoyou.sdk.ui.WeChatPayActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:screenOrientation="portrait" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <!-- 启动语句需要注释调 -->
                <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
                <data
                    android:host="MainActivity"
                    android:scheme="com.aoyou.sdk" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
        <!--微信登录回调界面-->
                <data android:scheme="" />
            </intent-filter>
        </activity>
        <activity
            android:name="com.aoyou.sdk.ui.WxH5PayActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:screenOrientation="portrait" >
        </activity>
        <!-- 微信登录回调界面 -->
        <activity
            android:name="com.aoyou.sdk.wxapi.WXEntryActivity"
            android:label="@string/app_name"
            android:exported="true">
            android:exported="true"
            android:label="@string/app_name" >
        </activity>
        <!--微信支付回调界面-->
        <!-- 微信支付回调界面 -->
        <activity
            android:name="com.aoyou.sdk.wxapi.WXPayEntryActivity"
            android:exported="true"
            android:launchMode="singleTop" />
        <activity
            android:name="com.aoyou.sdk.ui.PhoneBindingActivity"
            android:configChanges="orientation|keyboardHidden|screenSize"
            android:theme="@android:style/Theme.Dialog"
            android:screenOrientation="portrait">
            android:screenOrientation="portrait"
            android:theme="@android:style/Theme.Dialog" >
        </activity>
        <meta-data
            android:name="WANCMS_APPID"
@@ -190,37 +220,6 @@
        <meta-data
            android:name="TouTiao_Chanel"
            android:value="${TT_Chanel}" />
        <!-- 以下为三方支付页面 -->
        <!-- 微支付SDK界面 -->
        <!-- 显示网页界面 -->
        <activity
            android:name="com.iapppay.sdk.main.WebActivity"
            android:configChanges="screenSize|orientation|keyboard|navigation|layoutDirection"
            android:theme="@android:style/Theme.Translucent.NoTitleBar" />
        <activity
            android:name="com.iapppay.ui.activity.PersonCenterActivity"
            android:configChanges="screenSize|orientation|keyboard|navigation|layoutDirection" />
        <!-- 收银台-普通 -->
        <activity
            android:name="com.iapppay.ui.activity.PayHubActivity"
            android:configChanges="screenSize|orientation|keyboard|navigation|layoutDirection" />
        <!-- 选择充值金额界面 -->
        <activity
            android:name="com.iapppay.ui.activity.SelectAmountActivity"
            android:configChanges="screenSize|orientation|keyboard|navigation|layoutDirection"
            android:launchMode="singleTask" />
        <activity
            android:name="com.iapppay.ui.activity.ChargeActivity"
            android:configChanges="screenSize|orientation|keyboard|navigation|layoutDirection"
            android:launchMode="singleTask" />
        <!-- 游戏卡和话费卡界面 -->
        <activity
            android:name="com.iapppay.ui.card.GamepayActivity"
            android:configChanges="screenSize|orientation|keyboard|navigation|layoutDirection"
            android:launchMode="singleTask" />
    </application>
Project/yl_sdk/src/game_ylgame/res/drawable-hdpi-v4/ipay_checkbox_normal.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-hdpi-v4/ipay_checkbox_pressed.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-hdpi-v4/ipay_dropdown_bg.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-hdpi-v4/ipay_loading_img.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-hdpi-v4/ipay_scrollbar.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-hdpi/main_login.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_common_back_normal.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_common_back_press.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_common_slash.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_dialog_close.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_aibeibi.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_alipay.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_gamecard.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_phonecard.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_qq.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_tenpay.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_unionpay.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_icon_paytype_weixin.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_ui_checked.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_ui_person_center_back.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_ui_right_arrow.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_ui_scrollbar.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable-xhdpi-v4/ipay_ui_unchecked.png
Binary files differ
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_account_common_btn_text_color.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_account_smscode_btn_text_color.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg_4_1.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg_btn_color_2.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg_charge_input_color_stroke_2.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg_charge_input_color_stroke_7.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg_select_charge_color_7.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_bg_select_charge_item_color_1.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_border_style.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_bg.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_btn_bg_color.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_btn_disable.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_btn_normal.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_btn_pressed.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_btn_text_color.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_checkbox_selector.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_common_slash_bg.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_edit_cursor_color_bottom.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_edit_cursor_color_top.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_fillet_border_color_8.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_loading.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_recharge_bg_style.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_ui_back_selector.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ipay_ui_title_right_button_selector.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/drawable/ttw_register_topleft_select.xml
New file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
    <!-- 背景 -->
    <solid android:color="#F5F5F5" />
    <!-- 圆角 -->
    <corners
        android:bottomLeftRadius="0dp"
        android:bottomRightRadius="0dp"
        android:topLeftRadius="20dp"
        android:topRightRadius="0dp" />
</shape>
Project/yl_sdk/src/game_ylgame/res/drawable/ttw_register_topright_select.xml
New file
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
    <!-- 背景 -->
    <solid android:color="#F5F5F5" />
    <!-- 圆角 -->
    <corners
        android:bottomLeftRadius="0dp"
        android:bottomRightRadius="0dp"
        android:topLeftRadius="0dp"
        android:topRightRadius="20dp" />
</shape>
Project/yl_sdk/src/game_ylgame/res/layout/ipay_common_webview_layout.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_layout_common_alert_dialog.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_layout_dialog_bg_round_rectangle.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_layout_person_center.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_loading_dialog.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_single_select_dialog.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_single_select_dialog_item.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_sub_game_pay_common_layout.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_sub_game_pay_v.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_charge_layout.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_charge_type_item.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_login_layout.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_pay_hub_layout_h.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_pay_hub_layout_v.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_pay_type_item.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_select_amount_item.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_select_amount_layout.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/ipay_ui_title_bar_normal.xml
File was deleted
Project/yl_sdk/src/game_ylgame/res/layout/main_login.xml
@@ -155,15 +155,9 @@
        <RelativeLayout
            android:id="@+id/ll_logo"
            android:layout_width="fill_parent"
            android:layout_height="45dip"
            android:layout_height="35dip"
            android:layout_marginBottom="10dip" >
            <ImageView
                android:id="@+id/iv_logo"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_centerInParent="true"
                android:src="@drawable/main_login" />
        </RelativeLayout>
        <RelativeLayout
Project/yl_sdk/src/game_ylgame/res/layout/main_register.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
@@ -12,32 +12,55 @@
        android:layout_marginLeft="20dip"
        android:layout_marginRight="20dip"
        android:background="@drawable/main_bg_login_noquick"
        android:paddingBottom="10dip"
        android:paddingLeft="18dip"
        android:paddingRight="18dip"
        android:paddingTop="10dip" >
        android:paddingBottom="20dip"
        android:paddingLeft="0dip"
        android:paddingRight="0dip"
        android:paddingTop="0dip" >
        <RelativeLayout
            android:id="@+id/ll_logo"
            android:layout_width="fill_parent"
            android:layout_height="45dip"
            android:layout_marginBottom="10dip" >
            android:layout_height="40dip"
            android:layout_marginBottom="16dip"
            android:layout_marginLeft="0dip"
            android:layout_marginRight="0dip" >
            <TextView
                android:id="@+id/tv_logo"
                android:layout_width="wrap_content"
            <LinearLayout
                android:id="@+id/ll_registertype"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_centerInParent="true"
                android:text="手机注册"
                android:textColor="@color/red"
                android:textSize="20sp" />
                android:orientation="horizontal" >
                <Button
                    android:id="@+id/btn_phoneregister"
                    android:layout_width="0dip"
                    android:layout_height="40dip"
                    android:layout_weight="1"
                    android:background="@android:color/transparent"
                    android:text="手机注册"
                    android:textColor="@android:color/black"
                    android:textSize="16sp" />
                <Button
                    android:id="@+id/btn_normalregister"
                    android:layout_width="0dip"
                    android:layout_height="40dip"
                    android:layout_marginLeft="-8dip"
                    android:layout_weight="1"
                    android:background="@drawable/ttw_register_topright_select"
                    android:text="账号注册"
                    android:textColor="@android:color/black"
                    android:textSize="16sp" />
            </LinearLayout>
        </RelativeLayout>
        <RelativeLayout
            android:id="@+id/rl_username"
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:layout_below="@id/ll_logo" >
            android:layout_below="@id/ll_logo"
            android:paddingLeft="18dip"
            android:paddingRight="18dip" >
            <EditText
                android:id="@+id/et_username"
@@ -73,7 +96,9 @@
            android:layout_height="wrap_content"
            android:layout_below="@id/rl_username"
            android:layout_marginBottom="5dip"
            android:layout_marginTop="5dip" >
            android:layout_marginTop="5dip"
            android:paddingLeft="18dip"
            android:paddingRight="18dip" >
            <EditText
                android:id="@+id/et_normal_account"
@@ -175,7 +200,9 @@
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
            android:layout_below="@id/rl_pwd"
            android:layout_marginBottom="5dip" >
            android:layout_marginBottom="5dip"
            android:paddingLeft="18dip"
            android:paddingRight="18dip" >
            <LinearLayout
                android:id="@+id/ll_agreement"
@@ -216,15 +243,17 @@
            android:layout_width="match_parent"
            android:layout_height="40dip"
            android:layout_below="@id/rl_retext"
            android:orientation="horizontal" >
            android:orientation="horizontal"
            android:paddingLeft="18dip"
            android:paddingRight="18dip" >
            <Button
                android:id="@+id/btn_normalregister"
                android:id="@+id/btn_backlogin"
                android:layout_width="0dip"
                android:layout_height="40dip"
                android:layout_weight="1"
                android:background="@drawable/ttw_login_in"
                android:text="账号注册"
                android:text="已有账号"
                android:textColor="@android:color/white"
                android:textSize="16sp" />
@@ -239,25 +268,6 @@
                android:textColor="@android:color/white"
                android:textSize="16sp" />
        </LinearLayout>
        <RelativeLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_below="@id/ll_goregister"
            android:layout_marginBottom="10dip"
            android:layout_marginTop="10dip" >
            <TextView
                android:id="@+id/tv_cut"
                android:layout_width="80dip"
                android:layout_height="20dip"
                android:layout_alignParentRight="true"
                android:background="#FFFFFF"
                android:gravity="center"
                android:text="已有账号"
                android:textColor="#878787"
                android:textSize="15sp" />
        </RelativeLayout>
    </RelativeLayout>
</RelativeLayout>
Project/yl_sdk/src/game_ylgame/res/layout/main_register_dialog.xml
@@ -14,8 +14,7 @@
        android:layout_height="wrap_content"
        android:layout_width="wrap_content"
        android:layout_marginTop="10dp"
        android:layout_centerHorizontal="true"
        android:background="@drawable/main_login"/>
        android:layout_centerHorizontal="true"/>
        <LinearLayout 
            android:id="@+id/dialog_ll"
Project/yl_sdk/src/game_ylgame/res/layout/ttw_alipay_pay.xml
@@ -2,178 +2,158 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:background="#EDEDED">
<LinearLayout
    android:id="@+id/ll_content"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical"
    android:layout_marginLeft="10dip"
    android:layout_marginRight="10dip">
    android:background="#EDEDED" >
    <LinearLayout
        android:id="@+id/ll_goods_name"
        android:id="@+id/ll_content"
        android:layout_width="match_parent"
        android:layout_height="38dip"
        android:background="#FFFFFF"
        android:layout_marginTop="5dip"
        android:orientation="horizontal"
        android:focusable="true"
        android:focusableInTouchMode="true" >
     <TextView
        android:id="@+id/tv_desc"
        android:layout_width="100dip"
        android:layout_height="fill_parent"
        android:text="商品名称:"
        android:paddingLeft="15dip"
        android:gravity="center_vertical"
        android:textColor="#6E6E6E"
        android:textSize="16sp" />
        android:layout_height="wrap_content"
        android:layout_marginLeft="10dip"
        android:layout_marginRight="10dip"
        android:orientation="vertical" >
     <TextView
         android:id="@+id/tv_gold_count"
         android:layout_width="120dp"
         android:layout_height="match_parent"
         android:paddingLeft="1dip"
         android:gravity="center_vertical"
         android:text="魔神"
         android:textSize="16sp" />
        <LinearLayout
            android:id="@+id/ll_goods_name"
            android:layout_width="match_parent"
            android:layout_height="38dip"
            android:layout_marginTop="5dip"
            android:background="#FFFFFF"
            android:focusable="true"
            android:focusableInTouchMode="true"
            android:orientation="horizontal" >
            <TextView
                android:id="@+id/tv_desc"
                android:layout_width="100dip"
                android:layout_height="fill_parent"
                android:gravity="center_vertical"
                android:paddingLeft="15dip"
                android:text="商品名称:"
                android:textColor="#6E6E6E"
                android:textSize="16sp" />
            <TextView
                android:id="@+id/tv_gold_count"
                android:layout_width="120dp"
                android:layout_height="match_parent"
                android:gravity="center_vertical"
                android:paddingLeft="1dip"
                android:text="魔神"
                android:textSize="16sp" />
        </LinearLayout>
        <RelativeLayout
            android:id="@+id/ll_goods_price"
            android:layout_width="match_parent"
            android:layout_height="38dip"
            android:layout_marginTop="5dip"
            android:background="#FFFFFF"
            android:focusable="true"
            android:focusableInTouchMode="true"
            android:orientation="horizontal" >
            <TextView
                android:id="@+id/tv_price"
                android:layout_width="100dip"
                android:layout_height="fill_parent"
                android:gravity="center_vertical"
                android:paddingLeft="15dip"
                android:text="商品价格:"
                android:textColor="#6E6E6E"
                android:textSize="16sp" />
            <TextView
                android:id="@+id/tv_price_count"
                android:layout_width="120dp"
                android:layout_height="fill_parent"
                android:layout_toRightOf="@id/tv_price"
                android:gravity="center_vertical"
                android:paddingLeft="1dip"
                android:text="1"
                android:textSize="16sp" />
            <TextView
                android:id="@+id/tv_yuan"
                android:layout_width="wrap_content"
                android:layout_height="fill_parent"
                android:layout_alignParentRight="true"
                android:layout_marginRight="15dip"
                android:gravity="center_vertical"
                android:text="元"
                android:textColor="#FF8C00"
                android:textSize="16sp" />
        </RelativeLayout>
        <LinearLayout
            android:id="@+id/ll_curent_acount"
            android:layout_width="match_parent"
            android:layout_height="38dip"
            android:layout_marginTop="5dip"
            android:background="#FFFFFF"
            android:focusable="true"
            android:focusableInTouchMode="true"
            android:orientation="horizontal" >
            <TextView
                android:id="@+id/tv_curent_acount"
                android:layout_width="100dip"
                android:layout_height="fill_parent"
                android:gravity="center_vertical"
                android:paddingLeft="15dip"
                android:text="当前账号:"
                android:textColor="#6E6E6E"
                android:textSize="16sp" />
            <TextView
                android:id="@+id/tv_count_number"
                android:layout_width="120dp"
                android:layout_height="fill_parent"
                android:layout_toRightOf="@id/tv_price"
                android:gravity="center_vertical"
                android:paddingLeft="1dip"
                android:text="1111111"
                android:textSize="16sp" />
        </LinearLayout>
        <RelativeLayout
            android:id="@+id/ll_acount_surplus"
            android:layout_width="match_parent"
            android:layout_height="38dip"
            android:layout_marginTop="5dip"
            android:background="#FFFFFF"
            android:focusable="true"
            android:focusableInTouchMode="true"
            android:visibility="visible" >
            <TextView
                android:id="@+id/tv_surplus"
                android:layout_width="100dip"
                android:layout_height="fill_parent"
                android:gravity="center_vertical"
                android:paddingLeft="15dip"
                android:text="平台币余额:"
                android:textColor="#6E6E6E"
                android:textSize="16sp" />
            <TextView
                android:id="@+id/tv_ttb_count"
                android:layout_width="120dp"
                android:layout_height="fill_parent"
                android:layout_toRightOf="@id/tv_surplus"
                android:gravity="left|center"
                android:paddingLeft="1dip"
                android:text="0"
                android:textSize="16sp" />
        </RelativeLayout>
    </LinearLayout>
   <RelativeLayout
        android:id="@+id/ll_goods_price"
        android:layout_width="match_parent"
        android:layout_height="38dip"
        android:layout_marginTop="5dip"
        android:background="#FFFFFF"
        android:orientation="horizontal"
        android:focusable="true"
        android:focusableInTouchMode="true" >
        <TextView
            android:id="@+id/tv_price"
            android:layout_width="100dip"
            android:layout_height="fill_parent"
            android:paddingLeft="15dip"
            android:textColor="#6E6E6E"
            android:textSize="16sp"
            android:text="商品价格:"
            android:gravity="center_vertical"/>
        <TextView
            android:id="@+id/tv_price_count"
            android:layout_width="120dp"
            android:layout_height="fill_parent"
            android:paddingLeft="1dip"
            android:layout_toRightOf="@id/tv_price"
            android:gravity="center_vertical"
            android:text="1"
            android:textSize="16sp" />
      <TextView
            android:id="@+id/tv_yuan"
            android:layout_width="wrap_content"
            android:layout_height="fill_parent"
            android:layout_alignParentRight="true"
            android:layout_marginRight="15dip"
            android:gravity="center_vertical"
            android:text="元"
            android:textColor="#FF8C00"
            android:textSize="16sp" />
    </RelativeLayout>
   <LinearLayout
        android:id="@+id/ll_curent_acount"
        android:layout_width="match_parent"
        android:layout_height="38dip"
        android:layout_marginTop="5dip"
        android:background="#FFFFFF"
        android:orientation="horizontal"
        android:focusable="true"
        android:focusableInTouchMode="true" >
        <TextView
            android:id="@+id/tv_curent_acount"
            android:layout_width="100dip"
            android:layout_height="fill_parent"
            android:textColor="#6E6E6E"
            android:paddingLeft="15dip"
            android:textSize="16sp"
            android:text="当前账号:"
            android:gravity="center_vertical"/>
        <TextView
            android:id="@+id/tv_count_number"
            android:layout_width="120dp"
            android:layout_height="fill_parent"
            android:paddingLeft="1dip"
            android:layout_toRightOf="@id/tv_price"
            android:gravity="center_vertical"
            android:text="1111111"
            android:textSize="16sp" />
    </LinearLayout>
   <RelativeLayout
        android:id="@+id/ll_acount_surplus"
        android:layout_width="match_parent"
        android:layout_height="38dip"
        android:layout_marginTop="5dip"
        android:background="#FFFFFF"
        android:visibility="visible"
        android:focusable="true"
        android:focusableInTouchMode="true" >
        <TextView
            android:id="@+id/tv_surplus"
            android:layout_width="100dip"
            android:layout_height="fill_parent"
            android:textColor="#6E6E6E"
            android:paddingLeft="15dip"
            android:textSize="16sp"
            android:text="平台币余额:"
            android:gravity="center_vertical"/>
        <TextView
            android:id="@+id/tv_ttb_count"
            android:layout_width="60dp"
            android:layout_height="fill_parent"
            android:paddingLeft="1dip"
            android:layout_toRightOf="@id/tv_surplus"
            android:gravity="left|center"
            android:text="0"
            android:textSize="16sp" />
      <TextView
          android:id="@+id/tv_refresh"
          android:layout_width="60dp"
          android:layout_height="30dip"
          android:layout_marginRight="10dip"
          android:background="@drawable/ttw_edit_bg"
          android:gravity="center"
          android:layout_centerVertical="true"
          android:layout_alignParentRight="true"
          android:text="刷新"
          android:textSize="14sp" />
    </RelativeLayout>
    </LinearLayout>
    <TextView
        android:id="@+id/tv_pay"
        android:layout_width="match_parent"
        android:layout_height="40dip"
        android:layout_below="@id/ll_content"
        android:layout_marginLeft="15dip"
        android:layout_marginRight="15dip"
        android:layout_below="@id/ll_content"
        android:layout_marginTop="15dip"
        android:background="#FF8C00"
        android:gravity="center"
Project/yl_sdk/src/game_ylgame/res/values/values.xml
File was deleted
Project/yl_sdk/src/main/AndroidManifest.xml
@@ -5,6 +5,13 @@
    android:versionCode="1"
    android:versionName="1.1.0">
    <supports-screens
        android:smallScreens="true"
        android:normalScreens="true"
        android:largeScreens="true"
        android:resizeable="true"
        android:anyDensity="true" />
    <uses-sdk
        android:minSdkVersion="16"
        android:targetSdkVersion="22" />