xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
584 Commits 2 Branches 0 Tags
18c36b179ef674ce7afc7c606e1e3cfaef9a2a64
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
squallzhjch e5ebe64e0b 路径绑定测试 2023-09-11 16:15:08 +08:00
squallzhjch 85c9677739 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
	vtm
 2023-09-11 15:16:31 +08:00
squallzhjch 8230e44f83 代码冲突 2023-09-11 15:14:28 +08:00
squallzhjch 0f29f32906 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-09-05 14:08:33 +08:00
squallzhjch 1206c0d61c 修改交限渲染 2023-09-05 14:07:49 +08:00
squallzhjch 128c45f90c Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-09-05 09:19:01 +08:00
squallzhjch 1b5df15491 修改收费站详情 2023-09-05 09:18:24 +08:00
squallzhjch 34977af660 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-09-01 17:21:18 +08:00
squallzhjch 5ffb0e68e8 增加收费站的预警信息 
增加文字，停止位置，危险信息的详情和预警
 2023-09-01 17:20:46 +08:00
squallzhjch e4aa29ea32 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-08-31 15:33:15 +08:00
squallzhjch 2d3e725119 增加任务列表下拉刷新功能 
增加警示信息的预警面板和详情面板
 2023-08-31 15:32:33 +08:00
squallzhjch f5e6a87b9b Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
	vtm
 2023-08-30 14:47:00 +08:00
squallzhjch 9fed02564c 时间区间算法，车道施工，道路施工 2023-08-30 14:45:58 +08:00
squallzhjch 6447bbb8d5 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-25 17:35:45 +08:00
squallzhjch bccb235521 时间区间算法 2023-08-25 17:35:35 +08:00
squallzhjch 31074e8e71 开发道路施工 2023-08-25 14:23:17 +08:00
squallzhjch 7c533faad2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-08-25 09:28:23 +08:00
squallzhjch f4495ea202 修改bug 2023-08-25 09:28:04 +08:00
squallzhjch 5b2fcbddd9 修改bug 2023-08-24 10:14:07 +08:00
squallzhjch 13c2d55159 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-22 10:09:42 +08:00
squallzhjch 06f77dd1cd 修改数据库查询bug导致交限数据不渲染 2023-08-22 10:09:19 +08:00
squallzhjch 95b0dd540f Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-17 17:38:10 +08:00
squallzhjch 31991ebe00 增加多点列表 2023-08-17 17:37:49 +08:00
squallzhjch 53e5154c36 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-17 10:10:09 +08:00
squallzhjch d1040b65ba 修改主页布局 2023-08-17 10:09:31 +08:00
squallzhjch 51b9a398a4 增加道路属性，道路形态展示 2023-08-16 16:43:48 +08:00
squallzhjch f9b5c8a1d1 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
 2023-08-16 13:43:45 +08:00
squallzhjch b17ff18c67 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/enum/DataCodeEnum.kt
 2023-08-16 11:25:02 +08:00
squallzhjch 2431fc3bdd 增加道路属性，跨线立交，匝道，上下线分离，隧道，环岛的道路属性展示 2023-08-16 11:22:07 +08:00
squallzhjch f7843baabe 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/java/com/navinfo/omqs/ui/widget/SignUtil.kt
	vtm
 2023-08-15 09:52:48 +08:00
squallzhjch 8fba6764bb 增加全封闭，匝道内容显示 2023-08-15 09:47:55 +08:00
squallzhjch dc4c6daf2e 增加坐标复制和测量结果复制功能 2023-08-11 17:24:56 +08:00
squallzhjch 4417201497 恢复代码 2023-08-11 15:32:22 +08:00
squallzhjch 3dd4daa11e 优化UI 2023-08-11 14:51:37 +08:00
squallzhjch 212193dc26 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDataSource.java
	collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java
	vtm
 2023-08-11 14:30:42 +08:00
squallzhjch 595cc42b3f 优化UI 2023-08-11 14:29:18 +08:00
squallzhjch 00e197f264 优化UI 2023-08-11 14:28:55 +08:00
squallzhjch 54b30d5db5 修改测量工具的联动功能 
修改崩溃bug
 2023-08-10 14:02:52 +08:00
squallzhjch 6bed16f470 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-08-10 11:18:40 +08:00
squallzhjch 4baa137ad6 重构测量工具代码，修改代码逻辑和展现形式。 
增加面积，角度测量
修改地图渲染面会崩溃的问题
 2023-08-10 11:18:14 +08:00
squallzhjch 8578ea0afd Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-04 10:11:55 +08:00
squallzhjch 8f3bd1926a 增加要素捕捉功能， 
增加测量功能
 2023-08-04 10:11:29 +08:00
squallzhjch 5266cbb4b1 修改编辑评测数据编辑时切换任务关闭 右侧面板 2023-07-28 10:03:38 +08:00
squallzhjch 485c2b4b79 修改离线地图下载的按钮状态 
修改详细信息面板快捷进入新增数据界面
 2023-07-27 17:15:51 +08:00
squallzhjch b9e3e4766e Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-07-27 11:16:49 +08:00
squallzhjch 2b4b2645a6 修改任务下载 2023-07-27 11:16:36 +08:00
squallzhjch 01bc6ac7fc 修改登录逻辑和数据访问顺序 
增加任务和作业数据统计
 2023-07-26 17:08:45 +08:00
squallzhjch e1b0e45157 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
	app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
	vtm
 2023-07-26 10:53:01 +08:00
squallzhjch e69b6fca03 修改任务下载按钮刷新不及时问题 2023-07-26 10:49:23 +08:00
squallzhjch 7a268f43e0 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-07-25 10:37:28 +08:00
squallzhjch 33cc1dc243 修改任务下载刷新不及时 2023-07-25 10:37:06 +08:00
squallzhjch 5806fbf5ac 增加非空判断 2023-07-21 15:50:44 +08:00
squallzhjch 19876f8275 修改冲突 2023-07-21 15:39:44 +08:00
squallzhjch 6c386505d6 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
	collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
 2023-07-21 15:30:20 +08:00
squallzhjch 2bb7203539 评测数据增加任务id 
评测数据根据所选任务显隐
修改评测link和评测数据的联动维护
 2023-07-21 15:11:21 +08:00
squallzhjch 4ef07f470d 修改点击聚合marker崩溃问题 2023-07-18 15:13:01 +08:00
squallzhjch 71948187c3 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
 2023-07-18 10:58:21 +08:00
squallzhjch 45e3e3ca0d 修改地图卡顿 
修改新增link线型编辑
 2023-07-18 10:49:56 +08:00
squallzhjch e3695fb6cb 解决代码冲突 2023-07-14 16:45:31 +08:00
squallzhjch eea7cb6fdf 解决代码冲突 2023-07-14 16:41:39 +08:00
squallzhjch 1be2b00bf2 解决代码冲突 2023-07-14 16:33:09 +08:00
squallzhjch 3fb89ca470 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/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
 2023-07-14 16:32:39 +08:00
squallzhjch 1412f7106a 增加评测link功能 2023-07-14 16:28:19 +08:00
squallzhjch be2d0389cf 增加评测link功能 2023-07-13 17:43:38 +08:00
squallzhjch 43b62f9947 增加评测link功能 2023-07-13 16:36:43 +08:00
squallzhjch 23a3490c20 增加评测link功能 2023-07-13 14:09:58 +08:00
squallzhjch ae44b848e2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-07-07 13:55:31 +08:00
squallzhjch 07d3165813 增加便签功能 2023-07-07 13:54:08 +08:00
squallzhjch d84356415c 增加多媒体照片 2023-06-30 14:31:51 +08:00
squallzhjch f415ded353 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-06-29 17:23:12 +08:00
squallzhjch c00592f6d5 统一地图图标渲染尺寸 
优化提前显示面板，详细信息面板
增加多媒体照片
 2023-06-29 17:22:40 +08:00
squallzhjch 2fe71fe94f Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
 2023-06-27 16:13:50 +08:00
squallzhjch 6921e4c0b0 增加车信提前看板显示 
调整条件限速，常规限速提前看板，详细看板
调整道路名详细信息
 2023-06-27 16:11:11 +08:00
squallzhjch fd2c5d0358 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/assets/omdb_config.json
 2023-06-21 10:21:50 +08:00
squallzhjch 7b4229d756 增加道路名显示和详细信息功能 2023-06-21 10:10:21 +08:00
squallzhjch 1fe90ccf26 增加提示项 2023-06-16 17:16:20 +08:00
squallzhjch 236f422fa1 修改冲突代码 2023-06-16 15:29:01 +08:00
squallzhjch 89c7fd4585 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/assets/editormarker.xml
	vtm
 2023-06-16 15:24:02 +08:00
squallzhjch 083a6fd57a 调整离线地图UI，任务列表UI，个人中心UI 2023-06-16 15:16:10 +08:00
squallzhjch 6cd9bab9e1 调整中控联动UI 2023-06-14 14:42:34 +08:00
squallzhjch 876d5bef44 调整中控联动UI 2023-06-14 14:06:13 +08:00
squallzhjch 46fa06d1a8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt
 2023-06-14 13:51:43 +08:00
squallzhjch e352a34ef9 调整中控联动UI 2023-06-14 13:47:49 +08:00
squallzhjch 4ddabe7a94 增加中控页面 2023-06-09 16:58:08 +08:00
squallzhjch 5665638120 增加中控页面 2023-06-09 13:38:40 +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
squallzhjch d68e7bd768 调整UI 2023-06-02 14:12:25 +08:00
squallzhjch b8015a8b20 调整任务列表的UI， 
增加任务列表和道路link的筛选功能
调整问题原因面板的UI
增加经纬度定位功能
 2023-05-31 15:47:38 +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
squallzhjch 75a6d56471 调整看板 2023-05-26 17:23:47 +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
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
squallzhjch 59bc0f544b 调整UI 
调整道路属性面板
 2023-05-26 10:51:36 +08:00
squallzhjch b6bbcad634 调整UI 
调整道路属性面板
 2023-05-26 10:06:58 +08:00
squallzhjch 4e997b8632 调整UI 
调整道路属性面板
 2023-05-24 15:57:52 +08:00