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

168 Commits

Author SHA1 Message Date
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
qiji4215
999052507a 重构网络返回对象2.对应服务上报问题接口变更 2023-06-08 10:48:44 +08:00
xiaoyan
02a65100c8 fix: 修改车道边线数据导入时的选取原则 2023-06-05 15:59:56 +08:00
xiaoyan
3d4b9ce78d fix: 合并代码 2023-06-02 14:16:30 +08:00
xiaoyan
c237ccb928 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-06-02 10:06:30 +08:00
xiaoyan
6a77e69ed7 feat: 增加车道边线渲染 2023-06-02 10:05:53 +08:00
qiji4215
6cc0a20aa6 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-06-01 10:18:19 +08:00
squallzhjch
b8015a8b20 调整任务列表的UI， 
增加任务列表和道路link的筛选功能
调整问题原因面板的UI
增加经纬度定位功能
 2023-05-31 15:47:38 +08:00
qiji4215
7a7eb61401 merge code 2023-05-30 14:00:32 +08:00
squallzhjch
e9735ee4d8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-26 17:45:56 +08:00
squallzhjch
75a6d56471 调整看板 2023-05-26 17:23:47 +08:00
xiaoyan
61165ff9f0 fix: 合并代码 2023-05-26 15:22:33 +08:00
xiaoyan
90897174ac fix: 修改渲染样式 2023-05-26 15:18:23 +08:00
squallzhjch
c94eb5654d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-26 14:01:49 +08:00
squallzhjch
10ec7a1e04 增加经纬度定位功能 2023-05-26 14:01:36 +08:00
xiaoyan
22f52429f4 fix: 修改普通交限的显示 2023-05-26 13:46:32 +08:00
xiaoyan
12e9fd1a2a feat: 增加交限和交通灯的渲染图标 2023-05-25 15:10:40 +08:00
xiaoyan
71dab4d22b feat: 以submodule方式引入vtm源码，方便后续修改 2023-05-22 17:48:20 +08:00
xiaoyan
1050eed1d6 fix: 合并代码 2023-05-22 10:18:13 +08:00
xiaoyan
1d3dcb1a2a feat: 增加数据预处理环节 2023-05-22 10:16:17 +08:00
squallzhjch
00f39555ab 修改条件限速 
修改数据上传下载地址
 2023-05-19 17:23:45 +08:00
squallzhjch
a21a9bd09c Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-18 17:17:18 +08:00
squallzhjch
4749bc66cd 1、优化地图主页布局，适配2560尺寸 
2、优化右侧面板UI
3、修改评测任务列表UI
4、增加当前任务UI及相关功能
 2023-05-18 17:17:08 +08:00
xiaoyan
73a85221fc fix: 增加条件点限速、可变点限速渲染 2023-05-18 17:14:35 +08:00
squallzhjch
a13e1f660d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
 2023-05-08 14:33:52 +08:00
squallzhjch
840bd24b7c 修改离线地图下载，数据下载安装 2023-05-08 14:26:12 +08:00
xiaoyan
931cb79c23 fix: 修改道路方向图标 2023-05-08 11:05:33 +08:00
xiaoyan
bdde0116e6 fix: 修改渲染样式 2023-05-08 10:59:55 +08:00
xiaoyan
4b84331e5b fix: 修改realm编译报错的问题 2023-05-06 18:43:14 +08:00
xiaoyan
b17d0484de fix: 增加忽略规则 2023-05-06 18:42:52 +08:00
xiaoyan
e87897c3ba Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 18:09:09 +08:00
xiaoyan
5eeaa0634e fix: 增加限速渲染图标 2023-05-06 18:08:53 +08:00
qiji4215
d1fba662b4 merge code 2023-05-06 17:23:49 +08:00
qiji4215
c5d9e70776 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 17:19:42 +08:00
qiji4215
c9e8512f19 merge code 2023-05-06 17:19:27 +08:00
xiaoyan
9cc9cf8856 fix: 修改车道中心线渲染规则 2023-05-06 17:03:24 +08:00
qiji4215
0127c554f3 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:45:38 +08:00
xiaoyan
e90b802b63 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 16:45:07 +08:00
xiaoyan
f4681e39a2 fix: 修改按钮圆角混乱的问题 2023-05-06 16:44:55 +08:00