xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
431 Commits 2 Branches 0 Tags
Commit Graph

175 Commits

Author SHA1 Message Date
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
squallzhjch
6bed16f470 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-08-10 11:18:40 +08:00
squallzhjch
4baa137ad6 重构测量工具代码，修改代码逻辑和展现形式。 
增加面积，角度测量
修改地图渲染面会崩溃的问题
 2023-08-10 11:18:14 +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
squallzhjch
8578ea0afd Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-04 10:11:55 +08:00
squallzhjch
8f3bd1926a 增加要素捕捉功能， 
增加测量功能
 2023-08-04 10:11:29 +08:00
qiji4215
19c8fd3cf3 1.增加按任务linkpid进行数据显示业务2.增加桥要素渲染 2023-08-04 10:10:46 +08:00
xiaoyan
a500d3ffea fix: 解决冲突 2023-08-01 16:30:08 +08:00
qiji4215
c54cbae676 修改问题记录上传无效问题 2023-08-01 15:36:56 +08:00
xiaoyan
5d0ce1e4ce Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-08-01 09:54:23 +08:00
qiji4215
1d258c4b8e 修改已知问题2.调整渲染图层策略及样式 2023-07-27 16:35:15 +08:00
xiaoyan
1188e470bb fix: 解析omdb高程数据-道路标牌和杆状物 2023-07-27 15:53:24 +08:00
squallzhjch
01bc6ac7fc 修改登录逻辑和数据访问顺序 
增加任务和作业数据统计
 2023-07-26 17:08:45 +08:00
squallzhjch
e69b6fca03 修改任务下载按钮刷新不及时问题 2023-07-26 10:49:23 +08:00
qiji4215
b92110c785 修改渲染策略 2023-07-24 14:28:49 +08:00
squallzhjch
6c386505d6 Merge branch 'master' of 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
	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
	collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt
 2023-07-21 15:30:20 +08:00
squallzhjch
2bb7203539 评测数据增加任务id 
评测数据根据所选任务显隐
修改评测link和评测数据的联动维护
 2023-07-21 15:11:21 +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
78bd363372 重构轨迹回放业务 2023-07-18 15:45:11 +08:00
qiji4215
694ad106d7 修复地图卡顿问题 2023-07-18 10:11:34 +08:00
qiji4215
6210f41b69 增加室内整理工具更新信息逻辑 2023-07-17 14:49:21 +08:00
squallzhjch
1412f7106a 增加评测link功能 2023-07-14 16:28:19 +08:00
squallzhjch
23a3490c20 增加评测link功能 2023-07-13 14:09:58 +08:00
squallzhjch
ae44b848e2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-07-07 13:55:31 +08:00
squallzhjch
07d3165813 增加便签功能 2023-07-07 13:54:08 +08:00
qiji4215
e3a78aeb77 增加任务无mark校验及关闭业务 2023-07-04 10:08:47 +08:00
qiji4215
5e32c7ac8e 增加版本号显示 2023-06-30 17:45:33 +08:00
squallzhjch
f415ded353 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-06-29 17:23:12 +08:00
squallzhjch
c00592f6d5 统一地图图标渲染尺寸 
优化提前显示面板，详细信息面板
增加多媒体照片
 2023-06-29 17:22:40 +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
squallzhjch
6921e4c0b0 增加车信提前看板显示 
调整条件限速，常规限速提前看板，详细看板
调整道路名详细信息
 2023-06-27 16:11:11 +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
a970ca1992 增加室内整理工具扫描业务 2023-06-25 16:44:40 +08:00
qiji4215
d0b85d649a 封装二维码扫描业务 2023-06-21 17:51:49 +08:00
squallzhjch
7b4229d756 增加道路名显示和详细信息功能 2023-06-21 10:10:21 +08:00
squallzhjch
1fe90ccf26 增加提示项 2023-06-16 17:16:20 +08:00
squallzhjch
083a6fd57a 调整离线地图UI，任务列表UI，个人中心UI 2023-06-16 15:16:10 +08:00
squallzhjch
6cd9bab9e1 调整中控联动UI 2023-06-14 14:42:34 +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
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