Merge branch 'master' of gitlab.navinfo.com:vivo/navinfovivo
Conflicts: app/build.gradle app/src/main/java/com/navinfo/volvo/database/entity/GreetingMessage.kt app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageViewModel.kt
This commit is contained in:
@@ -149,8 +149,10 @@ dependencies {
|
||||
implementation("com.github.bumptech.glide:glide:4.11.0") {
|
||||
exclude group: "com.android.support"
|
||||
}
|
||||
|
||||
|
||||
// 多媒体播放库 https://github.com/JagarYousef/ChatVoicePlayer
|
||||
implementation 'com.github.JagarYousef:ChatVoicePlayer:1.1.0'
|
||||
// 图片查看器 https://github.com/XiaoGe-1996/ImageViewer
|
||||
implementation 'com.github.XiaoGe-1996:ImageViewer:v1.0.0'
|
||||
}
|
||||
|
||||
kapt {
|
||||
|
||||
Reference in New Issue
Block a user