add easy2pay and modify rixty&nanlueng

赵康
1 parent e4307bd087
Showing 6 changed files with 48 additions and 0 deletions Side-by-side Diff
android/GameSDKRelease/libs/Easy2PaySDK_1_1_0_4.jar
android/GameSDKRelease/libs/GameSDK_proguard_v2.0.1.jar
android/GameSDKRelease/libs/GameSDK_proguard_v2.0.jar
android/GameSDKRelease/res/layout/fragment_payment_choice.xml
android/GameSDKRelease/res/values/strings.xml
android/GameSDKSample/AndroidManifest.xml
@@ -215,6 +215,52 @@
                 android:layout_marginRight="45dp"
                 android:src="@drawable/arrow_tag" />
         </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/item_ep_th"
+            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>
+
+        <RelativeLayout
+            android:id="@+id/item_ep_my"
+            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
@@ -63,6 +63,7 @@
     <string name="title_paypal">Paypal</string>
     <string name="title_rixty">Rixty</string>
     <string name="title_ngan">NganLoung</string>
+    <string name="title_easy2pay">Easy2Pay</string>
     <string name="title_payment_choice">Select payment methods</string>
     <!-- summary title -->
     <string name="summary_title">Price list:</string>
@@ -20,6 +20,7 @@
     <!-- for card.io card scanning -->
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.SEND_SMS"/>
  
     <uses-feature
         android:name="android.hardware.camera"
...	...	@@ -215,6 +215,52 @@
215	215	android:layout_marginRight="45dp"
216	216	android:src="@drawable/arrow_tag" />
217	217	</RelativeLayout>
	218	+
	219	+ <RelativeLayout
	220	+ android:id="@+id/item_ep_th"
	221	+ android:layout_width="match_parent"
	222	+ android:layout_height="wrap_content"
	223	+ android:background="@drawable/payment_bg"
	224	+ android:visibility="gone" >
	225	+
	226	+ <ImageView
	227	+ android:layout_width="wrap_content"
	228	+ android:layout_height="wrap_content"
	229	+ android:layout_centerVertical="true"
	230	+ android:layout_marginLeft="10dp"
	231	+ android:src="@drawable/logo_gp" />
	232	+
	233	+ <ImageView
	234	+ android:layout_width="wrap_content"
	235	+ android:layout_height="wrap_content"
	236	+ android:layout_alignParentRight="true"
	237	+ android:layout_centerVertical="true"
	238	+ android:layout_marginRight="45dp"
	239	+ android:src="@drawable/arrow_tag" />
	240	+ </RelativeLayout>
	241	+
	242	+ <RelativeLayout
	243	+ android:id="@+id/item_ep_my"
	244	+ android:layout_width="match_parent"
	245	+ android:layout_height="wrap_content"
	246	+ android:background="@drawable/payment_bg"
	247	+ android:visibility="gone" >
	248	+
	249	+ <ImageView
	250	+ android:layout_width="wrap_content"
	251	+ android:layout_height="wrap_content"
	252	+ android:layout_centerVertical="true"
	253	+ android:layout_marginLeft="10dp"
	254	+ android:src="@drawable/logo_gp" />
	255	+
	256	+ <ImageView
	257	+ android:layout_width="wrap_content"
	258	+ android:layout_height="wrap_content"
	259	+ android:layout_alignParentRight="true"
	260	+ android:layout_centerVertical="true"
	261	+ android:layout_marginRight="45dp"
	262	+ android:src="@drawable/arrow_tag" />
	263	+ </RelativeLayout>
218	264	</LinearLayout>
219	265
220	266	</ScrollView>
221	267	\ No newline at end of file
...	...	@@ -63,6 +63,7 @@
63	63	<string name="title_paypal">Paypal</string>
64	64	<string name="title_rixty">Rixty</string>
65	65	<string name="title_ngan">NganLoung</string>
	66	+ <string name="title_easy2pay">Easy2Pay</string>
66	67	<string name="title_payment_choice">Select payment methods</string>
67	68	<!-- summary title -->
68	69	<string name="summary_title">Price list:</string>
...	...	@@ -20,6 +20,7 @@
20	20	<!-- for card.io card scanning -->
21	21	<uses-permission android:name="android.permission.CAMERA" />
22	22	<uses-permission android:name="android.permission.VIBRATE" />
	23	+ <uses-permission android:name="android.permission.SEND_SMS"/>
23	24
24	25	<uses-feature
25	26	android:name="android.hardware.camera"