532 Commits

Author SHA1 Message Date
1aba0b513d fix: 修改电子眼类型配置错误 2023-09-05 15:58:13 +08:00
0b2b5bfe7d fix: 修改车信渲染配置为动态类型 2023-09-05 15:25:27 +08:00
9a486bde52 fix: 合并代码 2023-09-04 10:22:45 +08:00
d0301aac95 fix: 杆状物要素增加导入时过滤流程 2023-09-04 10:20:43 +08:00
squallzhjch
34977af660 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-09-01 17:21:18 +08:00
squallzhjch
5ffb0e68e8 增加收费站的预警信息
增加文字,停止位置,危险信息的详情和预警
2023-09-01 17:20:46 +08:00
1762b8d165 fix: 修改箭头对象渲染方向及颜色 2023-09-01 14:51:12 +08:00
0f2bc264d3 fix: 合并代码 2023-09-01 14:25:56 +08:00
af294bbf50 fix: 修改杆状物渲染为图标样式 2023-09-01 14:24:22 +08:00
qiji4215
a7f9422d9d merge code 2023-09-01 13:32:27 +08:00
8a1d36b117 fix: 完善人行道对象面纹理图片 2023-09-01 10:34:58 +08:00
qiji4215
94c9b8fd4f 增加要素是否捕捉控制参数 2023-09-01 10:26:45 +08:00
qiji4215
8fe236922e Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	vtm
2023-08-31 16:46:15 +08:00
squallzhjch
e4aa29ea32 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-08-31 15:33:15 +08:00
squallzhjch
2d3e725119 增加任务列表下拉刷新功能
增加警示信息的预警面板和详情面板
2023-08-31 15:32:33 +08:00
qiji4215
87190c90ae Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-31 15:20:04 +08:00
qiji4215
6fe9e50b2c merge code 2023-08-31 15:19:44 +08:00
aad0197f5c fix: 优化人行横道和文字渲染样式 2023-08-31 15:06:05 +08:00
qiji4215
45341a9747 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-31 10:38:00 +08:00
qiji4215
31f9358415 merge code 2023-08-31 10:37:16 +08:00
squallzhjch
f5e6a87b9b Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
	vtm
2023-08-30 14:47:00 +08:00
squallzhjch
9fed02564c 时间区间算法,车道施工,道路施工 2023-08-30 14:45:58 +08:00
4fc6b0cd5b fix: 合并代码 2023-08-30 14:20:04 +08:00
817009953c feat: 增加文字object的渲染 2023-08-30 11:05:56 +08:00
qiji4215
4c53144549 增加人行横道渲染 2023-08-30 11:04:51 +08:00
qiji4215
bfbf89d7e5 merge code 2023-08-28 09:30:15 +08:00
qiji4215
3b951ab9fb Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-25 17:42:02 +08:00
qiji4215
7994ae611a merge code 2023-08-25 17:41:16 +08:00
squallzhjch
6447bbb8d5 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-25 17:35:45 +08:00
30ae2d18d4 fix: 修改桥数据渲染起终点图标按线样式渲染的问题 2023-08-25 17:35:41 +08:00
squallzhjch
bccb235521 时间区间算法 2023-08-25 17:35:35 +08:00
qiji4215
d346dc1d4c merge code 2023-08-25 17:24:30 +08:00
qiji4215
12a1d22651 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-08-25 15:54:38 +08:00
qiji4215
554452ddc9 merge code 2023-08-25 15:42:13 +08:00
f6c52e649a fix: 合并代码 2023-08-25 14:46:54 +08:00
29e78f78f4 fix: 更换车信图标 2023-08-25 14:46:13 +08:00
squallzhjch
31074e8e71 开发道路施工 2023-08-25 14:23:17 +08:00
squallzhjch
7c533faad2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-08-25 09:28:23 +08:00
squallzhjch
f4495ea202 修改bug 2023-08-25 09:28:04 +08:00
5a9cbd09e6 feat: 增加警示信息图标渲染 2023-08-24 14:27:31 +08:00
squallzhjch
5b2fcbddd9 修改bug 2023-08-24 10:14:07 +08:00
d92a75e2b5 fix: 合并代码 2023-08-23 14:46:29 +08:00
b05c1f9038 fix: 修改电子眼图标渲染 2023-08-23 14:45:05 +08:00
qiji4215
207c61184d 增加非避让属性设置 2023-08-23 14:18:11 +08:00
qiji4215
7e297dbb73 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-08-23 14:11:40 +08:00
qiji4215
5614f513f7 增加道路施工/车道施工渲染业务 2023-08-23 14:08:09 +08:00
e30e824a1b fix: 合并代码 2023-08-23 14:00:54 +08:00
d05222e65f feat: 增加marker支持压盖 2023-08-23 13:57:17 +08:00
qiji4215
9ba310428f 增加道路施工及车道施工 2023-08-22 17:44:37 +08:00
b3bb83032b fix: omdb_config增加是否引入3D Z轴数据参数,默认不引入,如果引入,数据按照3D样式渲染 2023-08-22 13:54:14 +08:00