xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
534 Commits 2 Branches 0 Tags
827fe1bf7787f56b5d33193355f14c50558aac2b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
qiji4215 31f9358415 merge code 2023-08-31 10:37:16 +08:00
qiji4215 4c53144549 增加人行横道渲染 2023-08-30 11:04:51 +08:00
qiji4215 bfbf89d7e5 merge code 2023-08-28 09:30:15 +08:00
qiji4215 3b951ab9fb Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-25 17:42:02 +08:00
qiji4215 7994ae611a merge code 2023-08-25 17:41:16 +08:00
qiji4215 d346dc1d4c merge code 2023-08-25 17:24:30 +08:00
qiji4215 12a1d22651 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-08-25 15:54:38 +08:00
qiji4215 554452ddc9 merge code 2023-08-25 15:42:13 +08:00
qiji4215 207c61184d 增加非避让属性设置 2023-08-23 14:18:11 +08:00
qiji4215 7e297dbb73 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-08-23 14:11:40 +08:00
qiji4215 5614f513f7 增加道路施工/车道施工渲染业务 2023-08-23 14:08:09 +08:00
qiji4215 9ba310428f 增加道路施工及车道施工 2023-08-22 17:44:37 +08:00
qiji4215 f43dce5ae2 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-22 11:20:37 +08:00
qiji4215 a310df91e1 增加铁路道口渲染业务 2023-08-22 11:19:45 +08:00
qiji4215 7abb32610a 更换图标，修复部分问题 2023-08-22 08:52:53 +08:00
qiji4215 05bd11419d Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-21 10:07:12 +08:00
qiji4215 130b3ff7ad merge code 2023-08-21 10:04:43 +08:00
qiji4215 75a99929b0 merge code 2023-08-17 17:51:29 +08:00
qiji4215 b53aa520d4 修改道路形态code不对问题 2023-08-17 17:35:06 +08:00
qiji4215 ac17e764ea Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/assets/omdb_config.json
 2023-08-17 10:07:06 +08:00
qiji4215 9fe1847f60 merge code 2023-08-17 10:04:48 +08:00
qiji4215 27d21f341f 1.增加护栏渲染2.增加路牙渲染 2023-08-17 09:32:58 +08:00
qiji4215 0f8f36ea8c 修改车道边界类型渲染效果 2023-08-16 16:31:49 +08:00
qiji4215 a0c9dadbd8 merge code 2023-08-16 13:33:34 +08:00
qiji4215 015733451b 增加草图任务id及重构部分数据库读取业务 2023-08-16 11:24:56 +08:00
qiji4215 7abf0e9e15 merge code 2023-08-15 17:17:45 +08:00
qiji4215 04d8922c90 merge code 2023-08-15 16:15:07 +08:00
qiji4215 de86fb57fb 增加SA/PA渲染原则 2023-08-15 14:16:00 +08:00
qiji4215 5fa01313b4 增加道路形态渲染业务 2023-08-15 10:45:59 +08:00
qiji4215 4fe231cf02 增加数据过滤 2023-08-14 18:19:26 +08:00
qiji4215 85e863c7b4 merge code 2023-08-14 17:08:47 +08:00
qiji4215 63d36c3e1d Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-14 14:41:18 +08:00
qiji4215 08283761e0 修改数据类型增加PA/SA要素编码处理 2023-08-14 14:18:19 +08:00
qiji4215 f100578627 merge code 2023-08-11 16:18:16 +08:00
qiji4215 1b2c149c43 merge code 2023-08-11 15:35:14 +08:00
qiji4215 dfcc1ca0e7 merge code 2023-08-11 14:20:26 +08:00
qiji4215 dcca1d50ea merge code 2023-08-11 10:27:35 +08:00
qiji4215 215aad041e Merge branch 'master' of https://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
	collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java
	vtm
 2023-08-11 10:05:35 +08:00
qiji4215 061aca96ab merge code 2023-08-11 09:49:45 +08:00
qiji4215 311823cc6a merge code 2023-08-10 13:49:59 +08:00
qiji4215 8d7c6036f1 merge code 2023-08-10 13:43:36 +08:00
qiji4215 af4baf80b5 增加路口要素按任务link渲染 2023-08-10 13:37:39 +08:00
qiji4215 96316fe1bb Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-10 10:56:52 +08:00
qiji4215 57ccf8584b 1.增加搜索相关功能业务2.解决下载omdb后不及时渲染问题3.增加按任务及link关联渲染业务4.接口中增加按任务查询条件 2023-08-10 10:51:22 +08:00
qiji4215 1765b8801b 增加要素按任务关联LinkPid进行渲染业务 2023-08-04 15:50:42 +08:00
qiji4215 8a8a48fbb5 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java
 2023-08-04 10:15:17 +08:00
qiji4215 19c8fd3cf3 1.增加按任务linkpid进行数据显示业务2.增加桥要素渲染 2023-08-04 10:10:46 +08:00
qiji4215 c54cbae676 修改问题记录上传无效问题 2023-08-01 15:36:56 +08:00
qiji4215 34ee4a0101 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-28 17:06:44 +08:00
qiji4215 3c8bf307a2 修改渲染策略 2023-07-28 11:04:42 +08:00
qiji4215 0979cc7caf Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-28 09:41:21 +08:00
qiji4215 0b7b262540 调整资源 2023-07-28 09:40:31 +08:00
qiji4215 1d258c4b8e 修改已知问题2.调整渲染图层策略及样式 2023-07-27 16:35:15 +08:00
qiji4215 53ae5ab043 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-26 18:37:54 +08:00
qiji4215 27e812c49f 调整渲染级别 2023-07-26 18:37:35 +08:00
qiji4215 43bd63a397 渲染表增加任务id和显示缩放级别控制 2023-07-26 10:21:50 +08:00
qiji4215 17524bbabb Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
 2023-07-24 14:30:12 +08:00
qiji4215 b92110c785 修改渲染策略 2023-07-24 14:28:49 +08:00
qiji4215 7df7cf1345 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-21 15:40:32 +08:00
qiji4215 04f157c036 修改测评问题人记录错误2.调整车道边界类型渲染原则 2023-07-21 15:10:28 +08:00
qiji4215 c83ed1b97e 完善室内整理功能 2023-07-20 16:01:42 +08:00
qiji4215 0848ee491b 增加登录缓存校验 2023-07-20 10:48:38 +08:00
qiji4215 392fb91215 增加自动定位开关 2023-07-19 17:46:50 +08:00
qiji4215 58f5329a75 增加相机自动重新连接功能 2023-07-19 17:40:44 +08:00
qiji4215 45de9982fc 增加室内整理工具反向控制 2023-07-19 17:01:02 +08:00
qiji4215 063927653a 增加室内整理工具反向控制业务 2023-07-18 18:00:31 +08:00
qiji4215 0378378dec 修改定位无效问题 2023-07-18 17:08:07 +08:00
qiji4215 53275472f4 解决代码冲突 2023-07-18 15:56:21 +08:00
qiji4215 44d1473a4a Merge branch 'master' of https://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
	collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
 2023-07-18 15:54:06 +08:00
qiji4215 78bd363372 重构轨迹回放业务 2023-07-18 15:45:11 +08:00
qiji4215 dfbea188ea merge code 2023-07-18 10:43:41 +08:00
qiji4215 07c0103de1 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkViewModel.kt
 2023-07-18 10:12:41 +08:00
qiji4215 694ad106d7 修复地图卡顿问题 2023-07-18 10:11:34 +08:00
qiji4215 6210f41b69 增加室内整理工具更新信息逻辑 2023-07-17 14:49:21 +08:00
qiji4215 1253cc10be Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-14 16:42:15 +08:00
qiji4215 3883c934fc merge code 2023-07-14 16:40:14 +08:00
qiji4215 4fa9df8e3c merge code 2023-07-14 14:25:44 +08:00
qiji4215 c8ac5c9582 1、适配上传接口2、代码融合 2023-07-14 14:20:34 +08:00
qiji4215 c3f299222a Merge branch 'master' of https://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
	collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
 2023-07-14 11:07:57 +08:00
qiji4215 108c6daa2f merge code 2023-07-14 10:54:02 +08:00
qiji4215 7ebdfc93ff 增加轨迹存储 2023-07-13 16:00:19 +08:00
qiji4215 d1f7129549 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt
 2023-07-13 14:16:51 +08:00
qiji4215 29a90b5555 更换隧道起终点坐标 2023-07-12 13:55:05 +08:00
qiji4215 3c5c1c3220 增加车道边界类型渲染2.增加地图级别联动底部工具栏调整位置 2023-07-12 10:47:53 +08:00
qiji4215 c8c7c4d4ce Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-07 18:06:38 +08:00
qiji4215 b505bdc044 增加隧道渲染原则 2023-07-07 18:06:19 +08:00
qiji4215 7c57a451f1 修改车道面为车道中心线并在辅助表中存储 2023-07-05 14:09:45 +08:00
qiji4215 e3a78aeb77 增加任务无mark校验及关闭业务 2023-07-04 10:08:47 +08:00