Quellcode durchsuchen

扫码问题解决

huyuguo vor 4 Jahren
Ursprung
Commit
756a5867ed

+ 1 - 1
XRefreshView/build.gradle

@ -6,7 +6,7 @@ android {
6 6
7 7
    resourcePrefix "XRefreshView"
8 8
    defaultConfig {
9
        minSdkVersion 21
9
        minSdkVersion 24
10 10
        targetSdkVersion 29
11 11
        versionCode 1
12 12
        versionName "1.0.1"

+ 1 - 1
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

+ 3 - 12
app/src/main/AndroidManifest.xml

@ -2,8 +2,8 @@
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
    android:versionCode="91"
6
    android:versionName="3.5.3">
7 7
    <!-- 往SDCard写入数据权限 -->
8 8
    <permission
9 9
        android:name="${applicationId}.permission.JPUSH_MESSAGE"
@ -686,18 +686,9 @@
686 686
            android:name=".activity.RecommendZhanActivity"
687 687
            android:screenOrientation="portrait" />
688 688
        <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 689
            android:name=".activity.QaActivity"
696 690
            android:launchMode="singleTask"
697
            android:screenOrientation="portrait" /> <!-- <activity -->
698
        <!-- android:name=".activity.MyCaptureActivity" -->
699
        <!-- android:launchMode="singleTask" -->
700
        <!-- android:screenOrientation="portrait" /> -->
691
            android:screenOrientation="portrait" />
701 692
        <activity
702 693
            android:name=".activity.ChatActivity"
703 694
            android:launchMode="singleTask"

+ 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" />

+ 1 - 1
autolayout/build.gradle

@ -4,7 +4,7 @@ android {
4 4
    compileSdkVersion 29
5 5
    buildToolsVersion '29.0.2'
6 6
    defaultConfig {
7
        minSdkVersion 21
7
        minSdkVersion 24
8 8
        targetSdkVersion 29
9 9
        versionCode 1
10 10
        versionName "1.0"

+ 1 - 1
library/build.gradle

@ -4,7 +4,7 @@ android {
4 4
    buildToolsVersion '29.0.2'
5 5
6 6
    defaultConfig {
7
        minSdkVersion 21
7
        minSdkVersion 24
8 8
    }
9 9
10 10
    buildTypes {

+ 2 - 3
zxing/build.gradle

@ -4,7 +4,7 @@ android {
4 4
    compileSdkVersion 29
5 5
    buildToolsVersion '29.0.2'
6 6
    defaultConfig {
7
        minSdkVersion 21
7
        minSdkVersion 24
8 8
        targetSdkVersion 29
9 9
10 10
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@ -30,10 +30,9 @@ dependencies {
30 30
    api 'pub.devrel:easypermissions:0.2.0'
31 31
    api 'com.google.code.gson:gson:2.2.4'
32 32
//    compile 'com.github.bumptech.glide:glide:4.1.1'
33
    api 'com.github.bumptech.glide:glide:4.2.0'
33
    api 'com.github.bumptech.glide:glide:4.11.0'
34 34
//    compile 'com.google.zxing:core:+'
35 35
//    compile 'com.google.zxing:android-core:+'
36
    // 扫码时防止24以下的系统奔溃
37 36
    api 'com.google.zxing:core:3.4.0'
38 37
    api 'com.google.zxing:android-core:3.3.0'
39 38
    api 'com.blankj:utilcode:1.9.8'