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

653 Commits

Author SHA1 Message Date
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
squallzhjch
485c2b4b79 修改离线地图下载的按钮状态 
修改详细信息面板快捷进入新增数据界面
 2023-07-27 17:15:51 +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
b9e3e4766e Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-07-27 11:16:49 +08:00
squallzhjch
2b4b2645a6 修改任务下载 2023-07-27 11:16:36 +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
squallzhjch
01bc6ac7fc 修改登录逻辑和数据访问顺序 
增加任务和作业数据统计
 2023-07-26 17:08:45 +08:00
xiaoyan
7ad3fcbbb4 fix: 合并代码 2023-07-26 15:29:13 +08:00
xiaoyan
1a19dc1cfa feat: 杆状物、交通面板3D化测试 2023-07-26 14:45:16 +08:00
squallzhjch
e1b0e45157 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
	app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
	vtm
 2023-07-26 10:53:01 +08:00
squallzhjch
e69b6fca03 修改任务下载按钮刷新不及时问题 2023-07-26 10:49:23 +08:00
qiji4215
43bd63a397 渲染表增加任务id和显示缩放级别控制 2023-07-26 10:21:50 +08:00
squallzhjch
7a268f43e0 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-07-25 10:37:28 +08:00
squallzhjch
33cc1dc243 修改任务下载刷新不及时 2023-07-25 10:37:06 +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
squallzhjch
5806fbf5ac 增加非空判断 2023-07-21 15:50:44 +08:00
qiji4215
7df7cf1345 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-21 15:40:32 +08:00
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
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
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
xiaoyan
3f173aa86f 面数据增加纹理 2023-07-18 10:56: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
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
squallzhjch
e3695fb6cb 解决代码冲突 2023-07-14 16:45:31 +08:00
qiji4215
1253cc10be Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-07-14 16:42:15 +08:00
squallzhjch
eea7cb6fdf 解决代码冲突 2023-07-14 16:41:39 +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