22 Commits

Author SHA1 Message Date
d174c82cb6 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-24 17:21:31 +08:00
0a1e6c6f2b fix: 解决导入数据时将int类型转换为Double的问题 2023-04-24 17:21:25 +08:00
qiji4215
e72cc87475 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
2023-04-23 17:13:56 +08:00
qiji4215
30c7907253 merge code 2023-04-23 17:12:07 +08:00
squallzhjch
ccfd30228e Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	collect-library/build.gradle
2023-04-21 14:23:29 +08:00
squallzhjch
d46f5f4223 增加地图捕捉数据功能 2023-04-21 14:22:12 +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
qiji4215
4cce37e991 增加轨迹存储业务 2023-04-21 14:04:40 +08:00
qiji4215
5943949cc8 增加轨迹业务类 2023-04-20 16:45:15 +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
qiji4215
3876ab9f38 增加佳明相机业务 2023-04-19 15:41:33 +08:00
squallzhjch
a9def220ce 增加数据渲染 2023-04-19 15:40:00 +08:00
qiji4215
fdb62780ee merge code 2023-04-14 10:00:13 +08:00
squallzhjch
88326d3247 增加质检结果展示页面 2023-04-12 15:07:46 +08:00
squallzhjch
5e8b75005f 调整mapapi 2023-03-24 13:56:13 +08:00
squallzhjch
6a249a254a Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/BaseActivity.java
	collect-library/src/main/java/com/navinfo/collect/library/data/handler/DataCameraHandler.kt
2023-03-22 10:28:07 +08:00
068721ed4f fix: 删除flutter和ocr的依赖 2023-03-22 10:24:01 +08:00
squallzhjch
f69d668557 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/FlutterBaseActivity.kt
	settings.gradle
2023-03-22 10:05:24 +08:00
squallzhjch
1f82fc32b1 编译工程 2023-03-22 10:04:30 +08:00
9f964fab5b fix: 修改配置 2023-03-22 10:02:36 +08:00
squallzhjch
f76c8b050c 创建工程 2023-03-21 16:57:28 +08:00