Revert "扫码支付bug修改"

This reverts commit c2b13687944bc4d05efb432c4624d4119b4957a0.

# Conflicts:
#	XRefreshView/build.gradle
#	app/src/main/AndroidManifest.xml
#	autolayout/build.gradle
#	library/build.gradle
#	zxing/build.gradle

XRefreshView/build.gradle

@@ -1,13 +1,18 @@
apply plugin: 'com.android.library'
android {
    compileSdkVersion 29
    buildToolsVersion '29.0.2'
    compileSdkVersion 26
    buildToolsVersion '29.0.0'
    resourcePrefix "XRefreshView"
    defaultConfig {
<<<<<<< HEAD
        minSdkVersion 24
        targetSdkVersion 29
=======
        minSdkVersion 14
        targetSdkVersion 26
>>>>>>> parent of c2b1368... 扫码支付bug修改
        versionCode 1
        versionName "1.0.1"
    }

app/build.gradle

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

app/src/main/AndroidManifest.xml

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

autolayout/build.gradle

@@ -1,11 +1,16 @@
apply plugin: 'com.android.library'
android {
    compileSdkVersion 29
    buildToolsVersion '29.0.2'
    compileSdkVersion 26
    buildToolsVersion '29.0.0'
    defaultConfig {
<<<<<<< HEAD
        minSdkVersion 24
        targetSdkVersion 29
=======
        minSdkVersion 19
        targetSdkVersion 26
>>>>>>> parent of c2b1368... 扫码支付bug修改
        versionCode 1
        versionName "1.0"
    }

library/build.gradle

@@ -1,10 +1,14 @@
apply plugin: 'com.android.library'
android {
    compileSdkVersion 29
    buildToolsVersion '29.0.2'
    buildToolsVersion '29.0.0'
    defaultConfig {
<<<<<<< HEAD
        minSdkVersion 24
=======
        minSdkVersion 19
>>>>>>> parent of c2b1368... 扫码支付bug修改
    }
    buildTypes {

zxing/build.gradle

@@ -1,11 +1,16 @@
apply plugin: 'com.android.library'
android {
    compileSdkVersion 29
    buildToolsVersion '29.0.2'
    compileSdkVersion 26
    buildToolsVersion '29.0.0'
    defaultConfig {
<<<<<<< HEAD
        minSdkVersion 24
        targetSdkVersion 29
=======
        minSdkVersion 19
        targetSdkVersion 26
>>>>>>> parent of c2b1368... 扫码支付bug修改
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -33,8 +38,14 @@ dependencies {
    api 'com.github.bumptech.glide:glide:4.11.0'
//    compile 'com.google.zxing:core:+'
//    compile 'com.google.zxing:android-core:+'
<<<<<<< HEAD
    api 'com.google.zxing:core:3.4.0'
    api 'com.google.zxing:android-core:3.3.0'
=======
    // 扫码时防止24以下的系统奔溃
    api 'com.google.zxing:core:3.3.3'
    api 'com.google.zxing:android-core:3.2.0'
>>>>>>> parent of c2b1368... 扫码支付bug修改
    api 'com.blankj:utilcode:1.9.8'
    api 'com.zhy:okhttputils:2.4.1'
    api 'com.alibaba:fastjson:1.1.64.android'