提交

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 {
        minSdkVersion 21
<<<<<<< HEAD
        minSdkVersion 24
        targetSdkVersion 29
=======
        minSdkVersion 14
        targetSdkVersion 26
>>>>>>> parent of c2b1368... 扫码支付bug修改
        versionCode 1
        versionName "1.0.1"
    }

app/build.gradle

@@ -31,7 +31,7 @@ android {
    defaultConfig {
        applicationId "com.electric.chargingpile"
        minSdkVersion 21
        minSdkVersion 24
        targetSdkVersion 29
        multiDexEnabled true
@@ -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"
    android:versionCode="90"
    android:versionName="3.5.2">
<<<<<<< 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"
@@ -686,18 +691,9 @@
            android:name=".activity.RecommendZhanActivity"
            android:screenOrientation="portrait" />
        <activity
            android:name="me.iwf.photopicker.PhotoPickerActivity"
            android:screenOrientation="portrait" />
        <activity
            android:name="me.iwf.photopicker.PhotoPagerActivity"
            android:screenOrientation="portrait" />
        <activity
            android:name=".activity.QaActivity"
            android:launchMode="singleTask"
            android:screenOrientation="portrait" /> <!-- <activity -->
        <!-- android:name=".activity.MyCaptureActivity" -->
        <!-- android:launchMode="singleTask" -->
        <!-- android:screenOrientation="portrait" /> -->
            android:screenOrientation="portrait" />
        <activity
            android:name=".activity.ChatActivity"
            android:launchMode="singleTask"

app/src/main/res/drawable-xhdpi/╥бн╒пем╪ф╛╡╩╢Мбр/ImageSelected1/app/src/main/AndroidManifest.xml

@@ -5,8 +5,8 @@
    android:versionName="1.0" >
    <uses-sdk
        android:minSdkVersion="8"
        android:targetSdkVersion="21" />
        android:minSdkVersion="24"
        android:targetSdkVersion="29" />
    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
    <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS" />

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 {
        minSdkVersion 21
<<<<<<< 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 {
        minSdkVersion 21
<<<<<<< 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 {
        minSdkVersion 21
<<<<<<< HEAD
        minSdkVersion 24
        targetSdkVersion 29
=======
        minSdkVersion 19
        targetSdkVersion 26
>>>>>>> parent of c2b1368... 扫码支付bug修改
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
@@ -30,12 +35,17 @@ dependencies {
    api 'pub.devrel:easypermissions:0.2.0'
    api 'com.google.code.gson:gson:2.2.4'
//    compile 'com.github.bumptech.glide:glide:4.1.1'
    api 'com.github.bumptech.glide:glide:4.2.0'
    api 'com.github.bumptech.glide:glide:4.11.0'
//    compile 'com.google.zxing:core:+'
//    compile 'com.google.zxing:android-core:+'
    // 扫码时防止24以下的系统奔溃
<<<<<<< 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'