Commit Graph
655 Commits
Author SHA1 Message Date
xiaoyan159 4b84331e5b fix: 修改realm编译报错的问题 2023-05-06 18:43:14 +08:00
xiaoyan159 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
xiaoyan159 e87897c3ba Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 18:09:09 +08:00
xiaoyan159 5eeaa0634e fix: 增加限速渲染图标 2023-05-06 18:08:53 +08:00
qiji4215 33c6d1aa16 修改背景底色 2023-05-06 17:30:12 +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
xiaoyan159 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
xiaoyan159 e90b802b63 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 16:45:07 +08:00
xiaoyan159 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
xiaoyan159 65f4fe548c Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 16:27:40 +08:00
xiaoyan159 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
qiji4215 2c2a141b95 merge code 2023-05-06 16:23:45 +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
xiaoyan159 b164338ec7 fix: 修改左侧界面标题样式 2023-05-06 15:58:08 +08:00
xiaoyan159 9f619a2f50 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 15:42:17 +08:00
xiaoyan159 c4e2c2fdcc fix: 修改地图的默认背景色 2023-05-06 15:42:11 +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 451fe92e37 更换图标 2023-05-06 15:25:16 +08:00
qiji4215 dd5435f24e merge code 2023-05-06 15:01:46 +08:00
xiaoyan159 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
xiaoyan159 7a09721dc8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 11:04:32 +08:00
xiaoyan159 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 e4729d2202 美化报告下拉菜单 2023-05-06 10:55:26 +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 752550f376 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 16:52:43 +08:00
xiaoyan159 cde0cd39df Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 16:52:32 +08:00
xiaoyan159 9495b54a4b fix: 修改离线地图样式 2023-05-05 16:52:18 +08:00