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

532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
1be2b00bf2 解决代码冲突 2023-07-14 16:33:09 +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
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
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
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
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
7c57a451f1 修改车道面为车道中心线并在辅助表中存储 2023-07-05 14:09:45 +08:00
xiaoyan
13089fe6f2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-07-05 10:13:51 +08:00
xiaoyan
df3a32a07d feat: 增加车信图标及渲染配置 2023-07-05 10:13:24 +08:00