Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

Browse Source

 Conflicts:

	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt

	app/src/main/res/layout/adapter_sign.xml

...

This commit is contained in:

squallzhjch

2023-06-02 14:17:05 +08:00

parent d68e7bd768 5f953aa816

commit ebc4ddf5a9

13 changed files with 131 additions and 64 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

app/src/main/res/drawable-xxhdpi/icon_evaluation.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 988 B