Commit 8d82d11b066cef8f9e5096719df1f3d3de26780c

Authored by 赵康
1 parent 1b1227b3bf
Exists in master

release 1.0.2

增加中文支持
优化界面元素

Showing 4 changed files with 24 additions and 23 deletions Inline Diff

InlandSDKRelease/libs/InlandSDK_v1.0.1_proguard.jar
No preview for this file type
InlandSDKRelease/libs/InlandSDK_v1.0.2_proguard.jar
No preview for this file type
InlandSDKRelease/res/layout/fragment_sign_choice.xml
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 2 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 android:layout_width="match_parent" 3 android:layout_width="match_parent"
4 android:layout_height="wrap_content" 4 android:layout_height="wrap_content"
5 android:gravity="center" 5 android:gravity="center"
6 android:orientation="vertical" > 6 android:orientation="vertical" >
7 7
8 <LinearLayout 8 <LinearLayout
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="wrap_content" 10 android:layout_height="wrap_content"
11 android:background="@color/white_translucent" 11 android:background="@color/white_translucent"
12 android:orientation="vertical" > 12 android:orientation="vertical" >
13 13
14 <LinearLayout 14 <LinearLayout
15 android:layout_width="match_parent" 15 android:layout_width="match_parent"
16 android:layout_height="31dp" 16 android:layout_height="31dp"
17 android:layout_marginLeft="35dp" 17 android:layout_marginLeft="35dp"
18 android:layout_marginRight="35dp" 18 android:layout_marginRight="35dp"
19 android:layout_marginTop="13dp" 19 android:layout_marginTop="13dp"
20 android:background="@color/white" > 20 android:background="@color/white" >
21 21
22 <ImageView 22 <ImageView
23 android:layout_width="wrap_content" 23 android:layout_width="wrap_content"
24 android:layout_height="wrap_content" 24 android:layout_height="wrap_content"
25 android:layout_gravity="center_vertical" 25 android:layout_gravity="center_vertical"
26 android:layout_marginLeft="9.5dp" 26 android:layout_marginLeft="9.5dp"
27 android:layout_marginRight="9.5dp" 27 android:layout_marginRight="9.5dp"
28 android:src="@drawable/ic_user" /> 28 android:src="@drawable/ic_user" />
29 29
30 <View 30 <View
31 android:layout_width="1dp" 31 android:layout_width="1dp"
32 android:layout_height="20dp" 32 android:layout_height="20dp"
33 android:layout_gravity="center_vertical" 33 android:layout_gravity="center_vertical"
34 android:background="@color/light_gray" /> 34 android:background="@color/light_gray" />
35 35
36 <EditText 36 <EditText
37 android:id="@+id/username" 37 android:id="@+id/username"
38 android:layout_width="match_parent" 38 android:layout_width="match_parent"
39 android:layout_height="match_parent" 39 android:layout_height="match_parent"
40 android:background="@color/transparent" 40 android:background="@color/transparent"
41 android:hint="@string/user_name_hint" 41 android:hint="@string/user_name_hint"
42 android:paddingLeft="6dp" /> 42 android:paddingLeft="6dp" />
43 </LinearLayout> 43 </LinearLayout>
44 44
45 <LinearLayout 45 <LinearLayout
46 android:layout_width="match_parent" 46 android:layout_width="match_parent"
47 android:layout_height="31dp" 47 android:layout_height="31dp"
48 android:layout_marginLeft="35dp" 48 android:layout_marginLeft="35dp"
49 android:layout_marginRight="35dp" 49 android:layout_marginRight="35dp"
50 android:layout_marginTop="16dp" 50 android:layout_marginTop="16dp"
51 android:background="@color/white" 51 android:background="@color/white"
52 android:orientation="horizontal" > 52 android:orientation="horizontal" >
53 53
54 <ImageView 54 <ImageView
55 android:layout_width="wrap_content" 55 android:layout_width="wrap_content"
56 android:layout_height="wrap_content" 56 android:layout_height="wrap_content"
57 android:layout_gravity="center_vertical" 57 android:layout_gravity="center_vertical"
58 android:layout_marginLeft="12.5dp" 58 android:layout_marginLeft="12.5dp"
59 android:layout_marginRight="12.5dp" 59 android:layout_marginRight="12.5dp"
60 android:src="@drawable/ic_pwd" /> 60 android:src="@drawable/ic_pwd" />
61 61
62 <View 62 <View
63 android:layout_width="1dp" 63 android:layout_width="1dp"
64 android:layout_height="20dp" 64 android:layout_height="20dp"
65 android:layout_gravity="center_vertical" 65 android:layout_gravity="center_vertical"
66 android:background="@color/light_gray" /> 66 android:background="@color/light_gray" />
67 67
68 <EditText 68 <EditText
69 android:id="@+id/pwd" 69 android:id="@+id/pwd"
70 android:layout_width="match_parent" 70 android:layout_width="match_parent"
71 android:layout_height="match_parent" 71 android:layout_height="match_parent"
72 android:background="@color/white" 72 android:background="@color/white"
73 android:hint="@string/password_hint" 73 android:hint="@string/password_hint"
74 android:inputType="textPassword" 74 android:inputType="textPassword"
75 android:paddingLeft="6dp" /> 75 android:paddingLeft="6dp" />
76 </LinearLayout> 76 </LinearLayout>
77 77
78 <LinearLayout 78 <LinearLayout
79 android:layout_width="fill_parent" 79 android:layout_width="fill_parent"
80 android:layout_height="wrap_content" 80 android:layout_height="wrap_content"
81 android:layout_marginLeft="35dp" 81 android:layout_marginLeft="35dp"
82 android:layout_marginRight="35dp" 82 android:layout_marginRight="35dp"
83 android:layout_marginTop="16dp" 83 android:layout_marginTop="16dp"
84 android:orientation="horizontal" > 84 android:orientation="horizontal" >
85 85
86 <Button 86 <Button
87 android:id="@+id/gump_reg" 87 android:id="@+id/gump_reg"
88 android:layout_width="fill_parent" 88 android:layout_width="fill_parent"
89 android:layout_height="wrap_content" 89 android:layout_height="wrap_content"
90 android:layout_marginRight="10dp" 90 android:layout_marginRight="10dp"
91 android:layout_weight="1" 91 android:layout_weight="1"
92 android:background="@drawable/btn_green_bg" 92 android:background="@drawable/btn_green_bg"
93 android:text="@string/signup" 93 android:text="@string/signup"
94 android:textColor="@color/white" /> 94 android:textColor="@color/white" />
95 95
96 <Button 96 <Button
97 android:id="@+id/gump_login" 97 android:id="@+id/gump_login"
98 android:layout_width="fill_parent" 98 android:layout_width="fill_parent"
99 android:layout_height="wrap_content" 99 android:layout_height="wrap_content"
100 android:layout_marginLeft="11dp" 100 android:layout_marginLeft="11dp"
101 android:layout_weight="1" 101 android:layout_weight="1"
102 android:background="@drawable/btn_orange_bg" 102 android:background="@drawable/btn_orange_bg"
103 android:gravity="center" 103 android:gravity="center"
104 android:text="@string/login" 104 android:text="@string/login"
105 android:textColor="@android:color/white" 105 android:textColor="@android:color/white"
106 android:textSize="15sp" 106 android:textSize="15sp"
107 android:textStyle="bold" /> 107 android:textStyle="bold" />
108 </LinearLayout> 108 </LinearLayout>
109 109
110 <Button 110 <Button
111 android:id="@+id/play" 111 android:id="@+id/play"
112 android:layout_width="fill_parent" 112 android:layout_width="fill_parent"
113 android:layout_height="wrap_content" 113 android:layout_height="wrap_content"
114 android:layout_marginBottom="16dp" 114 android:layout_marginBottom="0dp"
115 android:layout_marginLeft="35dp" 115 android:layout_marginLeft="35dp"
116 android:layout_marginRight="35dp" 116 android:layout_marginRight="35dp"
117 android:layout_marginTop="16dp" 117 android:layout_marginTop="16dp"
118 android:background="@drawable/btn_orange_bg" 118 android:background="@drawable/btn_orange_bg"
119 android:padding="5dp" 119 android:padding="5dp"
120 android:text="@string/quick_play" 120 android:text="@string/quick_play"
121 android:textColor="@android:color/white" 121 android:textColor="@android:color/white"
122 android:textSize="16sp" 122 android:textSize="16sp"
123 android:textStyle="bold" /> 123 android:textStyle="bold" />
124 124
125 <ImageView 125 <ImageView
126 android:layout_width="fill_parent" 126 android:layout_width="fill_parent"
127 android:layout_height="wrap_content" 127 android:layout_height="wrap_content"
128 android:layout_marginLeft="35dp" 128 android:layout_marginLeft="35dp"
129 android:layout_marginRight="35dp" 129 android:layout_marginRight="35dp"
130 android:visibility="gone"
130 android:background="@drawable/horizontal_line" /> 131 android:background="@drawable/horizontal_line" />
131 </LinearLayout> 132 </LinearLayout>
132 133
133 <LinearLayout 134 <LinearLayout
134 android:layout_width="match_parent" 135 android:layout_width="match_parent"
135 android:layout_height="wrap_content" 136 android:layout_height="wrap_content"
136 android:background="@drawable/bottom_light_bg" 137 android:background="@drawable/bottom_light_bg"
137 android:gravity="center_horizontal" > 138 android:gravity="center_horizontal" >
138 139
139 </LinearLayout> 140 </LinearLayout>
140 141
141 </LinearLayout> 142 </LinearLayout>
InlandSDKRelease/res/values/strings.xml
1 <resources> 1 <resources>
2 2
3 <string name="user_name_hint">Email</string> 3 <string name="user_name_hint">邮箱</string>
4 <string name="password_hint">Password</string> 4 <string name="password_hint">密码</string>
5 <string name="switch_user">Change account</string> 5 <string name="switch_user">切换用户</string>
6 <string name="loging">Signing...</string> 6 <string name="loging">加载中……</string>
7 <string name="loading">loading</string> 7 <string name="loading">加载中……</string>
8 8
9 <string name="signup">Signup</string> 9 <string name="signup">注册</string>
10 <string name="login">Login</string> 10 <string name="login">登录</string>
11 <string name="quick_play">Play</string> 11 <string name="quick_play">一键登录</string>
12 <!-- toast --> 12 <!-- toast -->
13 <string name="illegal_uname_tip">Invalid Email</string> 13 <string name="illegal_uname_tip">请输入正确的邮箱</string>
14 <string name="illegal_pwd_tip">Invalid Password (6–20 characters).</string> 14 <string name="illegal_pwd_tip">密码格式不正确 (请输入6–20字符)</string>
15 <string name="illegal_user_exist">Email has already used</string> 15 <string name="illegal_user_exist">邮箱已注册</string>
16 <string name="illegal_pwd_invalid">Password is incorrect. Please try again.</string> 16 <string name="illegal_pwd_invalid">密码不正确,请重试</string>
17 <string name="illegal_user_not_exist">Invalid Email</string> 17 <string name="illegal_user_not_exist">邮箱未注册</string>
18 <string name="invalid_email">Invalid Email</string> 18 <string name="invalid_email">请输入正确的邮箱</string>
19 <string name="login_fail">Login failed</string> 19 <string name="login_fail">登录失败</string>
20 <string name="signup_fail">Signup failed</string> 20 <string name="signup_fail">注册失败</string>
21 <string name="signup_success">Sign Up Successfully</string> 21 <string name="signup_success">注册成功</string>
22 <string name="gen_quick_acc_err">Login failed, please try again</string> 22 <string name="gen_quick_acc_err">登录失败,请重试</string>
23 <string name="quick_login_err">Login failed, please try again</string> 23 <string name="quick_login_err">登录失败,请重试</string>
24 <string name="net_error">Internet unavailable, please check</string> 24 <string name="net_error">网络无法连接,请查看网络设置</string>
25 25
26 <string-array name="payment_channel"> 26 <string-array name="payment_channel">
27 <item>微信支付</item> 27 <item>微信支付</item>
28 <item>支付宝</item> 28 <item>支付宝</item>
29 <item>银联支付</item> 29 <item>银联支付</item>
30 </string-array> 30 </string-array>
31 </resources> 31 </resources>
32