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

676 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
qiji4215
130b3ff7ad merge code 2023-08-21 10:04:43 +08:00
xiaoyan
df2524244f fix: 合并代码 2023-08-18 16:19:09 +08:00
xiaoyan
521324fd6e fix: 面纹理渲染修改 2023-08-18 16:17:11 +08:00
qiji4215
75a99929b0 merge code 2023-08-17 17:51:29 +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
qiji4215
b53aa520d4 修改道路形态code不对问题 2023-08-17 17:35:06 +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
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
xiaoyan
471e869ad9 fix: 修改vtm配置 2023-08-16 16:52:11 +08:00
xiaoyan
58dfe64227 feat: 增加道路形态图层分组 2023-08-16 16:49:38 +08:00
squallzhjch
51b9a398a4 增加道路属性，道路形态展示 2023-08-16 16:43:48 +08:00
qiji4215
0f8f36ea8c 修改车道边界类型渲染效果 2023-08-16 16:31:49 +08:00
xiaoyan
f388f7c986 fix: 合并冲突 2023-08-16 13:54:33 +08:00
xiaoyan
5f6d363bb8 fix: 添加导流区纹理 2023-08-16 13:52:55 +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
qiji4215
a0c9dadbd8 merge code 2023-08-16 13:33:34 +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
qiji4215
015733451b 增加草图任务id及重构部分数据库读取业务 2023-08-16 11:24:56 +08:00
squallzhjch
2431fc3bdd 增加道路属性，跨线立交，匝道，上下线分离，隧道，环岛的道路属性展示 2023-08-16 11:22:07 +08:00
qiji4215
7abf0e9e15 merge code 2023-08-15 17:17:45 +08:00
xiaoyan
29f6ba22bc Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-15 16:16:15 +08:00
xiaoyan
697a80b6c9 fix: 增加导流区渲染样式 2023-08-15 16:16:06 +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
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