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

39 Commits

Author SHA1 Message Date
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
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
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
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
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
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
b446a2562a 修改UI部分 2023-04-24 15:34:44 +08:00
qiji4215
c940c4b236 增加我的数据列表部分功能 2023-04-24 10:50:17 +08:00
squallzhjch
a1170db7a9 增加任务列表和下载功能 2023-04-23 16:35:45 +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
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
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
9d5b9b1755 解决冲突 2023-04-19 17:21:13 +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
squallzhjch
88326d3247 增加质检结果展示页面 2023-04-12 15:07:46 +08:00
squallzhjch
dbb1572688 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/Constant.kt
	app/src/main/java/com/navinfo/omqs/bean/OfflineMapCityBean.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt
	app/src/main/res/layout/adapter_offline_map_city.xml
 2023-04-03 10:46:26 +08:00
squallzhjch
dcc5f581fb 增加离线地图下载流程 2023-04-03 10:40:53 +08:00
xiaoyan
56c5badcf0 fix: 增加Realm依赖 2023-04-03 10:26:38 +08:00
xiaoyan
68551656ac feat: 引入Reaml依赖 2023-03-30 16:13:15 +08:00
squallzhjch
3a80a4ee5d 增加离线地图下载流程 2023-03-30 10:50:20 +08:00
xiaoyan
b927edb67c fix: 增加文件选择功能 2023-03-29 17:49:41 +08:00
squallzhjch
97a48237ba 调整mapapi 2023-03-24 15:34:22 +08:00
squallzhjch
5e8b75005f 调整mapapi 2023-03-24 13:56:13 +08:00
squallzhjch
24220e7f83 编译工程 2023-03-22 09:33:13 +08:00
squallzhjch
1b94b361ca 创建工程 2023-03-21 17:06:56 +08:00