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/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt

...

This commit is contained in:

squallzhjch

2023-07-14 16:32:39 +08:00

parent 1412f7106a 4fa9df8e3c

commit 3fb89ca470

29 changed files with 700 additions and 210 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

collect-library/src/main/res/mipmap-xxhdpi/icon_gps.png Normal file

Binary file not shown.

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

BIN

collect-library/src/main/res/mipmap-xxhdpi/icon_gps_1.png Normal file

Binary file not shown.

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

BIN

collect-library/src/main/res/mipmap-xxhdpi/icon_nilocation.png Normal file

Binary file not shown.

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

BIN

collect-library/src/main/res/mipmap-xxhdpi/icon_nilocation_1.png Normal file

Binary file not shown.

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