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

101 Commits

Author SHA1 Message Date
qiji4215
591b9cd579 merge code 2023-05-26 15:32:47 +08:00
squallzhjch
dae344afc2 调整看板 2023-05-26 15:16:09 +08:00
squallzhjch
c94eb5654d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-26 14:01:49 +08:00
squallzhjch
10ec7a1e04 增加经纬度定位功能 2023-05-26 14:01:36 +08:00
qiji4215
f99517b386 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-26 13:56:32 +08:00
xiaoyan
549031e8a8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-26 13:47:39 +08:00
squallzhjch
59bc0f544b 调整UI 
调整道路属性面板
 2023-05-26 10:51:36 +08:00
qiji4215
d1aab7aabb Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-26 10:24:12 +08:00
qiji4215
3c0fe6b1b1 merge code 2023-05-26 10:24:00 +08:00
squallzhjch
b6bbcad634 调整UI 
调整道路属性面板
 2023-05-26 10:06:58 +08:00
qiji4215
e86b0696b6 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/res/layout/text_item_select.xml
 2023-05-26 09:59:24 +08:00
xiaoyan
12e9fd1a2a feat: 增加交限和交通灯的渲染图标 2023-05-25 15:10:40 +08:00
squallzhjch
4e997b8632 调整UI 
调整道路属性面板
 2023-05-24 15:57:52 +08:00
squallzhjch
6d0f36068d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-23 09:48:21 +08:00
squallzhjch
dc6b4b91e5 调整UI 
增加道路属性面板
 2023-05-23 09:48:07 +08:00
xiaoyan
1050eed1d6 fix: 合并代码 2023-05-22 10:18:13 +08:00
xiaoyan
1d3dcb1a2a feat: 增加数据预处理环节 2023-05-22 10:16:17 +08:00
qiji4215
6af2479dbd Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-19 17:25:10 +08:00
squallzhjch
00f39555ab 修改条件限速 
修改数据上传下载地址
 2023-05-19 17:23:45 +08:00
qiji4215
2807b2f689 增加登录接口和问题回传接口变更 2023-05-19 17:12:19 +08:00
squallzhjch
a21a9bd09c Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-18 17:17:18 +08:00
squallzhjch
4749bc66cd 1、优化地图主页布局，适配2560尺寸 
2、优化右侧面板UI
3、修改评测任务列表UI
4、增加当前任务UI及相关功能
 2023-05-18 17:17:08 +08:00
xiaoyan
73a85221fc fix: 增加条件点限速、可变点限速渲染 2023-05-18 17:14:35 +08:00
xiaoyan
4b84331e5b fix: 修改realm编译报错的问题 2023-05-06 18:43:14 +08:00
squallzhjch
8e4d1c7e0e Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/res/layout/adapter_task_list.xml
 2023-05-06 15:39:31 +08:00
squallzhjch
3733634eb5 修改面板快捷新增时的种类联动 2023-05-06 15:38:27 +08:00
qiji4215
bfd9df9d8a merge code 2023-05-06 14:57:04 +08:00
squallzhjch
8501f64b2c 修改线选择 2023-05-06 14:30:30 +08:00
squallzhjch
d86ec46943 修改任务线刷新，数据安装刷新 2023-05-06 11:01:50 +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
79af59bb02 优化地图界面UI 2023-05-05 14:23:23 +08:00
xiaoyan
8a75aad54c fix: 增加omdb图层管理 2023-05-05 14:02:32 +08:00
xiaoyan
d926a147f3 feat: 增加图层管理功能 2023-05-05 10:58:16 +08:00
squallzhjch
4280c0bf0b 优化提前显示面板 2023-05-05 10:07:55 +08:00
squallzhjch
53bb2f3ca6 解决代码冲突 2023-05-04 14:55:19 +08:00
squallzhjch
4b3adaaa97 解决代码冲突 2023-05-04 14:51:44 +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
894732ee45 修改定位，修改提前看板 2023-04-28 16:03:40 +08:00
xiaoyan
61ba1d1d2f Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-27 13:37:37 +08:00
xiaoyan
cb0275cee3 fix: 解决冲突 2023-04-27 13:37:20 +08:00
xiaoyan
c4ee38d703 fix: 修改道路面的渲染 2023-04-27 10:18:11 +08:00
qiji4215
c5876c9713 增加数据上传业务 2023-04-26 18:05:51 +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