236 Commits

Author SHA1 Message Date
65f4fe548c Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 16:27:40 +08:00
30ed640f3f fix: 修改限速渲染样式 2023-05-06 16:27:03 +08:00
qiji4215
6840e4d965 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:24:01 +08:00
qiji4215
2c2a141b95 merge code 2023-05-06 16:23:45 +08:00
squallzhjch
eae10036c8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 16:13:28 +08:00
squallzhjch
51be5bd178 修改任务线颜色 2023-05-06 16:13:12 +08:00
qiji4215
1d1fe13ab4 merge code 2023-05-06 16:01:51 +08:00
b164338ec7 fix: 修改左侧界面标题样式 2023-05-06 15:58:08 +08:00
9f619a2f50 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 15:42:17 +08:00
c4e2c2fdcc fix: 修改地图的默认背景色 2023-05-06 15:42:11 +08:00
squallzhjch
8e4d1c7e0e Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/res/layout/adapter_task_list.xml
2023-05-06 15:39:31 +08:00
squallzhjch
3733634eb5 修改面板快捷新增时的种类联动 2023-05-06 15:38:27 +08:00
qiji4215
be9e582048 解决冲突 2023-05-06 15:28:39 +08:00
qiji4215
a260d94561 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/res/menu/personal_center_menu.xml
2023-05-06 15:26:51 +08:00
qiji4215
451fe92e37 更换图标 2023-05-06 15:25:16 +08:00
qiji4215
dd5435f24e merge code 2023-05-06 15:01:46 +08:00
0255b0ea84 fix: 修改左侧面板界面样式 2023-05-06 14:58:39 +08:00
qiji4215
bfd9df9d8a merge code 2023-05-06 14:57:04 +08:00
squallzhjch
fbff312f41 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
2023-05-06 14:31:05 +08:00
squallzhjch
8501f64b2c 修改线选择 2023-05-06 14:30:30 +08:00
7a09721dc8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 11:04:32 +08:00
b0b4f2be52 feat: 左侧界面美化(部分) 2023-05-06 11:04:23 +08:00
squallzhjch
9f7bf771c2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/res/layout/activity_main.xml
2023-05-06 11:03:57 +08:00
squallzhjch
d86ec46943 修改任务线刷新,数据安装刷新 2023-05-06 11:01:50 +08:00
qiji4215
e4729d2202 美化报告下拉菜单 2023-05-06 10:55:26 +08:00
qiji4215
0ac805302d UI美化质检报告页面 2023-05-06 10:20:16 +08:00
qiji4215
9929423a3b Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 16:58:22 +08:00
qiji4215
6b1ac4df9b merge code 2023-05-05 16:58:03 +08:00
squallzhjch
752550f376 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 16:52:43 +08:00
cde0cd39df Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 16:52:32 +08:00
9495b54a4b fix: 修改离线地图样式 2023-05-05 16:52:18 +08:00
squallzhjch
3a1e1bc9d6 修改数据上传 2023-05-05 16:52:07 +08:00
squallzhjch
5826922bb9 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/tools/LayerConfigUtils.kt
2023-05-05 15:15:07 +08:00
squallzhjch
d3fd50f941 修改数据上传 2023-05-05 15:14:20 +08:00
qiji4215
af79ae4146 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 14:48:00 +08:00
qiji4215
0cce793b9e 更新资源 2023-05-05 14:47:43 +08:00
af9dcca34f Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 14:43:40 +08:00
ca978100b2 fix: 修改图层管理报错的问题 2023-05-05 14:43:17 +08:00
squallzhjch
611385c145 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
2023-05-05 14:34:46 +08:00
squallzhjch
4d4549557d 修改数据上传 2023-05-05 14:33:54 +08:00
qiji4215
eb84e153ff Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 14:33:23 +08:00
qiji4215
ad59a0efac merge code 2023-05-05 14:33:08 +08:00
qiji4215
79af59bb02 优化地图界面UI 2023-05-05 14:23:23 +08:00
464ca815c4 fix: 修改图层管理 2023-05-05 14:12:20 +08:00
8a75aad54c fix: 增加omdb图层管理 2023-05-05 14:02:32 +08:00
qiji4215
186d24bf22 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 11:03:23 +08:00
qiji4215
6dec79f763 美化质检问题界面及logo 2023-05-05 11:03:05 +08:00
d926a147f3 feat: 增加图层管理功能 2023-05-05 10:58:16 +08:00
squallzhjch
b98e8b1614 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 10:08:30 +08:00
squallzhjch
2c44ac045d 优化提前显示面板 2023-05-05 10:08:19 +08:00