diff-61e19484f691be5f0facc54b011dc5da772738efR9">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'
|