xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
364 Commits 2 Branches 0 Tags
53275472f44b927b4fd0f74ab866963979733446
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
qiji4215 53275472f4 解决代码冲突 2023-07-18 15:56:21 +08:00
qiji4215 44d1473a4a Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
 2023-07-18 15:54:06 +08:00
qiji4215 78bd363372 重构轨迹回放业务 2023-07-18 15:45:11 +08:00
qiji4215 dfbea188ea merge code 2023-07-18 10:43:41 +08:00
qiji4215 07c0103de1 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklink/TaskLinkViewModel.kt
 2023-07-18 10:12:41 +08:00
qiji4215 694ad106d7 修复地图卡顿问题 2023-07-18 10:11:34 +08:00
qiji4215 6210f41b69 增加室内整理工具更新信息逻辑 2023-07-17 14:49:21 +08:00
qiji4215 1253cc10be Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-14 16:42:15 +08:00
qiji4215 3883c934fc merge code 2023-07-14 16:40:14 +08:00
qiji4215 4fa9df8e3c merge code 2023-07-14 14:25:44 +08:00
qiji4215 c8ac5c9582 1、适配上传接口2、代码融合 2023-07-14 14:20:34 +08:00
qiji4215 c3f299222a Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
	collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
 2023-07-14 11:07:57 +08:00
qiji4215 108c6daa2f merge code 2023-07-14 10:54:02 +08:00
qiji4215 7ebdfc93ff 增加轨迹存储 2023-07-13 16:00:19 +08:00
qiji4215 d1f7129549 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListFragment.kt
 2023-07-13 14:16:51 +08:00
qiji4215 29a90b5555 更换隧道起终点坐标 2023-07-12 13:55:05 +08:00
qiji4215 3c5c1c3220 增加车道边界类型渲染2.增加地图级别联动底部工具栏调整位置 2023-07-12 10:47:53 +08:00
qiji4215 c8c7c4d4ce Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-07 18:06:38 +08:00
qiji4215 b505bdc044 增加隧道渲染原则 2023-07-07 18:06:19 +08:00
qiji4215 7c57a451f1 修改车道面为车道中心线并在辅助表中存储 2023-07-05 14:09:45 +08:00
qiji4215 e3a78aeb77 增加任务无mark校验及关闭业务 2023-07-04 10:08:47 +08:00
qiji4215 5e32c7ac8e 增加版本号显示 2023-06-30 17:45:33 +08:00
qiji4215 39a3835de4 增加任务缓存处理，保留已上传最近3个月数据及未上传任务 2023-06-30 17:00:02 +08:00
qiji4215 827e6b31b8 1、问题记录增加要素编码存储2.回传问题增加未测评判断业务 2023-06-29 17:16:36 +08:00
qiji4215 b9d85640aa Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-06-28 11:14:12 +08:00
qiji4215 f6b4c7543a 1、修改问题描述2、修改定位适配较低系统 2023-06-28 11:13:03 +08:00
qiji4215 2c9c20e913 merge code 2023-06-26 14:45:39 +08:00
qiji4215 02b65eedf2 merge code 2023-06-26 14:24:46 +08:00
qiji4215 fb08f42848 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/Constant.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
 2023-06-26 14:18:48 +08:00
qiji4215 97ad787f51 1、增加室内整理工具布局2、封装定时业务类 2023-06-26 14:12:38 +08:00
qiji4215 d3fc05adad 增加室内整理工具更新接口 2023-06-25 17:50:23 +08:00
qiji4215 a970ca1992 增加室内整理工具扫描业务 2023-06-25 16:44:40 +08:00
qiji4215 d0b85d649a 封装二维码扫描业务 2023-06-21 17:51:49 +08:00
qiji4215 d5fbeec02b merge code 2023-06-14 14:29:13 +08:00
qiji4215 94467f21a1 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
 2023-06-14 14:23:08 +08:00
qiji4215 4e98a5745c 1.优化部分页面2.修复Task无link数据地图及控制业务无效问题 2023-06-14 14:20:37 +08:00
qiji4215 e0b6d687f6 1.修改布局允许水平旋转2.修复主页访问图层管理崩溃问题3.扩充轨迹字段 2023-06-13 17:00:02 +08:00
qiji4215 4884db93fc merge code 2023-06-09 19:10:55 +08:00
qiji4215 43e554b344 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-06-09 16:59:31 +08:00
qiji4215 4614ef4db8 merge code 2023-06-09 16:59:10 +08:00
qiji4215 8310f4b7e7 重构离线地图页面 2023-06-08 11:07:15 +08:00
qiji4215 999052507a 重构网络返回对象2.对应服务上报问题接口变更 2023-06-08 10:48:44 +08:00
qiji4215 0d3b16503a Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-06-05 10:01:36 +08:00
qiji4215 e42ba1909c merge code 2023-06-05 10:00:46 +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
qiji4215 7a7eb61401 merge code 2023-05-30 14:00:32 +08:00
qiji4215 7fb8af31b5 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-26 17:51:13 +08:00
qiji4215 5ff8509c95 merge code 2023-05-26 17:35:15 +08:00
qiji4215 591b9cd579 merge code 2023-05-26 15:32:47 +08:00
qiji4215 64eb25d5d4 mergecode 2023-05-26 15:08:09 +08:00
qiji4215 8988661bed Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-26 14:54:05 +08:00
qiji4215 f99517b386 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-26 13:56:32 +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
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
qiji4215 6af2479dbd Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-19 17:25:10 +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
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
qiji4215 e6c2c3f76d 增加删除确认窗体2增加返回箭头 2023-05-11 16:36:35 +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
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
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
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
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
qiji4215 0127c554f3 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:45:38 +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
qiji4215 9970f98e90 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:28:24 +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
qiji4215 1d1fe13ab4 merge code 2023-05-06 16:01:51 +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
qiji4215 bfd9df9d8a merge code 2023-05-06 14:57:04 +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
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
qiji4215 eb84e153ff Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 14:33:23 +08:00
qiji4215 ad59a0efac merge code 2023-05-05 14:33:08 +08:00
qiji4215 79af59bb02 优化地图界面UI 2023-05-05 14:23:23 +08:00
qiji4215 186d24bf22 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 11:03:23 +08:00
qiji4215 6dec79f763 美化质检问题界面及logo 2023-05-05 11:03:05 +08:00
qiji4215 b31f301ae6 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-04 18:03:44 +08:00