squallzhjch 1d48ff0cce Merge branch 'master' of gitlab.navinfo.com:vivo/navinfovivo ...

 Conflicts:

	app/src/main/java/com/navinfo/volvo/ui/fragments/message/ObtainMessageFragment.kt

2023-01-11 14:26:12 +08:00

..

java/com/navinfo/volvo

Merge branch 'master' of gitlab.navinfo.com:vivo/navinfovivo

2023-01-11 14:26:12 +08:00

proto

增加sharde数据存储功能，记录登录用户

2023-01-09 10:58:19 +08:00

res

Merge branch 'master' of gitlab.navinfo.com:vivo/navinfovivo

2023-01-11 14:26:12 +08:00

AndroidManifest.xml

修改第三方view 依赖注入 崩溃问题

2023-01-11 14:24:28 +08:00