xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
734 Commits 2 Branches 0 Tags
Commit Graph

734 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
xiaoyan
fa4cf3d251 fix: 合并代码 2023-11-27 15:11:57 +08:00
xiaoyan
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
xiaoyan
0e96ab1ee2 合并代码 2023-11-24 16:19:33 +08:00
qiji4215
6563a41389 更新图标资源 2023-11-24 13:40:32 +08:00
xiaoyan
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
xiaoyan
2e0712ed2b fix: 修改车信导入功能 2023-11-21 17:06:24 +08:00
qiji4215
796ced9243 提交代码，修复交通标牌不显示，增加车道、道路边界类型杆状障碍物渲染 2023-11-21 17:05:35 +08:00
xiaoyan
5fbeb45e5a fix: 合并代码 2023-11-17 09:28:02 +08:00
xiaoyan
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
xiaoyan
35301e4c48 fix: 修改动态marker显示错乱的问题 2023-11-08 15:50:17 +08:00
xiaoyan
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
xiaoyan
5ad883d543 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-11-03 17:48:24 +08:00
xiaoyan
8fea0fb041 fix: 增加marker外边框，调查渲染稀疏问题 2023-11-03 17:48:12 +08:00
qiji4215
21ebf3900c Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-11-03 17:22:56 +08:00
qiji4215
00c37a8996 增加安装进度处理 2023-11-03 17:21:22 +08:00
xiaoyan
92181c5ab4 fix: 合并代码 2023-11-03 15:31:34 +08:00
xiaoyan
5df2ba7cd0 feat: 增加车道类型渲染 2023-11-03 15:28:28 +08:00
qiji4215
0f97c08b44 优化数据安装效率，更换第三方库 2023-10-31 15:02:21 +08:00
qiji4215
584eea6928 优化数据安装性能，更换阿里Json库 2023-10-30 16:40:27 +08:00
qiji4215
707f3b8961 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-10-30 10:42:05 +08:00
qiji4215
323298334a merge code 2023-10-30 10:41:48 +08:00
squallzhjch
ffba871e3c 数据库增加索引 2023-10-30 10:36:47 +08:00
qiji4215
db2ecd45be Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
	app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
 2023-10-30 10:34:42 +08:00
qiji4215
1dc4e807cc 优化数据安装效率，更换压缩库及不进行车道中心线转化面业务 2023-10-30 10:31:10 +08:00
squallzhjch
1c5a8f542b 修改多线程安装 2023-10-27 17:24:56 +08:00
squallzhjch
d6acc030f2 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
 2023-10-27 14:49:47 +08:00
squallzhjch
43523d09b4 修改多线程安装 2023-10-27 14:18:38 +08:00
qiji4215
b40a9e2ebb merge codew 2023-10-27 14:05:59 +08:00
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