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

453 Commits

Author SHA1 Message Date
squallzhjch
8dfd95dff4 修改车信存储 2023-12-01 16:43:25 +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
qiji4215
796ced9243 提交代码，修复交通标牌不显示，增加车道、道路边界类型杆状障碍物渲染 2023-11-21 17:05:35 +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
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
qiji4215
21ebf3900c Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-11-03 17:22:56 +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
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
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
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
qiji4215
d3398ae755 增加轨迹多层显示 2023-10-26 14:58:43 +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
xiaoyan
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
xiaoyan
8c49ac7bc8 增加车道类型、车道点限速渲染导入 2023-10-24 11:03:57 +08:00
squallzhjch
9cf39d476c Merge branch 'navinfo-20231018' 
# Conflicts:
#	app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
#	app/src/main/java/com/navinfo/omqs/util/NaviEngine.kt
#	collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java
 2023-10-20 16:38:53 +08:00
squallzhjch
51c44f00b1 优化数据库查询 2023-10-20 16:30:27 +08:00
xiaoyan
00515cfe37 feat: 引入通行车辆类型Lane类型数据，增加对应渲染原则 2023-10-19 16:30:38 +08:00
squallzhjch
129c48f11d 优化数据库查询 2023-10-19 14:47:15 +08:00
xiaoyan
7a99a9d0fb fix: 将数据的linkPid提到外边 2023-10-19 09:56:42 +08:00
qiji4215
3bf5db5d55 增加物理车道组业务 2023-10-16 09:22:53 +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
xiaoyan
dbf4108979 fix: 合并代码 2023-10-13 17:40:51 +08:00
xiaoyan
ab873e86af fix: 修改18级overzoom模式，解决部分情况下渲染出错的问题 2023-10-13 17:39:53 +08:00
squallzhjch
7c5a1763fe 修改轨迹回放功能 2023-10-13 17:34:02 +08:00
squallzhjch
b69f4fc9c6 修改桥 小分类问题 
修改 匝道问题
修改数据上传字段改动问题
增加轨迹回放功能
 2023-10-13 15:08:26 +08:00
qiji4215
0ae4a00346 增加车道边界偏移量计算原则 2023-10-11 13:38:36 +08:00
qiji4215
673d8b900d Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-10-09 14:21:32 +08:00
xiaoyan
9db5e0c4b1 fix: 修改车信渲染位置错误的问题 2023-10-09 11:07:30 +08:00
qiji4215
0fce93ecc9 merge code 2023-10-09 09:58:51 +08:00