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

653 Commits

Author SHA1 Message Date
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
xiaoyan
cb0275cee3 fix: 解决冲突 2023-04-27 13:37:20 +08:00
qiji4215
977b4b54da 增加问题回传业务 2023-04-27 12:16:05 +08:00
qiji4215
ad1156a4fc Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-04-27 10:34:08 +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
squallzhjch
92a9f9d6c4 修改道路捕捉 2023-04-27 10:12:29 +08:00
qiji4215
331380905d 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-27 09:35:12 +08:00
qiji4215
c5876c9713 增加数据上传业务 2023-04-26 18:05:51 +08:00
squallzhjch
4119fa2309 合并代码 2023-04-26 15:19:36 +08:00
squallzhjch
d00505c22d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
 2023-04-26 15:19:25 +08:00
squallzhjch
cf640cb1d2 修改元数据导入 2023-04-26 15:18:43 +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
xiaoyan
c37abcbda5 feat: 修改导入配置文件 2023-04-25 17:58:31 +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
qiji4215
e29854d650 merge coee 2023-04-25 16:02:43 +08:00
qiji4215
f96292b686 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-04-25 15:47:37 +08:00
qiji4215
95aefba06a 更新资源文件，适配相机显示内容 2023-04-25 15:46:32 +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
153156d07c 合并代码 2023-04-25 15:35:50 +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
2a6dad3ac0 merge code 2023-04-24 16:31:59 +08:00
qiji4215
07a6227e7d 解决冲突 2023-04-24 16:29:53 +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
qiji4215
a5b60d3a3f 1、增加问题列表显示2、重构常量函数3、增加常用颜色常量 2023-04-24 16:24:57 +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
xiaoyan
8e9bd3bc5d 修改数据导入功能 2023-04-24 15:02:48 +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
c940c4b236 增加我的数据列表部分功能 2023-04-24 10:50:17 +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
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