750 Commits

Author SHA1 Message Date
1eef357079 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-12-07 14:18:06 +08:00
qiji4215
517d5a884c 1、修改物理车道数编码2、修复车道中心面断面问题3、修复中央隔离带按通行方向左右显示4、修复设施分离按通行方向左右显示5、更新可变线限速样式 2023-12-06 17:21:46 +08:00
qiji4215
3fc43af5bf 1、增加照片记录功能2、增加便签语音及照片功能3、修复便签保存后绘制画布没有消失问题 2023-12-05 17:24:22 +08:00
qiji4215
b906ec83d2 修改设施分离渲染样式 2023-12-04 19:09:29 +08:00
qiji4215
27cbd1a9cf 调整车道边界类型渲染样式 2023-12-04 15:01:03 +08:00
e5df2c0785 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-12-04 11:02:46 +08:00
fb85eebc87 fix: 修改测试定位位置 2023-12-04 11:02:21 +08:00
qiji4215
57538774fe 调整中央隔离带渲染错误 2023-12-01 18:41:54 +08:00
qiji4215
21605c8bbd merge code 2023-12-01 18:20:00 +08:00
qiji4215
1032187dab Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS into origin 2023-12-01 17:59:04 +08:00
qiji4215
2f513c8b43 增加物理车道数渲染及屏蔽物理车道数道路属性 2023-12-01 17:55:13 +08:00
squallzhjch
273fc3d327 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-12-01 16:43:50 +08:00
squallzhjch
8dfd95dff4 修改车信存储 2023-12-01 16:43:25 +08:00
qiji4215
1d0611b7e9 修改车道类型不渲染2、修复列表连续下载失败 2023-12-01 14:32:53 +08:00
qiji4215
edaf8b8784 1、增加简要标题内容定义2、增加全封闭渲染3、修改路口内交通岛编码为3028 2023-11-28 17:29:14 +08:00
qiji4215
55fc6e8d80 增加道路边界类型详情显示 2023-11-28 15:53:52 +08:00
qiji4215
acd086c255 merge code 2023-11-28 15:27:59 +08:00
qiji4215
a93fe8695f 增加对象类要素导入及渲染业务 2023-11-28 14:47:39 +08:00
unknown
4a67fb1026 修改动态资源适配 2023-11-28 09:51:18 +08:00
qiji4215
32d3d1a76f merge code 2023-11-28 09:22:10 +08:00
fa4cf3d251 fix: 合并代码 2023-11-27 15:11:57 +08:00
69849fee98 fix: 修改vtm子模块的git地址 2023-11-27 15:10:48 +08:00
qiji4215
559f55f498 要素样式优化 2023-11-27 09:36:28 +08:00
qiji4215
37a8a4fac8 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-11-24 16:22:11 +08:00
0e96ab1ee2 合并代码 2023-11-24 16:19:33 +08:00
qiji4215
6563a41389 更新图标资源 2023-11-24 13:40:32 +08:00
1ebe58a2a9 feat: symbol添加背景、前景、内容显示区域设置 2023-11-24 09:30:59 +08:00
qiji4215
231d7c429d 更新图标资源 2023-11-24 09:26:35 +08:00
qiji4215
167cbdc4d3 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-11-22 09:54:47 +08:00
qiji4215
1043946c0b 调整杆状障碍物图标资源 2023-11-22 09:54:07 +08:00
squallzhjch
b5afd6fd2b Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
	collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java
	vtm
2023-11-21 17:40:52 +08:00
squallzhjch
2b506941b6 修改语音播报 2023-11-21 17:34:55 +08:00
2e0712ed2b fix: 修改车信导入功能 2023-11-21 17:06:24 +08:00
qiji4215
796ced9243 提交代码,修复交通标牌不显示,增加车道、道路边界类型杆状障碍物渲染 2023-11-21 17:05:35 +08:00
5fbeb45e5a fix: 合并代码 2023-11-17 09:28:02 +08:00
89b862a0cd feat: 动态marker配置支持多图标设置 2023-11-17 09:24:53 +08:00
qiji4215
3de8ce6a39 调整图标样式 2023-11-16 11:09:08 +08:00
qiji4215
2c571bf9ce 1.增加要素聚合显示数字业务2.调整部分渲染样式 2023-11-15 16:37:44 +08:00
squallzhjch
eaeef833ae Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
	collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
	vtm
2023-11-10 15:17:37 +08:00
squallzhjch
bd024342d2 注释掉测试代码 2023-11-10 15:15:30 +08:00
qiji4215
b123fa543f 修改交通标牌为同点位聚合 2023-11-09 17:25:25 +08:00
qiji4215
e4aff19599 增加交通标牌同点位坐标转换 2023-11-09 16:14:31 +08:00
qiji4215
e7985f195c Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-11-09 15:15:08 +08:00
qiji4215
791fe30bf4 修改车信解析错误并增加主点位捕捉业务 2023-11-09 15:13:22 +08:00
35301e4c48 fix: 修改动态marker显示错乱的问题 2023-11-08 15:50:17 +08:00
c1f4774b43 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-11-07 14:27:18 +08:00
squallzhjch
c2e2d33025 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
2023-11-06 16:33:56 +08:00
squallzhjch
763fef952e 增加车信按车道编辑,自动生成问题描述功能 2023-11-06 16:21:46 +08:00
5ad883d543 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-11-03 17:48:24 +08:00
8fea0fb041 fix: 增加marker外边框,调查渲染稀疏问题 2023-11-03 17:48:12 +08:00