Skip to content

Commit 7205f8f

Browse files
committed
更新支付宝的 SDK 版本至 15.8.06; 更新 targetSdkVersion 至 31
1 parent 79b0a73 commit 7205f8f

File tree

10 files changed

+46
-27
lines changed

10 files changed

+46
-27
lines changed

README.md

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,16 @@ Android SDK 要求 `Android 4.1` 及以上版本
5656
allprojects {
5757
repositories {
5858
// ...其他仓库地址...
59-
jcenter()
60-
61-
// 添加下面的 bintray 仓库地址
59+
mavenCentral()
6260
maven {
63-
url "https://dl.bintray.com/pingxx/maven"
61+
url "https://maven.aliyun.com/repository/jcenter"
62+
}
63+
64+
// 本地 aar 目录,根据实际 aar 放置的目录修改 dirs 中内容。以下为当前项目的示例
65+
flatDir {
66+
dirs(
67+
project(":lib:pingpp").file("libs")
68+
)
6469
}
6570
}
6671
}
@@ -69,9 +74,9 @@ allprojects {
6974
```groovy
7075
dependencies {
7176
implementation 'com.pingxx:pingpp-android:2.3.5' // (Ping++ 标准版 SDK) 必须添加
72-
implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.5.8' // 使用微信支付时添加,具体版本参考微信官方文档或者 jcenter
73-
implementation 'com.pingxx:pingpp-android-alipay-with-utdid:15.7.4' // 使用支付宝时添加(包含 UTDID)
74-
// implementation 'com.pingxx:pingpp-android-alipay:15.7.4' // 使用支付宝时添加(不包含 UTDID)
77+
implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.8.0' // 使用微信支付时添加,具体版本参考微信官方文档或者 jcenter
78+
implementation(group: "", name: "alipaysdk-noutdid-15.8.06.211122165332", ext: "aar") // 使用支付宝时添加(包含 UTDID)
79+
// implementation(group = "", name = "alipaysdk-15.8.06.211122170115", ext = "aar") // 使用支付宝时添加(不包含 UTDID)
7580
implementation 'com.pingxx:pingpp-android-upacp:3.4.9' // 使用银联支付时添加
7681
implementation 'com.pingxx:pingpp-qpay:2.1.19' // 使用QQ钱包时添加
7782
implementation 'com.pingxx:pingpp-android-cmbwallet:1.1.1' // 使用招行一网通时添加

build.gradle

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,28 @@
22
buildscript {
33
repositories {
44
google()
5-
jcenter()
5+
maven {
6+
url "https://maven.aliyun.com/repository/jcenter"
7+
}
68
}
79
dependencies {
8-
classpath 'com.android.tools.build:gradle:3.5.3'
10+
classpath 'com.android.tools.build:gradle:7.0.4'
911
}
1012
}
1113

1214
allprojects {
1315
repositories {
1416
google()
15-
jcenter()
16-
17+
mavenCentral()
1718
maven {
18-
url "https://dl.bintray.com/pingxx/maven"
19+
url "https://maven.aliyun.com/repository/jcenter"
20+
}
21+
22+
// 本地 aar 目录
23+
flatDir {
24+
dirs(
25+
project(":lib:pingpp").file("libs")
26+
)
1927
}
2028
}
2129
}

example/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/release
2+
/build

example/AndroidManifest.xml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,25 @@
2222

2323
<!-- 示例 Activity 供用户参考 -->
2424
<activity
25-
android:name=".MainActivity"
26-
android:screenOrientation="portrait">
25+
android:name="com.pingxx.demoapp.MainActivity"
26+
android:screenOrientation="portrait"
27+
android:exported="true">
2728
<intent-filter>
2829
<action android:name="android.intent.action.MAIN" />
2930

3031
<category android:name="android.intent.category.LAUNCHER" />
3132
</intent-filter>
3233
</activity>
3334

34-
<activity android:name=".ClientSDKActivity" >
35+
<activity android:name="com.pingxx.demoapp.ClientSDKActivity" >
3536
</activity>
3637

3738
<!-- Ping++ sdk -->
3839
<activity
3940
android:name="com.pingplusplus.android.PaymentActivity"
4041
android:theme="@style/AppTheme"
41-
tools:replace="theme">
42+
tools:replace="theme"
43+
android:exported="true">
4244

4345
<intent-filter>
4446
<action android:name="android.intent.action.VIEW"/>
@@ -65,7 +67,8 @@
6567
<!-- 建行 SDK -->
6668
<activity android:name="com.ccb.ccbnetpay.activity.appresult.ResultActivity"
6769
android:configChanges="orientation|keyboardHidden|screenSize"
68-
android:screenOrientation="portrait">
70+
android:screenOrientation="portrait"
71+
android:exported="false">
6972
<intent-filter>
7073
<action android:name="pingppdemowv"/>
7174
<category android:name="android.intent.category.DEFAULT"/>

example/build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 29
4+
compileSdkVersion 31
55
defaultConfig {
66
applicationId "com.pingxx.demoapp"
7-
minSdkVersion 16
8-
targetSdkVersion 29
7+
minSdkVersion 19
8+
targetSdkVersion 31
99
}
10+
1011
buildTypes {
1112
release {
1213
minifyEnabled true
@@ -36,12 +37,12 @@ dependencies {
3637

3738
implementation 'com.pingxx:pingpp-android:2.3.5'
3839
// 使用微信支付时添加
39-
implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:5.5.8'
40+
implementation 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.8.0'
4041
// 使用支付宝时添加不包含 UTDID (当同时使用阿里百川等 SDK 时出现 UTDID 相关冲突可以用这个)
41-
implementation 'com.pingxx:pingpp-android-alipay:15.7.4'
42+
implementation(group: "", name: "alipaysdk-noutdid-15.8.06.211122165332", ext: "aar")
4243

4344
// 使用支付宝时添加(包含 UTDID)
44-
// implementation 'com.pingxx:pingpp-android-alipay-with-utdid:15.7.4'
45+
// implementation(group = "", name = "alipaysdk-15.8.06.211122170115", ext = "aar")
4546
// 使用银联支付时添加
4647
implementation 'com.pingxx:pingpp-android-upacp:3.4.9'
4748
// 使用QQ钱包时添加

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip

lib/pingpp/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 28
4+
compileSdkVersion 31
55
defaultConfig {
6-
minSdkVersion 16
7-
targetSdkVersion 28
6+
minSdkVersion 19
7+
targetSdkVersion 31
88
}
99
buildTypes {
1010
release {
-157 KB
Binary file not shown.
341 KB
Binary file not shown.
321 KB
Binary file not shown.

0 commit comments

Comments
 (0)