Commit 0c0fa22f136a18fd780ac09590035fde89d5217f
1 parent
99a0c40778
Exists in
master
version3.3.12
修改asynctask阻塞问题 修改文案 修改push图标和色彩问题
Showing 11 changed files with 20 additions and 16 deletions Inline 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
android/GameSDKRelease/AndroidManifest.xml
1 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" | 1 | <manifest xmlns:android="http://schemas.android.com/apk/res/android" |
2 | package="com.facebook.android" | 2 | package="com.facebook.android" |
3 | android:versionCode="1" | 3 | android:versionCode="1" |
4 | android:versionName="1.0" > | 4 | android:versionName="1.0" > |
5 | 5 | ||
6 | <uses-sdk | 6 | <uses-sdk |
7 | android:minSdkVersion="8" | 7 | android:minSdkVersion="8" |
8 | android:targetSdkVersion="19" /> | 8 | android:targetSdkVersion="19" /> |
9 | 9 | ||
10 | <application | 10 | <application |
11 | android:allowBackup="true" | 11 | android:allowBackup="true" |
12 | android:icon="@drawable/ic_launcher" > | 12 | > |
13 | </application> | 13 | </application> |
14 | 14 | ||
15 | </manifest> | 15 | </manifest> |
android/GameSDKRelease/libs/GameSDK_v3.3.11_proguard.jar
No preview for this file type
android/GameSDKRelease/libs/GameSDK_v3.3.12_proguard.jar
No preview for this file type
android/GameSDKRelease/res/drawable-hdpi/ic_launcher.png
9.18 KB
android/GameSDKRelease/res/layout/custom_notification.xml
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | <RelativeLayout 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="match_parent" | 4 | android:layout_height="match_parent" |
5 | android:background="?android:attr/colorBackground" | ||
5 | android:paddingBottom="10dp" | 6 | android:paddingBottom="10dp" |
6 | android:paddingTop="10dp" > | 7 | android:paddingTop="10dp" > |
7 | 8 | ||
8 | <ImageView | 9 | <ImageView |
9 | android:id="@+id/icon" | 10 | android:id="@+id/icon" |
10 | android:layout_width="43dp" | 11 | android:layout_width="43dp" |
11 | android:layout_height="43dp" | 12 | android:layout_height="43dp" |
12 | android:layout_centerVertical="true" | 13 | android:layout_centerVertical="true" |
13 | android:layout_marginLeft="10dp" | 14 | android:layout_marginLeft="10dp" |
14 | android:scaleType="fitXY" /> | 15 | android:scaleType="fitXY" /> |
15 | 16 | ||
16 | <LinearLayout | 17 | <LinearLayout |
17 | android:layout_width="wrap_content" | 18 | android:layout_width="wrap_content" |
18 | android:layout_height="wrap_content" | 19 | android:layout_height="wrap_content" |
19 | android:layout_centerVertical="true" | 20 | android:layout_centerVertical="true" |
20 | android:layout_marginLeft="15dp" | 21 | android:layout_marginLeft="15dp" |
21 | android:layout_toRightOf="@id/icon" | 22 | android:layout_toRightOf="@id/icon" |
22 | android:orientation="vertical" > | 23 | android:orientation="vertical" > |
23 | 24 | ||
24 | <TextView | 25 | <TextView |
25 | android:id="@+id/title" | 26 | android:id="@+id/title" |
26 | style="@style/NotificationTitle" | 27 | style="@style/NotificationTitle" |
27 | android:layout_width="wrap_content" | 28 | android:layout_width="wrap_content" |
28 | android:layout_height="wrap_content" | 29 | android:layout_height="wrap_content" |
29 | android:text="LEVEL PROMOTED TO GRADE 1" | 30 | android:text="LEVEL PROMOTED TO GRADE 1" |
30 | android:textSize="17sp" /> | 31 | android:textSize="17sp" /> |
31 | 32 | ||
32 | <TextView | 33 | <TextView |
33 | android:id="@+id/desc" | 34 | android:id="@+id/desc" |
34 | style="@style/NotificationText" | 35 | style="@style/NotificationText" |
35 | android:layout_width="wrap_content" | 36 | android:layout_width="wrap_content" |
36 | android:layout_height="wrap_content" | 37 | android:layout_height="wrap_content" |
37 | android:text="CLICK TO VIEW RANKING >" | 38 | android:text="CLICK TO VIEW RANKING >" |
38 | android:textSize="12sp" /> | 39 | android:textSize="12sp" /> |
39 | </LinearLayout> | 40 | </LinearLayout> |
40 | 41 | ||
41 | </RelativeLayout> | 42 | </RelativeLayout> |
android/GameSDKRelease/res/values/strings.xml
1 | <resources> | 1 | <resources> |
2 | 2 | ||
3 | <string name="user_name_hint">Email</string> | 3 | <string name="user_name_hint">Email</string> |
4 | <string name="password_hint">Password</string> | 4 | <string name="password_hint">Password</string> |
5 | <string name="quick_login">Play(%sS)</string> | 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 | <string name="login">Login</string> | 7 | <string name="login">Login</string> |
8 | <string name="signup">Signup</string> | 8 | <string name="signup">Signup</string> |
9 | <string name="bind">Bound to email</string> | 9 | <string name="bind">Bind your email</string> |
10 | <string name="loading">Loading</string> | 10 | <string name="loading">Loading</string> |
11 | <string name="loging">Loding...</string> | 11 | <string name="loging">Loading...</string> |
12 | <string name="switch_user">Switching accounts</string> | 12 | <string name="switch_user">Switch Account</string> |
13 | <!-- toast --> | 13 | <!-- toast --> |
14 | <string name="illegal_uname_tip">Invalid Email</string> | 14 | <string name="illegal_uname_tip">Invalid Email</string> |
15 | <string name="illegal_pwd_tip">Invalid Password (6–20 characters).</string> | 15 | <string name="illegal_pwd_tip">Invalid Password (6–20 characters).</string> |
16 | <string name="illegal_user_exist">Email has already used</string> | 16 | <string name="illegal_user_exist">Email has already been used</string> |
17 | <string name="illegal_pwd_invalid">Password is incorrect. Please try again.</string> | 17 | <string name="illegal_pwd_invalid">Incorrect password. Please try again.</string> |
18 | <string name="illegal_user_not_exist">Invalid Email</string> | 18 | <string name="illegal_user_not_exist">Invalid Email</string> |
19 | <string name="invalid_email">Invalid Email</string> | 19 | <string name="invalid_email">Invalid Email</string> |
20 | <string name="login_fail">Login failed</string> | 20 | <string name="login_fail">Login Failed</string> |
21 | <string name="signup_fail">Signup failed</string> | 21 | <string name="signup_fail">Signup Failed</string> |
22 | <string name="bind_fail">Bound failed</string> | 22 | <string name="bind_fail">Bind Failed</string> |
23 | <string name="net_error">Internet unavailable, please check</string> | 23 | <string name="net_error">No Internet connection.</string> |
24 | <string name="gump_login">Login</string> | 24 | <string name="gump_login">Login</string> |
25 | <string name="vk_login">Login with VK</string> | 25 | <string name="vk_login">Login with VK</string> |
26 | <string name="fb_login">Login with Facebook</string> | 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 | <string name="gen_quick_acc_err">Login failed, please try again</string> | 28 | <string name="gen_quick_acc_err">Login failed, please try again</string> |
29 | <string name="quick_login_err">Login failed, please try again</string> | 29 | <string name="quick_login_err">Login failed, please try again</string> |
30 | <!-- 修改密码 --> | 30 | <!-- 修改密码 --> |
31 | <string name="old_pwd">Current Password</string> | 31 | <string name="old_pwd">Current Password</string> |
32 | <string name="new_pwd">New Password</string> | 32 | <string name="new_pwd">New Password</string> |
33 | <string name="mod_pwd">Change Password</string> | 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 | <string name="submit">Confirm</string> | 35 | <string name="submit">Confirm</string> |
36 | <string name="reset">Reset</string> | 36 | <string name="reset">Reset</string> |
37 | <string name="reset_intro">Current password isn’t required when reset password</string> | 37 | <string name="reset_intro">Current password isn’t required when reset password</string> |
38 | <string name="mod_pwd_success">Succeed</string> | 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 | ||
43 | 43 | ||
44 | <!-- title --> | 44 | <!-- title --> |
45 | <string name="title_mycard">Mycard點數儲值</string> | 45 | <string name="title_mycard">Mycard點數儲值</string> |
46 | <string name="title_mycard_member">Mycard會員扣點</string> | 46 | <string name="title_mycard_member">Mycard會員扣點</string> |
47 | <string name="title_mycard_billing">Mycard Billing</string> | 47 | <string name="title_mycard_billing">Mycard Billing</string> |
48 | <string name="title_mol">MOLPoints Gift Card</string> | 48 | <string name="title_mol">MOLPoints Gift Card</string> |
49 | <string name="title_mol_wallet">MOLPoints E-Wallet</string> | 49 | <string name="title_mol_wallet">MOLPoints E-Wallet</string> |
50 | <string name="title_12call">12Call</string> | 50 | <string name="title_12call">12Call</string> |
51 | <string name="title_tm">True Money</string> | 51 | <string name="title_tm">True Money</string> |
52 | <string name="title_zest">Zest</string> | 52 | <string name="title_zest">Zest</string> |
53 | <string name="title_gp">Google play</string> | 53 | <string name="title_gp">Google play</string> |
54 | <string name="title_paypal">Paypal</string> | 54 | <string name="title_paypal">Paypal</string> |
55 | <string name="title_rixty">Rixty</string> | 55 | <string name="title_rixty">Rixty</string> |
56 | <string name="title_ngan">NganLoung</string> | 56 | <string name="title_ngan">NganLoung</string> |
57 | <string name="title_easy2pay">Easy2Pay</string> | 57 | <string name="title_easy2pay">Easy2Pay</string> |
58 | <string name="title_boa">BOACompra</string> | 58 | <string name="title_boa">BOACompra</string> |
59 | <string name="title_indomog_voucher">Indomog</string> | 59 | <string name="title_indomog_voucher">Indomog</string> |
60 | <string name="title_indomog_account">Indomog Account Balance</string> | 60 | <string name="title_indomog_account">Indomog Account Balance</string> |
61 | <string name="title_yandex">Yandex</string> | 61 | <string name="title_yandex">Yandex</string> |
62 | <string name="title_vnpt_vnp">VinaPhone</string> | 62 | <string name="title_vnpt_vnp">VinaPhone</string> |
63 | <string name="title_vnpt_vms">MobiFone</string> | 63 | <string name="title_vnpt_vms">MobiFone</string> |
64 | <string name="title_vnpt_onc">Oncash</string> | 64 | <string name="title_vnpt_onc">Oncash</string> |
65 | <string name="title_vnpt_fpt">FPT</string> | 65 | <string name="title_vnpt_fpt">FPT</string> |
66 | <string name="title_vnpt_vtt">Viettel</string> | 66 | <string name="title_vnpt_vtt">Viettel</string> |
67 | <string name="title_vnpt_mgc">MegaCard</string> | 67 | <string name="title_vnpt_mgc">MegaCard</string> |
68 | <string name="title_coda">Coda Payment</string> | 68 | <string name="title_coda">Coda Payment</string> |
69 | <string name="title_cherry">Cherry Credits</string> | 69 | <string name="title_cherry">Cherry Credits</string> |
70 | <string name="title_payment_choice">Select payment methods</string> | 70 | <string name="title_payment_choice">Select payment methods</string> |
71 | 71 | ||
72 | <!-- summary title --> | 72 | <!-- summary title --> |
73 | <string name="summary_title">Price list:</string> | 73 | <string name="summary_title">Price list:</string> |
74 | 74 | ||
75 | <!-- payment --> | 75 | <!-- payment --> |
76 | <string name="useranme_pattern">Account:%s</string> | 76 | <string name="useranme_pattern">Account:%s</string> |
77 | <string name="mol_card_hint">Card No.</string> | 77 | <string name="mol_card_hint">Card No.</string> |
78 | <string name="mol_pass_hint">Password</string> | 78 | <string name="mol_pass_hint">Password</string> |
79 | <string name="pay_ok">OK</string> | 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 | <string name="card_input_tip">Card information</string> | 81 | <string name="card_input_tip">Card information</string> |
82 | <string name="amount_choice_tip">Please select the amount</string> | 82 | <string name="amount_choice_tip">Please select the amount</string> |
83 | 83 | ||
84 | <!-- paypal --> | 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 | <string name="paypal_choice_tip">Please select the amount</string> | 86 | <string name="paypal_choice_tip">Please select the amount</string> |
87 | <!-- gp --> | 87 | <!-- gp --> |
88 | <string name="gp_choice_tip">Please select the amount</string> | 88 | <string name="gp_choice_tip">Please select the amount</string> |
89 | <!-- yandex --> | 89 | <!-- yandex --> |
90 | <string name="yandex_money">Yandex Money</string> | 90 | <string name="yandex_money">Yandex Money</string> |
91 | <string name="yandex_bank">Yandex Bank</string> | 91 | <string name="yandex_bank">Yandex Bank</string> |
92 | <string name="yandex_cash">Yandex Cash</string> | 92 | <string name="yandex_cash">Yandex Cash</string> |
93 | 93 | ||
94 | </resources> | 94 | </resources> |
android/GameSDKSample/lint.xml
File was created | 1 | <?xml version="1.0" encoding="UTF-8"?> | |
2 | <lint> | ||
3 | </lint> |
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
9.91 KB
android/GameSDKSample/res/drawable-xhdpi/ic_launcher.png