Commit 0ea573a86689772980698e1169e02f014c5228b4

Authored by 赵康
1 parent 41d220c11e
Exists in master

update bluePay code for line pay

Showing 8 changed files with 4 additions and 21 deletions Side-by-side Diff

GameSDK-release4.1.1.aar
No preview for this file type
GameSDK-release4.1.2.aar
No preview for this file type
GameSDKDemo/GameSDKDemo.iml
... ... @@ -82,33 +82,16 @@
82 82 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
83 83 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
84 84 <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
85   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
86 85 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
87   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
88   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
89   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
90 86 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/GameSDK-release4.1.1/jars" />
91 87 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.2.0/jars" />
92 88 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.2.0/jars" />
93 89 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
94   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
95   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
96   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
97   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
98   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
99   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
100   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
101 90 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
102   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
103   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
104 91 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
105   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
106 92 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
107   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
108 93 <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
109   - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
110 94 <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
111   - <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
112 95 </content>
113 96 <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
114 97 <orderEntry type="sourceFolder" forTests="false" />
GameSDKDemo/build.gradle
... ... @@ -34,5 +34,5 @@ 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.1.1',ext:'aar')
  37 + compile(name:'GameSDK-release4.1.2',ext:'aar')
38 38 }
GameSDKDemo/libs/GameSDK-release4.1.1.aar
No preview for this file type
GameSDKDemo/libs/GameSDK-release4.1.2.aar
No preview for this file type
GameSDKDemo/proguard-rules.pro
1 1 # Add project specific ProGuard rules here.
2 2 # By default, the flags in this file are appended to flags specified
3   -# in D:\DevTools\android-sdk-windows/tools/proguard/proguard-android.txt
  3 +# in D:\DevTools\android-com.gumptech.sdk-windows/tools/proguard/proguard-android.txt
4 4 # You can edit the include path and order by changing the proguardFiles
5 5 # directive in build.gradle.
6 6 #
GameSDKDemo/src/main/AndroidManifest.xml
... ... @@ -69,9 +69,9 @@
69 69 </service>
70 70  
71 71 <!-- vk -->
72   - <!-- <activity android:name="com.vk.sdk.VKOpenAuthActivity" /> -->
  72 + <!-- <activity android:name="com.vk.com.gumptech.sdk.VKOpenAuthActivity" /> -->
73 73 <!-- <activity -->
74   - <!-- android:name="com.vk.sdk.VKServiceActivity" -->
  74 + <!-- android:name="com.vk.com.gumptech.sdk.VKServiceActivity" -->
75 75 <!-- android:label="ServiceActivity" -->
76 76 <!-- android:theme="@style/VK.Transparent" /> -->
77 77 </application>