750 Commits

Author SHA1 Message Date
549031e8a8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-26 13:47:39 +08:00
22f52429f4 fix: 修改普通交限的显示 2023-05-26 13:46:32 +08:00
squallzhjch
59bc0f544b 调整UI
调整道路属性面板
2023-05-26 10:51:36 +08:00
qiji4215
46268b3549 增加点击事件返回联动 2023-05-26 10:51:24 +08:00
qiji4215
d1aab7aabb Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-26 10:24:12 +08:00
qiji4215
3c0fe6b1b1 merge code 2023-05-26 10:24:00 +08:00
squallzhjch
b6bbcad634 调整UI
调整道路属性面板
2023-05-26 10:06:58 +08:00
qiji4215
e86b0696b6 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/res/layout/text_item_select.xml
2023-05-26 09:59:24 +08:00
12e9fd1a2a feat: 增加交限和交通灯的渲染图标 2023-05-25 15:10:40 +08:00
80b8b60556 fix: 修改数据导入 2023-05-24 17:12:34 +08:00
squallzhjch
4e997b8632 调整UI
调整道路属性面板
2023-05-24 15:57:52 +08:00
4d579d87c4 fix: 增加右偏功能,增加角度计算功能 2023-05-24 14:04:11 +08:00
f160f1dd00 fix: 修改git忽略文件 2023-05-23 15:44:41 +08:00
e606d83bcb Merge branch 'master' into vtm-lib 2023-05-23 15:43:57 +08:00
47495bd6ef fix: 增加vtm子模块 2023-05-23 15:42:45 +08:00
7f6ae65e62 feat: 增加geometry右移函数 2023-05-23 15:41:36 +08:00
f4ddc2768d fix: 更新git忽略文件 2023-05-23 15:39:11 +08:00
d0c0eb97ba fix: 更新git忽略文件 2023-05-23 15:37:12 +08:00
squallzhjch
d89ad95a17 调整UI
增加道路属性面板
2023-05-23 14:03:36 +08:00
squallzhjch
6d0f36068d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-23 09:48:21 +08:00
squallzhjch
dc6b4b91e5 调整UI
增加道路属性面板
2023-05-23 09:48:07 +08:00
71dab4d22b feat: 以submodule方式引入vtm源码,方便后续修改 2023-05-22 17:48:20 +08:00
1050eed1d6 fix: 合并代码 2023-05-22 10:18:13 +08:00
1d3dcb1a2a feat: 增加数据预处理环节 2023-05-22 10:16:17 +08:00
qiji4215
6af2479dbd Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-19 17:25:10 +08:00
squallzhjch
00f39555ab 修改条件限速
修改数据上传下载地址
2023-05-19 17:23:45 +08:00
qiji4215
24f58b7872 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-19 17:14:12 +08:00
qiji4215
2807b2f689 增加登录接口和问题回传接口变更 2023-05-19 17:12:19 +08:00
squallzhjch
ebe5ecc689 增加条件点限速,可变点限速面板展示功能 2023-05-19 15:54:15 +08:00
qiji4215
c42045ba45 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/res/layout/fragment_evaluation_result.xml
2023-05-19 09:28:50 +08:00
qiji4215
4ec107b359 merge code 2023-05-19 09:27:11 +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
73a85221fc fix: 增加条件点限速、可变点限速渲染 2023-05-18 17:14:35 +08:00
qiji4215
e6c2c3f76d 增加删除确认窗体2增加返回箭头 2023-05-11 16:36: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
qiji4215
09c6d741ca Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-08 11:11:57 +08:00
qiji4215
9f8349506a merge code 2023-05-08 11:11:12 +08:00
931cb79c23 fix: 修改道路方向图标 2023-05-08 11:05:33 +08:00
qiji4215
2e732faa38 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-08 11:00:27 +08:00
qiji4215
077d5bb32f 修改同步逻辑 2023-05-08 10:59:58 +08:00
bdde0116e6 fix: 修改渲染样式 2023-05-08 10:59:55 +08:00
qiji4215
8b20da237b Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 18:43:38 +08:00
qiji4215
96ee3d1ec5 merge code 2023-05-06 18:43:19 +08:00
4b84331e5b fix: 修改realm编译报错的问题 2023-05-06 18:43:14 +08:00
b17d0484de fix: 增加忽略规则 2023-05-06 18:42:52 +08:00
qiji4215
4a9174e8dd Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 18:25:05 +08:00
qiji4215
07e9309951 merge code 2023-05-06 18:24:45 +08:00
e87897c3ba Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 18:09:09 +08:00