Commit Graph
100 Commits
Author SHA1 Message Date
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
qiji4215 32d3d1a76f merge code 2023-11-28 09:22:10 +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
qiji4215 6563a41389 更新图标资源 2023-11-24 13:40:32 +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
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
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
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
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
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
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
qiji4215 40d07cc329 修改任务新增link刷新列表崩溃问题 2023-10-26 09:43:40 +08:00
qiji4215 9bc68b52fa Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-10-25 09:23:18 +08:00
qiji4215 172d84f8c2 增加轨迹日志信息 2023-10-24 17:53:46 +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
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
qiji4215 4957115122 merge code 2023-10-13 17:34:36 +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
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
qiji4215 92ae4af99e merge code 2023-10-09 14:18:31 +08:00
qiji4215 0fce93ecc9 merge code 2023-10-09 09:58:51 +08:00
qiji4215 0627f1917f 修改渲染样式 2023-09-28 10:59:33 +08:00
qiji4215 7c0375c211 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-09-28 10:20:33 +08:00
qiji4215 c101490242 merge code 2023-09-28 10:16:00 +08:00
qiji4215 37de10fe89 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-27 16:21:25 +08:00
qiji4215 7b603e6af3 增加道路边界类型路牙、护栏渲染 2023-09-27 16:20:58 +08:00
qiji4215 4c18381125 修改多点列表点击显示问题 2023-09-26 17:46:14 +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
qiji4215 3471ac9b93 增加列表连续点击后只保留最近一条数据 2023-09-26 17:18:17 +08:00
qiji4215 b4724f205e 1、修改车道中心面样式,解决缺口问题2、修改道路边界类型间隔与车道类型一致 2023-09-26 16:32:05 +08:00
qiji4215 1f34a8f306 增加车道中心线扩充面业务 2023-09-26 16:14:30 +08:00
qiji4215 4b91feca22 增加车道边界类型实线渲染样式2.修复数据无法上传问题 2023-09-25 14:37:51 +08:00
qiji4215 e37d7bc38f Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-21 16:14:43 +08:00
qiji4215 575540a03b 1、增加要素线捕捉开关2、增加图层开关与要素捕捉联动3、个人中心增加Marker显隐开关4、修复道路属性不显示道路种别问题 2023-09-21 16:14:29 +08:00
qiji4215 ab27048d54 1、增加要素线捕捉开关2、增加图层开关与要素捕捉联动3、个人中心增加Marker显隐开关4、修复道路属性不显示道路种别问题 2023-09-21 16:13:46 +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
qiji4215 121a8cf39c mergecode 2023-09-21 09:55:14 +08:00
qiji4215 2eb8528f98 增加任务错误数据容错2.增加交通标牌详情显示 2023-09-20 15:32:57 +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
qiji4215 0d9b6e90ac 修复已知bug及优化部分要素渲染效果 2023-09-19 11:22:18 +08:00
qiji4215 633f254b2a merge code 2023-09-18 17:37:32 +08:00
qiji4215 95ca4cb9ff 修改路牙样式,增加对话窗体内容复制功能 2023-09-18 11:04:35 +08:00
qiji4215 934ece1df4 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-15 16:15:53 +08:00
qiji4215 7999d6f8de merge code 2023-09-15 16:15:32 +08:00
qiji4215 25583f6240 修改配置文件,解决大数据量无法下载 2023-09-15 15:37:52 +08:00
qiji4215 fbdaeb3939 增加全要素捕捉开关及属性信息显示窗体展示 2023-09-14 17:49:39 +08:00
qiji4215 c3d9ed5a2f 对数据插入进行优化重构 2023-09-13 17:53:12 +08:00
qiji4215 de0a1e3223 merge code 2023-09-13 10:49:56 +08:00
qiji4215 a8d88a2ada Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-13 10:22:01 +08:00
qiji4215 fbf2be815f 修改自动定位逻辑 2023-09-13 10:21:17 +08:00
qiji4215 f40f1a1881 增加10S自动定位及指北模式 2023-09-12 17:18:01 +08:00
qiji4215 3caaa57e20 增加地图要素捕捉过滤业务 2023-09-12 11:15:47 +08:00
qiji4215 33d17eea0d 修复冲突 2023-09-11 17:17:32 +08:00
qiji4215 c61599bcc8 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	vtm
2023-09-11 17:13:53 +08:00
qiji4215 5e957c30a9 增加原则设置要素捕捉条件 2023-09-11 16:59:20 +08:00
qiji4215 30822c7937 修改realm事物存储逻辑,解决OOM问题 2023-09-11 15:59:56 +08:00
qiji4215 dbe81f5bde Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-06 09:32:13 +08:00
qiji4215 6c4eab70a0 merge code 2023-09-06 09:09:23 +08:00
qiji4215 8328876ec8 调整种别渲染线宽 2023-09-05 17:53:50 +08:00
qiji4215 edf98fe624 merge code 2023-09-05 16:58:34 +08:00
qiji4215 4230bbd3d0 merge code 2023-09-05 14:07:11 +08:00
qiji4215 ef13f9a926 merge code 2023-09-05 12:26:21 +08:00
qiji4215 ba063003dd merge code 2023-09-05 09:16:44 +08:00
qiji4215 6d0880b3a9 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-09-04 10:23:17 +08:00
qiji4215 827fe1bf77 merge code 2023-09-04 10:20:41 +08:00
qiji4215 8f9dc82353 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-09-01 18:00:36 +08:00
qiji4215 624460d546 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-01 14:51:52 +08:00
qiji4215 b04a8bef8c 修改箭头颜色 2023-09-01 14:51:07 +08:00
qiji4215 d01fb35541 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-01 14:27:30 +08:00
qiji4215 2e2d6718f1 merge code 2023-09-01 14:27:12 +08:00
qiji4215 a7f9422d9d merge code 2023-09-01 13:32:27 +08:00
qiji4215 94c9b8fd4f 增加要素是否捕捉控制参数 2023-09-01 10:26:45 +08:00
qiji4215 8fe236922e Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	vtm
2023-08-31 16:46:15 +08:00
qiji4215 87190c90ae Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-31 15:20:04 +08:00
qiji4215 6fe9e50b2c merge code 2023-08-31 15:19:44 +08:00
qiji4215 45341a9747 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-31 10:38:00 +08:00