xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
597 Commits 2 Branches 0 Tags
af3cd2b4641335f5697e334b56b9c49548834c4d
Commit Graph
597 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
qiji4215 79af59bb02 优化地图界面UI 2023-05-05 14:23:23 +08:00
xiaoyan159 464ca815c4 fix: 修改图层管理 2023-05-05 14:12:20 +08:00
xiaoyan159 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
xiaoyan159 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 2c44ac045d 优化提前显示面板 2023-05-05 10:08:19 +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
qiji4215 2ab18451e3 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	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 15:06:45 +08:00
squallzhjch 53bb2f3ca6 解决代码冲突 2023-05-04 14:55:19 +08:00
qiji4215 70a2ff072e ui资源 2023-05-04 14:53:54 +08:00
squallzhjch 4b3adaaa97 解决代码冲突 2023-05-04 14:51:44 +08:00
squallzhjch 1726c93c9d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-04 14:18:33 +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
xiaoyan159 7de2a930db fix: 合并代码 2023-05-04 14:17:33 +08:00
xiaoyan159 804b893489 fix: 修改语音列表不显示 2023-05-04 14:16:27 +08:00
squallzhjch ebbb9b99b2 增加看板进数据编辑页面 2023-05-04 14:10:30 +08:00
qiji4215 ebfdd778b9 增加录音点击播放业务 2023-05-04 13:54:09 +08:00
xiaoyan159 375cc4709b Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-04 11:07:46 +08:00
qiji4215 9379e7a7bb 增加语音相关业务 2023-05-04 11:02:33 +08:00
xiaoyan159 b9e6ec427c Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-28 18:16:44 +08:00
xiaoyan159 db9b248d92 feat: 登录界面美化，图层控制功能添加 2023-04-28 18:16:24 +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
xiaoyan159 3eed9bad33 fix: 增加任务数据高亮功能 2023-04-27 17:16:53 +08:00
xiaoyan159 d129f26d82 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-27 15:38:25 +08:00
xiaoyan159 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
xiaoyan159 61ba1d1d2f Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-27 13:37:37 +08:00
xiaoyan159 cb0275cee3 fix: 解决冲突 2023-04-27 13:37:20 +08:00
qiji4215 977b4b54da 增加问题回传业务 2023-04-27 12:16:05 +08:00
qiji4215 ad1156a4fc Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-04-27 10:34:08 +08:00
qiji4215 f78daabed3 merge code 2023-04-27 10:33:20 +08:00
xiaoyan159 c4ee38d703 fix: 修改道路面的渲染 2023-04-27 10:18:11 +08:00
squallzhjch 92a9f9d6c4 修改道路捕捉 2023-04-27 10:12:29 +08:00
qiji4215 331380905d Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
 2023-04-27 09:35:12 +08:00
qiji4215 c5876c9713 增加数据上传业务 2023-04-26 18:05:51 +08:00
squallzhjch 4119fa2309 合并代码 2023-04-26 15:19:36 +08:00
squallzhjch d00505c22d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
 2023-04-26 15:19:25 +08:00
squallzhjch cf640cb1d2 修改元数据导入 2023-04-26 15:18:43 +08:00
xiaoyan159 743ea163f2 fix: 合并代码 2023-04-26 11:46:12 +08:00