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

362 Commits

Author SHA1 Message Date
qiji4215
6840e4d965 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:24:01 +08:00
qiji4215
2c2a141b95 merge code 2023-05-06 16:23:45 +08:00
squallzhjch
eae10036c8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 16:13:28 +08:00
squallzhjch
51be5bd178 修改任务线颜色 2023-05-06 16:13:12 +08:00
qiji4215
1d1fe13ab4 merge code 2023-05-06 16:01:51 +08:00
xiaoyan
9f619a2f50 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 15:42:17 +08:00
xiaoyan
c4e2c2fdcc fix: 修改地图的默认背景色 2023-05-06 15:42:11 +08:00
qiji4215
451fe92e37 更换图标 2023-05-06 15:25:16 +08:00
qiji4215
bfd9df9d8a merge code 2023-05-06 14:57:04 +08:00
squallzhjch
3a1e1bc9d6 修改数据上传 2023-05-05 16:52:07 +08:00
squallzhjch
5826922bb9 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/tools/LayerConfigUtils.kt
 2023-05-05 15:15:07 +08:00
squallzhjch
d3fd50f941 修改数据上传 2023-05-05 15:14:20 +08:00
qiji4215
af79ae4146 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 14:48:00 +08:00
squallzhjch
611385c145 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
 2023-05-05 14:34:46 +08:00
squallzhjch
4d4549557d 修改数据上传 2023-05-05 14:33:54 +08:00
qiji4215
eb84e153ff Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 14:33:23 +08:00
qiji4215
ad59a0efac merge code 2023-05-05 14:33:08 +08:00
xiaoyan
8a75aad54c fix: 增加omdb图层管理 2023-05-05 14:02:32 +08:00
qiji4215
186d24bf22 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 11:03:23 +08:00
qiji4215
6dec79f763 美化质检问题界面及logo 2023-05-05 11:03:05 +08:00
xiaoyan
d926a147f3 feat: 增加图层管理功能 2023-05-05 10:58:16 +08:00
squallzhjch
b98e8b1614 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 10:08:30 +08:00
squallzhjch
4280c0bf0b 优化提前显示面板 2023-05-05 10:07:55 +08:00
qiji4215
b31f301ae6 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-04 18:03:44 +08:00
qiji4215
dfbdc1500f 提交资源文件 2023-05-04 18:03:11 +08:00
squallzhjch
eace5d2521 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/activity/map/SignAdapter.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
 2023-05-04 14:18:10 +08:00
squallzhjch
ebbb9b99b2 增加看板进数据编辑页面 2023-05-04 14:10:30 +08:00
qiji4215
9379e7a7bb 增加语音相关业务 2023-05-04 11:02:33 +08:00
qiji4215
62ce5b1566 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
	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
 2023-04-28 16:20:31 +08:00
qiji4215
defcfb66fb 增加语音部分业务 2023-04-28 16:16:17 +08:00
squallzhjch
efe5d43555 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-28 16:03:52 +08:00
squallzhjch
894732ee45 修改定位，修改提前看板 2023-04-28 16:03:40 +08:00
xiaoyan
3eed9bad33 fix: 增加任务数据高亮功能 2023-04-27 17:16:53 +08:00
xiaoyan
d129f26d82 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-27 15:38:25 +08:00
xiaoyan
58136320d4 fix: 增加多线图层 2023-04-27 15:04:18 +08:00
squallzhjch
3dc650a76b Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt
 2023-04-27 15:03:32 +08:00
squallzhjch
b028975221 增加高亮图层 2023-04-27 15:01:57 +08:00
xiaoyan
61ba1d1d2f Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-27 13:37:37 +08:00
qiji4215
977b4b54da 增加问题回传业务 2023-04-27 12:16:05 +08:00
qiji4215
f78daabed3 merge code 2023-04-27 10:33:20 +08:00
xiaoyan
c4ee38d703 fix: 修改道路面的渲染 2023-04-27 10:18:11 +08:00
xiaoyan
743ea163f2 fix: 合并代码 2023-04-26 11:46:12 +08:00
xiaoyan
c4812eada4 fix: 修改ManiFest文件 2023-04-26 11:32:30 +08:00
xiaoyan
5defa32f03 fix: 修改导入数据类型 2023-04-26 10:53:38 +08:00
qiji4215
a81e2f5d82 修改轨迹存储异常 2023-04-26 10:46:12 +08:00
qiji4215
cba2c8868b Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-04-25 17:59:17 +08:00
xiaoyan
8559e4f616 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-25 17:58:46 +08:00
qiji4215
77ac36515b merge code 2023-04-25 17:58:19 +08:00
xiaoyan
f1d6ebe22b feat: 增加常规点限速的渲染 2023-04-25 17:15:47 +08:00
qiji4215
51ffecd35a 修改定位不连续问题 2023-04-25 16:22:36 +08:00