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

Browse Source

 Conflicts:

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

...

This commit is contained in:

squallzhjch

2023-09-15 13:37:15 +08:00

parent 95f2209cc6 fbdaeb3939

commit d78423b039

38 changed files with 1155 additions and 644 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_location_north.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.8 KiB

BIN

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

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 4.6 KiB