750 Commits

Author SHA1 Message Date
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
92181c5ab4 fix: 合并代码 2023-11-03 15:31:34 +08:00
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
qiji4215
d3398ae755 增加轨迹多层显示 2023-10-26 14:58:43 +08:00
77482329fa Merge branch 'dev' 2023-10-26 14:48:41 +08:00
squallzhjch
459970d01b 修改多线程安装 2023-10-26 14:28:58 +08:00
squallzhjch
ed116d2acd 修改查询语句 2023-10-26 10:04:20 +08:00
261812b870 fix: 修改测试定位位置 2023-10-26 09:52:47 +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
e9c1190637 feat: 增加立交类型 2023-10-25 09:21:49 +08:00
qiji4215
172d84f8c2 增加轨迹日志信息 2023-10-24 17:53:46 +08:00
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
00515cfe37 feat: 引入通行车辆类型Lane类型数据,增加对应渲染原则 2023-10-19 16:30:38 +08:00
squallzhjch
129c48f11d 优化数据库查询 2023-10-19 14:47:15 +08:00
7a99a9d0fb fix: 将数据的linkPid提到外边 2023-10-19 09:56:42 +08:00
qiji4215
884ec8a583 merge code 2023-10-18 14:13:55 +08:00
qiji4215
6c29e7f6c7 merge coee 2023-10-17 09:32:47 +08:00
squallzhjch
202e2b3a8e 修改路径规划失败提示 2023-10-17 09:18:25 +08:00
qiji4215
576c66c19d 增加相机状态显示 2023-10-16 19:25:06 +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
dbf4108979 fix: 合并代码 2023-10-13 17:40:51 +08:00
ab873e86af fix: 修改18级overzoom模式,解决部分情况下渲染出错的问题 2023-10-13 17:39:53 +08:00
qiji4215
4957115122 merge code 2023-10-13 17:34:36 +08:00
squallzhjch
7c5a1763fe 修改轨迹回放功能 2023-10-13 17:34:02 +08:00
squallzhjch
06993b6a22 修改轨迹回放功能 2023-10-13 17:33:53 +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