squallzhjch
|
e4f28405dc
|
解决冲突
|
2023-06-02 14:18:49 +08:00 |
|
squallzhjch
|
ebc4ddf5a9
|
Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
Conflicts:
app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
app/src/main/res/layout/adapter_sign.xml
|
2023-06-02 14:17:05 +08:00 |
|
squallzhjch
|
d68e7bd768
|
调整UI
|
2023-06-02 14:12:25 +08:00 |
|
qiji4215
|
5f953aa816
|
1.解决新增问题后点击获取数据无效2.预警面板增加快速问题记录
|
2023-06-02 13:57:50 +08:00 |
|
qiji4215
|
6cc0a20aa6
|
Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
|
2023-06-01 10:18:19 +08:00 |
|
qiji4215
|
02cf95b83d
|
merge code
|
2023-06-01 10:18:00 +08:00 |
|
squallzhjch
|
b8015a8b20
|
调整任务列表的UI，
增加任务列表和道路link的筛选功能
调整问题原因面板的UI
增加经纬度定位功能
|
2023-05-31 15:47:38 +08:00 |
|
qiji4215
|
7a7eb61401
|
merge code
|
2023-05-30 14:00:32 +08:00 |
|
qiji4215
|
7fb8af31b5
|
Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
|
2023-05-26 17:51:13 +08:00 |
|
squallzhjch
|
e9735ee4d8
|
Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
|
2023-05-26 17:45:56 +08:00 |
|
squallzhjch
|
8d6bb8c6e8
|
修改普通交限的道路渲染
|
2023-05-26 17:45:36 +08:00 |
|
qiji4215
|
5ff8509c95
|
merge code
|
2023-05-26 17:35:15 +08:00 |
|
squallzhjch
|
75a6d56471
|
调整看板
|
2023-05-26 17:23:47 +08:00 |
|
qiji4215
|
591b9cd579
|
merge code
|
2023-05-26 15:32:47 +08:00 |
|
|
|
c2416ab709
|
fix: 修改submodule配置
|
2023-05-26 15:24:03 +08:00 |
|
|
|
61165ff9f0
|
fix: 合并代码
|
2023-05-26 15:22:33 +08:00 |
|
|
|
90897174ac
|
fix: 修改渲染样式
|
2023-05-26 15:18:23 +08:00 |
|
squallzhjch
|
d5d251c85e
|
Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
|
2023-05-26 15:16:19 +08:00 |
|
squallzhjch
|
dae344afc2
|
调整看板
|
2023-05-26 15:16:09 +08:00 |
|
qiji4215
|
64eb25d5d4
|
mergecode
|
2023-05-26 15:08:09 +08:00 |
|
qiji4215
|
8988661bed
|
Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
|
2023-05-26 14:54:05 +08:00 |
|
|
|
f2891d6d2f
|
fix: 修改submodule的仓库地址
|
2023-05-26 14:53:27 +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 |
|
|
|
549031e8a8
|
Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
|
2023-05-26 13:47:39 +08:00 |
|
|
|
22f52429f4
|
fix: 修改普通交限的显示
|
2023-05-26 13:46:32 +08:00 |
|
squallzhjch
|
59bc0f544b
|
调整UI
调整道路属性面板
|
2023-05-26 10:51:36 +08:00 |
|
qiji4215
|
46268b3549
|
增加点击事件返回联动
|
2023-05-26 10:51:24 +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 |
|
|
|
12e9fd1a2a
|
feat: 增加交限和交通灯的渲染图标
|
2023-05-25 15:10:40 +08:00 |
|
|
|
80b8b60556
|
fix: 修改数据导入
|
2023-05-24 17:12:34 +08:00 |
|
squallzhjch
|
4e997b8632
|
调整UI
调整道路属性面板
|
2023-05-24 15:57:52 +08:00 |
|
|
|
4d579d87c4
|
fix: 增加右偏功能，增加角度计算功能
|
2023-05-24 14:04:11 +08:00 |
|
|
|
f160f1dd00
|
fix: 修改git忽略文件
|
2023-05-23 15:44:41 +08:00 |
|
|
|
e606d83bcb
|
Merge branch 'master' into vtm-lib
|
2023-05-23 15:43:57 +08:00 |
|
|
|
47495bd6ef
|
fix: 增加vtm子模块
|
2023-05-23 15:42:45 +08:00 |
|
|
|
7f6ae65e62
|
feat: 增加geometry右移函数
|
2023-05-23 15:41:36 +08:00 |
|
|
|
f4ddc2768d
|
fix: 更新git忽略文件
|
2023-05-23 15:39:11 +08:00 |
|
|
|
d0c0eb97ba
|
fix: 更新git忽略文件
|
2023-05-23 15:37:12 +08:00 |
|
squallzhjch
|
d89ad95a17
|
调整UI
增加道路属性面板
|
2023-05-23 14:03:36 +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 |
|
|
|
71dab4d22b
|
feat: 以submodule方式引入vtm源码，方便后续修改
|
2023-05-22 17:48:20 +08:00 |
|
|
|
1050eed1d6
|
fix: 合并代码
|
2023-05-22 10:18:13 +08:00 |
|
|
|
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 |
|
