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

 Conflicts:

	app/src/main/java/com/navinfo/omqs/Constant.kt

	app/src/main/java/com/navinfo/omqs/bean/OfflineMapCityBean.kt

	app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt

	app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt

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

2023-04-03 10:46:26 +08:00

..

activity_login.xml

增加离线地图下载流程

2023-04-03 10:40:53 +08:00

activity_main.xml

增加离线地图下载流程

2023-03-30 10:50:20 +08:00

activity_map_test.xml

fix: 增加文件选择功能

2023-03-29 17:49:41 +08:00

adapter_offline_map_city.xml

增加离线地图下载流程

2023-04-03 10:40:53 +08:00

fragment_map_download.xml

增加离线地图下载流程

2023-03-30 10:50:20 +08:00

fragment_offline_map_city_list.xml

增加离线地图下载流程

2023-03-30 10:50:20 +08:00

fragment_offline_map_state_list.xml

增加离线地图下载流程

2023-03-30 10:50:20 +08:00

fragment_offline_map.xml

增加离线地图下载流程

2023-03-30 10:50:20 +08:00

fragment_personal_center.xml

增加离线地图下载流程

2023-03-30 10:50:20 +08:00

map_view.xml

增加离线地图下载流程

2023-03-30 10:50:20 +08:00

personal_center_head.xml

增加离线地图下载流程

2023-03-30 10:50:20 +08:00