version 2.0

赵康
1 parent 02981dfa81
Showing 110 changed files with 1056 additions and 268 deletions Side-by-side Diff
GameSDKRelease/libs/GameSDK_proguard_v2.0.jar
GameSDKRelease/libs/LoginSDK_proguard_v1.6.jar
GameSDKRelease/res/color/item_card_choice_text.xml
GameSDKRelease/res/drawable-hdpi/arrow_tag.png
GameSDKRelease/res/drawable-hdpi/choice_box_bg.png
GameSDKRelease/res/drawable-hdpi/header_tip_bg.png
GameSDKRelease/res/drawable-hdpi/ic_arrow_down.png
GameSDKRelease/res/drawable-hdpi/ic_arrow_up.png
GameSDKRelease/res/drawable-hdpi/ic_back_dark.png
GameSDKRelease/res/drawable-hdpi/ic_back_light.png
GameSDKRelease/res/drawable-hdpi/ic_cancel_dark.png
GameSDKRelease/res/drawable-hdpi/logo_12call.png
GameSDKRelease/res/drawable-hdpi/logo_gp.png
GameSDKRelease/res/drawable-hdpi/logo_mol.png
GameSDKRelease/res/drawable-hdpi/logo_mycard.png
GameSDKRelease/res/drawable-hdpi/logo_ngan.png
GameSDKRelease/res/drawable-hdpi/logo_paypal.png
GameSDKRelease/res/drawable-hdpi/logo_rixty.png
GameSDKRelease/res/drawable-hdpi/logo_tm.png
GameSDKRelease/res/drawable-hdpi/logo_zest.png
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true" android:color="@android:color/white"/>
+    <item android:color="@color/black_text"/>
+
+</selector>
 \ No newline at end of file
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
-
-            <solid android:color="@color/orange_pressed" />
-
-            <size android:height="35dp" />
-        </shape>
-        
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="3dp" />
-
-            <solid android:color="@color/orange_normal" />
-
-            <size android:height="35dp" />
-        </shape>
-        
-    </item>
-
-</selector>
 \ No newline at end of file
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="3dp" />
+
+            <solid android:color="@color/orange_pressed" />
+
+            <size android:height="35dp" />
+        </shape>
+        
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="3dp" />
+
+            <solid android:color="@color/orange_normal" />
+
+            <size android:height="35dp" />
+        </shape>
+        
+    </item>
+
+</selector>
 \ No newline at end of file
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_pressed="true">
+        <shape android:shape="rectangle">
+            <corners android:radius="3dp" />
+
+            <solid android:color="@color/btn_white_pressed" />
+
+            <size android:height="35dp" />
+
+            <stroke android:width="1dp" android:color="@color/line" />
+        </shape>
+        
+        </item>
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="3dp" />
+
+            <solid android:color="@color/btn_white_normal" />
+
+            <size android:height="35dp" />
+
+            <stroke android:width="1dp" android:color="@color/line" />
+        </shape>
+        
+        </item>
+
+</selector>
 \ No newline at end of file
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
+    <corners android:radius="5dp"/>
+	<solid android:color="@android:color/white"/>
+</shape>
@@ -16,6 +16,6 @@
         android:right="8dp"
         android:top="2dp" />
  
-    <corners android:radius="2dp" />
+    <corners android:radius="5dp" />
  
 </shape>
 \ No newline at end of file
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/orange_normal" android:state_pressed="true"/>
+    <item android:drawable="@android:color/white"/>
+
+</selector>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
  
-    <item android:drawable="@drawable/payment_bg_selected" android:state_selected="true"/>
+    <item android:drawable="@drawable/payment_bg_pressed" android:state_pressed="true"/>
     <item android:drawable="@drawable/payment_bg_normal"/>
  
 </selector>
 \ No newline at end of file
@@ -37,6 +37,7 @@
             android:shadowRadius="1"
             android:layout_alignParentRight="true"
             />
+    
     <LinearLayout
             android:id="@+id/com_facebook_picker_divider"
             android:layout_width="1dp"
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center"
+    android:background="@drawable/dialog_bg"
     android:orientation="vertical" >
  
     <include layout="@layout/title" />
  
     <LinearLayout
         android:id="@+id/container"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical" >
  
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/choice_bar"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="13dp"
+    android:layout_marginRight="13dp"
+    android:layout_marginTop="16dp"
+    android:background="@drawable/choice_box_bg" >
+
+    <TextView
+        android:id="@+id/tv_amount"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="15dp"
+        android:text="50d"
+        android:textColor="@color/black_text"
+        android:textSize="18sp"
+        android:textStyle="italic" />
+
+    <ImageView
+        android:id="@+id/arrow_tag"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:scaleType="center"
+        android:src="@drawable/ic_arrow_down" />
+
+    <View
+        android:layout_width="1dp"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
+        android:layout_toLeftOf="@id/arrow_tag"
+        android:background="@drawable/split_vertical" />
+
+</RelativeLayout>
 \ No newline at end of file
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/payment_common_bg" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/choice_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/header_tip_bg"
+            android:gravity="center_vertical"
+            android:paddingLeft="10dp"
+            android:text="@string/amount_choice_tip"
+            android:textColor="@color/black_text" />
+
+        <RelativeLayout
+            android:id="@+id/card_choice"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:layout_marginTop="16dp"
+            android:background="@drawable/choice_box_bg" >
+
+            <TextView
+                android:id="@+id/tv_card"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="15dp"
+                android:textColor="@color/black_text"
+                android:textSize="18sp"
+                android:textStyle="italic" />
+
+            <ImageView
+                android:id="@+id/arrow_tag"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:scaleType="center"
+                android:src="@drawable/ic_arrow_down" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@id/arrow_tag"
+                android:background="@drawable/split_vertical" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/amount_choice"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:layout_marginTop="16dp"
+            android:background="@drawable/choice_box_bg" >
+
+            <TextView
+                android:id="@+id/tv_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="15dp"
+                android:textColor="@color/black_text"
+                android:textSize="18sp"
+                android:textStyle="italic" />
+
+            <ImageView
+                android:id="@id/arrow_tag"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:scaleType="center"
+                android:src="@drawable/ic_arrow_down" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@id/arrow_tag"
+                android:background="@drawable/split_vertical" />
+        </RelativeLayout>
+
+        <Button
+            android:id="@+id/pay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:layout_marginTop="23dp"
+            android:layout_weight="3"
+            android:background="@drawable/btn_orange_bg"
+            android:text="@string/pay_ok"
+            android:textColor="@android:color/white" />
+
+        <TextView
+            android:id="@+id/summary_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:background="@color/summary_bg"
+            android:paddingLeft="10dp"
+            android:textColor="@color/black_text"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/intro"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:background="@color/summary_bg"
+            android:padding="8dp"
+            android:textColor="@color/black_text" />
+    </LinearLayout>
+
+</ScrollView>
 \ No newline at end of file
@@ -35,7 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
-            android:background="@drawable/btn_orange"
+            android:background="@drawable/btn_orange_bg"
             android:padding="5dp"
             android:text="@string/bind"
             android:textColor="@android:color/white"
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/payment_common_bg" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/header_tip_bg"
+            android:gravity="center_vertical"
+            android:paddingLeft="10dp"
+            android:text="@string/card_input_tip"
+            android:textColor="@color/black_text" />
+
+        <LinearLayout
+            android:id="@+id/card_input_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:orientation="vertical" >
+
+            <EditText
+                android:id="@+id/card_no"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:background="@drawable/et_bg"
+                android:hint="@string/mol_card_hint" />
+
+            <EditText
+                android:id="@+id/card_pwd"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="13dp"
+                android:background="@drawable/et_bg"
+                android:hint="@string/mol_pass_hint" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/start_pay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="13dp"
+            android:background="@drawable/btn_orange_bg"
+            android:text="@string/pay_ok"
+            android:textColor="@android:color/white" />
+
+        <TextView
+            android:id="@+id/summary_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:background="@color/summary_bg"
+            android:paddingLeft="10dp"
+            android:textColor="@color/black_text"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:background="@color/summary_bg"
+            android:padding="10dp"
+            android:textColor="@color/black_text"
+            android:textSize="11sp" />
+    </LinearLayout>
+
+</ScrollView>
 \ No newline at end of file
@@ -135,7 +135,7 @@
             android:layout_marginLeft="13dp"
             android:layout_marginRight="13dp"
             android:layout_marginTop="10dp"
-            android:background="@drawable/btn_orange"
+            android:background="@drawable/btn_orange_bg"
             android:text="@string/pay_ok"
             android:textColor="@android:color/white" />
  
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:scrollbars="none" >
  
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
+        android:background="@drawable/dialog_bg"
         android:minWidth="293dp"
         android:orientation="vertical" >
  
@@ -19,8 +19,8 @@
             android:layout_marginRight="13dp"
             android:layout_marginTop="10dp"
             android:background="@drawable/et_bg"
-            android:imeOptions="flagNoExtractUi"
-            android:hint="@string/user_name_hint" />
+            android:hint="@string/user_name_hint"
+            android:imeOptions="flagNoExtractUi" />
  
         <EditText
             android:id="@+id/password"
@@ -29,57 +29,40 @@
             android:layout_marginLeft="13dp"
             android:layout_marginRight="13dp"
             android:layout_marginTop="10dp"
-            android:imeOptions="flagNoExtractUi"
             android:background="@drawable/et_bg"
             android:hint="@string/password_hint"
+            android:imeOptions="flagNoExtractUi"
             android:inputType="textPassword" />
  
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
             android:layout_marginTop="13dp"
             android:gravity="center"
             android:orientation="horizontal" >
  
             <Button
-                android:id="@+id/quick"
+                android:id="@+id/login"
                 android:layout_width="100dp"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="13dp"
-                android:background="@drawable/btn_orange"
+                android:background="@drawable/btn_orange_bg"
                 android:padding="5dp"
-                android:text="@string/quick_login"
+                android:text="@string/login"
                 android:textColor="@android:color/white"
                 android:textSize="16sp" />
  
             <Button
-                android:id="@+id/login"
+                android:id="@+id/sign_up"
                 android:layout_width="100dp"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="13dp"
                 android:background="@drawable/btn_white_bg"
                 android:padding="5dp"
-                android:text="@string/login"
+                android:text="@string/signup"
                 android:textColor="@color/black_text"
                 android:textSize="16sp" />
         </LinearLayout>
-
-        <com.facebook.widget.LoginButton
-            android:id="@+id/fb_login"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="13dp"
-            android:layout_marginRight="13dp"
-            android:layout_marginTop="30dp"
-            android:text="facebook login" />
-
-        <TextView
-            android:id="@+id/sign_up"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="25dp"
-            android:layout_marginTop="25dp"
-            android:text="@string/signup" />
     </LinearLayout>
  
 </ScrollView>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="wrap_content" >
+    android:layout_height="match_parent"
+    android:background="@color/payment_common_bg" >
  
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
-        android:minWidth="293dp"
         android:orientation="vertical" >
  
         <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="13dp"
-            android:layout_marginTop="10dp"
-            android:text="@string/mol_channel_title" />
-
-        <RadioGroup
-            android:id="@+id/cardGroup"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:layout_marginTop="5dp"
-            android:orientation="horizontal"
-            android:paddingLeft="13dp"
-            android:paddingRight="13dp" >
-
-            <RadioButton
-                android:id="@+id/radio12call"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="13dp"
-                android:layout_weight="1"
-                android:background="@drawable/r_bg"
-                android:button="@null"
-                android:checked="true"
-                android:gravity="center"
-                android:paddingBottom="10dp"
-                android:paddingTop="10dp"
-                android:text="@string/channel_12call"
-                android:textColor="@color/black_text"
-                android:textSize="12sp" />
-
-            <RadioButton
-                android:id="@+id/truemoney"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="13dp"
-                android:layout_weight="1"
-                android:background="@drawable/r_bg"
-                android:button="@null"
-                android:gravity="center"
-                android:paddingBottom="10dp"
-                android:paddingTop="10dp"
-                android:text="@string/channel_truemoney"
-                android:textColor="@color/black_text"
-                android:textSize="12sp" />
-
-            <RadioButton
-                android:id="@+id/molpoint"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="13dp"
-                android:layout_weight="1"
-                android:background="@drawable/r_bg"
-                android:button="@null"
-                android:gravity="center"
-                android:paddingBottom="10dp"
-                android:paddingTop="10dp"
-                android:text="@string/channel_molpoint"
-                android:textColor="@color/black_text"
-                android:textSize="12sp" />
-
-            <RadioButton
-                android:id="@+id/zest"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:background="@drawable/r_bg"
-                android:button="@null"
-                android:gravity="center"
-                android:paddingBottom="10dp"
-                android:paddingTop="10dp"
-                android:text="@string/channel_zest"
-                android:textColor="@color/black_text"
-                android:textSize="12sp" />
-        </RadioGroup>
+            android:background="@drawable/header_tip_bg"
+            android:gravity="center_vertical"
+            android:paddingLeft="10dp"
+            android:text="@string/card_input_tip"
+            android:textColor="@color/black_text" />
  
         <LinearLayout
+            android:id="@+id/card_input_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
             android:layout_marginTop="10dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal" >
+            android:orientation="vertical" >
  
             <EditText
-                android:id="@+id/serial_no"
+                android:id="@+id/card_no"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="13dp"
-                android:layout_weight="1"
                 android:background="@drawable/et_bg"
-                android:hint="@string/mol_card_hint"
-                android:visibility="gone" />
+                android:hint="@string/mol_card_hint" />
  
-            <View
+            <EditText
+                android:id="@+id/card_pwd"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_weight="3" />
+                android:layout_marginTop="13dp"
+                android:background="@drawable/et_bg"
+                android:hint="@string/mol_pass_hint" />
         </LinearLayout>
  
-        <LinearLayout
+        <Button
+            android:id="@+id/start_pay"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:gravity="center_vertical"
-            android:orientation="horizontal" >
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:layout_marginTop="16dp"
+            android:background="@drawable/btn_orange_bg"
+            android:text="@string/pay_ok"
+            android:textColor="@android:color/white"
+            android:textSize="16sp" />
  
-            <EditText
-                android:id="@+id/passwd"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="13dp"
-                android:layout_weight="1"
-                android:background="@drawable/et_bg"
-                android:hint="@string/mol_pass_hint" />
+        <Button
+            android:id="@+id/wallet"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="15dp"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/btn_wallet_bg"
+            android:text="@string/title_mol_wallet"
+            android:textSize="15sp" />
  
-            <Button
-                android:id="@+id/submit"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="13dp"
-                android:layout_marginRight="13dp"
-                android:layout_weight="3"
-                android:background="@drawable/btn_orange"
-                android:text="@string/pay_ok"
-                android:textColor="@android:color/white" />
-        </LinearLayout>
+        <TextView
+            android:id="@+id/summary_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:background="@color/summary_bg"
+            android:paddingLeft="10dp"
+            android:textColor="@color/black_text"
+            android:textSize="12sp" />
  
         <TextView
-            android:id="@+id/intro"
+            android:id="@+id/summary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:background="@color/common_gray"
-            android:padding="8dp"
-            android:textColor="@color/black_text" />
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:background="@color/summary_bg"
+            android:padding="10dp"
+            android:textColor="@color/black_text"
+            android:textSize="11sp" />
     </LinearLayout>
  
 </ScrollView>
 \ No newline at end of file
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="match_parent"
+    android:background="@color/payment_common_bg" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minWidth="293dp"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/header_tip_bg"
+            android:gravity="center_vertical"
+            android:paddingLeft="10dp"
+            android:text="@string/card_input_tip"
+            android:textColor="@color/black_text" />
+
+        <LinearLayout
+            android:id="@+id/card_input_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:layout_marginTop="10dp"
+            android:orientation="vertical" >
+
+            <EditText
+                android:id="@+id/card_no"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/et_bg"
+                android:hint="@string/mol_card_hint" />
+
+            <EditText
+                android:id="@+id/card_pwd"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="13dp"
+                android:background="@drawable/et_bg"
+                android:hint="@string/mol_pass_hint" />
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/start_pay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:layout_marginTop="16dp"
+            android:background="@drawable/btn_orange_bg"
+            android:text="@string/pay_ok"
+            android:textColor="@android:color/white"
+            android:textSize="16sp" />
+
+        <Button
+            android:id="@+id/wallet"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/btn_wallet_bg"
+            android:text="@string/title_mycard_member"
+            android:textSize="15sp" />
+
+        <Button
+            android:id="@+id/billing"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="15dp"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:layout_marginTop="10dp"
+            android:background="@drawable/btn_wallet_bg"
+            android:text="@string/title_mycard_billing"
+            android:textSize="15sp" />
+
+        <TextView
+            android:id="@+id/summary_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:background="@color/summary_bg"
+            android:paddingLeft="10dp"
+            android:textColor="@color/black_text"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/summary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:background="@color/summary_bg"
+            android:padding="10dp"
+            android:textColor="@color/black_text"
+            android:textSize="11sp" />
+    </LinearLayout>
+
+</ScrollView>
 \ No newline at end of file
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:id="@+id/item_mycard"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/payment_bg"
+            android:visibility="gone" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/logo_mycard" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="45dp"
+                android:src="@drawable/arrow_tag" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/item_mol"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/payment_bg"
+            android:visibility="gone" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/logo_mol" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="45dp"
+                android:src="@drawable/arrow_tag" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/item_12call"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/payment_bg"
+            android:visibility="gone" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/logo_12call" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="45dp"
+                android:src="@drawable/arrow_tag" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/item_zest"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/payment_bg"
+            android:visibility="gone" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/logo_zest" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="45dp"
+                android:src="@drawable/arrow_tag" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/item_tm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/payment_bg"
+            android:visibility="gone" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/logo_tm" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="45dp"
+                android:src="@drawable/arrow_tag" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/item_rixty"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/payment_bg"
+            android:visibility="gone" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/logo_rixty" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="45dp"
+                android:src="@drawable/arrow_tag" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/item_paypal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/payment_bg"
+            android:visibility="gone" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/logo_paypal" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="45dp"
+                android:src="@drawable/arrow_tag" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/item_ngan"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/payment_bg"
+            android:visibility="gone" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/logo_ngan" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="45dp"
+                android:src="@drawable/arrow_tag" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/item_gp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/payment_bg"
+            android:visibility="gone" >
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/logo_gp" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:layout_marginRight="45dp"
+                android:src="@drawable/arrow_tag" />
+        </RelativeLayout>
+    </LinearLayout>
+
+</ScrollView>
 \ No newline at end of file
@@ -141,19 +141,20 @@
                 android:id="@+id/amount"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginRight="13dp"
                 android:layout_weight="1"
                 android:background="@drawable/et_bg"
                 android:hint="@string/paypal_amount_hint"
                 android:imeOptions="flagNoExtractUi"
-                android:inputType="number" />
+                android:inputType="number"
+                android:visibility="gone" />
  
             <Button
                 android:id="@+id/pay"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="13dp"
                 android:layout_weight="3"
-                android:background="@drawable/btn_orange"
+                android:background="@drawable/btn_orange_bg"
                 android:text="@string/pay_ok"
                 android:textColor="@android:color/white" />
         </LinearLayout>
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/payment_common_bg"
+    android:orientation="vertical" >
+
+    <Button
+        android:id="@+id/start_pay"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="13dp"
+        android:background="@drawable/btn_orange_bg"
+        android:text="@string/pay_ok"
+        android:textColor="@android:color/white" />
+
+    <TextView
+        android:id="@+id/summary_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="13dp"
+        android:layout_marginRight="13dp"
+        android:background="@color/summary_bg"
+        android:paddingLeft="10dp"
+        android:textColor="@color/black_text"
+        android:textSize="12sp" />
+
+    <TextView
+        android:id="@+id/summary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="13dp"
+        android:layout_marginRight="13dp"
+        android:background="@color/summary_bg"
+        android:padding="10dp"
+        android:textColor="@color/black_text"
+        android:textSize="11sp" />
+
+</LinearLayout>
 \ No newline at end of file
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <Button
+        android:id="@+id/quick"
+        android:layout_width="fill_parent"
+        android:layout_height="36dp"
+        android:layout_marginLeft="13dp"
+        android:layout_marginRight="13dp"
+        android:layout_marginTop="16dp"
+        android:background="@drawable/btn_orange_bg"
+        android:padding="5dp"
+        android:text="@string/quick_login"
+        android:textColor="@android:color/white"
+        android:textSize="16sp" />
+
+    <com.facebook.widget.LoginButton
+        android:id="@+id/fb_login"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="13dp"
+        android:layout_marginRight="13dp"
+        android:layout_marginTop="10dp" />
+
+    <TextView
+        android:id="@+id/gump_login"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginBottom="10dp"
+        android:textSize="11sp"
+        android:gravity="center"
+        android:textColor="@color/com_facebook_blue"
+        android:text="Gumptech login>>" />
+
+</LinearLayout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:scrollbars="none" >
  
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/white"
+        android:background="@drawable/dialog_bg"
         android:minWidth="293dp"
         android:orientation="vertical" >
  
@@ -17,8 +17,8 @@
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
             android:background="@drawable/et_bg"
-            android:imeOptions="flagNoExtractUi"
-            android:hint="@string/user_name_hint" />
+            android:hint="@string/user_name_hint"
+            android:imeOptions="flagNoExtractUi" />
  
         <EditText
             android:id="@+id/pwd"
@@ -35,7 +35,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="8dp"
-            android:background="@drawable/btn_orange"
+            android:background="@drawable/btn_orange_bg"
             android:padding="5dp"
             android:text="@string/signup"
             android:textColor="@android:color/white"
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/payment_common_bg" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" >
+
+        <TextView
+            android:id="@+id/choice_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/header_tip_bg"
+            android:gravity="center_vertical"
+            android:paddingLeft="10dp"
+            android:text="@string/amount_choice_tip"
+            android:textColor="@color/black_text" />
+
+        <RelativeLayout
+            android:id="@+id/amount_choice"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:layout_marginTop="16dp"
+            android:background="@drawable/choice_box_bg" >
+
+            <TextView
+                android:id="@+id/tv_amount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_marginLeft="15dp"
+                android:textColor="@color/black_text"
+                android:textSize="18sp"
+                android:textStyle="italic"
+                android:text="50d" />
+
+            <ImageView
+                android:id="@+id/arrow_tag"
+                android:layout_width="35dp"
+                android:layout_height="35dp"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:scaleType="center"
+                android:src="@drawable/ic_arrow_down" />
+
+            <View
+                android:layout_width="1dp"
+                android:layout_height="match_parent"
+                android:layout_centerVertical="true"
+                android:layout_toLeftOf="@id/arrow_tag"
+                android:background="@drawable/split_vertical" />
+        </RelativeLayout>
+
+        <Button
+            android:id="@+id/pay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="20dp"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:layout_marginTop="23dp"
+            android:layout_weight="3"
+            android:background="@drawable/btn_orange_bg"
+            android:text="@string/pay_ok"
+            android:textColor="@android:color/white" />
+
+        <TextView
+            android:id="@+id/summary_title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:background="@color/summary_bg"
+            android:paddingLeft="10dp"
+            android:textColor="@color/black_text"
+            android:textSize="12sp" />
+
+        <TextView
+            android:id="@+id/intro"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:layout_marginLeft="13dp"
+            android:layout_marginRight="13dp"
+            android:background="@color/summary_bg"
+            android:padding="8dp"
+            android:textColor="@color/black_text" />
+    </LinearLayout>
+
+</ScrollView>
 \ No newline at end of file
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/white"
+    android:minWidth="293dp"
+    android:orientation="vertical" >
+
+    <ProgressBar
+        android:id="@+id/loading_prog"
+        style="@android:style/Widget.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="2dp" />
+
+    <WebView
+        android:id="@+id/mycard_web"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" />
+
+</LinearLayout>
 \ No newline at end of file
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/item_card_choice_bg"
+    android:orientation="vertical"
+    android:padding="10dp" >
+
+    <TextView
+        android:id="@+id/name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:textColor="@color/item_card_choice_text"
+        android:textSize="16sp" />
+
+</LinearLayout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@android:color/white"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/payment_common_bg"
     android:orientation="vertical" >
  
-    <include layout="@layout/title" />
+    <include layout="@layout/pay_title" />
  
-    <TabHost
-        android:id="@android:id/tabhost"
+    <LinearLayout
+        android:id="@+id/container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical" >
-
-            <TabWidget
-                android:id="@android:id/tabs"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@android:color/white"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:divider="@null"
-                android:orientation="horizontal" >
-            </TabWidget>
-
-            <FrameLayout
-                android:id="@android:id/tabcontent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone" >
-            </FrameLayout>
-
-            <android.support.v4.view.ViewPager
-                android:id="@+id/pager"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
-        </LinearLayout>
-    </TabHost>
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+       
+    </LinearLayout>
  
 </LinearLayout>
 \ No newline at end of file
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/pay_title_bg" >
+
+    <ImageView
+        android:id="@+id/back"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:scaleType="center"
+        android:src="@drawable/ic_back_light" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:textColor="@android:color/white"
+        android:textSize="18sp" />
+
+</RelativeLayout>
 \ No newline at end of file
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="38dp"
-    android:background="@drawable/payment_bg"
-    android:padding="0dp" >
-
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:src="@drawable/tag_gp" />
-
-</RelativeLayout>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="50dp"
-    android:background="@android:color/white" >
+    android:layout_height="45dp"
+    android:background="@drawable/dialog_bg" >
  
     <ImageView
         android:id="@+id/btn_back"
@@ -11,7 +11,7 @@
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
         android:layout_marginLeft="10dp"
-        android:src="@drawable/btn_back" />
+        android:src="@drawable/ic_back_dark" />
  
     <TextView
         android:id="@+id/up_txt"
@@ -45,7 +45,7 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_margin="10dp"
-        android:src="@drawable/btn_cancel" />
+        android:src="@drawable/ic_cancel_dark" />
  
     <View
         android:layout_width="fill_parent"
@@ -20,15 +20,20 @@
     <string name="bind_fail">ผูกอีเมลล์ไม่สำเร็จ</string>
     <!-- facebook id -->
     <!-- payment -->
+    <string name="title_payment_choice">เลือกช่องทางชำระเงิน</string>
+    <!-- summary title -->
+    <string name="summary_title">ตารางแลกเปลี่ยน:</string>
     <string name="useranme_pattern">ชื่อผู้ใช้:%s</string>
-    <string name="mol_channel_title">เลือกช่องทางชำระเงิน</string>
+<!--     <string name="mol_channel_title">เลือกช่องทางชำระเงิน</string> -->
     <string name="mol_card_hint">กรุณากรอกรหัสบัตร</string>
     <string name="mol_pass_hint">กรุณาใส่รหัส</string>
     <string name="pay_ok">OK</string>
     <string name="pay_error">การชำระล้มเหลว กรุณาลองใหม่อีกครั้ง</string>
+    <string name="card_input_tip">กรุณากรอกรายละเอียดบัตร</string>
+    <string name="amount_choice_tip">กรุณาเลือกยอดเติมเงิน</string>
     <!-- paypal -->
     <string name="paypal_amount_hint">กรุณาใส่จำนวนเงินที่ต้องการ(%s-10000เป็นจำนวนเต็ม)</string>
-    <string name="paypal_choice_tip">กรุณาเลือกหรือกรอกจำนวนเงินที่ต้องการชำระ</string>
+    <string name="paypal_choice_tip">กรุณาเลือกยอดเติมเงิน</string>
 	 <!-- gp -->
-	<string name="gp_choice_tip">กรุณาเลือกจำนวนเงินที่ต้องการชำระ</string>
+	<string name="gp_choice_tip">กรุณาเลือกยอดเติมเงิน</string>
 </resources>
 \ No newline at end of file
@@ -20,4 +20,21 @@
     <string name="bind_fail">綁定失敗</string>
     <!-- facebook id -->
  
+
+    <!-- 支付相关 -->
+    <!-- title -->
+    <string name="title_payment_choice">請選擇支付方式</string>
+    <!-- summary title -->
+    <string name="summary_title">兌換表:</string>
+    <string name="mol_card_hint">請輸入卡號</string>
+    <string name="mol_pass_hint">請輸入密碼</string>
+    <string name="pay_ok">OK</string>
+    <string name="pay_error">支付失敗，請再重試。</string>
+    <string name="card_input_tip">請輸入點卡信息</string>
+    <string name="amount_choice_tip">請選擇支付金額</string>
+    <!-- paypal -->
+    <string name="paypal_choice_tip">請選擇支付金額</string>
+    <!-- gp -->
+    <string name="gp_choice_tip">請選擇支付金額</string>
+
 </resources>
 \ No newline at end of file
@@ -21,15 +21,19 @@
     <string name="net_error">网络无法连接，请查看网络设置</string>
     <!-- facebook id -->
     <!-- payment -->
-    <string name="useranme_pattern">用户昵称:%s</string>
-    <string name="mol_channel_title">请选择支付方式</string>
+    <!-- title -->
+    <string name="title_payment_choice">请选择支付方式</string>
+    <!-- summary title -->
+    <string name="summary_title">兑换表:</string>
+    <!-- payment -->
     <string name="mol_card_hint">请输入卡号</string>
     <string name="mol_pass_hint">请输入密码</string>
     <string name="pay_ok">OK</string>
     <string name="pay_error">充值失败，请重试</string>
+    <string name="card_input_tip">请输入点卡信息</string>
+    <string name="amount_choice_tip">请选择支付金额</string>
     <!-- paypal -->
-    <string name="paypal_amount_hint">请输入支付金额（%s-10000的整数）</string>
-	<string name="paypal_choice_tip">请选择或输入支付金额</string>
+    <string name="paypal_choice_tip">请选择支付金额</string>
 	 <!-- gp -->
 	<string name="gp_choice_tip">请选择支付金额</string>
 </resources>
 \ No newline at end of file
@@ -2,13 +2,20 @@
 <resources>
  
     <color name="line">#e5e5e5</color>
-    <color name="orange_normal">#ff5e28</color>
-    <color name="orange_pressed">#ff812d</color>
+    <color name="orange_normal">#fe5f27</color>
+    <color name="orange_pressed">#fe0000</color>
     <color name="black_text">#3f3c38</color>
+    <color name="btn_white_normal">#f8f7f4</color>
+    <color name="btn_white_pressed">#f8f7f4</color>
+    
     <color name="common_gray">#ecf0f0</color>
     <color name="common_gray2">#e0e6e8</color>
     <color name="translucent">#7e000000</color>
-    
+	<color name="transparent">#00000000</color>
+
+	<color name="payment_common_bg">#f2efeb</color>
+	<color name="summary_bg">#d6d4d1</color>
+	<color name="background_color">#00a0e9</color>
     <!-- facebook -->
     <dimen name="com_facebook_picker_place_image_size">64dp</dimen>
  
@@ -46,22 +46,37 @@
     <string name="com_facebook_requesterror_password_changed">Your Facebook password has changed. Please log into this app again to reconnect your Facebook account.</string>
     <string name="com_facebook_requesterror_reconnect">Please log into this app again to reconnect your Facebook account.</string>
     <string name="com_facebook_requesterror_permissions">This app doesn’t have permission to do this. To change permissions, try logging into the app again.</string>
-    <!-- mol channel -->
-    <string name="channel_12call">12call</string>
-    <string name="channel_truemoney">true money</string>
-    <string name="channel_zest">zest</string>
-    <string name="channel_molpoint">mol points</string>
+    <!-- 支付相关 -->
+    <!-- title -->
+    <string name="title_mycard">Mycard點數儲值</string>
+    <string name="title_mycard_member">Mycard會員扣點</string>
+    <string name="title_mycard_billing">Mycard billing</string>
+    <string name="title_mol">MOLPoints Gift Card</string>
+    <string name="title_mol_wallet">MOLPoints E-Wallet</string>
+    <string name="title_12call">12Call</string>
+    <string name="title_tm">True Money</string>
+    <string name="title_zest">Zest</string>
+    <string name="title_gp">Google play</string>
+    <string name="title_paypal">Paypal</string>
+    <string name="title_rixty">Rixty</string>
+    <string name="title_ngan">NganLoung</string>
+    <string name="title_payment_choice">Select payment methods</string>
+    <!-- summary title -->
+    <string name="summary_title">Price list:</string>
+
     <!-- payment -->
     <string name="useranme_pattern">Account:%s</string>
-	<string name="mol_channel_title">Please select payment methods</string>
-	<string name="mol_card_hint">Please input your card number</string>
-	<string name="mol_pass_hint">Please input your password</string>
+    <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="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_choice_tip">Please select or enter the amount</string>
+    <string name="paypal_choice_tip">Please select the amount</string>
     <!-- gp -->
 	<string name="gp_choice_tip">Please select the amount</string>
+
 </resources>
 \ No newline at end of file
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
  
-    <style name="container_dialog" parent="@android:style/Theme.Dialog">
+    <style name="container_dialog" >
         <item name="android:windowFrame">@null</item>
         <item name="android:windowIsFloating">true</item>
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowNoTitle">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
-        <item name="android:backgroundDimEnabled">false</item>
+        <item name="android:windowBackground">@color/transparent</item>
+        <item name="android:backgroundDimEnabled">true</item>
         <item name="android:windowFullscreen">true</item> 
     </style>
  
@@ -48,7 +48,7 @@
         <activity
             android:name="com.gumptech.sdk.ContainerActivity"
             android:configChanges="orientation|screenLayout"
-            android:screenOrientation="landscape"
+            android:screenOrientation="portrait"
             android:theme="@style/container_dialog" >
         </activity>
         <activity
@@ -11,5 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
  
 # Project target.
-target=android-14
+target=android-18
 android.library.reference.1=../GameSDKRelease
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@android:color/white"
     android:orientation="vertical" >
  
     <TextView
@@ -6,7 +6,6 @@ import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
-import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.Toast;
  
@@ -48,12 +47,12 @@ public class MainActivity extends Activity implements GumpSDK.Callback {
 				Bundle payInfo = new Bundle();
 				payInfo.putString("nick", "thi");
 				payInfo.putString("product", "元宝");
-				payInfo.putFloat("amount", 40.0f);
+				payInfo.putFloat("amount", 0.0f);
 				payInfo.putString("extraInfo", "This is demo!");
 				GumpSDK.pay(MainActivity.this, payInfo);
 			}
 		});
-		GumpSDK.init("100", "100", "301596413332339", "1000", "110", "120");
+		GumpSDK.init("10009", "483d8df877b31405c1e8fe4247f02d86", "301596413332339", "1000", "4003", "120");
 		GumpSDK.start(this);
 	}
...	...	@@ -0,0 +1,7 @@
	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" android:color="@android:color/white"/>
	5	+ <item android:color="@color/black_text"/>
	6	+
	7	+</selector>
0	8	\ No newline at end of file
...	...	@@ -1,25 +0,0 @@
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">
5		- <shape android:shape="rectangle">
6		- <corners android:radius="3dp" />
7		-
8		- <solid android:color="@color/orange_pressed" />
9		-
10		- <size android:height="35dp" />
11		- </shape>
12		-
13		- </item>
14		- <item>
15		- <shape android:shape="rectangle">
16		- <corners android:radius="3dp" />
17		-
18		- <solid android:color="@color/orange_normal" />
19		-
20		- <size android:height="35dp" />
21		- </shape>
22		-
23		- </item>
24		-
25		-</selector>
26	0	\ No newline at end of file
...	...	@@ -0,0 +1,25 @@
	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">
	5	+ <shape android:shape="rectangle">
	6	+ <corners android:radius="3dp" />
	7	+
	8	+ <solid android:color="@color/orange_pressed" />
	9	+
	10	+ <size android:height="35dp" />
	11	+ </shape>
	12	+
	13	+ </item>
	14	+ <item>
	15	+ <shape android:shape="rectangle">
	16	+ <corners android:radius="3dp" />
	17	+
	18	+ <solid android:color="@color/orange_normal" />
	19	+
	20	+ <size android:height="35dp" />
	21	+ </shape>
	22	+
	23	+ </item>
	24	+
	25	+</selector>
0	26	\ No newline at end of file
...	...	@@ -0,0 +1,29 @@
	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">
	5	+ <shape android:shape="rectangle">
	6	+ <corners android:radius="3dp" />
	7	+
	8	+ <solid android:color="@color/btn_white_pressed" />
	9	+
	10	+ <size android:height="35dp" />
	11	+
	12	+ <stroke android:width="1dp" android:color="@color/line" />
	13	+ </shape>
	14	+
	15	+ </item>
	16	+ <item>
	17	+ <shape android:shape="rectangle">
	18	+ <corners android:radius="3dp" />
	19	+
	20	+ <solid android:color="@color/btn_white_normal" />
	21	+
	22	+ <size android:height="35dp" />
	23	+
	24	+ <stroke android:width="1dp" android:color="@color/line" />
	25	+ </shape>
	26	+
	27	+ </item>
	28	+
	29	+</selector>
0	30	\ No newline at end of file
...	...	@@ -0,0 +1,5 @@
	1	+<?xml version="1.0" encoding="utf-8"?>
	2	+<shape xmlns:android="http://schemas.android.com/apk/res/android" >
	3	+ <corners android:radius="5dp"/>
	4	+ <solid android:color="@android:color/white"/>
	5	+</shape>
...	...	@@ -16,6 +16,6 @@
16	16	android:right="8dp"
17	17	android:top="2dp" />
18	18
19		- <corners android:radius="2dp" />
	19	+ <corners android:radius="5dp" />
20	20
21	21	</shape>
22	22	\ No newline at end of file
1	1	<?xml version="1.0" encoding="utf-8"?>
2	2	<selector xmlns:android="http://schemas.android.com/apk/res/android">
3	3
4		- <item android:drawable="@drawable/payment_bg_selected" android:state_selected="true"/>
	4	+ <item android:drawable="@drawable/payment_bg_pressed" android:state_pressed="true"/>
5	5	<item android:drawable="@drawable/payment_bg_normal"/>
6	6
7	7	</selector>
8	8	\ No newline at end of file
...	...	@@ -37,6 +37,7 @@
37	37	android:shadowRadius="1"
38	38	android:layout_alignParentRight="true"
39	39	/>
	40	+
40	41	<LinearLayout
41	42	android:id="@+id/com_facebook_picker_divider"
42	43	android:layout_width="1dp"
1	1	<?xml version="1.0" encoding="utf-8"?>
2	2	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3		- android:layout_width="wrap_content"
	3	+ android:layout_width="match_parent"
4	4	android:layout_height="wrap_content"
5	5	android:gravity="center"
	6	+ android:background="@drawable/dialog_bg"
6	7	android:orientation="vertical" >
7	8
8	9	<include layout="@layout/title" />
9	10
10	11	<LinearLayout
11	12	android:id="@+id/container"
12		- android:layout_width="wrap_content"
	13	+ android:layout_width="match_parent"
13	14	android:layout_height="wrap_content"
14	15	android:orientation="vertical" >
15	16
...	...	@@ -0,0 +1,38 @@
	1	+<?xml version="1.0" encoding="utf-8"?>
	2	+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
	3	+ android:id="@+id/choice_bar"
	4	+ android:layout_width="match_parent"
	5	+ android:layout_height="wrap_content"
	6	+ android:layout_marginLeft="13dp"
	7	+ android:layout_marginRight="13dp"
	8	+ android:layout_marginTop="16dp"
	9	+ android:background="@drawable/choice_box_bg" >
	10	+
	11	+ <TextView
	12	+ android:id="@+id/tv_amount"
	13	+ android:layout_width="wrap_content"
	14	+ android:layout_height="wrap_content"
	15	+ android:layout_centerVertical="true"
	16	+ android:layout_marginLeft="15dp"
	17	+ android:text="50d"
	18	+ android:textColor="@color/black_text"
	19	+ android:textSize="18sp"
	20	+ android:textStyle="italic" />
	21	+
	22	+ <ImageView
	23	+ android:id="@+id/arrow_tag"
	24	+ android:layout_width="35dp"
	25	+ android:layout_height="35dp"
	26	+ android:layout_alignParentRight="true"
	27	+ android:layout_centerVertical="true"
	28	+ android:scaleType="center"
	29	+ android:src="@drawable/ic_arrow_down" />
	30	+
	31	+ <View
	32	+ android:layout_width="1dp"
	33	+ android:layout_height="match_parent"
	34	+ android:layout_centerVertical="true"
	35	+ android:layout_toLeftOf="@id/arrow_tag"
	36	+ android:background="@drawable/split_vertical" />
	37	+
	38	+</RelativeLayout>
0	39	\ No newline at end of file