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

561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
qiji4215
33d17eea0d 修复冲突 2023-09-11 17:17:32 +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
5e957c30a9 增加原则设置要素捕捉条件 2023-09-11 16:59:20 +08:00
squallzhjch
e5ebe64e0b 路径绑定测试 2023-09-11 16:15:08 +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
qiji4215
dbe81f5bde Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-09-06 09:32:13 +08:00
xiaoyan
ab266bce3e fix: 修改realm插入大量数据OOM问题 2023-09-06 09:31:07 +08:00
qiji4215
6c4eab70a0 merge code 2023-09-06 09:09:23 +08:00
qiji4215
8328876ec8 调整种别渲染线宽 2023-09-05 17:53:50 +08:00
xiaoyan
b1e5e30880 fix: 修改数据安装事务提交机制 2023-09-05 16:58:46 +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
1aba0b513d fix: 修改电子眼类型配置错误 2023-09-05 15:58:13 +08:00
xiaoyan
0b2b5bfe7d fix: 修改车信渲染配置为动态类型 2023-09-05 15:25:27 +08:00
squallzhjch
0f29f32906 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-09-05 14:08:33 +08:00
squallzhjch
1206c0d61c 修改交限渲染 2023-09-05 14:07:49 +08:00
qiji4215
4230bbd3d0 merge code 2023-09-05 14:07:11 +08:00
qiji4215
ef13f9a926 merge code 2023-09-05 12:26:21 +08:00
squallzhjch
128c45f90c Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-09-05 09:19:01 +08:00
squallzhjch
1b5df15491 修改收费站详情 2023-09-05 09:18:24 +08:00
qiji4215
ba063003dd merge code 2023-09-05 09:16:44 +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
9a486bde52 fix: 合并代码 2023-09-04 10:22:45 +08:00
xiaoyan
d0301aac95 fix: 杆状物要素增加导入时过滤流程 2023-09-04 10:20:43 +08:00
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
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
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
xiaoyan
0f2bc264d3 fix: 合并代码 2023-09-01 14:25:56 +08:00
xiaoyan
af294bbf50 fix: 修改杆状物渲染为图标样式 2023-09-01 14:24:22 +08:00
qiji4215
a7f9422d9d merge code 2023-09-01 13:32:27 +08:00
xiaoyan
8a1d36b117 fix: 完善人行道对象面纹理图片 2023-09-01 10:34:58 +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
squallzhjch
e4aa29ea32 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-08-31 15:33:15 +08:00
squallzhjch
2d3e725119 增加任务列表下拉刷新功能 
增加警示信息的预警面板和详情面板
 2023-08-31 15:32:33 +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
xiaoyan
aad0197f5c fix: 优化人行横道和文字渲染样式 2023-08-31 15:06:05 +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
squallzhjch
f5e6a87b9b Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
	vtm
 2023-08-30 14:47:00 +08:00