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

65 Commits

Author SHA1 Message Date
squallzhjch
4280c0bf0b 优化提前显示面板 2023-05-05 10:07:55 +08:00
squallzhjch
53bb2f3ca6 解决代码冲突 2023-05-04 14:55:19 +08:00
squallzhjch
4b3adaaa97 解决代码冲突 2023-05-04 14:51:44 +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
894732ee45 修改定位，修改提前看板 2023-04-28 16:03:40 +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
xiaoyan
c4ee38d703 fix: 修改道路面的渲染 2023-04-27 10:18:11 +08:00
qiji4215
c5876c9713 增加数据上传业务 2023-04-26 18:05:51 +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
5defa32f03 fix: 修改导入数据类型 2023-04-26 10:53:38 +08:00
qiji4215
a81e2f5d82 修改轨迹存储异常 2023-04-26 10:46:12 +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
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
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
qiji4215
e4e8866ad6 merge code 2023-04-21 15:06:19 +08:00
squallzhjch
d46f5f4223 增加地图捕捉数据功能 2023-04-21 14:22:12 +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
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