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

430 Commits

Author SHA1 Message Date
xiaoyan
78766de39c fix: 合并代码 2023-09-21 09:57:07 +08:00
qiji4215
121a8cf39c mergecode 2023-09-21 09:55:14 +08:00
squallzhjch
f775267612 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-09-20 16:21:40 +08:00
squallzhjch
7d29ce2309 路线选择时，要素距离计算 2023-09-20 16:21:26 +08:00
xiaoyan
ecdd28898e fix: 合并代码 2023-09-20 15:36:10 +08:00
xiaoyan
3dc346f29d feat: symbol增加y方向的偏移选项 2023-09-20 15:35:14 +08:00
qiji4215
2eb8528f98 增加任务错误数据容错2.增加交通标牌详情显示 2023-09-20 15:32:57 +08:00
squallzhjch
427e36bb8a 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/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	vtm
 2023-09-20 09:59:34 +08:00
qiji4215
03c778c1ec Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-19 16:34:33 +08:00
qiji4215
5320caac69 1、增加任务列表定位2、地图初始化显示底部工具栏3、修改道路形态标题 2023-09-19 16:33:42 +08:00
xiaoyan
0bacea8259 feat: 交通标牌2D化渲染 2023-09-19 16:19:33 +08:00
xiaoyan
18c36b179e fix: 合并代码 2023-09-19 15:07:46 +08:00
xiaoyan
10e8f32070 fix: 修改文字渲染，不显示边框 2023-09-19 15:03:52 +08:00
xiaoyan
baf223dc39 fix: 修改文字对象渲染，支持按数据颜色渲染 2023-09-19 14:09:57 +08:00
qiji4215
0d9b6e90ac 修复已知bug及优化部分要素渲染效果 2023-09-19 11:22:18 +08:00
qiji4215
95ca4cb9ff 修改路牙样式，增加对话窗体内容复制功能 2023-09-18 11:04:35 +08:00
qiji4215
934ece1df4 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-15 16:15:53 +08:00
qiji4215
7999d6f8de merge code 2023-09-15 16:15:32 +08:00
xiaoyan
093842cbbb fix: 修改任务切换时label图层的marker继续显示的问题 2023-09-15 14:35:30 +08:00
squallzhjch
d78423b039 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
 2023-09-15 13:37:15 +08:00
squallzhjch
95f2209cc6 开发路径导航功能 2023-09-15 13:31:37 +08:00
qiji4215
c3d9ed5a2f 对数据插入进行优化重构 2023-09-13 17:53:12 +08:00
qiji4215
a8d88a2ada Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-13 10:22:01 +08:00
qiji4215
fbf2be815f 修改自动定位逻辑 2023-09-13 10:21:17 +08:00
xiaoyan
963c84a7d0 fix: 解决冲突 2023-09-13 10:19:44 +08:00
qiji4215
f40f1a1881 增加10S自动定位及指北模式 2023-09-12 17:18:01 +08:00
qiji4215
3caaa57e20 增加地图要素捕捉过滤业务 2023-09-12 11:15:47 +08:00
qiji4215
c61599bcc8 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	vtm
 2023-09-11 17:13:53 +08:00
qiji4215
30822c7937 修改realm事物存储逻辑，解决OOM问题 2023-09-11 15:59:56 +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
xiaoyan
70b820a358 fix: 修改最高级别下线数据出现幽灵渲染的问题 2023-09-08 17:20:39 +08:00
xiaoyan
bcc11946a1 fix: 修改电子眼渲染图标 2023-09-07 14:52:01 +08:00
xiaoyan
27b8be2cb1 fix: 修改电子眼图标 2023-09-07 14:26:21 +08:00
qiji4215
dbe81f5bde Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-06 09:32:13 +08:00
qiji4215
8328876ec8 调整种别渲染线宽 2023-09-05 17:53:50 +08:00
qiji4215
edf98fe624 merge code 2023-09-05 16:58:34 +08:00
xiaoyan
cfa1041f7e Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-09-05 16:02:08 +08:00
xiaoyan
ebd70520e4 feat: 修改同点位marker避让时未参考angle角度的问题 2023-09-05 15:59:09 +08:00
xiaoyan
0b2b5bfe7d fix: 修改车信渲染配置为动态类型 2023-09-05 15:25:27 +08:00
qiji4215
ef13f9a926 merge code 2023-09-05 12:26:21 +08:00
qiji4215
6d0880b3a9 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-09-04 10:23:17 +08:00
xiaoyan
d0301aac95 fix: 杆状物要素增加导入时过滤流程 2023-09-04 10:20:43 +08:00
qiji4215
8f9dc82353 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-09-01 18:00:36 +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
qiji4215
624460d546 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-01 14:51:52 +08:00
xiaoyan
1762b8d165 fix: 修改箭头对象渲染方向及颜色 2023-09-01 14:51:12 +08:00
qiji4215
b04a8bef8c 修改箭头颜色 2023-09-01 14:51:07 +08:00
xiaoyan
0f2bc264d3 fix: 合并代码 2023-09-01 14:25:56 +08:00