version3.3.12

修改asynctask阻塞问题修改文案修改push图标和色彩问题

version3.3.12
修改asynctask阻塞问题修改文案修改push图标和色彩问题
赵康
1 parent 99a0c40778
Showing 11 changed files with 20 additions and 16 deletions Side-by-side Diff
android/GameSDKRelease/AndroidManifest.xml
android/GameSDKRelease/libs/GameSDK_v3.3.11_proguard.jar
android/GameSDKRelease/libs/GameSDK_v3.3.12_proguard.jar
android/GameSDKRelease/res/drawable-hdpi/ic_launcher.png
android/GameSDKRelease/res/layout/custom_notification.xml
android/GameSDKRelease/res/values/strings.xml
android/GameSDKSample/lint.xml
android/GameSDKSample/res/drawable-hdpi/ic_launcher.png
android/GameSDKSample/res/drawable-mdpi/ic_launcher.png
android/GameSDKSample/res/drawable-xhdpi/gump_push_icon.png
android/GameSDKSample/res/drawable-xhdpi/ic_launcher.png
@@ -9,7 +9,7 @@
  
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher" >
+         >
     </application>
  
 </manifest>
 \ No newline at end of file
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?android:attr/colorBackground"
     android:paddingBottom="10dp"
     android:paddingTop="10dp" >
  
@@ -3,40 +3,40 @@
     <string name="user_name_hint">Email</string>
     <string name="password_hint">Password</string>
     <string name="quick_login">Play(%sS)</string>
-    <string name="quick_play">Guest Play</string>
+    <string name="quick_play">Play as Guest</string>
     <string name="login">Login</string>
     <string name="signup">Signup</string>
-    <string name="bind">Bound to email</string>
+    <string name="bind">Bind your email</string>
     <string name="loading">Loading</string>
-    <string name="loging">Loding...</string>
-    <string name="switch_user">Switching accounts</string>
+    <string name="loging">Loading...</string>
+    <string name="switch_user">Switch Account</string>
     <!-- toast -->
     <string name="illegal_uname_tip">Invalid Email</string>
     <string name="illegal_pwd_tip">Invalid Password (6–20 characters).</string>
-    <string name="illegal_user_exist">Email has already used</string>
-    <string name="illegal_pwd_invalid">Password is incorrect. Please try again.</string>
+    <string name="illegal_user_exist">Email has already been used</string>
+    <string name="illegal_pwd_invalid">Incorrect password. Please try again.</string>
     <string name="illegal_user_not_exist">Invalid Email</string>
     <string name="invalid_email">Invalid Email</string>
-    <string name="login_fail">Login failed</string>
-    <string name="signup_fail">Signup failed</string>
-    <string name="bind_fail">Bound failed</string>
-    <string name="net_error">Internet unavailable, please check</string>
+    <string name="login_fail">Login Failed</string>
+    <string name="signup_fail">Signup Failed</string>
+    <string name="bind_fail">Bind Failed</string>
+    <string name="net_error">No Internet connection.</string>
     <string name="gump_login">Login</string>
     <string name="vk_login">Login with VK</string>
     <string name="fb_login">Login with Facebook</string>
-    <string name="signup_success">Sign Up Successfully</string>
+    <string name="signup_success">Sign Up Succeeded</string>
     <string name="gen_quick_acc_err">Login failed, please try again</string>
     <string name="quick_login_err">Login failed, please try again</string>
     <!-- 修改密码 -->
     <string name="old_pwd">Current Password</string>
     <string name="new_pwd">New Password</string>
     <string name="mod_pwd">Change Password</string>
-    <string name="cant_change_unknown">Reset fail, please contact customer service</string>
+    <string name="cant_change_unknown">Reset failed, please contact customer service</string>
     <string name="submit">Confirm</string>
     <string name="reset">Reset</string>
     <string name="reset_intro">Current password isn’t required when reset password</string>
     <string name="mod_pwd_success">Succeed</string>
-    <string name="mail_sent_success">An email has been sent to you, please follow the instructions in the email.</string>
+    <string name="mail_sent_success">An Email has been sent to you, please follow the instructions in the Email.</string>
  
     <!-- 支付相关 -->
  
@@ -77,12 +77,12 @@
     <string name="mol_card_hint">Card No.</string>
     <string name="mol_pass_hint">Password</string>
     <string name="pay_ok">OK</string>
-    <string name="pay_error">Charging Failed, please try again.</string>
+    <string name="pay_error">Recharge failed, please try again.</string>
     <string name="card_input_tip">Card information</string>
     <string name="amount_choice_tip">Please select the amount</string>
  
     <!-- paypal -->
-    <string name="paypal_amount_hint">Please enter the payment amount (Integer between %s to 10000)</string>
+    <string name="paypal_amount_hint">Please enter the amount (Integer between %s to 10000)</string>
     <string name="paypal_choice_tip">Please select the amount</string>
     <!-- gp -->
     <string name="gp_choice_tip">Please select the amount</string>
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>
 \ No newline at end of file
...	...	@@ -9,7 +9,7 @@
9	9
10	10	<application
11	11	android:allowBackup="true"
12		- android:icon="@drawable/ic_launcher" >
	12	+ >
13	13	</application>
14	14
15	15	</manifest>
16	16	\ No newline at end of file
...	...	@@ -2,6 +2,7 @@
2	2	<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3	3	android:layout_width="match_parent"
4	4	android:layout_height="match_parent"
	5	+ android:background="?android:attr/colorBackground"
5	6	android:paddingBottom="10dp"
6	7	android:paddingTop="10dp" >
7	8
...	...	@@ -3,40 +3,40 @@
3	3	<string name="user_name_hint">Email</string>
4	4	<string name="password_hint">Password</string>
5	5	<string name="quick_login">Play(%sS)</string>
6		- <string name="quick_play">Guest Play</string>
	6	+ <string name="quick_play">Play as Guest</string>
7	7	<string name="login">Login</string>
8	8	<string name="signup">Signup</string>
9		- <string name="bind">Bound to email</string>
	9	+ <string name="bind">Bind your email</string>
10	10	<string name="loading">Loading</string>
11		- <string name="loging">Loding...</string>
12		- <string name="switch_user">Switching accounts</string>
	11	+ <string name="loging">Loading...</string>
	12	+ <string name="switch_user">Switch Account</string>
13	13	<!-- toast -->
14	14	<string name="illegal_uname_tip">Invalid Email</string>
15	15	<string name="illegal_pwd_tip">Invalid Password (6–20 characters).</string>
16		- <string name="illegal_user_exist">Email has already used</string>
17		- <string name="illegal_pwd_invalid">Password is incorrect. Please try again.</string>
	16	+ <string name="illegal_user_exist">Email has already been used</string>
	17	+ <string name="illegal_pwd_invalid">Incorrect password. Please try again.</string>
18	18	<string name="illegal_user_not_exist">Invalid Email</string>
19	19	<string name="invalid_email">Invalid Email</string>
20		- <string name="login_fail">Login failed</string>
21		- <string name="signup_fail">Signup failed</string>
22		- <string name="bind_fail">Bound failed</string>
23		- <string name="net_error">Internet unavailable, please check</string>
	20	+ <string name="login_fail">Login Failed</string>
	21	+ <string name="signup_fail">Signup Failed</string>
	22	+ <string name="bind_fail">Bind Failed</string>
	23	+ <string name="net_error">No Internet connection.</string>
24	24	<string name="gump_login">Login</string>
25	25	<string name="vk_login">Login with VK</string>
26	26	<string name="fb_login">Login with Facebook</string>
27		- <string name="signup_success">Sign Up Successfully</string>
	27	+ <string name="signup_success">Sign Up Succeeded</string>
28	28	<string name="gen_quick_acc_err">Login failed, please try again</string>
29	29	<string name="quick_login_err">Login failed, please try again</string>
30	30	<!-- 修改密码 -->
31	31	<string name="old_pwd">Current Password</string>
32	32	<string name="new_pwd">New Password</string>
33	33	<string name="mod_pwd">Change Password</string>
34		- <string name="cant_change_unknown">Reset fail, please contact customer service</string>
	34	+ <string name="cant_change_unknown">Reset failed, please contact customer service</string>
35	35	<string name="submit">Confirm</string>
36	36	<string name="reset">Reset</string>
37	37	<string name="reset_intro">Current password isn’t required when reset password</string>
38	38	<string name="mod_pwd_success">Succeed</string>
39		- <string name="mail_sent_success">An email has been sent to you, please follow the instructions in the email.</string>
	39	+ <string name="mail_sent_success">An Email has been sent to you, please follow the instructions in the Email.</string>
40	40
41	41	<!-- 支付相关 -->
42	42
...	...	@@ -77,12 +77,12 @@
77	77	<string name="mol_card_hint">Card No.</string>
78	78	<string name="mol_pass_hint">Password</string>
79	79	<string name="pay_ok">OK</string>
80		- <string name="pay_error">Charging Failed, please try again.</string>
	80	+ <string name="pay_error">Recharge failed, please try again.</string>
81	81	<string name="card_input_tip">Card information</string>
82	82	<string name="amount_choice_tip">Please select the amount</string>
83	83
84	84	<!-- paypal -->
85		- <string name="paypal_amount_hint">Please enter the payment amount (Integer between %s to 10000)</string>
	85	+ <string name="paypal_amount_hint">Please enter the amount (Integer between %s to 10000)</string>
86	86	<string name="paypal_choice_tip">Please select the amount</string>
87	87	<!-- gp -->
88	88	<string name="gp_choice_tip">Please select the amount</string>
...	...	@@ -0,0 +1,3 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<lint>
	3	+</lint>
0	4	\ No newline at end of file