Commit bfd80f63f701e607e9342890e5de8d4644f98ed2

Authored by 赵康
1 parent f59eb10604
Exists in master

add pay method for overwrite

Showing 50 changed files with 346 additions and 228 deletions Side-by-side Diff

android/GameSDKRelease/libs/GameSDK2.2.2_proguard.jar
No preview for this file type
android/GameSDKRelease/libs/GameSDK_proguard_v2.0.1.jar
No preview for this file type
android/GameSDKRelease/res/drawable-hdpi/btn_orange_normal.png

1.33 KB

android/GameSDKRelease/res/drawable-hdpi/btn_orange_pressed.png

1.27 KB

android/GameSDKRelease/res/drawable-hdpi/ic_cancel_dark.png

1.08 KB | W: | H:

1.23 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
android/GameSDKRelease/res/drawable-hdpi/logo.png

4.1 KB

android/GameSDKRelease/res/drawable-hdpi/logo_e2p.png

12.2 KB

android/GameSDKRelease/res/drawable-hdpi/logo_indomog.png

8.48 KB

android/GameSDKRelease/res/drawable-hdpi/utype_fb.png

1.65 KB

android/GameSDKRelease/res/drawable-hdpi/utype_gump.png

3.41 KB

android/GameSDKRelease/res/drawable-hdpi/utype_quick.png

1.9 KB

android/GameSDKRelease/res/drawable-mdpi/btn_orange_normal.png

1.16 KB

android/GameSDKRelease/res/drawable-mdpi/btn_orange_pressed.png

1.13 KB

android/GameSDKRelease/res/drawable-mdpi/ic_cancel_dark.png

1.04 KB | W: | H:

1.07 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
android/GameSDKRelease/res/drawable-mdpi/logo.png

3.49 KB

android/GameSDKRelease/res/drawable-mdpi/logo_e2p.png

7.13 KB

android/GameSDKRelease/res/drawable-mdpi/logo_indomog.png

5.15 KB

android/GameSDKRelease/res/drawable-mdpi/utype_fb.png

1.41 KB

android/GameSDKRelease/res/drawable-mdpi/utype_gump.png

2.17 KB

android/GameSDKRelease/res/drawable-mdpi/utype_quick.png

1.52 KB

android/GameSDKRelease/res/drawable-nodpi/log.png

9.56 KB

android/GameSDKRelease/res/drawable-xhdpi/btn_orange_normal.png

1.44 KB

android/GameSDKRelease/res/drawable-xhdpi/btn_orange_pressed.png

1.39 KB

android/GameSDKRelease/res/drawable-xhdpi/ic_cancel_dark.png

1.15 KB | W: | H:

1.18 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
android/GameSDKRelease/res/drawable-xhdpi/logo.png

6.46 KB

android/GameSDKRelease/res/drawable-xhdpi/logo_e2p.png

21.1 KB

android/GameSDKRelease/res/drawable-xhdpi/logo_indomog.png

13.2 KB

android/GameSDKRelease/res/drawable-xhdpi/utype_fb.png

1.87 KB

android/GameSDKRelease/res/drawable-xhdpi/utype_gump.png

4.91 KB

android/GameSDKRelease/res/drawable-xhdpi/utype_quick.png

2.26 KB

android/GameSDKRelease/res/drawable/btn_light_gray_bg.xml
... ... @@ -0,0 +1,19 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<selector xmlns:android="http://schemas.android.com/apk/res/android">
  3 +
  4 + <item android:state_pressed="true"><shape>
  5 + <corners android:radius="3dp" />
  6 +
  7 + <solid android:color="@color/dark_gray" />
  8 +
  9 + <size android:height="30dp" />
  10 + </shape></item>
  11 + <item><shape>
  12 + <corners android:radius="3dp" />
  13 +
  14 + <solid android:color="@color/light_gray" />
  15 +
  16 + <size android:height="30dp" />
  17 + </shape></item>
  18 +
  19 +</selector>
0 20 \ No newline at end of file
android/GameSDKRelease/res/drawable/btn_orange_bg.xml
1 1 <?xml version="1.0" encoding="utf-8"?>
2 2 <selector xmlns:android="http://schemas.android.com/apk/res/android">
  3 +
  4 + <item android:state_pressed="true" android:drawable="@drawable/btn_orange_pressed"/>
  5 + <item android:drawable="@drawable/btn_orange_normal"/>
3 6  
4   - <item android:state_pressed="true">
5   - <shape android:shape="rectangle">
6   - <corners android:radius="3dp" />
  7 +<!-- <item android:state_pressed="true"> -->
  8 +<!-- <shape android:shape="rectangle"> -->
  9 +<!-- <corners android:radius="3dp" /> -->
7 10  
8   - <solid android:color="@color/orange_pressed" />
  11 +<!-- <solid android:color="@color/orange_pressed" /> -->
9 12  
10   - <size android:height="35dp" />
11   - </shape>
  13 +<!-- <size android:height="35dp" /> -->
  14 +<!-- </shape> -->
12 15  
13   - </item>
14   - <item>
15   - <shape android:shape="rectangle">
16   - <corners android:radius="3dp" />
  16 +<!-- </item> -->
  17 +<!-- <item> -->
  18 +<!-- <shape android:shape="rectangle"> -->
  19 +<!-- <corners android:radius="3dp" /> -->
17 20  
18   - <solid android:color="@color/orange_normal" />
  21 +<!-- <solid android:color="@color/orange_normal" /> -->
19 22  
20   - <size android:height="35dp" />
21   - </shape>
  23 +<!-- <size android:height="35dp" /> -->
  24 +<!-- </shape> -->
22 25  
23   - </item>
  26 +<!-- </item> -->
24 27  
25 28 </selector>
26 29 \ No newline at end of file
android/GameSDKRelease/res/drawable/dash_line.xml
... ... @@ -0,0 +1,10 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<shape xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:shape="line" >
  4 +
  5 + <stroke
  6 + android:dashGap="2dp"
  7 + android:dashWidth="4dp"
  8 + android:color="@color/line" />
  9 +
  10 +</shape>
0 11 \ No newline at end of file
android/GameSDKRelease/res/drawable/log.png

9.56 KB

android/GameSDKRelease/res/layout/fragment_bind.xml
... ... @@ -1,45 +0,0 @@
1   -<?xml version="1.0" encoding="utf-8"?>
2   -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3   - android:layout_width="wrap_content"
4   - android:layout_height="wrap_content"
5   - android:scrollbars="none" >
6   -
7   - <LinearLayout
8   - android:layout_width="wrap_content"
9   - android:layout_height="wrap_content"
10   - android:background="@android:color/white"
11   - android:minWidth="293dp"
12   - android:orientation="vertical" >
13   -
14   - <EditText
15   - android:id="@+id/username"
16   - android:layout_width="match_parent"
17   - android:layout_height="wrap_content"
18   - android:layout_margin="10dp"
19   - android:background="@drawable/et_bg"
20   - android:imeOptions="flagNoExtractUi"
21   - android:hint="@string/user_name_hint" />
22   -
23   - <EditText
24   - android:id="@+id/pwd"
25   - android:layout_width="match_parent"
26   - android:layout_height="wrap_content"
27   - android:layout_margin="10dp"
28   - android:background="@drawable/et_bg"
29   - android:imeOptions="flagNoExtractUi"
30   - android:hint="@string/password_hint"
31   - android:inputType="textPassword" />
32   -
33   - <Button
34   - android:id="@+id/bind"
35   - android:layout_width="match_parent"
36   - android:layout_height="wrap_content"
37   - android:layout_margin="8dp"
38   - android:background="@drawable/btn_orange_bg"
39   - android:padding="5dp"
40   - android:text="@string/bind"
41   - android:textColor="@android:color/white"
42   - android:textSize="16sp" />
43   - </LinearLayout>
44   -
45   -</ScrollView>
46 0 \ No newline at end of file
android/GameSDKRelease/res/layout/fragment_indomog.xml
... ... @@ -0,0 +1,87 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="fill_parent"
  4 + android:layout_height="match_parent"
  5 + android:background="@color/payment_common_bg" >
  6 +
  7 + <LinearLayout
  8 + android:layout_width="match_parent"
  9 + android:layout_height="wrap_content"
  10 + android:minWidth="293dp"
  11 + android:orientation="vertical" >
  12 +
  13 + <TextView
  14 + android:layout_width="match_parent"
  15 + android:layout_height="wrap_content"
  16 + android:background="@drawable/header_tip_bg"
  17 + android:gravity="center_vertical"
  18 + android:paddingLeft="10dp"
  19 + android:text="@string/card_input_tip"
  20 + android:textColor="@color/black_text" />
  21 +
  22 + <LinearLayout
  23 + android:id="@+id/card_input_layout"
  24 + android:layout_width="match_parent"
  25 + android:layout_height="wrap_content"
  26 + android:layout_marginLeft="13dp"
  27 + android:layout_marginRight="13dp"
  28 + android:layout_marginTop="10dp"
  29 + android:orientation="vertical" >
  30 +
  31 + <EditText
  32 + android:id="@+id/card_no"
  33 + android:layout_width="match_parent"
  34 + android:layout_height="wrap_content"
  35 + android:background="@drawable/et_bg"
  36 + android:hint="@string/mol_card_hint" />
  37 + </LinearLayout>
  38 +
  39 + <Button
  40 + android:id="@+id/start_pay"
  41 + android:layout_width="match_parent"
  42 + android:layout_height="wrap_content"
  43 + android:layout_marginLeft="13dp"
  44 + android:layout_marginRight="13dp"
  45 + android:layout_marginTop="16dp"
  46 + android:background="@drawable/btn_orange_bg"
  47 + android:text="@string/pay_ok"
  48 + android:textColor="@android:color/white"
  49 + android:textSize="16sp" />
  50 +
  51 + <Button
  52 + android:id="@+id/wallet"
  53 + android:layout_width="match_parent"
  54 + android:layout_height="wrap_content"
  55 + android:layout_marginBottom="15dp"
  56 + android:layout_marginLeft="13dp"
  57 + android:layout_marginRight="13dp"
  58 + android:layout_marginTop="10dp"
  59 + android:background="@drawable/btn_wallet_bg"
  60 + android:text="@string/title_indomog_account"
  61 + android:textSize="15sp" />
  62 +
  63 + <TextView
  64 + android:id="@+id/summary_title"
  65 + android:layout_width="match_parent"
  66 + android:layout_height="wrap_content"
  67 + android:layout_marginLeft="13dp"
  68 + android:layout_marginRight="13dp"
  69 + android:background="@color/summary_bg"
  70 + android:paddingLeft="10dp"
  71 + android:textColor="@color/black_text"
  72 + android:textSize="12sp" />
  73 +
  74 + <TextView
  75 + android:id="@+id/summary"
  76 + android:layout_width="match_parent"
  77 + android:layout_height="wrap_content"
  78 + android:layout_marginBottom="10dp"
  79 + android:layout_marginLeft="13dp"
  80 + android:layout_marginRight="13dp"
  81 + android:background="@color/summary_bg"
  82 + android:padding="10dp"
  83 + android:textColor="@color/black_text"
  84 + android:textSize="11sp" />
  85 + </LinearLayout>
  86 +
  87 +</ScrollView>
0 88 \ No newline at end of file
android/GameSDKRelease/res/layout/fragment_mol.xml
... ... @@ -1,94 +0,0 @@
1   -<?xml version="1.0" encoding="utf-8"?>
2   -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
3   - android:layout_width="fill_parent"
4   - android:layout_height="match_parent"
5   - android:background="@color/payment_common_bg" >
6   -
7   - <LinearLayout
8   - android:layout_width="match_parent"
9   - android:layout_height="wrap_content"
10   - android:orientation="vertical" >
11   -
12   - <TextView
13   - android:layout_width="match_parent"
14   - android:layout_height="wrap_content"
15   - android:background="@drawable/header_tip_bg"
16   - android:gravity="center_vertical"
17   - android:paddingLeft="10dp"
18   - android:text="@string/card_input_tip"
19   - android:textColor="@color/black_text" />
20   -
21   - <LinearLayout
22   - android:id="@+id/card_input_layout"
23   - android:layout_width="match_parent"
24   - android:layout_height="wrap_content"
25   - android:layout_marginLeft="13dp"
26   - android:layout_marginRight="13dp"
27   - android:layout_marginTop="10dp"
28   - android:orientation="vertical" >
29   -
30   - <EditText
31   - android:id="@+id/card_no"
32   - android:layout_width="match_parent"
33   - android:layout_height="wrap_content"
34   - android:background="@drawable/et_bg"
35   - android:hint="@string/mol_card_hint" />
36   -
37   - <EditText
38   - android:id="@+id/card_pwd"
39   - android:layout_width="match_parent"
40   - android:layout_height="wrap_content"
41   - android:layout_marginTop="13dp"
42   - android:background="@drawable/et_bg"
43   - android:hint="@string/mol_pass_hint" />
44   - </LinearLayout>
45   -
46   - <Button
47   - android:id="@+id/start_pay"
48   - android:layout_width="match_parent"
49   - android:layout_height="wrap_content"
50   - android:layout_marginLeft="13dp"
51   - android:layout_marginRight="13dp"
52   - android:layout_marginTop="16dp"
53   - android:background="@drawable/btn_orange_bg"
54   - android:text="@string/pay_ok"
55   - android:textColor="@android:color/white"
56   - android:textSize="16sp" />
57   -
58   - <Button
59   - android:id="@+id/wallet"
60   - android:layout_width="match_parent"
61   - android:layout_height="wrap_content"
62   - android:layout_marginBottom="15dp"
63   - android:layout_marginLeft="13dp"
64   - android:layout_marginRight="13dp"
65   - android:layout_marginTop="10dp"
66   - android:background="@drawable/btn_wallet_bg"
67   - android:text="@string/title_mol_wallet"
68   - android:textSize="15sp" />
69   -
70   - <TextView
71   - android:id="@+id/summary_title"
72   - android:layout_width="match_parent"
73   - android:layout_height="wrap_content"
74   - android:layout_marginLeft="13dp"
75   - android:layout_marginRight="13dp"
76   - android:background="@color/summary_bg"
77   - android:paddingLeft="10dp"
78   - android:textColor="@color/black_text"
79   - android:textSize="12sp" />
80   -
81   - <TextView
82   - android:id="@+id/summary"
83   - android:layout_width="match_parent"
84   - android:layout_height="wrap_content"
85   - android:layout_marginBottom="10dp"
86   - android:layout_marginLeft="13dp"
87   - android:layout_marginRight="13dp"
88   - android:background="@color/summary_bg"
89   - android:padding="10dp"
90   - android:textColor="@color/black_text"
91   - android:textSize="11sp" />
92   - </LinearLayout>
93   -
94   -</ScrollView>
95 0 \ No newline at end of file
android/GameSDKRelease/res/layout/fragment_mol_point.xml
... ... @@ -0,0 +1,94 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
  3 + android:layout_width="fill_parent"
  4 + android:layout_height="match_parent"
  5 + android:background="@color/payment_common_bg" >
  6 +
  7 + <LinearLayout
  8 + android:layout_width="match_parent"
  9 + android:layout_height="wrap_content"
  10 + android:orientation="vertical" >
  11 +
  12 + <TextView
  13 + android:layout_width="match_parent"
  14 + android:layout_height="wrap_content"
  15 + android:background="@drawable/header_tip_bg"
  16 + android:gravity="center_vertical"
  17 + android:paddingLeft="10dp"
  18 + android:text="@string/card_input_tip"
  19 + android:textColor="@color/black_text" />
  20 +
  21 + <LinearLayout
  22 + android:id="@+id/card_input_layout"
  23 + android:layout_width="match_parent"
  24 + android:layout_height="wrap_content"
  25 + android:layout_marginLeft="13dp"
  26 + android:layout_marginRight="13dp"
  27 + android:layout_marginTop="10dp"
  28 + android:orientation="vertical" >
  29 +
  30 + <EditText
  31 + android:id="@+id/card_no"
  32 + android:layout_width="match_parent"
  33 + android:layout_height="wrap_content"
  34 + android:background="@drawable/et_bg"
  35 + android:hint="@string/mol_card_hint" />
  36 +
  37 + <EditText
  38 + android:id="@+id/card_pwd"
  39 + android:layout_width="match_parent"
  40 + android:layout_height="wrap_content"
  41 + android:layout_marginTop="13dp"
  42 + android:background="@drawable/et_bg"
  43 + android:hint="@string/mol_pass_hint" />
  44 + </LinearLayout>
  45 +
  46 + <Button
  47 + android:id="@+id/start_pay"
  48 + android:layout_width="match_parent"
  49 + android:layout_height="wrap_content"
  50 + android:layout_marginLeft="13dp"
  51 + android:layout_marginRight="13dp"
  52 + android:layout_marginTop="16dp"
  53 + android:background="@drawable/btn_orange_bg"
  54 + android:text="@string/pay_ok"
  55 + android:textColor="@android:color/white"
  56 + android:textSize="16sp" />
  57 +
  58 + <Button
  59 + android:id="@+id/wallet"
  60 + android:layout_width="match_parent"
  61 + android:layout_height="wrap_content"
  62 + android:layout_marginBottom="15dp"
  63 + android:layout_marginLeft="13dp"
  64 + android:layout_marginRight="13dp"
  65 + android:layout_marginTop="10dp"
  66 + android:background="@drawable/btn_wallet_bg"
  67 + android:text="@string/title_mol_wallet"
  68 + android:textSize="15sp" />
  69 +
  70 + <TextView
  71 + android:id="@+id/summary_title"
  72 + android:layout_width="match_parent"
  73 + android:layout_height="wrap_content"
  74 + android:layout_marginLeft="13dp"
  75 + android:layout_marginRight="13dp"
  76 + android:background="@color/summary_bg"
  77 + android:paddingLeft="10dp"
  78 + android:textColor="@color/black_text"
  79 + android:textSize="12sp" />
  80 +
  81 + <TextView
  82 + android:id="@+id/summary"
  83 + android:layout_width="match_parent"
  84 + android:layout_height="wrap_content"
  85 + android:layout_marginBottom="10dp"
  86 + android:layout_marginLeft="13dp"
  87 + android:layout_marginRight="13dp"
  88 + android:background="@color/summary_bg"
  89 + android:padding="10dp"
  90 + android:textColor="@color/black_text"
  91 + android:textSize="11sp" />
  92 + </LinearLayout>
  93 +
  94 +</ScrollView>
0 95 \ No newline at end of file
android/GameSDKRelease/res/layout/fragment_payment_choice.xml
... ... @@ -54,6 +54,28 @@
54 54 android:layout_marginRight="45dp"
55 55 android:src="@drawable/arrow_tag" />
56 56 </RelativeLayout>
  57 + <RelativeLayout
  58 + android:id="@+id/item_mol_point"
  59 + android:layout_width="match_parent"
  60 + android:layout_height="wrap_content"
  61 + android:background="@drawable/payment_bg"
  62 + android:visibility="gone" >
  63 +
  64 + <ImageView
  65 + android:layout_width="wrap_content"
  66 + android:layout_height="wrap_content"
  67 + android:layout_centerVertical="true"
  68 + android:layout_marginLeft="10dp"
  69 + android:src="@drawable/logo_mol" />
  70 +
  71 + <ImageView
  72 + android:layout_width="wrap_content"
  73 + android:layout_height="wrap_content"
  74 + android:layout_alignParentRight="true"
  75 + android:layout_centerVertical="true"
  76 + android:layout_marginRight="45dp"
  77 + android:src="@drawable/arrow_tag" />
  78 + </RelativeLayout>
57 79  
58 80 <RelativeLayout
59 81 android:id="@+id/item_12call"
... ... @@ -228,7 +250,7 @@
228 250 android:layout_height="wrap_content"
229 251 android:layout_centerVertical="true"
230 252 android:layout_marginLeft="10dp"
231   - android:src="@drawable/logo_gp" />
  253 + android:src="@drawable/logo_e2p" />
232 254  
233 255 <ImageView
234 256 android:layout_width="wrap_content"
... ... @@ -251,7 +273,29 @@
251 273 android:layout_height="wrap_content"
252 274 android:layout_centerVertical="true"
253 275 android:layout_marginLeft="10dp"
254   - android:src="@drawable/logo_gp" />
  276 + android:src="@drawable/logo_e2p" />
  277 +
  278 + <ImageView
  279 + android:layout_width="wrap_content"
  280 + android:layout_height="wrap_content"
  281 + android:layout_alignParentRight="true"
  282 + android:layout_centerVertical="true"
  283 + android:layout_marginRight="45dp"
  284 + android:src="@drawable/arrow_tag" />
  285 + </RelativeLayout>
  286 + <RelativeLayout
  287 + android:id="@+id/item_indomog"
  288 + android:layout_width="match_parent"
  289 + android:layout_height="wrap_content"
  290 + android:background="@drawable/payment_bg"
  291 + android:visibility="gone" >
  292 +
  293 + <ImageView
  294 + android:layout_width="wrap_content"
  295 + android:layout_height="wrap_content"
  296 + android:layout_centerVertical="true"
  297 + android:layout_marginLeft="10dp"
  298 + android:src="@drawable/logo_indomog" />
255 299  
256 300 <ImageView
257 301 android:layout_width="wrap_content"
android/GameSDKRelease/res/layout/fragment_rixty.xml
... ... @@ -1,39 +0,0 @@
1   -<?xml version="1.0" encoding="utf-8"?>
2   -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3   - android:layout_width="match_parent"
4   - android:layout_height="match_parent"
5   - android:background="@color/payment_common_bg"
6   - android:orientation="vertical" >
7   -
8   - <Button
9   - android:id="@+id/start_pay"
10   - android:layout_width="match_parent"
11   - android:layout_height="wrap_content"
12   - android:layout_margin="13dp"
13   - android:background="@drawable/btn_orange_bg"
14   - android:text="@string/pay_ok"
15   - android:textColor="@android:color/white" />
16   -
17   - <TextView
18   - android:id="@+id/summary_title"
19   - android:layout_width="match_parent"
20   - android:layout_height="wrap_content"
21   - android:layout_marginLeft="13dp"
22   - android:layout_marginRight="13dp"
23   - android:background="@color/summary_bg"
24   - android:paddingLeft="10dp"
25   - android:textColor="@color/black_text"
26   - android:textSize="12sp" />
27   -
28   - <TextView
29   - android:id="@+id/summary"
30   - android:layout_width="match_parent"
31   - android:layout_height="wrap_content"
32   - android:layout_marginLeft="13dp"
33   - android:layout_marginRight="13dp"
34   - android:background="@color/summary_bg"
35   - android:padding="10dp"
36   - android:textColor="@color/black_text"
37   - android:textSize="11sp" />
38   -
39   -</LinearLayout>
40 0 \ No newline at end of file
android/GameSDKRelease/res/layout/fragment_sign_choice.xml
... ... @@ -4,19 +4,49 @@
4 4 android:layout_height="match_parent"
5 5 android:orientation="vertical" >
6 6  
  7 + <LinearLayout
  8 + android:layout_width="match_parent"
  9 + android:layout_height="wrap_content"
  10 + android:layout_marginTop="13dp"
  11 + android:gravity="center_horizontal"
  12 + android:orientation="horizontal" >
  13 +
  14 + <ImageView
  15 + android:id="@+id/utype_tag"
  16 + android:layout_width="25dp"
  17 + android:layout_height="25dp"
  18 + android:layout_marginRight="8dp"
  19 + android:src="@drawable/utype_quick" />
  20 +
  21 + <TextView
  22 + android:id="@+id/tv_nick"
  23 + android:layout_width="wrap_content"
  24 + android:layout_height="wrap_content"
  25 + android:layout_gravity="center_vertical"
  26 + android:textColor="@color/black_text"
  27 + android:textSize="15sp"
  28 + android:textStyle="bold" />
  29 + </LinearLayout>
  30 +
7 31 <Button
8   - android:id="@+id/quick"
  32 + android:id="@+id/play"
9 33 android:layout_width="fill_parent"
10   - android:layout_height="36dp"
  34 + android:layout_height="46dp"
  35 + android:layout_marginBottom="10dp"
11 36 android:layout_marginLeft="13dp"
12 37 android:layout_marginRight="13dp"
13   - android:layout_marginTop="16dp"
  38 + android:layout_marginTop="23dp"
14 39 android:background="@drawable/btn_orange_bg"
15 40 android:padding="5dp"
16   - android:text="@string/quick_login"
  41 + android:text="Play"
17 42 android:textColor="@android:color/white"
18 43 android:textSize="16sp" />
19 44  
  45 + <View
  46 + android:layout_width="fill_parent"
  47 + android:layout_height="2dp"
  48 + android:background="@drawable/dash_line" />
  49 +
20 50 <com.facebook.widget.LoginButton
21 51 android:id="@+id/fb_login"
22 52 android:layout_width="fill_parent"
... ... @@ -25,15 +55,18 @@
25 55 android:layout_marginRight="13dp"
26 56 android:layout_marginTop="10dp" />
27 57  
28   - <TextView
  58 + <Button
29 59 android:id="@+id/gump_login"
30 60 android:layout_width="fill_parent"
31   - android:layout_height="wrap_content"
32   - android:layout_marginTop="16dp"
33   - android:layout_marginBottom="10dp"
34   - android:textSize="11sp"
  61 + android:layout_height="40dp"
  62 + android:layout_marginBottom="15dp"
  63 + android:layout_marginLeft="13dp"
  64 + android:layout_marginRight="13dp"
  65 + android:layout_marginTop="8dp"
  66 + android:background="@drawable/btn_light_gray_bg"
35 67 android:gravity="center"
36   - android:textColor="@color/com_facebook_blue"
37   - android:text="Gumptech login>>" />
  68 + android:text="@string/gump_login"
  69 + android:textColor="@android:color/white"
  70 + android:textSize="15sp" />
38 71  
39 72 </LinearLayout>
40 73 \ No newline at end of file
android/GameSDKRelease/res/layout/title.xml
... ... @@ -7,10 +7,11 @@
7 7 <ImageView
8 8 android:id="@+id/btn_back"
9 9 android:layout_width="wrap_content"
10   - android:layout_height="wrap_content"
  10 + android:layout_height="match_parent"
11 11 android:layout_alignParentLeft="true"
12 12 android:layout_centerVertical="true"
13   - android:layout_marginLeft="10dp"
  13 + android:paddingLeft="10dp"
  14 + android:paddingRight="10dp"
14 15 android:src="@drawable/ic_back_dark" />
15 16  
16 17 <TextView
... ... @@ -28,7 +29,7 @@
28 29 android:layout_width="wrap_content"
29 30 android:layout_height="30dp"
30 31 android:layout_centerInParent="true"
31   - android:src="@drawable/log" />
  32 + android:src="@drawable/logo" />
32 33  
33 34 <TextView
34 35 android:id="@+id/title"
... ... @@ -41,10 +42,10 @@
41 42 <ImageView
42 43 android:id="@+id/btn_cancel"
43 44 android:layout_width="wrap_content"
44   - android:layout_height="wrap_content"
  45 + android:layout_height="match_parent"
45 46 android:layout_alignParentRight="true"
46 47 android:layout_centerVertical="true"
47   - android:layout_margin="10dp"
  48 + android:padding="10dp"
48 49 android:src="@drawable/ic_cancel_dark" />
49 50  
50 51 <View
android/GameSDKRelease/res/values-pt/strings.xml
... ... @@ -3,7 +3,6 @@
3 3 <string name="app_name">LoginSDK</string>
4 4 <string name="user_name_hint">Email</string>
5 5 <string name="password_hint">Senha</string>
6   - <string name="quick_login">Jogar Agora</string>
7 6 <string name="login">Login</string>
8 7 <string name="signup">Registrar</string>
9 8 <string name="bind">Vincular ao email</string>
android/GameSDKRelease/res/values-th/strings.xml
... ... @@ -3,7 +3,6 @@
3 3 <string name="app_name">LoginSDK</string>
4 4 <string name="user_name_hint">อีเมลล์</string>
5 5 <string name="password_hint">พาสเวิร์ด</string>
6   - <string name="quick_login">เริ่มเล่น</string>
7 6 <string name="login">ล็อกอิน</string>
8 7 <string name="signup">ลงทะเบียน</string>
9 8 <string name="bind">ผูกอีเมลล์</string>
... ... @@ -18,11 +17,13 @@
18 17 <string name="login_fail">ล็อกอินผิดพลาด</string>
19 18 <string name="signup_fail">ลงทะเบียนไม่สำเร็จ</string>
20 19 <string name="bind_fail">ผูกอีเมลล์ไม่สำเร็จ</string>
  20 + <string name="signup_success">สำเร็จ</string>
21 21 <!-- facebook id -->
22 22 <!-- payment -->
23 23 <string name="title_payment_choice">เลือกช่องทางชำระเงิน</string>
24 24 <!-- summary title -->
25 25 <string name="summary_title">ตารางแลกเปลี่ยน:</string>
  26 +
26 27 <string name="useranme_pattern">ชื่อผู้ใช้:%s</string>
27 28 <!-- <string name="mol_channel_title">เลือกช่องทางชำระเงิน</string> -->
28 29 <string name="mol_card_hint">กรุณากรอกรหัสบัตร</string>
android/GameSDKRelease/res/values-zh-rTW/strings.xml
... ... @@ -3,7 +3,6 @@
3 3 <string name="app_name">LoginSDK</string>
4 4 <string name="user_name_hint">郵箱</string>
5 5 <string name="password_hint">密碼</string>
6   - <string name="quick_login">一鍵進入</string>
7 6 <string name="login">登錄</string>
8 7 <string name="signup">註冊</string>
9 8 <string name="bind">綁定郵箱</string>
android/GameSDKRelease/res/values-zh/strings.xml
... ... @@ -3,7 +3,6 @@
3 3 <string name="app_name">LoginSDK</string>
4 4 <string name="user_name_hint">邮箱</string>
5 5 <string name="password_hint">密码</string>
6   - <string name="quick_login">一键进入</string>
7 6 <string name="login">登录</string>
8 7 <string name="signup">注册</string>
9 8 <string name="bind">绑定邮箱</string>
android/GameSDKRelease/res/values/colors.xml
... ... @@ -2,6 +2,8 @@
2 2 <resources>
3 3  
4 4 <color name="line">#e5e5e5</color>
  5 + <color name="light_gray">#c9c9c9</color>
  6 + <color name="dark_gray">#d9d9d9</color>
5 7 <color name="orange_normal">#fe5f27</color>
6 8 <color name="orange_pressed">#fe0000</color>
7 9 <color name="black_text">#3f3c38</color>
android/GameSDKRelease/res/values/strings.xml
... ... @@ -3,7 +3,8 @@
3 3 <string name="app_name">LoginSDK</string>
4 4 <string name="user_name_hint">Email</string>
5 5 <string name="password_hint">Password</string>
6   - <string name="quick_login">Play Now</string>
  6 + <string name="quick_login">Play(%sS)</string>
  7 + <string name="quick_play">Play</string>
7 8 <string name="login">Login</string>
8 9 <string name="signup">Signup</string>
9 10 <string name="bind">Bound to email</string>
... ... @@ -20,7 +21,8 @@
20 21 <string name="signup_fail">Signup failed</string>
21 22 <string name="bind_fail">Bound failed</string>
22 23 <string name="net_error">Internet unavailable, please check</string>
23   -
  24 + <string name="gump_login">Login with Gumptech</string>
  25 + <string name="signup_success">Sign Up Successfully</string>
24 26 <!-- facebook -->
25 27 <string name="com_facebook_dialogloginactivity_ok_button">OK</string>
26 28 <string name="com_facebook_loginview_log_out_button">Log out</string>
... ... @@ -53,7 +55,7 @@
53 55 <!-- title -->
54 56 <string name="title_mycard">Mycard點數儲值</string>
55 57 <string name="title_mycard_member">Mycard會員扣點</string>
56   - <string name="title_mycard_billing">Mycard billing</string>
  58 + <string name="title_mycard_billing">Mycard Billing</string>
57 59 <string name="title_mol">MOLPoints Gift Card</string>
58 60 <string name="title_mol_wallet">MOLPoints E-Wallet</string>
59 61 <string name="title_12call">12Call</string>
... ... @@ -64,6 +66,8 @@
64 66 <string name="title_rixty">Rixty</string>
65 67 <string name="title_ngan">NganLoung</string>
66 68 <string name="title_easy2pay">Easy2Pay</string>
  69 + <string name="title_indomog_voucher">Indomog</string>
  70 + <string name="title_indomog_account">Indomog Account Balance</string>
67 71 <string name="title_payment_choice">Select payment methods</string>
68 72 <!-- summary title -->
69 73 <string name="summary_title">Price list:</string>
android/GameSDKSample/src/com/gumptech/loginsdk/sample/MainActivity.java
... ... @@ -73,16 +73,6 @@ public class MainActivity extends Activity implements GumpSDK.Callback {
73 73 } else if (resultCode == RESULT_CANCELED) {
74 74 Toast.makeText(this, "operate be canceled", Toast.LENGTH_SHORT).show();
75 75 }
76   - } else if (requestCode == GumpSDK.BOUND_REQUEST_CODE) {
77   - if (resultCode == RESULT_OK) {
78   - int uid = data.getIntExtra("userId", -1);
79   - int accountType = data.getIntExtra("accountType", -1);
80   - String sessionkey = data.getStringExtra("sessionKey");
81   - userInfo.setText("userid:" + uid + ",accountType:" + accountType + ",sessionKey:" + sessionkey);
82   - btnBind.setVisibility(View.GONE);
83   - } else if (resultCode == RESULT_CANCELED) {
84   - Toast.makeText(this, "operate be canceled", Toast.LENGTH_SHORT).show();
85   - }
86 76 } else if (requestCode == GumpSDK.PAY_REQUEST_CODE) {
87 77 if (resultCode == RESULT_OK) {
88 78 int code = data.getIntExtra("code", -1);
doc/AndroidDocument.md
... ... @@ -153,6 +153,7 @@ Help==&gt;About Eclips点击Android对应的图标就可以查看版本了.
153 153 }
154 154 4.支付功能
155 155  
  156 + 1)使用gump通行证登录
156 157 Bundle payInfo = new Bundle();
157 158 payInfo.putString("nick", "thi");
158 159 payInfo.putString("product", "元宝");
... ... @@ -161,7 +162,17 @@ Help==&gt;About Eclips点击Android对应的图标就可以查看版本了.
161 162 payInfo.putString("serverId", "B4003");
162 163 payInfo.putString("roleId", "10010");
163 164 GumpSDK.pay(MainActivity.this, payInfo);
164   -调用pay方法时,必须穿入一个bundle对象,包含如上字段,可以设置值为空,但是字段必须全部包含,支付完成仍然通过onActivityResult回调,requestCode为GumpSDK.PAY_REQUEST_CODE,回调信息除code和msg外,还含有orderId和传入的extraInfo.
  165 +调用pay方法时,必须穿入一个bundle对象,包含如上字段,可以设置值为空,但是字段必须全部包含,支付完成仍然通过onActivityResult回调,requestCode为GumpSDK.PAY_REQUEST_CODE,回调信息除code和msg外,还含有orderId和传入的extraInfo.
  166 + 2)未使用gump通行证登录,需要传入用户id
  167 +
  168 + Bundle payInfo = new Bundle();
  169 + payInfo.putString("nick", "thi");
  170 + payInfo.putString("product", "元宝");
  171 + payInfo.putFloat("amount", 40.0f);
  172 + payInfo.putString("extraInfo", "This is demo!");
  173 + payInfo.putString("serverId", "B4003");
  174 + payInfo.putString("roleId", "10010");
  175 + GumpSDK.pay(MainActivity.this, payInfo,"1021");
165 176 5.注销登录
166 177  
167 178 GumpSDK.logout(Activity,GumpSDK.Callback);