Commit Graph
107 Commits
Author SHA1 Message Date
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
qiji4215 e0b6d687f6 1.修改布局允许水平旋转2.修复主页访问图层管理崩溃问题3.扩充轨迹字段 2023-06-13 17:00:02 +08:00
qiji4215 43e554b344 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-06-09 16:59:31 +08:00
squallzhjch 4ddabe7a94 增加中控页面 2023-06-09 16:58:08 +08:00
squallzhjch 5665638120 增加中控页面 2023-06-09 13:38:40 +08:00
qiji4215 8310f4b7e7 重构离线地图页面 2023-06-08 11:07:15 +08:00
qiji4215 999052507a 重构网络返回对象2.对应服务上报问题接口变更 2023-06-08 10:48:44 +08:00
squallzhjch ebc4ddf5a9 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	app/src/main/res/layout/adapter_sign.xml
2023-06-02 14:17:05 +08:00
squallzhjch d68e7bd768 调整UI 2023-06-02 14:12:25 +08:00
qiji4215 5f953aa816 1.解决新增问题后点击获取数据无效2.预警面板增加快速问题记录 2023-06-02 13:57:50 +08:00
qiji4215 6cc0a20aa6 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-06-01 10:18:19 +08:00
qiji4215 02cf95b83d merge code 2023-06-01 10:18:00 +08:00
squallzhjch b8015a8b20 调整任务列表的UI,
增加任务列表和道路link的筛选功能
调整问题原因面板的UI
增加经纬度定位功能
2023-05-31 15:47:38 +08:00
qiji4215 591b9cd579 merge code 2023-05-26 15:32:47 +08:00
squallzhjch dae344afc2 调整看板 2023-05-26 15:16:09 +08:00
squallzhjch 59bc0f544b 调整UI
调整道路属性面板
2023-05-26 10:51:36 +08:00
qiji4215 46268b3549 增加点击事件返回联动 2023-05-26 10:51:24 +08:00
qiji4215 3c0fe6b1b1 merge code 2023-05-26 10:24:00 +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
squallzhjch 4e997b8632 调整UI
调整道路属性面板
2023-05-24 15:57:52 +08:00
squallzhjch d89ad95a17 调整UI
增加道路属性面板
2023-05-23 14:03:36 +08:00
squallzhjch dc6b4b91e5 调整UI
增加道路属性面板
2023-05-23 09:48:07 +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 2807b2f689 增加登录接口和问题回传接口变更 2023-05-19 17:12:19 +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 4749bc66cd 1、优化地图主页布局,适配2560尺寸
2、优化右侧面板UI
3、修改评测任务列表UI
4、增加当前任务UI及相关功能
2023-05-18 17:17:08 +08:00
qiji4215 e6c2c3f76d 增加删除确认窗体2增加返回箭头 2023-05-11 16:36:35 +08:00
qiji4215 33c6d1aa16 修改背景底色 2023-05-06 17:30:12 +08:00
qiji4215 0127c554f3 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:45:38 +08:00
xiaoyan159 f4681e39a2 fix: 修改按钮圆角混乱的问题 2023-05-06 16:44:55 +08:00
qiji4215 6840e4d965 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:24:01 +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
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 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
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