Commit Graph
387 Commits
Author SHA1 Message Date
squallzhjch 4ddabe7a94 增加中控页面 2023-06-09 16:58:08 +08:00
squallzhjch 5665638120 增加中控页面 2023-06-09 13:38:40 +08:00
qiji4215 8310f4b7e7 重构离线地图页面 2023-06-08 11:07:15 +08:00
qiji4215 999052507a 重构网络返回对象2.对应服务上报问题接口变更 2023-06-08 10:48:44 +08:00
xiaoyan159 02a65100c8 fix: 修改车道边线数据导入时的选取原则 2023-06-05 15:59:56 +08:00
qiji4215 0d3b16503a Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-06-05 10:01:36 +08:00
qiji4215 e42ba1909c merge code 2023-06-05 10:00:46 +08:00
squallzhjch c6bf940dc4 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	vtm
2023-06-02 14:20:18 +08:00
squallzhjch e4f28405dc 解决冲突 2023-06-02 14:18:49 +08:00
squallzhjch ebc4ddf5a9 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	app/src/main/res/layout/adapter_sign.xml
2023-06-02 14:17:05 +08:00
肖岩 c643f2e08d Merge branch 'master' into 'master'
增加车道边线渲染

See merge request CollectVehicle/OneMapQS!2
2023-06-02 14:16:45 +08:00
xiaoyan159 3d4b9ce78d fix: 合并代码 2023-06-02 14:16:30 +08:00
squallzhjch d68e7bd768 调整UI 2023-06-02 14:12:25 +08:00
qiji4215 5f953aa816 1.解决新增问题后点击获取数据无效2.预警面板增加快速问题记录 2023-06-02 13:57:50 +08:00
xiaoyan159 c237ccb928 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-06-02 10:06:30 +08:00
xiaoyan159 6a77e69ed7 feat: 增加车道边线渲染 2023-06-02 10:05:53 +08:00
qiji4215 6cc0a20aa6 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-06-01 10:18:19 +08:00
qiji4215 02cf95b83d merge code 2023-06-01 10:18:00 +08:00
squallzhjch b8015a8b20 调整任务列表的UI,
增加任务列表和道路link的筛选功能
调整问题原因面板的UI
增加经纬度定位功能
2023-05-31 15:47:38 +08:00
qiji4215 7a7eb61401 merge code 2023-05-30 14:00:32 +08:00
qiji4215 7fb8af31b5 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-26 17:51:13 +08:00
squallzhjch e9735ee4d8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-26 17:45:56 +08:00
squallzhjch 8d6bb8c6e8 修改普通交限的道路渲染 2023-05-26 17:45:36 +08:00
qiji4215 5ff8509c95 merge code 2023-05-26 17:35:15 +08:00
squallzhjch 75a6d56471 调整看板 2023-05-26 17:23:47 +08:00
qiji4215 591b9cd579 merge code 2023-05-26 15:32:47 +08:00
xiaoyan159 c2416ab709 fix: 修改submodule配置 2023-05-26 15:24:03 +08:00
xiaoyan159 61165ff9f0 fix: 合并代码 2023-05-26 15:22:33 +08:00
xiaoyan159 90897174ac fix: 修改渲染样式 2023-05-26 15:18:23 +08:00
squallzhjch d5d251c85e Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-26 15:16:19 +08:00
squallzhjch dae344afc2 调整看板 2023-05-26 15:16:09 +08:00
qiji4215 64eb25d5d4 mergecode 2023-05-26 15:08:09 +08:00
qiji4215 8988661bed Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-26 14:54:05 +08:00
xiaoyan159 f2891d6d2f fix: 修改submodule的仓库地址 2023-05-26 14:53:27 +08:00
squallzhjch c94eb5654d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-26 14:01:49 +08:00
squallzhjch 10ec7a1e04 增加经纬度定位功能 2023-05-26 14:01:36 +08:00
qiji4215 f99517b386 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-26 13:56:32 +08:00
xiaoyan159 549031e8a8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-26 13:47:39 +08:00
xiaoyan159 22f52429f4 fix: 修改普通交限的显示 2023-05-26 13:46:32 +08:00
squallzhjch 59bc0f544b 调整UI
调整道路属性面板
2023-05-26 10:51:36 +08:00
qiji4215 46268b3549 增加点击事件返回联动 2023-05-26 10:51:24 +08:00
qiji4215 d1aab7aabb Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-26 10:24:12 +08:00
qiji4215 3c0fe6b1b1 merge code 2023-05-26 10:24:00 +08:00
squallzhjch b6bbcad634 调整UI
调整道路属性面板
2023-05-26 10:06:58 +08:00
qiji4215 e86b0696b6 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/res/layout/text_item_select.xml
2023-05-26 09:59:24 +08:00
xiaoyan159 12e9fd1a2a feat: 增加交限和交通灯的渲染图标 2023-05-25 15:10:40 +08:00
xiaoyan159 80b8b60556 fix: 修改数据导入 2023-05-24 17:12:34 +08:00
squallzhjch 4e997b8632 调整UI
调整道路属性面板
2023-05-24 15:57:52 +08:00
xiaoyan159 4d579d87c4 fix: 增加右偏功能,增加角度计算功能 2023-05-24 14:04:11 +08:00
xiaoyan159 f160f1dd00 fix: 修改git忽略文件 2023-05-23 15:44:41 +08:00