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

122 Commits

Author SHA1 Message Date
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
qiji4215
796ced9243 提交代码，修复交通标牌不显示，增加车道、道路边界类型杆状障碍物渲染 2023-11-21 17:05:35 +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
e4aff19599 增加交通标牌同点位坐标转换 2023-11-09 16:14:31 +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
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
xiaoyan
77482329fa Merge branch 'dev' 2023-10-26 14:48:41 +08:00
squallzhjch
459970d01b 修改多线程安装 2023-10-26 14:28:58 +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
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
xiaoyan
e9c1190637 feat: 增加立交类型 2023-10-25 09:21:49 +08:00
qiji4215
172d84f8c2 增加轨迹日志信息 2023-10-24 17:53:46 +08:00
xiaoyan
8c49ac7bc8 增加车道类型、车道点限速渲染导入 2023-10-24 11:03:57 +08:00
squallzhjch
51c44f00b1 优化数据库查询 2023-10-20 16:30:27 +08:00
xiaoyan
00515cfe37 feat: 引入通行车辆类型Lane类型数据，增加对应渲染原则 2023-10-19 16:30:38 +08:00
xiaoyan
7a99a9d0fb fix: 将数据的linkPid提到外边 2023-10-19 09:56:42 +08:00
qiji4215
3bf5db5d55 增加物理车道组业务 2023-10-16 09:22:53 +08:00
squallzhjch
b69f4fc9c6 修改桥 小分类问题 
修改 匝道问题
修改数据上传字段改动问题
增加轨迹回放功能
 2023-10-13 15:08:26 +08:00
qiji4215
c101490242 merge code 2023-09-28 10:16:00 +08:00
xiaoyan
4f9af9c218 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-09-27 09:38:02 +08:00
qiji4215
1187be699b Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
 2023-09-26 17:23:38 +08:00
squallzhjch
b7192a50e4 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-09-26 17:15:41 +08:00
qiji4215
1f34a8f306 增加车道中心线扩充面业务 2023-09-26 16:14:30 +08:00
xiaoyan
0f5c9bfb8d feat: 增加路口内交通岛、上方障碍物的渲染，修改符号、文字颜色 2023-09-25 14:56:02 +08:00
squallzhjch
c9f084d289 调试道路施工 2023-09-21 20:47:10 +08:00
qiji4215
e37d7bc38f Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-21 16:14:43 +08:00
qiji4215
ab27048d54 1、增加要素线捕捉开关2、增加图层开关与要素捕捉联动3、个人中心增加Marker显隐开关4、修复道路属性不显示道路种别问题 2023-09-21 16:13:46 +08:00
xiaoyan
2292fbc6d8 fix: 修改可变点限速不显示的问题 2023-09-21 15:05:54 +08:00
qiji4215
028fda54b5 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
 2023-09-21 10:01:21 +08:00
xiaoyan
78766de39c fix: 合并代码 2023-09-21 09:57:07 +08:00
qiji4215
121a8cf39c mergecode 2023-09-21 09:55:14 +08:00
squallzhjch
f775267612 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-09-20 16:21:40 +08:00
squallzhjch
7d29ce2309 路线选择时，要素距离计算 2023-09-20 16:21:26 +08:00
xiaoyan
ecdd28898e fix: 合并代码 2023-09-20 15:36:10 +08:00
qiji4215
2eb8528f98 增加任务错误数据容错2.增加交通标牌详情显示 2023-09-20 15:32:57 +08:00
xiaoyan
2b574da6d4 fix: 面纹理优化，根据实际长度设置纹理重复repeat次数 2023-09-20 13:41:16 +08:00
qiji4215
03c778c1ec Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-19 16:34:33 +08:00
qiji4215
5320caac69 1、增加任务列表定位2、地图初始化显示底部工具栏3、修改道路形态标题 2023-09-19 16:33:42 +08:00
xiaoyan
0bacea8259 feat: 交通标牌2D化渲染 2023-09-19 16:19:33 +08:00
xiaoyan
18c36b179e fix: 合并代码 2023-09-19 15:07:46 +08:00
xiaoyan
ad95095433 fix: 道路标牌预处理增加获取中心点坐标 2023-09-19 15:05:03 +08:00