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

169 Commits

Author SHA1 Message Date
squallzhjch
19876f8275 修改冲突 2023-07-21 15:39:44 +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
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
squallzhjch
4ef07f470d 修改点击聚合marker崩溃问题 2023-07-18 15:13:01 +08:00
squallzhjch
71948187c3 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
 2023-07-18 10:58:21 +08:00
squallzhjch
45e3e3ca0d 修改地图卡顿 
修改新增link线型编辑
 2023-07-18 10:49:56 +08:00
qiji4215
dfbea188ea merge code 2023-07-18 10:43: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
squallzhjch
3fb89ca470 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/java/com/navinfo/omqs/ui/fragment/tasklist/TaskViewModel.kt
 2023-07-14 16:32:39 +08:00
squallzhjch
1412f7106a 增加评测link功能 2023-07-14 16:28:19 +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
squallzhjch
be2d0389cf 增加评测link功能 2023-07-13 17:43:38 +08:00
squallzhjch
43b62f9947 增加评测link功能 2023-07-13 16:36:43 +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
squallzhjch
23a3490c20 增加评测link功能 2023-07-13 14:09:58 +08:00
qiji4215
29a90b5555 更换隧道起终点坐标 2023-07-12 13:55:05 +08:00
qiji4215
3c5c1c3220 增加车道边界类型渲染2.增加地图级别联动底部工具栏调整位置 2023-07-12 10:47:53 +08:00
squallzhjch
07d3165813 增加便签功能 2023-07-07 13:54:08 +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
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
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
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
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