574 Commits

Author SHA1 Message Date
093842cbbb fix: 修改任务切换时label图层的marker继续显示的问题 2023-09-15 14:35:30 +08:00
qiji4215
fbdaeb3939 增加全要素捕捉开关及属性信息显示窗体展示 2023-09-14 17:49:39 +08:00
qiji4215
c3d9ed5a2f 对数据插入进行优化重构 2023-09-13 17:53:12 +08:00
qiji4215
de0a1e3223 merge code 2023-09-13 10:49:56 +08:00
qiji4215
a8d88a2ada Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-13 10:22:01 +08:00
qiji4215
fbf2be815f 修改自动定位逻辑 2023-09-13 10:21:17 +08:00
963c84a7d0 fix: 解决冲突 2023-09-13 10:19:44 +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
qiji4215
5e957c30a9 增加原则设置要素捕捉条件 2023-09-11 16:59:20 +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
70b820a358 fix: 修改最高级别下线数据出现幽灵渲染的问题 2023-09-08 17:20:39 +08:00
408d98ddea fix: 修改主点偏移与参考图标不匹配的问题 2023-09-07 17:28:09 +08:00
bcc11946a1 fix: 修改电子眼渲染图标 2023-09-07 14:52:01 +08:00
27b8be2cb1 fix: 修改电子眼图标 2023-09-07 14:26:21 +08:00
qiji4215
dbe81f5bde Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-06 09:32:13 +08:00
ab266bce3e fix: 修改realm插入大量数据OOM问题 2023-09-06 09:31:07 +08:00
qiji4215
6c4eab70a0 merge code 2023-09-06 09:09:23 +08:00
qiji4215
8328876ec8 调整种别渲染线宽 2023-09-05 17:53:50 +08:00
b1e5e30880 fix: 修改数据安装事务提交机制 2023-09-05 16:58:46 +08:00
qiji4215
edf98fe624 merge code 2023-09-05 16:58:34 +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
1aba0b513d fix: 修改电子眼类型配置错误 2023-09-05 15:58:13 +08:00
0b2b5bfe7d fix: 修改车信渲染配置为动态类型 2023-09-05 15:25:27 +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
4230bbd3d0 merge code 2023-09-05 14:07:11 +08:00
qiji4215
ef13f9a926 merge code 2023-09-05 12:26:21 +08:00
squallzhjch
128c45f90c Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-09-05 09:19:01 +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
6d0880b3a9 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-09-04 10:23:17 +08:00
9a486bde52 fix: 合并代码 2023-09-04 10:22:45 +08:00
d0301aac95 fix: 杆状物要素增加导入时过滤流程 2023-09-04 10:20:43 +08:00
qiji4215
827fe1bf77 merge code 2023-09-04 10:20:41 +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
624460d546 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-01 14:51:52 +08:00
1762b8d165 fix: 修改箭头对象渲染方向及颜色 2023-09-01 14:51:12 +08:00
qiji4215
b04a8bef8c 修改箭头颜色 2023-09-01 14:51:07 +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