Hale Cai
2019-11-12 91d06a4714fc1a6d15696c84ae7d2cca6b69a485
UPDATE 更新恺英新SDK内容
7个文件已修改
2个文件已添加
152 ■■■■■ 已修改文件
ChannelDiff/Android/mgxbqy/libs/ky_sdk-game_ky-release.aar 补丁 | 查看 | 原始文档 | blame | 历史
Project/ky_sdk/libs/base_mg.jar 补丁 | 查看 | 原始文档 | blame | 历史
Project/ky_sdk/libs/ky_sdk_common.jar 补丁 | 查看 | 原始文档 | blame | 历史
Project/ky_sdk/libs/pay_mg.jar 补丁 | 查看 | 原始文档 | blame | 历史
Project/ky_sdk/src/game_ky/res/drawable-xxhdpi/mg_user_logout.png 补丁 | 查看 | 原始文档 | blame | 历史
Project/ky_sdk/src/game_ky/res/layout/mg_activity_account_security.xml 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/ky_sdk/src/game_ky/res/layout/xy_holder_login.xml 52 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/ky_sdk/src/game_ky/res/layout/xy_mg_account_login.xml 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Project/ky_sdk/src/game_ky/res/xml/file_paths.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ChannelDiff/Android/mgxbqy/libs/ky_sdk-game_ky-release.aar
Binary files differ
Project/ky_sdk/libs/base_mg.jar
Binary files differ
Project/ky_sdk/libs/ky_sdk_common.jar
Binary files differ
Project/ky_sdk/libs/pay_mg.jar
Binary files differ
Project/ky_sdk/src/game_ky/res/drawable-xxhdpi/mg_user_logout.png
Project/ky_sdk/src/game_ky/res/layout/mg_activity_account_security.xml
@@ -152,5 +152,44 @@
        android:layout_width="match_parent"
        android:layout_height="0.5dp"
        android:background="#dddddd" />
    <LinearLayout
        android:id="@+id/logout_account_ll"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="@color/white"
        android:gravity="center_vertical"
        android:orientation="horizontal"
        android:paddingBottom="8dp"
        android:paddingTop="8dp" >
        <ImageView
            android:layout_width="35dp"
            android:layout_height="25dp"
            android:layout_marginLeft="10dp"
            android:src="@drawable/mg_user_logout" />
        <TextView
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_marginLeft="5dp"
            android:layout_weight="1"
            android:text="账号注销"
            android:textColor="#343434"
            android:textSize="14sp"
             />
        <ImageView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:src="@drawable/ic_mine_forward"
            android:layout_marginRight="10dp"
            />
    </LinearLayout>
    <View
        android:layout_width="match_parent"
        android:layout_height="0.5dp"
        android:background="#dddddd" />
</LinearLayout>
Project/ky_sdk/src/game_ky/res/layout/xy_holder_login.xml
@@ -59,7 +59,7 @@
        android:id="@+id/login_holder_login_btn"
        android:layout_width="250dp"
        android:layout_height="wrap_content"
        android:layout_marginTop="35dp"
        android:layout_marginTop="30dp"
        android:text="登录"
        android:gravity="center_horizontal"
        android:textColor="@color/white"
@@ -71,6 +71,52 @@
        android:paddingBottom="10dp"            
        />
    
     <LinearLayout
             android:id="@+id/ll_protocol"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:orientation="horizontal"
            android:gravity="center"
            android:layout_below="@id/login_holder_login_btn"
            android:layout_marginTop="10dp"
            >
            <ImageView
                android:id="@+id/onekeyregin_holder_check_xieyi_iv"
                android:layout_width="15dp"
                android:layout_height="15dp"
                android:checked="true"
                android:src="@drawable/mg_register_protocol_checked" />
           <TextView
                 android:id="@+id/onekeyregin_holder_check_xieyi_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=" 我已阅读并同意"
                 android:textColor="@color/gray"
                 android:textSize="12sp" />
            <TextView
                android:id="@+id/onekeyregin_holder_xieyi_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textSize="12sp"
                android:text="《用户协议》"
                android:textColor="@color/xieyi"
                 />
            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="和"
                 android:textColor="@color/gray"
                 android:textSize="12sp" />
            <TextView
                android:id="@+id/onekeyregin_holder_yinsi_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textSize="12sp"
                android:text="《隐私政策》"
                android:textColor="@color/xieyi"
                 />
        </LinearLayout>
    
    <LinearLayout 
        android:layout_width="250dp"
@@ -78,8 +124,8 @@
        android:orientation="horizontal"
        android:gravity="center_vertical"
        android:layout_centerHorizontal="true"
        android:layout_below="@id/login_holder_login_btn"
        android:layout_marginTop="35dp"
        android:layout_below="@id/ll_protocol"
        android:layout_marginTop="10dp"
        >
        
        <!-- <TextView 
Project/ky_sdk/src/game_ky/res/layout/xy_mg_account_login.xml
@@ -80,7 +80,7 @@
        <RelativeLayout
            android:layout_width="250dp"
            android:layout_height="40dp"
            android:layout_marginTop="15dp"
            android:layout_marginTop="5dp"
            android:background="@drawable/xy_phone_regin_bg"
            android:gravity="center_vertical"
            android:orientation="horizontal"
@@ -120,7 +120,7 @@
            android:id="@+id/reg_next_tv"
            android:layout_width="250dp"
            android:layout_height="wrap_content"
            android:layout_marginTop="15dp"
            android:layout_marginTop="5dp"
            android:background="@drawable/xy_quick_login_save_bg"
            android:gravity="center_horizontal"
            android:paddingBottom="10dp"
@@ -130,11 +130,58 @@
            android:textSize="14sp" />
        <LinearLayout
            android:id="@+id/logout_ll"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_below="@id/login_holder_login_btn"
            android:orientation="horizontal"
            android:gravity="center"
              android:layout_below="@id/reg_next_tv"
            android:layout_marginTop="10dp"
            >
            <ImageView
                android:id="@+id/onekeyregin_holder_check_xieyi_iv"
                android:layout_width="15dp"
                android:layout_height="15dp"
                android:checked="true"
                android:src="@drawable/mg_register_protocol_checked" />
           <TextView
                 android:id="@+id/onekeyregin_holder_check_xieyi_tv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=" 我已阅读并同意"
                 android:textColor="@color/gray"
                 android:textSize="12sp" />
            <TextView
                android:id="@+id/onekeyregin_holder_xieyi_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textSize="12sp"
                android:text="《用户协议》"
                android:textColor="@color/xieyi"
                 />
            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="和"
                 android:textColor="@color/gray"
                 android:textSize="12sp" />
            <TextView
                android:id="@+id/onekeyregin_holder_yinsi_tv"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:textSize="12sp"
                android:text="《隐私政策》"
                android:textColor="@color/xieyi"
                 />
        </LinearLayout>
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_below="@id/logout_ll"
            android:layout_centerHorizontal="true"
            android:layout_marginTop="15dp"
            android:layout_marginTop="10dp"
            android:gravity="center_vertical"
            android:orientation="horizontal" >
Project/ky_sdk/src/game_ky/res/xml/file_paths.xml
New file
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<paths xmlns:android="http://schemas.android.com/apk/res/android">
    <external-path
        name="download"
        path="" />
</paths>