653 Commits

Author SHA1 Message Date
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
9f8349506a merge code 2023-05-08 11:11:12 +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
4b84331e5b fix: 修改realm编译报错的问题 2023-05-06 18:43:14 +08:00
b17d0484de fix: 增加忽略规则 2023-05-06 18:42:52 +08:00
qiji4215
33c6d1aa16 修改背景底色 2023-05-06 17:30:12 +08:00
qiji4215
c5d9e70776 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 17:19:42 +08:00
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
e90b802b63 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 16:45:07 +08:00
f4681e39a2 fix: 修改按钮圆角混乱的问题 2023-05-06 16:44:55 +08:00
qiji4215
0cb8cfbba3 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:42:59 +08:00
qiji4215
c7fb2eafc8 merge code 2023-05-06 16:42:36 +08:00
squallzhjch
94ce90b680 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 16:42:35 +08:00
squallzhjch
4c09d95670 修改任务线宽 2023-05-06 16:42:21 +08:00
qiji4215
9970f98e90 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:28:24 +08:00
65f4fe548c Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 16:27:40 +08:00
30ed640f3f fix: 修改限速渲染样式 2023-05-06 16:27:03 +08:00
qiji4215
6840e4d965 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:24:01 +08:00
squallzhjch
eae10036c8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 16:13:28 +08:00
squallzhjch
51be5bd178 修改任务线颜色 2023-05-06 16:13:12 +08:00
qiji4215
1d1fe13ab4 merge code 2023-05-06 16:01:51 +08:00
b164338ec7 fix: 修改左侧界面标题样式 2023-05-06 15:58:08 +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
be9e582048 解决冲突 2023-05-06 15:28:39 +08:00
qiji4215
a260d94561 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/res/menu/personal_center_menu.xml
2023-05-06 15:26:51 +08:00
qiji4215
dd5435f24e merge code 2023-05-06 15:01:46 +08:00
0255b0ea84 fix: 修改左侧面板界面样式 2023-05-06 14:58:39 +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
7a09721dc8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 11:04:32 +08:00
b0b4f2be52 feat: 左侧界面美化(部分) 2023-05-06 11:04:23 +08:00