141 Commits

Author SHA1 Message Date
squallzhjch
427e36bb8a Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	vtm
2023-09-20 09:59:34 +08:00
squallzhjch
607d4c290a 预警信息导航功能 2023-09-20 09:42:53 +08:00
0bacea8259 feat: 交通标牌2D化渲染 2023-09-19 16:19:33 +08:00
18c36b179e fix: 合并代码 2023-09-19 15:07:46 +08:00
ad95095433 fix: 道路标牌预处理增加获取中心点坐标 2023-09-19 15:05:03 +08:00
qiji4215
0d9b6e90ac 修复已知bug及优化部分要素渲染效果 2023-09-19 11:22:18 +08:00
qiji4215
633f254b2a merge code 2023-09-18 17:37:32 +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
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
3caaa57e20 增加地图要素捕捉过滤业务 2023-09-12 11:15:47 +08:00
qiji4215
5e957c30a9 增加原则设置要素捕捉条件 2023-09-11 16:59:20 +08:00
qiji4215
30822c7937 修改realm事物存储逻辑,解决OOM问题 2023-09-11 15:59:56 +08:00
408d98ddea fix: 修改主点偏移与参考图标不匹配的问题 2023-09-07 17:28:09 +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
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
qiji4215
4230bbd3d0 merge code 2023-09-05 14:07:11 +08:00
qiji4215
ef13f9a926 merge code 2023-09-05 12:26:21 +08:00
qiji4215
ba063003dd merge code 2023-09-05 09:16:44 +08:00
d0301aac95 fix: 杆状物要素增加导入时过滤流程 2023-09-04 10:20:43 +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
qiji4215
94c9b8fd4f 增加要素是否捕捉控制参数 2023-09-01 10:26:45 +08:00
qiji4215
bfbf89d7e5 merge code 2023-08-28 09:30:15 +08:00
30ae2d18d4 fix: 修改桥数据渲染起终点图标按线样式渲染的问题 2023-08-25 17:35:41 +08:00
squallzhjch
7c533faad2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-08-25 09:28:23 +08:00
5a9cbd09e6 feat: 增加警示信息图标渲染 2023-08-24 14:27:31 +08:00
squallzhjch
5b2fcbddd9 修改bug 2023-08-24 10:14:07 +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
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
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
75a99929b0 merge code 2023-08-17 17:51:29 +08:00