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

219 Commits

Author SHA1 Message Date
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
squallzhjch
54b30d5db5 修改测量工具的联动功能 
修改崩溃bug
 2023-08-10 14:02:52 +08:00
qiji4215
311823cc6a merge code 2023-08-10 13:49:59 +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
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
xiaoyan
d11dd5e806 fix: 适配面纹理及文字类型 2023-08-09 17:20:57 +08:00
xiaoyan
4b7ccbc3b4 fix: 合并代码 2023-08-08 16:00:11 +08:00
xiaoyan
9bc3560647 feat: 普通marker支持动态配置 2023-08-08 15:55:09 +08:00
xiaoyan
958e94ea1e feat: 面数据增加自适应纹理 2023-08-08 15:29:44 +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
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
qiji4215
19c8fd3cf3 1.增加按任务linkpid进行数据显示业务2.增加桥要素渲染 2023-08-04 10:10:46 +08:00
xiaoyan
a500d3ffea fix: 解决冲突 2023-08-01 16:30:08 +08:00
xiaoyan
5d0ce1e4ce Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-01 09:54:23 +08:00
qiji4215
34ee4a0101 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-28 17:06:44 +08:00
squallzhjch
5266cbb4b1 修改编辑评测数据编辑时切换任务关闭 右侧面板 2023-07-28 10:03:38 +08:00
qiji4215
0979cc7caf Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-28 09:41:21 +08:00
squallzhjch
485c2b4b79 修改离线地图下载的按钮状态 
修改详细信息面板快捷进入新增数据界面
 2023-07-27 17:15:51 +08:00
qiji4215
1d258c4b8e 修改已知问题2.调整渲染图层策略及样式 2023-07-27 16:35:15 +08:00
xiaoyan
1188e470bb fix: 解析omdb高程数据-道路标牌和杆状物 2023-07-27 15:53:24 +08:00
squallzhjch
2b4b2645a6 修改任务下载 2023-07-27 11:16:36 +08:00
squallzhjch
01bc6ac7fc 修改登录逻辑和数据访问顺序 
增加任务和作业数据统计
 2023-07-26 17:08:45 +08:00
xiaoyan
7ad3fcbbb4 fix: 合并代码 2023-07-26 15:29:13 +08:00
xiaoyan
1a19dc1cfa feat: 杆状物、交通面板3D化测试 2023-07-26 14:45:16 +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
qiji4215
43bd63a397 渲染表增加任务id和显示缩放级别控制 2023-07-26 10:21:50 +08:00
qiji4215
7df7cf1345 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-21 15:40:32 +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
qiji4215
04f157c036 修改测评问题人记录错误2.调整车道边界类型渲染原则 2023-07-21 15:10:28 +08:00
qiji4215
392fb91215 增加自动定位开关 2023-07-19 17:46:50 +08:00
qiji4215
45de9982fc 增加室内整理工具反向控制 2023-07-19 17:01:02 +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
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
xiaoyan
3f173aa86f 面数据增加纹理 2023-07-18 10:56:21 +08:00
squallzhjch
45e3e3ca0d 修改地图卡顿 
修改新增link线型编辑
 2023-07-18 10:49:56 +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
6210f41b69 增加室内整理工具更新信息逻辑 2023-07-17 14:49:21 +08:00
squallzhjch
e3695fb6cb 解决代码冲突 2023-07-14 16:45:31 +08:00
squallzhjch
eea7cb6fdf 解决代码冲突 2023-07-14 16:41:39 +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
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