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

206 Commits

Author SHA1 Message Date
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
squallzhjch
45e3e3ca0d 修改地图卡顿 
修改新增link线型编辑
 2023-07-18 10:49:56 +08:00
qiji4215
dfbea188ea merge code 2023-07-18 10:43:41 +08:00
qiji4215
694ad106d7 修复地图卡顿问题 2023-07-18 10:11:34 +08:00
qiji4215
1253cc10be Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-14 16:42:15 +08:00
squallzhjch
eea7cb6fdf 解决代码冲突 2023-07-14 16:41:39 +08:00
qiji4215
3883c934fc merge code 2023-07-14 16:40:14 +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
qiji4215
108c6daa2f merge code 2023-07-14 10:54:02 +08:00
squallzhjch
be2d0389cf 增加评测link功能 2023-07-13 17:43:38 +08:00
qiji4215
7ebdfc93ff 增加轨迹存储 2023-07-13 16:00:19 +08:00
qiji4215
d1f7129549 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt
 2023-07-13 14:16:51 +08:00
squallzhjch
23a3490c20 增加评测link功能 2023-07-13 14:09:58 +08:00
qiji4215
29a90b5555 更换隧道起终点坐标 2023-07-12 13:55:05 +08:00
qiji4215
3c5c1c3220 增加车道边界类型渲染2.增加地图级别联动底部工具栏调整位置 2023-07-12 10:47:53 +08:00
qiji4215
c8c7c4d4ce Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-07 18:06:38 +08:00
qiji4215
b505bdc044 增加隧道渲染原则 2023-07-07 18:06:19 +08:00
squallzhjch
ae44b848e2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-07-07 13:55:31 +08:00
squallzhjch
07d3165813 增加便签功能 2023-07-07 13:54:08 +08:00
qiji4215
7c57a451f1 修改车道面为车道中心线并在辅助表中存储 2023-07-05 14:09:45 +08:00
qiji4215
e3a78aeb77 增加任务无mark校验及关闭业务 2023-07-04 10:08:47 +08:00
qiji4215
39a3835de4 增加任务缓存处理，保留已上传最近3个月数据及未上传任务 2023-06-30 17:00:02 +08:00
squallzhjch
f415ded353 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-06-29 17:23:12 +08:00
squallzhjch
c00592f6d5 统一地图图标渲染尺寸 
优化提前显示面板，详细信息面板
增加多媒体照片
 2023-06-29 17:22:40 +08:00
qiji4215
827e6b31b8 1、问题记录增加要素编码存储2.回传问题增加未测评判断业务 2023-06-29 17:16:36 +08:00
qiji4215
b9d85640aa Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-06-28 11:14:12 +08:00
qiji4215
f6b4c7543a 1、修改问题描述2、修改定位适配较低系统 2023-06-28 11:13:03 +08:00
squallzhjch
2fe71fe94f Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
 2023-06-27 16:13:50 +08:00
squallzhjch
6921e4c0b0 增加车信提前看板显示 
调整条件限速，常规限速提前看板，详细看板
调整道路名详细信息
 2023-06-27 16:11:11 +08:00
xiaoyan
8551ce43a7 fix: 完善路口和电子眼渲染样式 2023-06-26 14:56:29 +08:00
xiaoyan
3d4d6c13a7 fix: 注释无用渲染样式 2023-06-25 17:12:02 +08:00
xiaoyan
e9af1785f8 fix: 修改普通交限入库规则，首尾相接数据不入库 2023-06-25 16:49:25 +08:00
xiaoyan
a5e964efbb feat: 增加路口渲染 2023-06-25 10:11:24 +08:00
xiaoyan
f6346acb89 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-06-20 14:30:30 +08:00
xiaoyan
ac6e3d577a fix: 增加道路面渲染 2023-06-20 14:30:07 +08:00
squallzhjch
236f422fa1 修改冲突代码 2023-06-16 15:29:01 +08:00
squallzhjch
89c7fd4585 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/assets/editormarker.xml
	vtm
 2023-06-16 15:24:02 +08:00
squallzhjch
083a6fd57a 调整离线地图UI，任务列表UI，个人中心UI 2023-06-16 15:16:10 +08:00
xiaoyan
dee79fd63a fix: 合并冲突 2023-06-16 13:49:20 +08:00
xiaoyan
23eaaf5aec fix: 修改测试按钮跳转位置 2023-06-15 10:23:11 +08:00
qiji4215
94467f21a1 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
 2023-06-14 14:23:08 +08:00
qiji4215
4e98a5745c 1.优化部分页面2.修复Task无link数据地图及控制业务无效问题 2023-06-14 14:20:37 +08:00
squallzhjch
46fa06d1a8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt
 2023-06-14 13:51:43 +08:00
squallzhjch
e352a34ef9 调整中控联动UI 2023-06-14 13:47:49 +08:00
xiaoyan
79659e78fb fix: 面渲染测试 2023-06-13 17:48:48 +08:00
qiji4215
e0b6d687f6 1.修改布局允许水平旋转2.修复主页访问图层管理崩溃问题3.扩充轨迹字段 2023-06-13 17:00:02 +08:00
qiji4215
4614ef4db8 merge code 2023-06-09 16:59:10 +08:00