Parcourir la Source

Revert "扫码支付bug修改"

This reverts commit c2b13687944bc4d05efb432c4624d4119b4957a0.

# Conflicts:
#	XRefreshView/build.gradle
#	app/src/main/AndroidManifest.xml
#	autolayout/build.gradle
#	library/build.gradle
#	zxing/build.gradle
huyuguo 4 ans auparavant
Parent
commit
38214819ea

+ 7 - 2
XRefreshView/build.gradle

@ -1,13 +1,18 @@
1 1
apply plugin: 'com.android.library'
2 2
3 3
android {
4
    compileSdkVersion 29
5
    buildToolsVersion '29.0.2'
4
    compileSdkVersion 26
5
    buildToolsVersion '29.0.0'
6 6
7 7
    resourcePrefix "XRefreshView"
8 8
    defaultConfig {
9
<<<<<<< HEAD
9 10
        minSdkVersion 24
10 11
        targetSdkVersion 29
12
=======
13
        minSdkVersion 14
14
        targetSdkVersion 26
15
>>>>>>> parent of c2b1368... 扫码支付bug修改
11 16
        versionCode 1
12 17
        versionName "1.0.1"
13 18
    }

+ 1 - 2
app/build.gradle

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

+ 5 - 0
app/src/main/AndroidManifest.xml

@ -2,8 +2,13 @@
2 2
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3 3
    xmlns:tools="http://schemas.android.com/tools"
4 4
    package="com.electric.chargingpile"
5
<<<<<<< HEAD
5 6
    android:versionCode="91"
6 7
    android:versionName="3.5.3">
8
=======
9
    android:versionCode="89"
10
    android:versionName="3.5.1">
11
>>>>>>> parent of c2b1368... 扫码支付bug修改
7 12
    <!-- 往SDCard写入数据权限 -->
8 13
    <permission
9 14
        android:name="${applicationId}.permission.JPUSH_MESSAGE"

+ 7 - 2
autolayout/build.gradle

@ -1,11 +1,16 @@
1 1
apply plugin: 'com.android.library'
2 2
3 3
android {
4
    compileSdkVersion 29
5
    buildToolsVersion '29.0.2'
4
    compileSdkVersion 26
5
    buildToolsVersion '29.0.0'
6 6
    defaultConfig {
7
<<<<<<< HEAD
7 8
        minSdkVersion 24
8 9
        targetSdkVersion 29
10
=======
11
        minSdkVersion 19
12
        targetSdkVersion 26
13
>>>>>>> parent of c2b1368... 扫码支付bug修改
9 14
        versionCode 1
10 15
        versionName "1.0"
11 16
    }

+ 5 - 1
library/build.gradle

@ -1,10 +1,14 @@
1 1
apply plugin: 'com.android.library'
2 2
android {
3 3
    compileSdkVersion 29
4
    buildToolsVersion '29.0.2'
4
    buildToolsVersion '29.0.0'
5 5
6 6
    defaultConfig {
7
<<<<<<< HEAD
7 8
        minSdkVersion 24
9
=======
10
        minSdkVersion 19
11
>>>>>>> parent of c2b1368... 扫码支付bug修改
8 12
    }
9 13
10 14
    buildTypes {

+ 13 - 2
zxing/build.gradle

@ -1,11 +1,16 @@
1 1
apply plugin: 'com.android.library'
2 2
3 3
android {
4
    compileSdkVersion 29
5
    buildToolsVersion '29.0.2'
4
    compileSdkVersion 26
5
    buildToolsVersion '29.0.0'
6 6
    defaultConfig {
7
<<<<<<< HEAD
7 8
        minSdkVersion 24
8 9
        targetSdkVersion 29
10
=======
11
        minSdkVersion 19
12
        targetSdkVersion 26
13
>>>>>>> parent of c2b1368... 扫码支付bug修改
9 14
10 15
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
11 16
    }
@ -33,8 +38,14 @@ dependencies {
33 38
    api 'com.github.bumptech.glide:glide:4.11.0'
34 39
//    compile 'com.google.zxing:core:+'
35 40
//    compile 'com.google.zxing:android-core:+'
41
<<<<<<< HEAD
36 42
    api 'com.google.zxing:core:3.4.0'
37 43
    api 'com.google.zxing:android-core:3.3.0'
44
=======
45
    // 扫码时防止24以下的系统奔溃
46
    api 'com.google.zxing:core:3.3.3'
47
    api 'com.google.zxing:android-core:3.2.0'
48
>>>>>>> parent of c2b1368... 扫码支付bug修改
38 49
    api 'com.blankj:utilcode:1.9.8'
39 50
    api 'com.zhy:okhttputils:2.4.1'
40 51
    api 'com.alibaba:fastjson:1.1.64.android'