xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
434 Commits 2 Branches 0 Tags
212193dc26b4a5e60055eca644366120cd08d76c
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
qiji4215 dfcc1ca0e7 merge code 2023-08-11 14:20:26 +08:00
qiji4215 dcca1d50ea merge code 2023-08-11 10:27:35 +08:00
qiji4215 215aad041e 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/source/OMDBTileDataSource.java
	vtm
 2023-08-11 10:05:35 +08:00
qiji4215 061aca96ab merge code 2023-08-11 09:49:45 +08:00
qiji4215 311823cc6a merge code 2023-08-10 13:49:59 +08:00
qiji4215 8d7c6036f1 merge code 2023-08-10 13:43:36 +08:00
qiji4215 af4baf80b5 增加路口要素按任务link渲染 2023-08-10 13:37:39 +08:00
qiji4215 96316fe1bb Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-08-10 10:56:52 +08:00
qiji4215 57ccf8584b 1.增加搜索相关功能业务2.解决下载omdb后不及时渲染问题3.增加按任务及link关联渲染业务4.接口中增加按任务查询条件 2023-08-10 10:51:22 +08:00
qiji4215 1765b8801b 增加要素按任务关联LinkPid进行渲染业务 2023-08-04 15:50:42 +08:00
qiji4215 8a8a48fbb5 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java
 2023-08-04 10:15:17 +08:00
qiji4215 19c8fd3cf3 1.增加按任务linkpid进行数据显示业务2.增加桥要素渲染 2023-08-04 10:10:46 +08:00
qiji4215 c54cbae676 修改问题记录上传无效问题 2023-08-01 15:36:56 +08:00
qiji4215 34ee4a0101 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-28 17:06:44 +08:00
qiji4215 3c8bf307a2 修改渲染策略 2023-07-28 11:04:42 +08:00
qiji4215 0979cc7caf Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-28 09:41:21 +08:00
qiji4215 0b7b262540 调整资源 2023-07-28 09:40:31 +08:00
qiji4215 1d258c4b8e 修改已知问题2.调整渲染图层策略及样式 2023-07-27 16:35:15 +08:00
qiji4215 53ae5ab043 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-26 18:37:54 +08:00
qiji4215 27e812c49f 调整渲染级别 2023-07-26 18:37:35 +08:00
qiji4215 43bd63a397 渲染表增加任务id和显示缩放级别控制 2023-07-26 10:21:50 +08:00
qiji4215 17524bbabb Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
 2023-07-24 14:30:12 +08:00
qiji4215 b92110c785 修改渲染策略 2023-07-24 14:28:49 +08:00
qiji4215 7df7cf1345 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-21 15:40:32 +08:00
qiji4215 04f157c036 修改测评问题人记录错误2.调整车道边界类型渲染原则 2023-07-21 15:10:28 +08:00
qiji4215 c83ed1b97e 完善室内整理功能 2023-07-20 16:01:42 +08:00
qiji4215 0848ee491b 增加登录缓存校验 2023-07-20 10:48:38 +08:00
qiji4215 392fb91215 增加自动定位开关 2023-07-19 17:46:50 +08:00
qiji4215 58f5329a75 增加相机自动重新连接功能 2023-07-19 17:40:44 +08:00
qiji4215 45de9982fc 增加室内整理工具反向控制 2023-07-19 17:01:02 +08:00
qiji4215 063927653a 增加室内整理工具反向控制业务 2023-07-18 18:00:31 +08:00
qiji4215 0378378dec 修改定位无效问题 2023-07-18 17:08:07 +08:00
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