huyuguo 4 lat temu
rodzic
commit
de269dfd50

+ 8 - 3
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
        minSdkVersion 21
9
<<<<<<< HEAD
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
    }

BIN
app/.DS_Store


+ 2 - 3
app/build.gradle

@ -31,7 +31,7 @@ android {
31 31
32 32
    defaultConfig {
33 33
        applicationId "com.electric.chargingpile"
34
        minSdkVersion 21
34
        minSdkVersion 24
35 35
        targetSdkVersion 29
36 36
37 37
        multiDexEnabled true
@ -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'

BIN
app/libs/AMap3DMap_6.9.2_AMapNavi_6.9.0_AMapSearch_6.9.2_AMapLocation_4.7.0_20190710.jar


BIN
app/libs/AMap3DMap_7.4.0_AMapNavi_7.4.0_AMapSearch_7.3.0_AMapLocation_5.0.0_20200609.jar


+ 8 - 12
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
    android:versionCode="90"
6
    android:versionName="3.5.2">
5
<<<<<<< HEAD
6
    android:versionCode="91"
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"
@ -686,18 +691,9 @@
686 691
            android:name=".activity.RecommendZhanActivity"
687 692
            android:screenOrientation="portrait" />
688 693
        <activity
689
            android:name="me.iwf.photopicker.PhotoPickerActivity"
690
            android:screenOrientation="portrait" />
691
        <activity
692
            android:name="me.iwf.photopicker.PhotoPagerActivity"
693
            android:screenOrientation="portrait" />
694
        <activity
695 694
            android:name=".activity.QaActivity"
696 695
            android:launchMode="singleTask"
697
            android:screenOrientation="portrait" /> <!-- <activity -->
698
        <!-- android:name=".activity.MyCaptureActivity" -->
699
        <!-- android:launchMode="singleTask" -->
700
        <!-- android:screenOrientation="portrait" /> -->
696
            android:screenOrientation="portrait" />
701 697
        <activity
702 698
            android:name=".activity.ChatActivity"
703 699
            android:launchMode="singleTask"

BIN
app/src/main/jniLibs/armeabi/libAMapSDK_MAP_v6_9_2.so


BIN
app/src/main/jniLibs/armeabi/libAMapSDK_NAVI_v6_9_0.so


BIN
app/src/main/jniLibs/armeabi/libAMapSDK_NAVI_v7_4_0.so


BIN
app/src/main/jniLibs/armeabi/libneonuijni.so


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

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

+ 8 - 3
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
        minSdkVersion 21
7
<<<<<<< HEAD
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
    }

+ 6 - 2
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
        minSdkVersion 21
7
<<<<<<< HEAD
8
        minSdkVersion 24
9
=======
10
        minSdkVersion 19
11
>>>>>>> parent of c2b1368... 扫码支付bug修改
8 12
    }
9 13
10 14
    buildTypes {

+ 15 - 5
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
        minSdkVersion 21
7
<<<<<<< HEAD
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
    }
@ -30,12 +35,17 @@ dependencies {
30 35
    api 'pub.devrel:easypermissions:0.2.0'
31 36
    api 'com.google.code.gson:gson:2.2.4'
32 37
//    compile 'com.github.bumptech.glide:glide:4.1.1'
33
    api 'com.github.bumptech.glide:glide:4.2.0'
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:+'
36
    // 扫码时防止24以下的系统奔溃
41
<<<<<<< HEAD
37 42
    api 'com.google.zxing:core:3.4.0'
38 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修改
39 49
    api 'com.blankj:utilcode:1.9.8'
40 50
    api 'com.zhy:okhttputils:2.4.1'
41 51
    api 'com.alibaba:fastjson:1.1.64.android'