434 Commits

Author SHA1 Message Date
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
d92a75e2b5 fix: 合并代码 2023-08-23 14:46:29 +08:00
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
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
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
qiji4215
27d21f341f 1.增加护栏渲染2.增加路牙渲染 2023-08-17 09:32:58 +08:00
471e869ad9 fix: 修改vtm配置 2023-08-16 16:52:11 +08:00
58dfe64227 feat: 增加道路形态图层分组 2023-08-16 16:49:38 +08:00
squallzhjch
51b9a398a4 增加道路属性,道路形态展示 2023-08-16 16:43:48 +08:00
qiji4215
0f8f36ea8c 修改车道边界类型渲染效果 2023-08-16 16:31:49 +08:00
f388f7c986 fix: 合并冲突 2023-08-16 13:54:33 +08:00
5f6d363bb8 fix: 添加导流区纹理 2023-08-16 13:52:55 +08:00
squallzhjch
f9b5c8a1d1 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/MainViewModel.kt
2023-08-16 13:43:45 +08:00
qiji4215
a0c9dadbd8 merge code 2023-08-16 13:33:34 +08:00
squallzhjch
b17ff18c67 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/enum/DataCodeEnum.kt
2023-08-16 11:25:02 +08:00
qiji4215
015733451b 增加草图任务id及重构部分数据库读取业务 2023-08-16 11:24:56 +08:00
squallzhjch
2431fc3bdd 增加道路属性,跨线立交,匝道,上下线分离,隧道,环岛的道路属性展示 2023-08-16 11:22:07 +08:00
29f6ba22bc Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-15 16:16:15 +08:00
697a80b6c9 fix: 增加导流区渲染样式 2023-08-15 16:16:06 +08:00
qiji4215
04d8922c90 merge code 2023-08-15 16:15:07 +08:00
qiji4215
de86fb57fb 增加SA/PA渲染原则 2023-08-15 14:16:00 +08:00
qiji4215
5fa01313b4 增加道路形态渲染业务 2023-08-15 10:45:59 +08:00
squallzhjch
f7843baabe Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt
	vtm
2023-08-15 09:52:48 +08:00
squallzhjch
8fba6764bb 增加全封闭,匝道内容显示 2023-08-15 09:47:55 +08:00
qiji4215
4fe231cf02 增加数据过滤 2023-08-14 18:19:26 +08:00
qiji4215
85e863c7b4 merge code 2023-08-14 17:08:47 +08:00
qiji4215
63d36c3e1d Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-14 14:41:18 +08:00
qiji4215
08283761e0 修改数据类型增加PA/SA要素编码处理 2023-08-14 14:18:19 +08:00
squallzhjch
dc4c6daf2e 增加坐标复制和测量结果复制功能 2023-08-11 17:24:56 +08:00
qiji4215
1b2c149c43 merge code 2023-08-11 15:35:14 +08:00