v4.2.1:clear for bluePay

赵康
1 parent 7aeb33662f
Showing 6 changed files with 26 additions and 26 deletions Side-by-side Diff
GameSDK-release4.2.0.aar
GameSDK-release4.2.1.aar
GameSDKDemo/build.gradle
GameSDKDemo/libs/GameSDK-release4.2.0.aar
GameSDKDemo/libs/GameSDK-release4.2.1.aar
GameSDKDemo/src/main/AndroidManifest.xml
@@ -34,6 +34,6 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:22.2.0'
 //    compile project(':GameSDK')
-    compile(name:'GameSDK-release4.2.0',ext:'aar')
+    compile(name:'GameSDK-release4.2.1',ext:'aar')
  
 }
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.gumptech.sdk.demo">
+          package="com.gumptech.sdk.demo">
  
  
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="20" />
+        android:targetSdkVersion="20"/>
  
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.BLUETOOTH"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
     <!-- Danger Level permission-->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.SEND_SMS"/>
  
     <!-- VERY IMPORTANT! Don't forget this permission, or in-app billing won't work. -->
-    <uses-permission android:name="com.android.vending.BILLING" />
+    <uses-permission android:name="com.android.vending.BILLING"/>
  
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
  
-        android:label="@string/app_name" >
+        android:label="@string/app_name">
         <activity
             android:name="com.gumptech.sdk.demo.MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout"
             android:label="@string/app_name"
-            android:screenOrientation="portrait" >
+            >
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
  
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
             android:name="com.gumptech.sdk.ContainerActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
             android:launchMode="singleTask"
-            android:theme="@style/Theme.TransparentWin" >
+            android:theme="@style/Theme.TransparentWin"
+            android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
         </activity>
         <activity
             android:name="com.gumptech.sdk.PaymentActivity"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout"
             android:launchMode="singleTask"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar" >
+            android:theme="@android:style/Theme.Translucent.NoTitleBar">
             <intent-filter>
-                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.DEFAULT"/>
  
-                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.intent.action.VIEW"/>
  
-                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.BROWSABLE"/>
  
                 <data
                     android:host="com.gump.sdk"
-                    android:scheme="gump10031" />
+                    android:scheme="gump10031"/>
             </intent-filter>
         </activity>
         <activity
             android:name="com.gumptech.sdk.ExchangeWindow"
             android:configChanges="orientation|screenSize|keyboardHidden|keyboard|screenLayout"
-            android:theme="@style/Theme.WinForExchange" >
+            android:theme="@style/Theme.WinForExchange">
         </activity>
  
-        <service android:name="com.gumptech.sdk.PushService" >
+        <service android:name="com.gumptech.sdk.PushService">
         </service>
  
         <!-- vk -->
...	...	@@ -34,6 +34,6 @@ dependencies {
34	34	testCompile 'junit:junit:4.12'
35	35	compile 'com.android.support:appcompat-v7:22.2.0'
36	36	// compile project(':GameSDK')
37		- compile(name:'GameSDK-release4.2.0',ext:'aar')
	37	+ compile(name:'GameSDK-release4.2.1',ext:'aar')
38	38
39	39	}
1	1	<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2		- package="com.gumptech.sdk.demo">
	2	+ package="com.gumptech.sdk.demo">
3	3
4	4
5	5	<uses-sdk
6	6	android:minSdkVersion="9"
7		- android:targetSdkVersion="20" />
	7	+ android:targetSdkVersion="20"/>
8	8
9		- <uses-permission android:name="android.permission.INTERNET" />
10		- <uses-permission android:name="android.permission.BLUETOOTH" />
11		- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
12		- <uses-permission android:name="android.permission.WRITE_SETTINGS" />
13		- <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
14		- <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
	9	+ <uses-permission android:name="android.permission.INTERNET"/>
	10	+ <uses-permission android:name="android.permission.BLUETOOTH"/>
	11	+ <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
	12	+ <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
	13	+ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
	14	+ <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
15	15	<!-- Danger Level permission-->
16		- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
17		- <uses-permission android:name="android.permission.GET_ACCOUNTS" />
18		- <uses-permission android:name="android.permission.READ_PHONE_STATE" />
	16	+ <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
	17	+ <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
	18	+ <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
19	19	<uses-permission android:name="android.permission.SEND_SMS"/>
20	20
21	21	<!-- VERY IMPORTANT! Don't forget this permission, or in-app billing won't work. -->
22		- <uses-permission android:name="com.android.vending.BILLING" />
	22	+ <uses-permission android:name="com.android.vending.BILLING"/>
23	23
24	24	<application
25	25	android:allowBackup="true"
26	26	android:icon="@drawable/ic_launcher"
27	27
28		- android:label="@string/app_name" >
	28	+ android:label="@string/app_name">
29	29	<activity
30	30	android:name="com.gumptech.sdk.demo.MainActivity"
31	31	android:configChanges="orientation\|screenSize\|keyboardHidden\|keyboard\|screenLayout"
32	32	android:label="@string/app_name"
33		- android:screenOrientation="portrait" >
	33	+ >
34	34	<intent-filter>
35		- <action android:name="android.intent.action.MAIN" />
	35	+ <action android:name="android.intent.action.MAIN"/>
36	36
37		- <category android:name="android.intent.category.LAUNCHER" />
	37	+ <category android:name="android.intent.category.LAUNCHER"/>
38	38	</intent-filter>
39	39	</activity>
40	40	<activity
41	41	android:name="com.gumptech.sdk.ContainerActivity"
42	42	android:configChanges="orientation\|screenSize\|keyboardHidden\|keyboard\|screenLayout"
43		- android:windowSoftInputMode="stateAlwaysHidden\|adjustPan"
44	43	android:launchMode="singleTask"
45		- android:theme="@style/Theme.TransparentWin" >
	44	+ android:theme="@style/Theme.TransparentWin"
	45	+ android:windowSoftInputMode="stateAlwaysHidden\|adjustPan">
46	46	</activity>
47	47	<activity
48	48	android:name="com.gumptech.sdk.PaymentActivity"
49	49	android:configChanges="orientation\|screenSize\|keyboardHidden\|keyboard\|screenLayout"
50	50	android:launchMode="singleTask"
51		- android:theme="@android:style/Theme.Translucent.NoTitleBar" >
	51	+ android:theme="@android:style/Theme.Translucent.NoTitleBar">
52	52	<intent-filter>
53		- <category android:name="android.intent.category.DEFAULT" />
	53	+ <category android:name="android.intent.category.DEFAULT"/>
54	54
55		- <action android:name="android.intent.action.VIEW" />
	55	+ <action android:name="android.intent.action.VIEW"/>
56	56
57		- <category android:name="android.intent.category.BROWSABLE" />
	57	+ <category android:name="android.intent.category.BROWSABLE"/>
58	58
59	59	<data
60	60	android:host="com.gump.sdk"
61		- android:scheme="gump10031" />
	61	+ android:scheme="gump10031"/>
62	62	</intent-filter>
63	63	</activity>
64	64	<activity
65	65	android:name="com.gumptech.sdk.ExchangeWindow"
66	66	android:configChanges="orientation\|screenSize\|keyboardHidden\|keyboard\|screenLayout"
67		- android:theme="@style/Theme.WinForExchange" >
	67	+ android:theme="@style/Theme.WinForExchange">
68	68	</activity>
69	69
70		- <service android:name="com.gumptech.sdk.PushService" >
	70	+ <service android:name="com.gumptech.sdk.PushService">
71	71	</service>
72	72
73	73	<!-- vk -->