26 Commits

Author SHA1 Message Date
e3a9b09aa2 fix: 合并冲突 2023-04-24 10:56:29 +08:00
60622a3197 1. 增加OMDB数据图层 2. 修改Realm数据库文件位置 2023-04-24 10:52:14 +08:00
squallzhjch
b5a3d72107 解决冲突 2023-04-23 16:42:57 +08:00
squallzhjch
9fd2d0fe8a Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
2023-04-23 16:41:04 +08:00
squallzhjch
a1170db7a9 增加任务列表和下载功能 2023-04-23 16:35:45 +08:00
qiji4215
8e4f8459d5 增加轨迹存储渲染业务 2023-04-21 17:20:34 +08:00
895fa63691 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-21 14:21:25 +08:00
7649777bb8 feat: Realm增加查询Link的接口 2023-04-21 14:20:58 +08:00
squallzhjch
5db8bfaade Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/PermissionsActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
2023-04-21 14:14:32 +08:00
squallzhjch
ab5cb7a078 增加地图捕捉数据功能 2023-04-21 14:10:05 +08:00
qiji4215
5943949cc8 增加轨迹业务类 2023-04-20 16:45:15 +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
squallzhjch
6da6a4d101 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
2023-04-19 17:29:44 +08:00
squallzhjch
c9ae281424 增加数据渲染 2023-04-19 17:28:05 +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
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
7ea778780c fix: 合并代码 2023-04-19 15:46:16 +08:00
82d622a136 feat: 增加数据导入 2023-04-19 15:41:36 +08:00
qiji4215
3876ab9f38 增加佳明相机业务 2023-04-19 15:41:33 +08:00
squallzhjch
a9def220ce 增加数据渲染 2023-04-19 15:40:00 +08:00
squallzhjch
88326d3247 增加质检结果展示页面 2023-04-12 15:07:46 +08:00
squallzhjch
fa4ad254a5 增加realm 在离线地图中的使用 2023-04-06 10:46:19 +08:00
80a42c8387 feat: 添加Realm-Java依赖 2023-03-31 11:37:33 +08:00
squallzhjch
3a80a4ee5d 增加离线地图下载流程 2023-03-30 10:50:20 +08:00