From d5d541f6bc23fd70875bbc706639b7e48d50468a Mon Sep 17 00:00:00 2001
From: Guo_shaoshan <2055829622@qq.com>
Date: 星期二, 04 四月 2023 20:36:41 +0800
Subject: [PATCH] 更改解决冲突
---
app_base/build.gradle | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/app_base/build.gradle b/app_base/build.gradle
index 82d4362..dc0253e 100644
--- a/app_base/build.gradle
+++ b/app_base/build.gradle
@@ -66,9 +66,23 @@
// kotlin鎵╁睍锛堝彲閫夛級
// implementation 'com.geyifeng.immersionbar:immersionbar-ktx:3.2.2'
//鍥剧墖鐩稿叧
- api 'com.github.bumptech.glide:glide:4.11.0'
- annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+ api 'com.github.bumptech.glide:glide:4.12.0'
+ annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
//鍐呭瓨娉勯湶宸ュ叿
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.9.1'
+ //鍥剧墖閫夋嫨鍣�
+ // PictureSelector 鍩虹 (蹇呴』)
+ api 'io.github.lucksiege:pictureselector:v3.10.8'
+ // 鍥剧墖鍘嬬缉 (鎸夐渶寮曞叆)
+ api 'io.github.lucksiege:compress:v3.10.8'
+ // 鍥剧墖瑁佸壀 (鎸夐渶寮曞叆)
+ api 'io.github.lucksiege:ucrop:v3.10.8'
+ // 鑷畾涔夌浉鏈� (鎸夐渶寮曞叆)
+ api 'io.github.lucksiege:camerax:v3.10.8'
+
+ // 鍔ㄧ敾瑙ｆ瀽搴擄細https://github.com/airbnb/lottie-android
+ // 鍔ㄧ敾璧勬簮锛歨ttps://lottiefiles.com銆乭ttps://icons8.com/animated-icons
+ api 'com.airbnb.android:lottie:4.1.0'
+
}
\ No newline at end of file
--
Gitblit v1.9.1