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

523 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
qiji4215
2c9c20e913 merge code 2023-06-26 14:45:39 +08:00
qiji4215
02b65eedf2 merge code 2023-06-26 14:24:46 +08:00
qiji4215
fb08f42848 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/Constant.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
 2023-06-26 14:18:48 +08:00
qiji4215
97ad787f51 1、增加室内整理工具布局2、封装定时业务类 2023-06-26 14:12:38 +08:00
qiji4215
d3fc05adad 增加室内整理工具更新接口 2023-06-25 17:50:23 +08:00
xiaoyan
3d4d6c13a7 fix: 注释无用渲染样式 2023-06-25 17:12:02 +08:00
xiaoyan
e9af1785f8 fix: 修改普通交限入库规则，首尾相接数据不入库 2023-06-25 16:49:25 +08:00
qiji4215
a970ca1992 增加室内整理工具扫描业务 2023-06-25 16:44:40 +08:00
xiaoyan
a5e964efbb feat: 增加路口渲染 2023-06-25 10:11:24 +08:00
qiji4215
d0b85d649a 封装二维码扫描业务 2023-06-21 17:51:49 +08:00
squallzhjch
fd2c5d0358 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/assets/omdb_config.json
 2023-06-21 10:21:50 +08:00
squallzhjch
7b4229d756 增加道路名显示和详细信息功能 2023-06-21 10:10:21 +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
1fe90ccf26 增加提示项 2023-06-16 17:16:20 +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
squallzhjch
6cd9bab9e1 调整中控联动UI 2023-06-14 14:42:34 +08:00
qiji4215
d5fbeec02b merge code 2023-06-14 14:29:13 +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
876d5bef44 调整中控联动UI 2023-06-14 14:06:13 +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
4884db93fc merge code 2023-06-09 19:10:55 +08:00
qiji4215
43e554b344 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-06-09 16:59:31 +08:00
qiji4215
4614ef4db8 merge code 2023-06-09 16:59:10 +08:00
squallzhjch
4ddabe7a94 增加中控页面 2023-06-09 16:58:08 +08:00
squallzhjch
5665638120 增加中控页面 2023-06-09 13:38:40 +08:00
qiji4215
8310f4b7e7 重构离线地图页面 2023-06-08 11:07:15 +08:00
qiji4215
999052507a 重构网络返回对象2.对应服务上报问题接口变更 2023-06-08 10:48:44 +08:00
xiaoyan
02a65100c8 fix: 修改车道边线数据导入时的选取原则 2023-06-05 15:59:56 +08:00
qiji4215
0d3b16503a Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-06-05 10:01:36 +08:00
qiji4215
e42ba1909c merge code 2023-06-05 10:00:46 +08:00
squallzhjch
c6bf940dc4 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-06-02 14:20:18 +08:00
squallzhjch
e4f28405dc 解决冲突 2023-06-02 14:18:49 +08:00
squallzhjch
ebc4ddf5a9 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/res/layout/adapter_sign.xml
 2023-06-02 14:17:05 +08:00
肖岩
c643f2e08d Merge branch 'master' into 'master' 
增加车道边线渲染

See merge request CollectVehicle/OneMapQS!2
 2023-06-02 14:16:45 +08:00
xiaoyan
3d4b9ce78d fix: 合并代码 2023-06-02 14:16:30 +08:00
squallzhjch
d68e7bd768 调整UI 2023-06-02 14:12:25 +08:00
qiji4215
5f953aa816 1.解决新增问题后点击获取数据无效2.预警面板增加快速问题记录 2023-06-02 13:57:50 +08:00