squallzhjch
|
9492580b84
|
Merge branch 'master' of gitlab.navinfo.com:vivo/navinfovivo
Conflicts:
app/build.gradle
app/src/main/java/com/navinfo/volvo/ui/MainActivity.kt
app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt
app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageViewModel.kt
app/src/main/res/layout/activity_main.xml
app/src/main/res/layout/fragment_dashboard.xml
app/src/main/res/layout/fragment_obtain_message.xml
app/src/main/res/navigation/mobile_navigation.xml
app/src/main/res/values-night/themes.xml
app/src/main/res/values/themes.xml
|
2023-01-04 15:16:53 +08:00 |
|