Browse Source

扫码支付bug修改

huyuguo 4 years ago
parent
commit
c2b1368794

+ 4 - 4
XRefreshView/build.gradle

1
apply plugin: 'com.android.library'
1
apply plugin: 'com.android.library'
2
2
3
android {
3
android {
4
    compileSdkVersion 26
5
    buildToolsVersion '29.0.0'
4
    compileSdkVersion 29
5
    buildToolsVersion '29.0.2'
6
6
7
    resourcePrefix "XRefreshView"
7
    resourcePrefix "XRefreshView"
8
    defaultConfig {
8
    defaultConfig {
9
        minSdkVersion 14
10
        targetSdkVersion 26
9
        minSdkVersion 21
10
        targetSdkVersion 29
11
        versionCode 1
11
        versionCode 1
12
        versionName "1.0.1"
12
        versionName "1.0.1"
13
    }
13
    }

+ 2 - 1
app/build.gradle

173
    implementation project(':library')
173
    implementation project(':library')
174
    implementation project(':zxing')
174
    implementation project(':zxing')
175
    implementation project(':XRefreshView')
175
    implementation project(':XRefreshView')
176
    //    implementation project(':videolibrary:picture_library')
176
//    implementation 'com.google.zxing:core:3.4.0'
177
//    implementation 'com.google.zxing:android-core:3.3.0'
177
    //    compile 'com.google.zxing:core:+'
178
    //    compile 'com.google.zxing:core:+'
178
    //    compile 'com.google.zxing:android-core:+'
179
    //    compile 'com.google.zxing:android-core:+'
179
    implementation 'com.blankj:utilcode:1.9.8'
180
    implementation 'com.blankj:utilcode:1.9.8'

+ 2 - 2
app/src/main/AndroidManifest.xml

2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
    xmlns:tools="http://schemas.android.com/tools"
3
    xmlns:tools="http://schemas.android.com/tools"
4
    package="com.electric.chargingpile"
4
    package="com.electric.chargingpile"
5
    android:versionCode="89"
6
    android:versionName="3.5.1">
5
    android:versionCode="90"
6
    android:versionName="3.5.2">
7
    <!-- 往SDCard写入数据权限 -->
7
    <!-- 往SDCard写入数据权限 -->
8
    <permission
8
    <permission
9
        android:name="${applicationId}.permission.JPUSH_MESSAGE"
9
        android:name="${applicationId}.permission.JPUSH_MESSAGE"

+ 4 - 4
autolayout/build.gradle

1
apply plugin: 'com.android.library'
1
apply plugin: 'com.android.library'
2
2
3
android {
3
android {
4
    compileSdkVersion 26
5
    buildToolsVersion '29.0.0'
4
    compileSdkVersion 29
5
    buildToolsVersion '29.0.2'
6
    defaultConfig {
6
    defaultConfig {
7
        minSdkVersion 19
8
        targetSdkVersion 26
7
        minSdkVersion 21
8
        targetSdkVersion 29
9
        versionCode 1
9
        versionCode 1
10
        versionName "1.0"
10
        versionName "1.0"
11
    }
11
    }

+ 2 - 2
library/build.gradle

1
apply plugin: 'com.android.library'
1
apply plugin: 'com.android.library'
2
android {
2
android {
3
    compileSdkVersion 29
3
    compileSdkVersion 29
4
    buildToolsVersion '29.0.0'
4
    buildToolsVersion '29.0.2'
5
5
6
    defaultConfig {
6
    defaultConfig {
7
        minSdkVersion 19
7
        minSdkVersion 21
8
    }
8
    }
9
9
10
    buildTypes {
10
    buildTypes {

+ 6 - 6
zxing/build.gradle

1
apply plugin: 'com.android.library'
1
apply plugin: 'com.android.library'
2
2
3
android {
3
android {
4
    compileSdkVersion 26
5
    buildToolsVersion '29.0.0'
4
    compileSdkVersion 29
5
    buildToolsVersion '29.0.2'
6
    defaultConfig {
6
    defaultConfig {
7
        minSdkVersion 19
8
        targetSdkVersion 26
7
        minSdkVersion 21
8
        targetSdkVersion 29
9
9
10
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
10
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
11
    }
11
    }
34
//    compile 'com.google.zxing:core:+'
34
//    compile 'com.google.zxing:core:+'
35
//    compile 'com.google.zxing:android-core:+'
35
//    compile 'com.google.zxing:android-core:+'
36
    // 扫码时防止24以下的系统奔溃
36
    // 扫码时防止24以下的系统奔溃
37
    api 'com.google.zxing:core:3.3.3'
38
    api 'com.google.zxing:android-core:3.2.0'
37
    api 'com.google.zxing:core:3.4.0'
38
    api 'com.google.zxing:android-core:3.3.0'
39
    api 'com.blankj:utilcode:1.9.8'
39
    api 'com.blankj:utilcode:1.9.8'
40
    api 'com.zhy:okhttputils:2.4.1'
40
    api 'com.zhy:okhttputils:2.4.1'
41
    api 'com.alibaba:fastjson:1.1.64.android'
41
    api 'com.alibaba:fastjson:1.1.64.android'