Skip to content

Commit ab13524

Browse files
sdwfqinsdwfqin
committed
升级第三方依赖，修改Widget aar文件
1 parent 960593f commit ab13524

File tree

18 files changed

+230
-119
lines changed

18 files changed

+230
-119
lines changed

‎.idea/codeStyles/Project.xml‎

Lines changed: 116 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
// 支持AndroidX
1010

1111
// quicklib(Base)
12-
implementation 'com.sdwfqin.quicklib:quicklib:3.0.1'
12+
implementation 'com.sdwfqin.quicklib:quicklib:3.0.2'
1313
// 如果使用butterknife请添加【可选】
1414
annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
1515

1616
// 支付模块
17-
implementation 'com.sdwfqin.quicklib:paylib:3.0.1'
17+
implementation 'com.sdwfqin.quicklib:paylib:3.0.2'
1818

1919
// Android 图片加载库（Glide封装）
20-
implementation 'com.sdwfqin.quick:imageloader:3.0.1'
20+
implementation 'com.sdwfqin.quick:imageloader:3.0.2'
2121

2222
// Android 自定义View组件
23-
implementation 'com.sdwfqin.quick:widget:3.0.1'
23+
implementation 'com.sdwfqin.quick:widget:3.0.2'
2424

2525
==================== AndroidX 分界线 ====================
2626

‎app/build.gradle‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ dependencies {
4242
implementation fileTree(include: ['*.jar'], dir: 'libs')
4343

4444
// 添加 CameraX core
45-
implementation "androidx.camera:camera-core:1.0.0-alpha03"
45+
implementation "androidx.camera:camera-core:1.0.0-alpha05"
4646
// 添加 CameraX Camera2 API 互操作支持
47-
implementation "androidx.camera:camera-camera2:1.0.0-alpha03"
47+
implementation "androidx.camera:camera-camera2:1.0.0-alpha05"
4848

4949
implementation retrofitDependencies["retrofit"]
5050
implementation retrofitDependencies["converter-gson"]
@@ -56,8 +56,6 @@ dependencies {
5656
implementation viewDependencies["pickerview"]
5757

5858
implementation utilsDependencies["multidex"]
59-
implementation 'androidx.appcompat:appcompat:1.0.2'
60-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
6159
annotationProcessor compilerDependencies["butterknife-compiler"]
6260
implementation("com.alibaba.android:vlayout:${vlayout}@aar") {
6361
transitive = true

‎app/src/main/java/com/sdwfqin/quickseed/ui/CameraxDemoActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void onImageSaved(@NonNull File file) {
9595
}
9696

9797
@Override
98-
public void onError(@NonNull ImageCapture.UseCaseError useCaseError, @NonNull String message, @Nullable Throwable cause) {
98+
public void onError(@NonNull ImageCapture.ImageCaptureError imageCaptureError, @NonNull String message, @Nullable Throwable cause) {
9999
String msg = "图片保存失败: " + message;
100100
showMsg(msg);
101101
LogUtils.e(msg);

‎app/src/main/res/layout/activity_pay_pwd_input.xml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,72 +13,72 @@
1313
android:layout_margin="10dp"
1414
android:layout_marginTop="20dp"
1515
android:inputType="number"
16-
app:divideLineWidth="1dp"
17-
app:isPwd="true"
18-
app:maxCount="6"
19-
app:psdType="weChat"
20-
app:rectAngle="0dp" />
16+
app:quick_divideLineWidth="1dp"
17+
app:quick_isPwd="true"
18+
app:quick_maxCount="6"
19+
app:quick_psdType="weChat"
20+
app:quick_rectAngle="0dp" />
2121

2222
<com.sdwfqin.widget.PayPwdInputView
2323
android:layout_width="match_parent"
2424
android:layout_height="wrap_content"
2525
android:layout_margin="10dp"
2626
android:layout_marginTop="20dp"
2727
android:inputType="number"
28-
app:divideLineWidth="1dp"
29-
app:isPwd="true"
30-
app:maxCount="6"
31-
app:psdType="bottomLine"
32-
app:rectAngle="0dp" />
28+
app:quick_divideLineWidth="1dp"
29+
app:quick_isPwd="true"
30+
app:quick_maxCount="6"
31+
app:quick_psdType="bottomLine"
32+
app:quick_rectAngle="0dp" />
3333

3434
<com.sdwfqin.widget.PayPwdInputView
3535
android:layout_width="match_parent"
3636
android:layout_height="wrap_content"
3737
android:layout_margin="10dp"
3838
android:layout_marginTop="20dp"
3939
android:inputType="number"
40-
app:divideLineWidth="1dp"
41-
app:isPwd="false"
42-
app:maxCount="6"
43-
app:psdType="weChat"
44-
app:rectAngle="0dp" />
40+
app:quick_divideLineWidth="1dp"
41+
app:quick_isPwd="false"
42+
app:quick_maxCount="6"
43+
app:quick_psdType="weChat"
44+
app:quick_rectAngle="0dp" />
4545

4646
<com.sdwfqin.widget.PayPwdInputView
4747
android:layout_width="match_parent"
4848
android:layout_height="wrap_content"
4949
android:layout_margin="10dp"
5050
android:layout_marginTop="20dp"
5151
android:inputType="number"
52-
app:divideLineWidth="1dp"
53-
app:isPwd="false"
54-
app:maxCount="6"
55-
app:psdType="bottomLine"
56-
app:rectAngle="0dp" />
52+
app:quick_divideLineWidth="1dp"
53+
app:quick_isPwd="false"
54+
app:quick_maxCount="6"
55+
app:quick_psdType="bottomLine"
56+
app:quick_rectAngle="0dp" />
5757

5858
<com.sdwfqin.widget.PayPwdInputView
5959
android:layout_width="match_parent"
6060
android:layout_height="wrap_content"
6161
android:layout_margin="10dp"
6262
android:layout_marginTop="20dp"
6363
android:inputType="number"
64-
app:autoSize="true"
65-
app:divideLineWidth="1dp"
66-
app:maxCount="6"
67-
app:psdType="block"
68-
app:rectAngle="0dp" />
64+
app:quick_autoSize="true"
65+
app:quick_divideLineWidth="1dp"
66+
app:quick_maxCount="6"
67+
app:quick_psdType="block"
68+
app:quick_rectAngle="0dp" />
6969

7070
<com.sdwfqin.widget.PayPwdInputView
7171
android:layout_width="match_parent"
7272
android:layout_height="wrap_content"
7373
android:layout_margin="10dp"
7474
android:layout_marginTop="20dp"
7575
android:inputType="number"
76-
app:autoSize="true"
77-
app:divideLineWidth="1dp"
78-
app:isPwd="false"
79-
app:maxCount="4"
80-
app:psdType="block"
81-
app:rectAngle="0dp" />
76+
app:quick_autoSize="true"
77+
app:quick_divideLineWidth="1dp"
78+
app:quick_isPwd="false"
79+
app:quick_maxCount="4"
80+
app:quick_psdType="block"
81+
app:quick_rectAngle="0dp" />
8282

8383
<com.sdwfqin.widget.PayPwdInputView
8484
android:layout_width="match_parent"
@@ -88,11 +88,11 @@
8888
android:layout_marginTop="20dp"
8989
android:background="@null"
9090
android:inputType="number"
91-
app:autoSize="true"
92-
app:divideLineWidth="1dp"
93-
app:isPwd="false"
94-
app:maxCount="6"
95-
app:psdType="weChat"
96-
app:rectAngle="0dp" />
91+
app:quick_autoSize="true"
92+
app:quick_divideLineWidth="1dp"
93+
app:quick_isPwd="false"
94+
app:quick_maxCount="6"
95+
app:quick_psdType="weChat"
96+
app:quick_rectAngle="0dp" />
9797

9898
</LinearLayout>

‎config.gradle‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ext {
22

3-
vlayout = "1.2.22"
3+
vlayout = "1.2.26"
44

55
android = [
66
compileSdkVersion: 28,
@@ -10,60 +10,60 @@ ext {
1010
]
1111

1212
googleDependencies = [
13-
"appcompat" : "androidx.appcompat:appcompat:1.1.0-rc01",
13+
"appcompat" : "androidx.appcompat:appcompat:1.1.0",
1414
"annotation" : "androidx.annotation:annotation:1.1.0",
1515
"legacy-support-v4" : "androidx.legacy:legacy-support-v4:1.0.0",
16-
"vectordrawable-animated": "androidx.vectordrawable:vectordrawable-animated:1.1.0-rc01",
16+
"vectordrawable-animated": "androidx.vectordrawable:vectordrawable-animated:1.1.0",
1717
"cardview" : "androidx.cardview:cardview:1.0.0",
1818
"constraintlayout" : "androidx.constraintlayout:constraintlayout:1.1.3",
1919
"material" : "com.google.android.material:material:1.0.0",
2020
]
2121

2222
eventDependencies = [
2323
// rxjava
24-
"rxjava" : "io.reactivex.rxjava2:rxjava:2.2.10",
24+
"rxjava" : "io.reactivex.rxjava2:rxjava:2.2.12",
2525
"rxandroid": "io.reactivex.rxjava2:rxandroid:2.1.1",
2626
// eventbus
2727
"eventbus" : "org.greenrobot:eventbus:3.1.1",
2828
]
2929

3030
retrofitDependencies = [
31-
"retrofit" : "com.squareup.retrofit2:retrofit:2.6.0",
32-
"converter-gson" : "com.squareup.retrofit2:converter-gson:2.6.0",
33-
"converter-scalars": "com.squareup.retrofit2:converter-scalars:2.6.0",
34-
"adapter-rxjava2" : "com.squareup.retrofit2:adapter-rxjava2:2.6.0",
31+
"retrofit" : "com.squareup.retrofit2:retrofit:2.6.1",
32+
"converter-gson" : "com.squareup.retrofit2:converter-gson:2.6.1",
33+
"converter-scalars": "com.squareup.retrofit2:converter-scalars:2.6.1",
34+
"adapter-rxjava2" : "com.squareup.retrofit2:adapter-rxjava2:2.6.1",
3535
]
3636

3737
okhttpDependencies = [
38-
"okhttp" : "com.squareup.okhttp3:okhttp:4.0.0",
39-
"logging-interceptor": "com.squareup.okhttp3:logging-interceptor:4.0.0",
38+
"okhttp" : "com.squareup.okhttp3:okhttp:4.2.0",
39+
"logging-interceptor": "com.squareup.okhttp3:logging-interceptor:4.2.0",
4040
]
4141

4242
viewDependencies = [
4343
// brvah
44-
"brvah" : "com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.45-androidx",
44+
"brvah" : "com.github.CymChad:BaseRecyclerViewAdapterHelper:2.9.49-androidx",
4545
// smartrefresh
46-
"smartrefresh": "com.scwang.smartrefresh:SmartRefreshLayout:1.1.0-andx-11",
46+
"smartrefresh": "com.scwang.smartrefresh:SmartRefreshLayout:1.1.0",
4747
// pickerview
4848
"pickerview" : "com.contrarywind:Android-PickerView:4.1.8",
4949
// butterknife
5050
"butterknife" : "com.jakewharton:butterknife:10.1.0",
5151
]
5252

5353
imageDependencies = [
54-
"glide" : "com.github.bumptech.glide:glide:4.9.0",
55-
"glide-integration": "com.github.bumptech.glide:okhttp3-integration:4.9.0",
54+
"glide" : "com.github.bumptech.glide:glide:4.10.0",
55+
"glide-integration": "com.github.bumptech.glide:okhttp3-integration:4.10.0",
5656
// photoView 图片放大
5757
"photoview" : "com.github.chrisbanes:PhotoView:2.3.0",
5858
// matisse
59-
"matisse" : "com.zhihu.android:matisse:0.5.2-beta4",
59+
"matisse" : "com.zhihu.android:matisse:0.5.3-beta2",
6060
]
6161

6262
utilsDependencies = [
6363
// rxpermissions
6464
"rxpermissions": "com.github.tbruyelle:rxpermissions:0.10.2",
6565
// utils
66-
"utilcodex" : "com.blankj:utilcodex:1.24.4",
66+
"utilcodex" : "com.blankj:utilcodex:1.25.9",
6767
// agentweb
6868
"agentweb" : "com.just.agentweb:agentweb:4.1.2",
6969
// google
@@ -78,11 +78,11 @@ ext {
7878
// 微信
7979
"wechat-sdk-mta" : "com.tencent.mm.opensdk:wechat-sdk-android-with-mta:5.3.1",
8080
// bugly
81-
"crashreport_upgrade": "com.tencent.bugly:crashreport_upgrade:1.4.0",
81+
"crashreport_upgrade": "com.tencent.bugly:crashreport_upgrade:1.4.1",
8282
]
8383

8484
compilerDependencies = [
85-
"glide-compiler" : "com.github.bumptech.glide:compiler:4.9.0",
85+
"glide-compiler" : "com.github.bumptech.glide:compiler:4.10.0",
8686
"butterknife-compiler": "com.jakewharton:butterknife-compiler:10.1.0",
8787
]
8888
}

0 commit comments

Comments
 (0)