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

750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
qiji4215
04d8922c90 merge code 2023-08-15 16:15:07 +08:00
qiji4215
de86fb57fb 增加SA/PA渲染原则 2023-08-15 14:16:00 +08:00
xiaoyan
60eed7d9ca fix: 合并代码 2023-08-15 10:49:55 +08:00
xiaoyan
8ba68d19f8 fix: 去除log 2023-08-15 10:49:17 +08:00
qiji4215
5fa01313b4 增加道路形态渲染业务 2023-08-15 10:45:59 +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
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
squallzhjch
dc4c6daf2e 增加坐标复制和测量结果复制功能 2023-08-11 17:24:56 +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
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
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
squallzhjch
54b30d5db5 修改测量工具的联动功能 
修改崩溃bug
 2023-08-10 14:02:52 +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
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
0462a1682e fix: 合并editormarker样式配置 2023-08-01 17:15:40 +08:00
xiaoyan
a500d3ffea fix: 解决冲突 2023-08-01 16:30:08 +08:00
xiaoyan
09b3dd2f43 fix: 适配3D渲染 2023-08-01 16:26:33 +08:00
xiaoyan
c2d47afed7 fix: 修改symbol要素在限制层级下依然显示的问题 2023-08-01 16:01:39 +08:00
qiji4215
c54cbae676 修改问题记录上传无效问题 2023-08-01 15:36:56 +08:00
xiaoyan
5d0ce1e4ce Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-01 09:54:23 +08:00
xiaoyan
4806168274 fix: 修改渲染样式 2023-08-01 09:54:11 +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
squallzhjch
5266cbb4b1 修改编辑评测数据编辑时切换任务关闭 右侧面板 2023-07-28 10:03:38 +08:00