Commit Graph
509 Commits
Author SHA1 Message Date
squallzhjch 5ffb0e68e8 增加收费站的预警信息
增加文字,停止位置,危险信息的详情和预警
2023-09-01 17:20:46 +08:00
qiji4215 d01fb35541 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-01 14:27:30 +08:00
qiji4215 2e2d6718f1 merge code 2023-09-01 14:27:12 +08:00
xiaoyan159 0f2bc264d3 fix: 合并代码 2023-09-01 14:25:56 +08:00
xiaoyan159 af294bbf50 fix: 修改杆状物渲染为图标样式 2023-09-01 14:24:22 +08:00
qiji4215 a7f9422d9d merge code 2023-09-01 13:32:27 +08:00
xiaoyan159 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
xiaoyan159 aad0197f5c fix: 优化人行横道和文字渲染样式 2023-08-31 15:06:05 +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
xiaoyan159 4fc6b0cd5b fix: 合并代码 2023-08-30 14:20:04 +08:00
xiaoyan159 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
xiaoyan159 30ae2d18d4 fix: 修改桥数据渲染起终点图标按线样式渲染的问题 2023-08-25 17:35:41 +08:00
squallzhjch bccb235521 时间区间算法 2023-08-25 17:35:35 +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
xiaoyan159 5a9cbd09e6 feat: 增加警示信息图标渲染 2023-08-24 14:27:31 +08:00
squallzhjch 5b2fcbddd9 修改bug 2023-08-24 10:14:07 +08:00
xiaoyan159 d92a75e2b5 fix: 合并代码 2023-08-23 14:46:29 +08:00
xiaoyan159 b05c1f9038 fix: 修改电子眼图标渲染 2023-08-23 14:45:05 +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
xiaoyan159 e30e824a1b fix: 合并代码 2023-08-23 14:00:54 +08:00
qiji4215 9ba310428f 增加道路施工及车道施工 2023-08-22 17:44:37 +08:00
xiaoyan159 b3bb83032b fix: omdb_config增加是否引入3D Z轴数据参数,默认不引入,如果引入,数据按照3D样式渲染 2023-08-22 13:54:14 +08:00
qiji4215 f43dce5ae2 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-22 11:20:37 +08:00
qiji4215 a310df91e1 增加铁路道口渲染业务 2023-08-22 11:19:45 +08:00
squallzhjch 13c2d55159 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-22 10:09:42 +08:00
squallzhjch 06f77dd1cd 修改数据库查询bug导致交限数据不渲染 2023-08-22 10:09:19 +08:00
qiji4215 7abb32610a 更换图标,修复部分问题 2023-08-22 08:52:53 +08:00
qiji4215 05bd11419d Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-21 10:07:12 +08:00
qiji4215 75a99929b0 merge code 2023-08-17 17:51:29 +08:00
squallzhjch 95b0dd540f Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-17 17:38:10 +08:00
squallzhjch 31991ebe00 增加多点列表 2023-08-17 17:37:49 +08:00
qiji4215 b53aa520d4 修改道路形态code不对问题 2023-08-17 17:35:06 +08:00
squallzhjch 53e5154c36 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-17 10:10:09 +08:00
squallzhjch d1040b65ba 修改主页布局 2023-08-17 10:09:31 +08:00
qiji4215 ac17e764ea Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/assets/omdb_config.json
2023-08-17 10:07:06 +08:00