gradle 升级

app/build.gradle

@@ -18,24 +18,35 @@ android {
            storePassword 'd1ev123'
        }
    }
    compileSdkVersion 26
    compileSdkVersion 27
//    buildToolsVersion '28.0.3'
    buildToolsVersion '29.0.0'
    aaptOptions.cruncherEnabled = false
    aaptOptions.useNewCruncher = false
//    compileOptions {
//        sourceCompatibility JavaVersion.VERSION_1_8
//        targetCompatibility JavaVersion.VERSION_1_8
//    }
    defaultConfig {
        applicationId "com.electric.chargingpile"
        minSdkVersion 19
        targetSdkVersion 26
        targetSdkVersion 27
        multiDexEnabled true
        ndk {
            abiFilters "armeabi"
        }
        flavorDimensions "default"
//        jackOptions {
//            enabled true
//        }
    }
    sourceSets.main {
        jniLibs.srcDirs 'src/main/libs'
    }
@@ -55,7 +66,7 @@ android {
            // 移除无用的resource文件
//            shrinkResources true
            //启用代码混淆  debug 模式下需要设置为false，否则无法看到局部变量的值
            minifyEnabled true
            minifyEnabled false
            //混淆规则配置文件
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
            signingConfig signingConfigs.release
@@ -92,11 +103,11 @@ android {
    }
    productFlavors {
        yingyongbao {}
        c360 {}
        xiaomi {}
        huawei {}
        oppo {}
//        yingyongbao {}
//        c360 {}
//        xiaomi {}
//        huawei {}
//        oppo {}
        cdz {}
@@ -155,76 +166,64 @@ MobSDK {
}
dependencies {
    compile files('libs/mframework.jar')
    compile files('libs/picasso-2.5.2.jar')
    compile project(':autolayout')
    compile files('libs/universal-image-loader-1.9.1.jar')
    compile files('libs/bugly_1.2.9_release.jar')
    //noinspection GradleCompatible
    compile files('libs/jg_filter_sdk_1.1.jar')
    compile files('libs/wup-1.0.0.E-SNAPSHOT.jar')
    compile files('libs/pinyin4j-2.5.0.jar')
    compile files('libs/pinyin4android1.0.jar')
    compile files('libs/Msc.jar')
    compile files('libs/libammsdk.jar')
    compile files('libs/alipaySdk-20160427.jar')
    implementation fileTree(dir: 'libs', include: ['*.jar'])
    implementation project(':autolayout')
    implementation project(':library')
    implementation project(':zxing')
    implementation project(':XRefreshView')
    implementation project(':videolibrary:picture_library')
//    compile 'com.google.zxing:core:+'
//    compile 'com.google.zxing:android-core:+'
    compile project(':library')
    compile files('libs/ZBarDecoder.jar')
    compile files('libs/jpush-android_v3.0.6.jar')
    compile files('libs/jcore-android_v1.1.3.jar')
    compile 'com.blankj:utilcode:1.9.8'
    //    compile project(':xrichtextt')
    compile 'com.android.support:multidex:1.0.1'
    compile 'com.umeng.analytics:analytics:latest.integration'
    compile 'com.google.code.gson:gson:2.2.4'
    implementation 'com.blankj:utilcode:1.9.8'
    implementation 'com.android.support:multidex:1.0.1'
    implementation 'com.umeng.analytics:analytics:latest.integration'
    implementation 'com.google.code.gson:gson:2.2.4'
    //    compile 'com.squareup.okhttp:okhttp:3.14.0'
    compile 'com.squareup.okhttp:okhttp:2.0.0'
    compile 'com.zhy:okhttputils:2.4.1'
    compile 'com.android.support:support-v4:26.1.0'
    compile 'com.google.android.gms:play-services-appindexing:9.4.0'
    compile 'com.android.support.constraint:constraint-layout:1.0.2'
    compile 'com.zhy:flowlayout-lib:1.0.3'
    compile 'com.squareup:otto:+'
    compile 'org.greenrobot:greendao:3.2.0'
    compile 'org.greenrobot:greendao-generator:3.2.0'
    compile 'com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.1.0'
    compile 'com.github.ksoichiro:android-observablescrollview:+'
    compile 'me.codeboy.android:align-text-view:2.3.0'
    compile 'me.itangqi.waveloadingview:library:0.3.5'
    compile 'com.yinglan.scrolllayout:scrolllayout:1.0.0'
    compile 'com.android.support:appcompat-v7:26.1.0'
    compile 'com.android.support:design:26.1.0'
    implementation 'com.squareup.okhttp:okhttp:2.0.0'
    implementation 'com.zhy:okhttputils:2.4.1'
    implementation 'com.android.support:support-v4:27.1.1'
    implementation 'com.google.android.gms:play-services-appindexing:9.4.0'
    implementation 'com.android.support.constraint:constraint-layout:1.1.2'
    implementation 'com.zhy:flowlayout-lib:1.0.3'
    implementation 'com.squareup:otto:+'
    implementation 'org.greenrobot:greendao:3.2.0'
    implementation 'org.greenrobot:greendao-generator:3.2.0'
    implementation 'com.github.yuweiguocn:GreenDaoUpgradeHelper:v2.1.0'
    implementation 'com.github.ksoichiro:android-observablescrollview:+'
    implementation 'me.codeboy.android:align-text-view:2.3.0'
    implementation 'me.itangqi.waveloadingview:library:0.3.5'
    implementation 'com.yinglan.scrolllayout:scrolllayout:1.0.0'
    implementation 'com.android.support:appcompat-v7:27.1.1'
    implementation 'com.android.support:design:27.1.1'
    //    compile 'com.nineoldandroids:library:2.4.0'
//    compile 'com.github.bumptech.glide:glide:4.1.1'
    compile 'com.github.bumptech.glide:glide:4.2.0'
    compile 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
    compile 'top.zibin:Luban:1.1.2'
    compile 'com.ms-square:expandableTextView:0.1.4'
    compile 'io.reactivex.rxjava2:rxjava:2.0.5'
    compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
    compile 'com.cjj.materialrefeshlayout:library:1.3.0'
    compile project(':zxing')
    compile 'com.alibaba:fastjson:1.1.64.android'
    compile 'pub.devrel:easypermissions:0.2.0'
    compile 'com.github.PhilJay:MPAndroidChart:v3.0.3'
    compile 'com.github.promeg:tinypinyin:1.0.0'
    compile 'org.greenrobot:eventbus:3.0.0'
    compile files('libs/AMap3DMap_6.9.2_AMapNavi_6.9.0_AMapSearch_6.9.2_AMapLocation_4.7.0_20190710.jar')
    compile 'com.qmuiteam:qmui:1.2.0'
    compile 'org.zackratos:ultimatebar:1.1.1'
    compile project(':XRefreshView')
    compile 'com.github.Aspsine:IRecyclerView:0.0.7'
    compile 'com.upyun:upyun-android-sdk:+'
    compile project(':videolibrary:picture_library')
    implementation 'com.github.bumptech.glide:glide:4.2.0'
    implementation 'me.iwf.photopicker:PhotoPicker:0.9.12@aar'
    implementation 'top.zibin:Luban:1.1.2'
    implementation 'com.ms-square:expandableTextView:0.1.4'
    implementation 'io.reactivex.rxjava2:rxjava:2.0.5'
    implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
    implementation 'com.cjj.materialrefeshlayout:library:1.3.0'
    implementation 'com.alibaba:fastjson:1.1.64.android'
    implementation 'pub.devrel:easypermissions:0.2.0'
    implementation 'com.github.PhilJay:MPAndroidChart:v3.0.3'
    implementation 'com.github.promeg:tinypinyin:1.0.0'
    implementation 'org.greenrobot:eventbus:3.0.0'
    implementation 'com.qmuiteam:qmui:1.2.0'
    implementation 'org.zackratos:ultimatebar:1.1.1'
    implementation 'com.github.Aspsine:IRecyclerView:0.0.7'
    implementation 'com.upyun:upyun-android-sdk:+'
    // 上下翻页
    compile 'com.github.castorflex.verticalviewpager:library:19.0.1'
    implementation 'com.github.castorflex.verticalviewpager:library:19.0.1'
    // sqlite异常结局
    compile 'net.zetetic:android-database-sqlcipher:3.5.7@aar'
    implementation 'net.zetetic:android-database-sqlcipher:3.5.7@aar'
    compile 'com.shuyu:GSYVideoPlayer:5.0.2'
    implementation 'com.shuyu:GSYVideoPlayer:5.0.2'
    //compile 'com.github.chrisbanes:PhotoView:2.0.0'
    compile 'com.wang.avi:library:2.1.3'
    implementation 'com.wang.avi:library:2.1.3'
}

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

@@ -357,7 +357,7 @@ public class UserCenterMoreActivity extends Activity implements View.OnClickList
                builder.setPositiveButton("确定", new DialogInterface.OnClickListener() {
                    @Override
                    public void onClick(DialogInterface dialog, int which) {
                        MobclickAgent.onProfileSignOff();
//                        MobclickAgent.onProfileSignOff();
                        try {
                            sendLoginStatus();
                        } catch (Exception e) {

build.gradle

@@ -14,7 +14,7 @@ buildscript {
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:2.3.3'
        classpath 'com.android.tools.build:gradle:3.2.1'
        classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2'
        classpath 'com.tencent.bugly:symtabfileuploader:latest.release'

gradle/wrapper/gradle-wrapper.properties

@@ -4,4 +4,4 @@ distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
org.gradle.jvmargs=-Xmx5120m -XX\:MaxPermSize\=5120m
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip

settings.gradle

@@ -1,2 +1,2 @@
include ':app', ':autolayout', ':zxing', ':XRefreshView',':library'
include ':videolibrary:picture_library', ':videolibrary:SmallVideoLib2'
include ':videolibrary:picture_library', ':videolibrary:SmallVideoLib2'

zxing/src/main/AndroidManifest.xml

@@ -13,8 +13,6 @@
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="22"/>
    <!-- Don't require camera, as this requires a rear camera. This allows it to work on the Nexus 7 -->
    <uses-feature android:name="android.hardware.camera" android:required="false"/>
    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>