将所有gradle升级至31

XRefreshView/build.gradle

@@ -1,13 +1,14 @@
apply plugin: 'com.android.library'
android {
    compileSdkVersion 29
    buildToolsVersion '29.0.2'
    def android = rootProject.ext.android
    compileSdkVersion android["compileSdkVersion"]
//    buildToolsVersion '29.0.2'
    resourcePrefix "XRefreshView"
    defaultConfig {
        minSdkVersion 24
        targetSdkVersion 29
        minSdkVersion android["minSdkVersion"]
        targetSdkVersion android["targetSdkVersion"]
        versionCode 1
        versionName "1.0.1"
    }

app/build.gradle

@@ -3,6 +3,7 @@ apply plugin: 'org.greenrobot.greendao'
apply plugin: 'com.mob.sdk'
apply plugin: 'bugly'
bugly {
    appId = '900010422' // 注册时分配的App ID
    appKey = 'mnhwhy8jP7Fq2G6b' // 注册时分配的App Key
@@ -18,8 +19,9 @@ android {
            storePassword 'd1ev123'
        }
    }
    compileSdkVersion 29
    buildToolsVersion '29.0.2'
    def android = rootProject.ext.android
    compileSdkVersion android["compileSdkVersion"]
    aaptOptions.cruncherEnabled = false
    aaptOptions.useNewCruncher = false
@@ -30,9 +32,9 @@ android {
    }
    defaultConfig {
        applicationId "com.electric.chargingpile"
        minSdkVersion 24
        targetSdkVersion 29
        applicationId android["applicationId"]
        minSdkVersion android["minSdkVersion"]
        targetSdkVersion android["targetSdkVersion"]
        multiDexEnabled true
@@ -43,14 +45,10 @@ android {
        flavorDimensions "default"
        vectorDrawables.useSupportLibrary = true
        manifestPlaceholders = rootProject.ext.manifestPlaceholders
//        jackOptions {
//            enabled true
//        }
    }
    ndkVersion '22.1.7171670'
    dataBinding {
        enabled true
    }
    buildFeatures {
        dataBinding = true
    }
    sourceSets.main {
@@ -111,7 +109,6 @@ android {
    productFlavors {
        yingyongbao {}
        xiaomi {}
        huawei {}
        oppo {}
@@ -193,7 +190,7 @@ dependencies {
    implementation 'com.zhy:flowlayout-lib:1.0.3'
    //类似与Event bus
    implementation 'com.squareup:otto:+'
    implementation 'org.greenrobot:greendao:3.2.0'
    implementation 'org.greenrobot:greendao:3.3.0'
    implementation 'org.greenrobot:greendao-generator:3.2.0'
    implementation 'com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.1.0'
    implementation 'com.github.ksoichiro:android-observablescrollview:+'
@@ -234,7 +231,8 @@ dependencies {
    implementation 'com.afollestad.material-dialogs:commons:0.9.6.0'
    // 库过期，下载源码修改
    //    implementation 'com.github.Aspsine:IRecyclerView:0.0.7'
    implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.5.6'
    //选择图片，查看图片
    implementation 'io.github.lucksiege:pictureselector:v2.7.3-rc10'
//    implementation files('libs/bugly_crash_release_3.2.2.jar')
    implementation "androidx.camera:camera-camera2:1.1.0-alpha07"
    implementation "androidx.camera:camera-core:1.1.0-alpha07"
@@ -245,6 +243,6 @@ dependencies {
//    implementation 'com.squareup.picasso:picasso:2.71828'
    // https://github.com/khoyron/Actionsheet-android
    implementation 'com.github.khoyron:Actionsheet-android:4'
    implementation 'cn.jiguang.sdk:jpush:4.0.6'
    implementation 'cn.jiguang.sdk:jcore:2.8.2'
    implementation 'cn.jiguang.sdk:jpush:4.6.2'
    implementation 'cn.jiguang.sdk:jcore:3.2.2'
}

app/src/main/AndroidManifest.xml

@@ -75,8 +75,9 @@
        tools:ignore="LockedOrientationActivity">
        <activity
            android:name=".activity.CarOwnerCertificateListActivity"
            android:launchMode="singleTask"></activity>
            android:launchMode="singleTask"/>
        <activity
            android:exported="true"
            android:name=".activity.PrivacyAgreementActivity"
            android:screenOrientation="portrait">
            <intent-filter>
@@ -86,7 +87,7 @@
        </activity>
        <activity
            android:name=".activity.PermissionAgreementActivity"
            android:screenOrientation="portrait"></activity>
            android:screenOrientation="portrait"/>
        <activity
            android:name=".activity.CarModelActivity"
            android:launchMode="singleTop"
@@ -627,6 +628,7 @@
            android:name=".activity.ChargingCommentActivity"
            android:screenOrientation="portrait" />
        <activity
            android:exported="true"
            android:name=".activity.NonSecretSeettingActivity"
            android:launchMode="singleTask"
            android:screenOrientation="portrait">
@@ -876,7 +878,9 @@
        <!-- User defined.  For test only  用户自定义接收消息器,3.0.7开始支持,目前新tag/alias接口设置结果会在该广播接收器对应的方法中回调-->
        <!--since 3.3.0 接收JPush相关事件-->
        <receiver android:name="com.electric.chargingpile.jpush.PushMessageReceiver">
        <receiver
            android:exported="false"
            android:name="com.electric.chargingpile.jpush.PushMessageReceiver">
            <intent-filter>
                <action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
                <category android:name="${applicationId}"></category>

app/src/main/java/com/electric/chargingpile/activity/PublishVideoTopicActivity.java

@@ -47,12 +47,10 @@ import com.electric.chargingpile.util.ToastUtil;
import com.electric.chargingpile.util.Util;
import com.luck.picture.lib.PictureSelector;
import com.luck.picture.lib.animators.AnimationType;
import com.luck.picture.lib.camera.CustomCameraView;
import com.luck.picture.lib.config.PictureConfig;
import com.luck.picture.lib.config.PictureMimeType;
import com.luck.picture.lib.entity.LocalMedia;
import com.luck.picture.lib.tools.SdkVersionUtils;
import com.luck.pictureselector.GlideEngine;
import com.electric.chargingpile.engine.GlideEngine;
import com.umeng.analytics.MobclickAgent;
import com.upyun.library.common.UploadEngine;
import com.upyun.library.listener.UpCompleteListener;
@@ -249,14 +247,14 @@ public class PublishVideoTopicActivity extends Activity implements OnClickListen
//                        .setPictureWindowAnimationStyle(mWindowAnimationStyle)// 自定义相册启动退出动画
                        .setRecyclerAnimationMode(AnimationType.SLIDE_IN_BOTTOM_ANIMATION)// 列表动画效果
                        .isMaxSelectEnabledMask(true)// 选择数到了最大阀值列表是否启用蒙层效果
                        .setButtonFeatures(CustomCameraView.BUTTON_STATE_ONLY_RECORDER)// 设置自定义相机按钮状态
//                        .setButtonFeatures(CustomCameraView.BUTTON_STATE_ONLY_RECORDER)// 设置自定义相机按钮状态
                        .maxVideoSelectNum(1) // 视频最大选择数量
                        .minVideoSelectNum(1)// 视频最小选择数量
                        //.closeAndroidQChangeVideoWH(!SdkVersionUtils.checkedAndroid_Q())// 关闭在AndroidQ下获取图片或视频宽高相反自动转换
                        .imageSpanCount(4)// 每行显示个数
                        .isReturnEmpty(false)// 未选择数据时点击按钮是否可以返回
                        .closeAndroidQChangeWH(true)//如果图片有旋转角度则对换宽高,默认为true
                        .closeAndroidQChangeVideoWH(!SdkVersionUtils.checkedAndroid_Q())// 如果视频有旋转角度则对换宽高,默认为false
//                        .closeAndroidQChangeWH(true)//如果图片有旋转角度则对换宽高,默认为true
//                        .closeAndroidQChangeVideoWH(!SdkVersionUtils.checkedAndroid_Q())// 如果视频有旋转角度则对换宽高,默认为false
                        .setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)// 设置相册Activity方向，不设置默认使用系统
                        .selectionMode(PictureConfig.MULTIPLE)// 多选 or 单选
                        .isPreviewVideo(true)// 是否可预览视频

app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@@ -203,6 +203,8 @@ public class MainApplication extends MultiDexApplication {
    public void initJPush() {
        //极光
        JPushInterface.setSmartPushEnable(this,true);
        JPushInterface.setDebugMode(BuildConfig.DEBUG);
        JPushInterface.init(this);
        Log.e("TAG", "initJPush: "+ JPushInterface.getRegistrationID(this) );

app/src/main/java/com/luck/pictureselector/GlideEngine.java

@@ -1,4 +1,4 @@
package com.luck.pictureselector;
package com.electric.chargingpile.engine;
import android.content.Context;
import android.graphics.Bitmap;
@@ -118,7 +118,6 @@ public class GlideEngine implements ImageEngine {
     * @param longImageView
     * @ 已废弃
     */
    @Override
    public void loadImage(@NonNull Context context, @NonNull String url,
                          @NonNull ImageView imageView,
                          SubsamplingScaleImageView longImageView) {
@@ -188,7 +187,6 @@ public class GlideEngine implements ImageEngine {
     * @param url       图片路径
     * @param imageView 承载图片ImageView
     */
    @Override
    public void loadAsGifImage(@NonNull Context context, @NonNull String url,
                               @NonNull ImageView imageView) {
        Glide.with(context)

autolayout/build.gradle

@@ -1,11 +1,13 @@
apply plugin: 'com.android.library'
android {
    compileSdkVersion 29
    buildToolsVersion '29.0.2'
    def android = rootProject.ext.android
    compileSdkVersion android["compileSdkVersion"]
//    buildToolsVersion '29.0.2'
    defaultConfig {
        minSdkVersion 24
        targetSdkVersion 29
        minSdkVersion android["minSdkVersion"]
        targetSdkVersion android["targetSdkVersion"]
        versionCode 1
        versionName "1.0"
    }

build.gradle

@@ -1,4 +1,5 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
apply from: "config.gradle"
buildscript {
//    apply plugin: 'bugly'
//    apply plugin: 'org.greenrobot.greendao'
@@ -11,11 +12,12 @@ buildscript {
        maven {url 'https://maven.aliyun.com/repository/google/'}
        maven {url 'https://maven.aliyun.com/repository/public/'}
        maven {url 'https://maven.aliyun.com/repository/gradle-plugin/'}
        mavenCentral()
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:3.6.3'
        classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
        classpath 'com.android.tools.build:gradle:4.2.1'
        classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0'
        classpath 'com.tencent.bugly:symtabfileuploader:latest.release'
        classpath "com.mob.sdk:MobSDK:+"
@@ -31,13 +33,6 @@ allprojects {
        maven {url 'https://maven.aliyun.com/repository/gradle-plugin/'}
        maven { url "https://www.jitpack.io" }
        maven { url 'https://repo1.maven.org/maven2/' }
        mavenCentral()
    }
}
ext{
    manifestPlaceholders= [
            JPUSH_PKGNAME : "com.electric.chargingpile",
            JPUSH_APPKEY  : "19fde8a6fe56b6918522bfa3", //JPush 上注册的包名对应的 Appkey.
            JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
    ]
}

config.gradle

@@ -0,0 +1,14 @@
ext{
    android = [
            compileSdkVersion: 31,
            applicationId    : "com.electric.chargingpile",
            minSdkVersion    : 24,
            targetSdkVersion : 31,
    ]
    manifestPlaceholders= [
            JPUSH_PKGNAME : "com.electric.chargingpile",
            JPUSH_APPKEY  : "19fde8a6fe56b6918522bfa3", //JPush 上注册的包名对应的 Appkey.
            JPUSH_CHANNEL : "developer-default", //暂时填写默认值即可.
    ]
}

gradle/wrapper/gradle-wrapper.properties

@@ -4,4 +4,4 @@ distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
org.gradle.jvmargs=-Xmx4096m -XX\:MaxPermSize\=6144m
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip

library/build.gradle

@@ -1,10 +1,12 @@
apply plugin: 'com.android.library'
android {
    compileSdkVersion 29
    buildToolsVersion '29.0.2'
    def android = rootProject.ext.android
    compileSdkVersion android["compileSdkVersion"]
//    buildToolsVersion '29.0.2'
    defaultConfig {
        minSdkVersion 24
        minSdkVersion android["minSdkVersion"]
    }
    buildTypes {

zxing/build.gradle

@@ -1,11 +1,14 @@
apply plugin: 'com.android.library'
android {
    compileSdkVersion 29
    buildToolsVersion '29.0.2'
    def android = rootProject.ext.android
    compileSdkVersion android["compileSdkVersion"]
//    buildToolsVersion '29.0.2'
    defaultConfig {
        minSdkVersion 24
        targetSdkVersion 29
        minSdkVersion android["minSdkVersion"]
        targetSdkVersion android["targetSdkVersion"]
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
    buildTypes {

zxing/src/main/AndroidManifest.xml

@@ -35,7 +35,9 @@
    <application
        android:label="@string/app_name"
        >
        <activity android:name=".CaptureActivity"
        <activity
            android:exported="true"
            android:name=".CaptureActivity"
            android:screenOrientation="portrait"
            android:clearTaskOnLaunch="true"
            android:stateNotNeeded="true"
@@ -83,8 +85,10 @@
        </activity>
        <activity android:name=".PreferencesActivity"
            android:label="@string/preferences_name"
            android:exported="true"
            android:stateNotNeeded="true"/>
        <activity android:name=".encode.EncodeActivity"
            android:exported="true"
            android:stateNotNeeded="true">
            <intent-filter>
                <action android:name="com.google.zxing.client.android.ENCODE"/>
@@ -106,6 +110,7 @@
        <activity android:name=".book.SearchBookContentsActivity"
            android:label="@string/sbc_name"
            android:stateNotNeeded="true"
            android:exported="true"
            android:screenOrientation="sensorLandscape">
            <intent-filter>
                <action android:name="com.google.zxing.client.android.SEARCH_BOOK_CONTENTS"/>
@@ -114,6 +119,7 @@
        </activity>
        <activity android:name=".share.ShareActivity"
            android:stateNotNeeded="true"
            android:exported="true"
            android:screenOrientation="user">
            <intent-filter>
                <action android:name="com.google.zxing.client.android.SHARE"/>

zxing/src/main/java/com/google/zxing/client/android/SystemTypeUtil.java

@@ -30,6 +30,7 @@ public class SystemTypeUtil {
    private static final String KEY_MIUI_VERSION_CODE = "ro.miui.ui.version.code";
    private static final String KEY_MIUI_VERSION_NAME = "ro.miui.ui.version.name";
    private static final String KEY_MIUI_INTERNAL_STORAGE = "ro.miui.internal.storage";
    private static final String APPLICATION_ID = "com.electric.chargingpile";
    /**
@@ -85,7 +86,7 @@ public class SystemTypeUtil {
//            ToastUtil.show("我是魅族");
            Intent intent = new Intent("com.meizu.safe.security.SHOW_APPSEC");
            intent.addCategory(Intent.CATEGORY_DEFAULT);
            intent.putExtra("packageName", BuildConfig.APPLICATION_ID);
            intent.putExtra("packageName", APPLICATION_ID);
            try {
                context.startActivity(intent);
            } catch (Exception e) {
@@ -97,7 +98,7 @@ public class SystemTypeUtil {
            Intent intent = new Intent("miui.intent.action.APP_PERM_EDITOR");
            ComponentName componentName = new ComponentName("com.miui.securitycenter", "com.miui.permcenter.permissions.AppPermissionsEditorActivity");
            intent.setComponent(componentName);
            intent.putExtra("extra_pkgname", BuildConfig.APPLICATION_ID);
            intent.putExtra("extra_pkgname", APPLICATION_ID);
            try {
                context.startActivity(intent);
            } catch (Exception e) {