Commit bc5e48d7120f365a067ad545cb2946d90e231706

Authored by 赵康
1 parent 34a1e9f2db
Exists in master

add cherry payment

modify facebook login within webview
modify paypal payment use new clientId

Showing 3 changed files with 0 additions and 1 deletions Inline Diff

android/GameSDKRelease/libs/GameSDK2.3.1_proguard.jar
No preview for this file type
android/GameSDKRelease/libs/GameSDK2.4.0_proguard.jar
No preview for this file type
android/GameSDKSample/AndroidManifest.xml
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 2 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 package="com.gumptech.loginsdk.sample" 3 package="com.gumptech.loginsdk.sample"
4 android:versionCode="4" 4 android:versionCode="4"
5 android:versionName="1.4" > 5 android:versionName="1.4" >
6 6
7 <uses-sdk 7 <uses-sdk
8 android:minSdkVersion="8" 8 android:minSdkVersion="8"
9 android:targetSdkVersion="8" /> 9 android:targetSdkVersion="8" />
10 10
11 <uses-permission android:name="android.permission.INTERNET" /> 11 <uses-permission android:name="android.permission.INTERNET" />
12 <uses-permission android:name="android.permission.READ_PHONE_STATE" /> 12 <uses-permission android:name="android.permission.READ_PHONE_STATE" />
13 <uses-permission android:name="android.permission.BLUETOOTH" /> 13 <uses-permission android:name="android.permission.BLUETOOTH" />
14 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> 14 <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
15 <uses-permission android:name="android.permission.WRITE_SETTINGS" /> 15 <uses-permission android:name="android.permission.WRITE_SETTINGS" />
16 <uses-permission android:name="android.permission.GET_ACCOUNTS" /> 16 <uses-permission android:name="android.permission.GET_ACCOUNTS" />
17 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 17 <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
18 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> 18 <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
19 <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/> 19 <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
20 <!-- for card.io card scanning --> 20 <!-- for card.io card scanning -->
21 <uses-permission android:name="android.permission.CAMERA" /> 21 <uses-permission android:name="android.permission.CAMERA" />
22 <uses-permission android:name="android.permission.VIBRATE" /> 22 <uses-permission android:name="android.permission.VIBRATE" />
23 <uses-permission android:name="android.permission.SEND_SMS"/> 23 <uses-permission android:name="android.permission.SEND_SMS"/>
24 <!-- coda --> 24 <!-- coda -->
25 <uses-permission android:name="android.permission.RECEIVE_SMS" /> 25 <uses-permission android:name="android.permission.RECEIVE_SMS" />
26 <uses-permission android:name="android.permission.READ_SMS" /> 26 <uses-permission android:name="android.permission.READ_SMS" />
27 <uses-permission android:name="android.permission.WRITE_SMS" /> 27 <uses-permission android:name="android.permission.WRITE_SMS" />
28 <uses-permission android:name="android.permission.GET_TASKS" /> 28 <uses-permission android:name="android.permission.GET_TASKS" />
29 29
30 <uses-feature 30 <uses-feature
31 android:name="android.hardware.camera" 31 android:name="android.hardware.camera"
32 android:required="false" /> 32 android:required="false" />
33 <uses-feature 33 <uses-feature
34 android:name="android.hardware.camera.autofocus" 34 android:name="android.hardware.camera.autofocus"
35 android:required="false" /> 35 android:required="false" />
36 <!-- VERY IMPORTANT! Don't forget this permission, or in-app billing won't work. --> 36 <!-- VERY IMPORTANT! Don't forget this permission, or in-app billing won't work. -->
37 <uses-permission android:name="com.android.vending.BILLING" /> 37 <uses-permission android:name="com.android.vending.BILLING" />
38 38
39 <application 39 <application
40 android:allowBackup="true" 40 android:allowBackup="true"
41 android:icon="@drawable/ic_launcher" 41 android:icon="@drawable/ic_launcher"
42 android:label="@string/app_name" > 42 android:label="@string/app_name" >
43 <activity 43 <activity
44 android:name="com.gumptech.loginsdk.sample.MainActivity" 44 android:name="com.gumptech.loginsdk.sample.MainActivity"
45 android:configChanges="navigation|orientation|keyboard" 45 android:configChanges="navigation|orientation|keyboard"
46 android:label="@string/app_name" 46 android:label="@string/app_name"
47 android:screenOrientation="portrait" > 47 android:screenOrientation="portrait" >
48 <intent-filter> 48 <intent-filter>
49 <action android:name="android.intent.action.MAIN" /> 49 <action android:name="android.intent.action.MAIN" />
50 50
51 <category android:name="android.intent.category.LAUNCHER" /> 51 <category android:name="android.intent.category.LAUNCHER" />
52 </intent-filter> 52 </intent-filter>
53 </activity> 53 </activity>
54 <activity 54 <activity
55 android:name="com.gumptech.sdk.ContainerActivity" 55 android:name="com.gumptech.sdk.ContainerActivity"
56 android:configChanges="orientation|screenLayout" 56 android:configChanges="orientation|screenLayout"
57 android:screenOrientation="portrait" 57 android:screenOrientation="portrait"
58 android:theme="@style/container_dialog" > 58 android:theme="@style/container_dialog" >
59 </activity> 59 </activity>
60 <activity 60 <activity
61 android:name="com.facebook.LoginActivity" 61 android:name="com.facebook.LoginActivity"
62 android:theme="@android:style/Theme.Translucent.NoTitleBar" > 62 android:theme="@android:style/Theme.Translucent.NoTitleBar" >
63 </activity> 63 </activity>
64 <activity 64 <activity
65 android:name="com.gumptech.sdk.PaymentActivity" 65 android:name="com.gumptech.sdk.PaymentActivity"
66 android:configChanges="orientation|screenLayout" 66 android:configChanges="orientation|screenLayout"
67 android:theme="@android:style/Theme.Translucent.NoTitleBar" > 67 android:theme="@android:style/Theme.Translucent.NoTitleBar" >
68 </activity> 68 </activity>
69
70 <activity 69 <activity
71 android:name="com.gumptech.sdk.ExchangeWindow" 70 android:name="com.gumptech.sdk.ExchangeWindow"
72 android:configChanges="orientation|screenLayout" 71 android:configChanges="orientation|screenLayout"
73 android:theme="@style/ex_win" > 72 android:theme="@style/ex_win" >
74 </activity> 73 </activity>
75 <!-- paypal --> 74 <!-- paypal -->
76 <service 75 <service
77 android:name="com.paypal.android.sdk.payments.PayPalService" 76 android:name="com.paypal.android.sdk.payments.PayPalService"
78 android:exported="false" /> 77 android:exported="false" />
79 78
80 <activity android:name="com.paypal.android.sdk.payments.PaymentActivity" /> 79 <activity android:name="com.paypal.android.sdk.payments.PaymentActivity" />
81 <activity android:name="com.paypal.android.sdk.payments.LoginActivity" /> 80 <activity android:name="com.paypal.android.sdk.payments.LoginActivity" />
82 <activity android:name="com.paypal.android.sdk.payments.PaymentMethodActivity" /> 81 <activity android:name="com.paypal.android.sdk.payments.PaymentMethodActivity" />
83 <activity android:name="com.paypal.android.sdk.payments.PaymentConfirmActivity" /> 82 <activity android:name="com.paypal.android.sdk.payments.PaymentConfirmActivity" />
84 <activity android:name="com.paypal.android.sdk.payments.PayPalFuturePaymentActivity" /> 83 <activity android:name="com.paypal.android.sdk.payments.PayPalFuturePaymentActivity" />
85 <activity android:name="com.paypal.android.sdk.payments.FuturePaymentConsentActivity" /> 84 <activity android:name="com.paypal.android.sdk.payments.FuturePaymentConsentActivity" />
86 <activity android:name="com.paypal.android.sdk.payments.FuturePaymentInfoActivity" /> 85 <activity android:name="com.paypal.android.sdk.payments.FuturePaymentInfoActivity" />
87 <activity 86 <activity
88 android:name="io.card.payment.CardIOActivity" 87 android:name="io.card.payment.CardIOActivity"
89 android:configChanges="keyboardHidden|orientation" /> 88 android:configChanges="keyboardHidden|orientation" />
90 <activity android:name="io.card.payment.DataEntryActivity" /> 89 <activity android:name="io.card.payment.DataEntryActivity" />
91 <activity 90 <activity
92 android:name="com.android.easy2pay.Easy2PayScreen" 91 android:name="com.android.easy2pay.Easy2PayScreen"
93 android:theme="@android:style/Theme.Translucent.NoTitleBar" /> 92 android:theme="@android:style/Theme.Translucent.NoTitleBar" />
94 <activity 93 <activity
95 android:name="com.codapayments.sdk.pay.CodaWeb" 94 android:name="com.codapayments.sdk.pay.CodaWeb"
96 android:alwaysRetainTaskState="true" 95 android:alwaysRetainTaskState="true"
97 android:configChanges="orientation|screenSize" 96 android:configChanges="orientation|screenSize"
98 android:screenOrientation="unspecified" > 97 android:screenOrientation="unspecified" >
99 </activity> 98 </activity>
100 99
101 <receiver 100 <receiver
102 android:name="com.codapayments.sdk.message.PendingTxnReceiver" 101 android:name="com.codapayments.sdk.message.PendingTxnReceiver"
103 android:enabled="true" > 102 android:enabled="true" >
104 </receiver> 103 </receiver>
105 </application> 104 </application>
106 105
107 </manifest> 106 </manifest>