xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
101 Commits 2 Branches 0 Tags
Commit Graph

69 Commits

Author SHA1 Message Date
qiji4215
f78daabed3 merge code 2023-04-27 10:33:20 +08:00
qiji4215
a81e2f5d82 修改轨迹存储异常 2023-04-26 10:46:12 +08:00
qiji4215
cba2c8868b Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-04-25 17:59:17 +08:00
xiaoyan
8559e4f616 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-25 17:58:46 +08:00
qiji4215
77ac36515b merge code 2023-04-25 17:58:19 +08:00
xiaoyan
f1d6ebe22b feat: 增加常规点限速的渲染 2023-04-25 17:15:47 +08:00
qiji4215
51ffecd35a 修改定位不连续问题 2023-04-25 16:22:36 +08:00
xiaoyan
67ce6f11b9 fix: 合并代码 2023-04-25 15:40:23 +08:00
xiaoyan
58c3ad62c3 fix: 增加渲染样式 2023-04-25 15:36:41 +08:00
squallzhjch
969d687c58 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
 2023-04-25 15:35:09 +08:00
squallzhjch
72d51c19c2 修改数据安装流程 2023-04-25 15:32:12 +08:00
qiji4215
9fb85862db 修改兼容性，解决sdk版本无法使用相机和权限校验问题 2023-04-25 14:54:25 +08:00
xiaoyan
d174c82cb6 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-24 17:21:31 +08:00
xiaoyan
0a1e6c6f2b fix: 解决导入数据时将int类型转换为Double的问题 2023-04-24 17:21:25 +08:00
qiji4215
123583652c Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/Constant.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/tasklist/TaskListAdapter.kt
 2023-04-24 16:26:40 +08:00
squallzhjch
385e0032c2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
 2023-04-24 15:36:25 +08:00
squallzhjch
b446a2562a 修改UI部分 2023-04-24 15:34:44 +08:00
qiji4215
5d7adb0aa7 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-04-24 10:58:26 +08:00
xiaoyan
e3a9b09aa2 fix: 合并冲突 2023-04-24 10:56:29 +08:00
xiaoyan
60622a3197 1. 增加OMDB数据图层 2. 修改Realm数据库文件位置 2023-04-24 10:52:14 +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
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
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
xiaoyan
f2ac094aa9 fix: Realm数据查询接口封装 2023-04-21 16:42:19 +08:00
qiji4215
e4e8866ad6 merge code 2023-04-21 15:06:19 +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
xiaoyan
895fa63691 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-21 14:21:25 +08:00
xiaoyan
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
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
xiaoyan
465afbda86 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-19 17:32:57 +08:00
xiaoyan
0a9376d398 fix: 生成json 2023-04-19 17:32:44 +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
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
xiaoyan
7ea778780c fix: 合并代码 2023-04-19 15:46:16 +08:00
xiaoyan
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