 qiji4215
|
51bd47842a
|
Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
|
2023-04-21 17:20:54 +08:00 |
|
|
qiji4215
|
8e4f8459d5
|
增加轨迹存储渲染业务
|
2023-04-21 17:20:34 +08:00 |
|
|
qiji4215
|
e4e8866ad6
|
merge code
|
2023-04-21 15:06:19 +08:00 |
|
|
qiji4215
|
4cce37e991
|
增加轨迹存储业务
|
2023-04-21 14:04:40 +08:00 |
|
|
qiji4215
|
5943949cc8
|
增加轨迹业务类
|
2023-04-20 16:45:15 +08:00 |
|
|
qiji4215
|
13f835f467
|
merge code
|
2023-04-20 13:52:24 +08:00 |
|
|
qiji4215
|
48e3e7817c
|
merge code
|
2023-04-20 09:38:51 +08:00 |
|
|
qiji4215
|
3d9ab011a8
|
Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS
Conflicts:
collect-library/src/main/java/com/navinfo/collect/library/map/handler/AnimationHandler.kt
|
2023-04-19 17:31:47 +08:00 |
|
|
齐济04215
|
134061533b
|
Merge branch 'master' into 'master'
Master
See merge request qiji4215/OneMapQS!4
|
2023-04-19 17:31:09 +08:00 |
|
|
qiji4215
|
a8bf952b3b
|
merge code
|
2023-04-19 17:26:36 +08:00 |
|
|
qiji4215
|
ab1fe0acc0
|
Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS
Conflicts:
app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
|
2023-04-19 17:25:43 +08:00 |
|
|
齐济04215
|
50462651d8
|
Merge branch 'master' into 'master'
Master
See merge request qiji4215/OneMapQS!3
|
2023-04-19 17:24:32 +08:00 |
|
|
qiji4215
|
9d5b9b1755
|
解决冲突
|
2023-04-19 17:21:13 +08:00 |
|
|
qiji4215
|
4f9f85d09d
|
Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS
Conflicts:
app/build.gradle
app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
app/src/main/java/com/navinfo/omqs/ui/MainActivity.kt
app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
app/src/main/res/layout/fragment_offline_map_state_list.xml
app/src/main/res/layout/map_view.xml
collect-library/build.gradle
|
2023-04-19 15:52:28 +08:00 |
|
|
齐济04215
|
12223e7a1e
|
Merge branch 'master' into 'master'
Master
See merge request qiji4215/OneMapQS!2
|
2023-04-19 15:42:23 +08:00 |
|
|
qiji4215
|
3876ab9f38
|
增加佳明相机业务
|
2023-04-19 15:41:33 +08:00 |
|
|
qiji4215
|
fdb62780ee
|
merge code
|
2023-04-14 10:00:13 +08:00 |
|
|
qiji4215
|
c740953f24
|
集成佳明相机sdk
|
2023-04-07 13:41:24 +08:00 |
|
|
qiji4215
|
26982dffbf
|
Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS
Conflicts:
build.gradle
|
2023-04-06 10:50:47 +08:00 |
|
|
齐济04215
|
82aa4ab2c0
|
Merge branch 'master' into 'master'
Master
See merge request qiji4215/OneMapQS!1
|
2023-04-06 10:49:38 +08:00 |
|
|
qiji4215
|
32b6af86c3
|
merge code
|
2023-04-06 10:40:22 +08:00 |
|