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

141 Commits

Author SHA1 Message Date
squallzhjch
b98e8b1614 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 10:08:30 +08:00
squallzhjch
4280c0bf0b 优化提前显示面板 2023-05-05 10:07:55 +08:00
qiji4215
b31f301ae6 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-04 18:03:44 +08:00
qiji4215
dfbdc1500f 提交资源文件 2023-05-04 18:03:11 +08:00
squallzhjch
eace5d2521 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultFragment.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
 2023-05-04 14:18:10 +08:00
squallzhjch
ebbb9b99b2 增加看板进数据编辑页面 2023-05-04 14:10:30 +08:00
qiji4215
9379e7a7bb 增加语音相关业务 2023-05-04 11:02:33 +08:00
qiji4215
62ce5b1566 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt
 2023-04-28 16:20:31 +08:00
qiji4215
defcfb66fb 增加语音部分业务 2023-04-28 16:16:17 +08:00
squallzhjch
efe5d43555 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-28 16:03:52 +08:00
squallzhjch
894732ee45 修改定位，修改提前看板 2023-04-28 16:03:40 +08:00
xiaoyan
3eed9bad33 fix: 增加任务数据高亮功能 2023-04-27 17:16:53 +08:00
xiaoyan
d129f26d82 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-27 15:38:25 +08:00
xiaoyan
58136320d4 fix: 增加多线图层 2023-04-27 15:04:18 +08:00
squallzhjch
3dc650a76b Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt
 2023-04-27 15:03:32 +08:00
squallzhjch
b028975221 增加高亮图层 2023-04-27 15:01:57 +08:00
xiaoyan
61ba1d1d2f Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-27 13:37:37 +08:00
qiji4215
977b4b54da 增加问题回传业务 2023-04-27 12:16:05 +08:00
qiji4215
f78daabed3 merge code 2023-04-27 10:33:20 +08:00
xiaoyan
c4ee38d703 fix: 修改道路面的渲染 2023-04-27 10:18:11 +08:00
xiaoyan
743ea163f2 fix: 合并代码 2023-04-26 11:46:12 +08:00
xiaoyan
c4812eada4 fix: 修改ManiFest文件 2023-04-26 11:32:30 +08:00
xiaoyan
5defa32f03 fix: 修改导入数据类型 2023-04-26 10:53:38 +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