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
squallzhjch
9f7bf771c2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/res/layout/activity_main.xml
 2023-05-06 11:03:57 +08:00
squallzhjch
d86ec46943 修改任务线刷新，数据安装刷新 2023-05-06 11:01:50 +08:00
qiji4215
e4729d2202 美化报告下拉菜单 2023-05-06 10:55:26 +08:00
qiji4215
0ac805302d UI美化质检报告页面 2023-05-06 10:20:16 +08:00
qiji4215
9929423a3b Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 16:58:22 +08:00
qiji4215
6b1ac4df9b merge code 2023-05-05 16:58:03 +08:00
squallzhjch
752550f376 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 16:52:43 +08:00
xiaoyan
cde0cd39df Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 16:52:32 +08:00
xiaoyan
9495b54a4b fix: 修改离线地图样式 2023-05-05 16:52:18 +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
qiji4215
0cce793b9e 更新资源 2023-05-05 14:47:43 +08:00
xiaoyan
af9dcca34f Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 14:43:40 +08:00
xiaoyan
ca978100b2 fix: 修改图层管理报错的问题 2023-05-05 14:43:17 +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
79af59bb02 优化地图界面UI 2023-05-05 14:23:23 +08:00
xiaoyan
464ca815c4 fix: 修改图层管理 2023-05-05 14:12:20 +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
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
xiaoyan
7de2a930db fix: 合并代码 2023-05-04 14:17:33 +08:00
xiaoyan
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
xiaoyan
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
xiaoyan
b9e6ec427c Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-28 18:16:44 +08:00
xiaoyan
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
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