19 Commits

Author SHA1 Message Date
qiji4215
48e3e7817c merge code 2023-04-20 09:38:51 +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
7ea778780c fix: 合并代码 2023-04-19 15:46:16 +08:00
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
qiji4215
fdb62780ee merge code 2023-04-14 10:00:13 +08:00
squallzhjch
88326d3247 增加质检结果展示页面 2023-04-12 15:07:46 +08:00
56c5badcf0 fix: 增加Realm依赖 2023-04-03 10:26:38 +08:00
80a42c8387 feat: 添加Realm-Java依赖 2023-03-31 11:37:33 +08:00
68551656ac feat: 引入Reaml依赖 2023-03-30 16:13:15 +08:00
squallzhjch
3a80a4ee5d 增加离线地图下载流程 2023-03-30 10:50:20 +08:00
b927edb67c fix: 增加文件选择功能 2023-03-29 17:49:41 +08:00
0b5fe7468b feat: 增加权限管理和文件选择功能 2023-03-24 16:23:32 +08:00
squallzhjch
5e8b75005f 调整mapapi 2023-03-24 13:56:13 +08:00
9f964fab5b fix: 修改配置 2023-03-22 10:02:36 +08:00
squallzhjch
f76c8b050c 创建工程 2023-03-21 16:57:28 +08:00