185 Commits

Author SHA1 Message Date
qiji4215
f03d8037d2 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/assets/omdb_config.json
	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
2023-10-26 15:02:34 +08:00
squallzhjch
ed116d2acd 修改查询语句 2023-10-26 10:04:20 +08:00
squallzhjch
15bfad1357 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/assets/omdb_config.json
	app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
	app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
	vtm
2023-10-26 09:45:16 +08:00
qiji4215
40d07cc329 修改任务新增link刷新列表崩溃问题 2023-10-26 09:43:40 +08:00
squallzhjch
1b5da9e536 优化数据库查询
1、去掉了RenderEntity表的主键
2、去掉了ReferenceEntity表的主键和 与RenderEntity表的关联外键
3、去掉了上面两个表的set,map集合改为int,String基础字段
4、对properties字段进行了压缩
5、将properties表中的linkpid字段移到RenderEntity中
6、查询语句修改
2023-10-26 09:18:02 +08:00
squallzhjch
c7122376cf 优化数据库查询 2023-10-25 10:17:16 +08:00
qiji4215
9bc68b52fa Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-10-25 09:23:18 +08:00
14ae6a695d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-10-25 09:22:06 +08:00
qiji4215
172d84f8c2 增加轨迹日志信息 2023-10-24 17:53:46 +08:00
8c49ac7bc8 增加车道类型、车道点限速渲染导入 2023-10-24 11:03:57 +08:00
squallzhjch
51c44f00b1 优化数据库查询 2023-10-20 16:30:27 +08:00
00515cfe37 feat: 引入通行车辆类型Lane类型数据,增加对应渲染原则 2023-10-19 16:30:38 +08:00
7a99a9d0fb fix: 将数据的linkPid提到外边 2023-10-19 09:56:42 +08:00
qiji4215
3bf5db5d55 增加物理车道组业务 2023-10-16 09:22:53 +08:00
qiji4215
998906dcb8 增加施工要素过滤条件 2023-10-14 10:41:00 +08:00
qiji4215
9ff0cb2aa2 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileSource.java
	vtm
2023-10-14 09:58:34 +08:00
qiji4215
4957115122 merge code 2023-10-13 17:34:36 +08:00
squallzhjch
b69f4fc9c6 修改桥 小分类问题
修改 匝道问题
修改数据上传字段改动问题
增加轨迹回放功能
2023-10-13 15:08:26 +08:00
qiji4215
fe8790440c Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-10-11 14:28:09 +08:00
qiji4215
f0c6e633eb 过滤掉车道边界类型无偏移数据,且无offset为0的数据不参与捕捉业务 2023-10-11 14:26:56 +08:00
squallzhjch
f3ed4f3f72 修改数据上传 2023-10-11 14:13:51 +08:00
qiji4215
0ae4a00346 增加车道边界偏移量计算原则 2023-10-11 13:38:36 +08:00
squallzhjch
887ee7f2e4 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-10-09 14:22:54 +08:00
squallzhjch
c23b6e1c7d 增加定位测试 2023-10-09 14:22:36 +08:00
b2d7b8af47 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-10-09 11:07:50 +08:00
9db5e0c4b1 fix: 修改车信渲染位置错误的问题 2023-10-09 11:07:30 +08:00
squallzhjch
eb97cb57b3 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-10-09 10:45:40 +08:00
squallzhjch
fc92cebe4a 增加导流区详情展示
修改数据查询接口
修改数据上传状态动态变化
2023-10-09 10:44:42 +08:00
qiji4215
0627f1917f 修改渲染样式 2023-09-28 10:59:33 +08:00
qiji4215
c101490242 merge code 2023-09-28 10:16:00 +08:00
qiji4215
37de10fe89 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-27 16:21:25 +08:00
qiji4215
7b603e6af3 增加道路边界类型路牙、护栏渲染 2023-09-27 16:20:58 +08:00
4f9af9c218 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-09-27 09:38:02 +08:00
qiji4215
1187be699b Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
2023-09-26 17:23:38 +08:00
squallzhjch
b7192a50e4 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-09-26 17:15:41 +08:00
squallzhjch
1a87a5ca34 修改多点列表点击功能
增加导航设置
2023-09-26 17:15:18 +08:00
qiji4215
1f34a8f306 增加车道中心线扩充面业务 2023-09-26 16:14:30 +08:00
0f5c9bfb8d feat: 增加路口内交通岛、上方障碍物的渲染,修改符号、文字颜色 2023-09-25 14:56:02 +08:00
squallzhjch
705779f631 增加条件线限速的展示 2023-09-21 16:18:59 +08:00
qiji4215
e37d7bc38f Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-21 16:14:43 +08:00
qiji4215
ab27048d54 1、增加要素线捕捉开关2、增加图层开关与要素捕捉联动3、个人中心增加Marker显隐开关4、修复道路属性不显示道路种别问题 2023-09-21 16:13:46 +08:00
squallzhjch
af3cd2b464 修改线选择的预警要素距离显示 2023-09-21 10:12:03 +08:00
squallzhjch
f775267612 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-09-20 16:21:40 +08:00
qiji4215
2eb8528f98 增加任务错误数据容错2.增加交通标牌详情显示 2023-09-20 15:32:57 +08:00
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