375 Commits

Author SHA1 Message Date
qiji4215
2eb8528f98 增加任务错误数据容错2.增加交通标牌详情显示 2023-09-20 15:32:57 +08:00
qiji4215
03c778c1ec Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-19 16:34:33 +08:00
qiji4215
5320caac69 1、增加任务列表定位2、地图初始化显示底部工具栏3、修改道路形态标题 2023-09-19 16:33:42 +08:00
18c36b179e fix: 合并代码 2023-09-19 15:07:46 +08:00
baf223dc39 fix: 修改文字对象渲染,支持按数据颜色渲染 2023-09-19 14:09:57 +08:00
qiji4215
0d9b6e90ac 修复已知bug及优化部分要素渲染效果 2023-09-19 11:22:18 +08:00
qiji4215
25583f6240 修改配置文件,解决大数据量无法下载 2023-09-15 15:37:52 +08:00
qiji4215
fbdaeb3939 增加全要素捕捉开关及属性信息显示窗体展示 2023-09-14 17:49:39 +08:00
qiji4215
c3d9ed5a2f 对数据插入进行优化重构 2023-09-13 17:53:12 +08:00
qiji4215
fbf2be815f 修改自动定位逻辑 2023-09-13 10:21:17 +08:00
qiji4215
f40f1a1881 增加10S自动定位及指北模式 2023-09-12 17:18:01 +08:00
qiji4215
3caaa57e20 增加地图要素捕捉过滤业务 2023-09-12 11:15:47 +08:00
qiji4215
33d17eea0d 修复冲突 2023-09-11 17:17:32 +08:00
qiji4215
c61599bcc8 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	vtm
2023-09-11 17:13:53 +08:00
squallzhjch
e5ebe64e0b 路径绑定测试 2023-09-11 16:15:08 +08:00
qiji4215
30822c7937 修改realm事物存储逻辑,解决OOM问题 2023-09-11 15:59:56 +08:00
squallzhjch
85c9677739 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
	vtm
2023-09-11 15:16:31 +08:00
squallzhjch
8230e44f83 代码冲突 2023-09-11 15:14:28 +08:00
cfa1041f7e Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-09-05 16:02:08 +08:00
ebd70520e4 feat: 修改同点位marker避让时未参考angle角度的问题 2023-09-05 15:59:09 +08:00
squallzhjch
0f29f32906 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-09-05 14:08:33 +08:00
squallzhjch
1206c0d61c 修改交限渲染 2023-09-05 14:07:49 +08:00
qiji4215
ef13f9a926 merge code 2023-09-05 12:26:21 +08:00
squallzhjch
1b5df15491 修改收费站详情 2023-09-05 09:18:24 +08:00
qiji4215
ba063003dd merge code 2023-09-05 09:16:44 +08:00
qiji4215
8f9dc82353 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-09-01 18:00:36 +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
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
0f2bc264d3 fix: 合并代码 2023-09-01 14:25:56 +08:00
af294bbf50 fix: 修改杆状物渲染为图标样式 2023-09-01 14:24:22 +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
squallzhjch
9fed02564c 时间区间算法,车道施工,道路施工 2023-08-30 14:45:58 +08:00
817009953c feat: 增加文字object的渲染 2023-08-30 11:05:56 +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
squallzhjch
06f77dd1cd 修改数据库查询bug导致交限数据不渲染 2023-08-22 10:09:19 +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