 squallzhjch
|
840bd24b7c
|
修改离线地图下载，数据下载安装
|
2023-05-08 14:26:12 +08:00 |
|
 qiji4215
|
9f8349506a
|
merge code
|
2023-05-08 11:11:12 +08:00 |
|
|
qiji4215
|
077d5bb32f
|
修改同步逻辑
|
2023-05-08 10:59:58 +08:00 |
|
 xiaoyan159
|
4b84331e5b
|
fix: 修改realm编译报错的问题
|
2023-05-06 18:43:14 +08:00 |
|
|
xiaoyan159
|
b17d0484de
|
fix: 增加忽略规则
|
2023-05-06 18:42:52 +08:00 |
|
|
squallzhjch
|
4c09d95670
|
修改任务线宽
|
2023-05-06 16:42:21 +08:00 |
|
|
squallzhjch
|
51be5bd178
|
修改任务线颜色
|
2023-05-06 16:13:12 +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
|
fbff312f41
|
Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
Conflicts:
app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
|
2023-05-06 14:31:05 +08:00 |
|
|
squallzhjch
|
8501f64b2c
|
修改线选择
|
2023-05-06 14:30:30 +08:00 |
|
|
xiaoyan159
|
7a09721dc8
|
Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
|
2023-05-06 11:04:32 +08:00 |
|
|
xiaoyan159
|
b0b4f2be52
|
feat: 左侧界面美化（部分）
|
2023-05-06 11:04:23 +08:00 |
|
|
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
|
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
|
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 |
|
|
xiaoyan159
|
af9dcca34f
|
Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
|
2023-05-05 14:43:40 +08:00 |
|
|
xiaoyan159
|
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 |
|
|
xiaoyan159
|
464ca815c4
|
fix: 修改图层管理
|
2023-05-05 14:12:20 +08:00 |
|
|
xiaoyan159
|
8a75aad54c
|
fix: 增加omdb图层管理
|
2023-05-05 14:02:32 +08:00 |
|
|
xiaoyan159
|
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
|
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 |
|