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

461 Commits

Author SHA1 Message Date
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
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
xiaoyan
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
9f8349506a merge code 2023-05-08 11:11:12 +08:00
qiji4215
077d5bb32f 修改同步逻辑 2023-05-08 10:59:58 +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
squallzhjch
4c09d95670 修改任务线宽 2023-05-06 16:42:21 +08:00
squallzhjch
51be5bd178 修改任务线颜色 2023-05-06 16:13:12 +08:00
squallzhjch
8e4d1c7e0e Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/res/layout/adapter_task_list.xml
 2023-05-06 15:39:31 +08:00
squallzhjch
3733634eb5 修改面板快捷新增时的种类联动 2023-05-06 15:38:27 +08:00
qiji4215
bfd9df9d8a merge code 2023-05-06 14:57:04 +08:00
squallzhjch
fbff312f41 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
 2023-05-06 14:31:05 +08:00
squallzhjch
8501f64b2c 修改线选择 2023-05-06 14:30:30 +08:00
xiaoyan
7a09721dc8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 11:04:32 +08:00
xiaoyan
b0b4f2be52 feat: 左侧界面美化（部分） 2023-05-06 11:04:23 +08:00
squallzhjch
9f7bf771c2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/res/layout/activity_main.xml
 2023-05-06 11:03:57 +08:00
squallzhjch
d86ec46943 修改任务线刷新，数据安装刷新 2023-05-06 11:01:50 +08:00
qiji4215
0ac805302d UI美化质检报告页面 2023-05-06 10:20:16 +08:00
qiji4215
9929423a3b Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 16:58:22 +08:00
qiji4215
6b1ac4df9b merge code 2023-05-05 16:58:03 +08:00
squallzhjch
3a1e1bc9d6 修改数据上传 2023-05-05 16:52:07 +08:00
squallzhjch
5826922bb9 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/tools/LayerConfigUtils.kt
 2023-05-05 15:15:07 +08:00
squallzhjch
d3fd50f941 修改数据上传 2023-05-05 15:14:20 +08:00
qiji4215
af79ae4146 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 14:48:00 +08:00
qiji4215
0cce793b9e 更新资源 2023-05-05 14:47:43 +08:00
xiaoyan
af9dcca34f Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 14:43:40 +08:00
xiaoyan
ca978100b2 fix: 修改图层管理报错的问题 2023-05-05 14:43:17 +08:00
squallzhjch
611385c145 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
 2023-05-05 14:34:46 +08:00
squallzhjch
4d4549557d 修改数据上传 2023-05-05 14:33:54 +08:00
qiji4215
eb84e153ff Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 14:33:23 +08:00
qiji4215
79af59bb02 优化地图界面UI 2023-05-05 14:23:23 +08:00
xiaoyan
464ca815c4 fix: 修改图层管理 2023-05-05 14:12:20 +08:00
xiaoyan
8a75aad54c fix: 增加omdb图层管理 2023-05-05 14:02:32 +08:00
xiaoyan
d926a147f3 feat: 增加图层管理功能 2023-05-05 10:58:16 +08:00
squallzhjch
4280c0bf0b 优化提前显示面板 2023-05-05 10:07:55 +08:00
squallzhjch
53bb2f3ca6 解决代码冲突 2023-05-04 14:55:19 +08:00