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

750 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
squallzhjch
d8735d67d6 增加地图捕捉数据功能 2023-04-21 14:10:15 +08:00
squallzhjch
ab5cb7a078 增加地图捕捉数据功能 2023-04-21 14:10:05 +08:00
肖岩
95019f7f3d Merge branch 'master' into 'master' 
Master

See merge request CollectVehicle/OneMapQS!1
 2023-04-21 14:07:04 +08:00
qiji4215
4cce37e991 增加轨迹存储业务 2023-04-21 14:04:40 +08:00
qiji4215
5943949cc8 增加轨迹业务类 2023-04-20 16:45:15 +08:00
qiji4215
13f835f467 merge code 2023-04-20 13:52:24 +08:00
qiji4215
48e3e7817c merge code 2023-04-20 09:38:51 +08:00
xiaoyan
465afbda86 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-19 17:32:57 +08:00
xiaoyan
0a9376d398 fix: 生成json 2023-04-19 17:32:44 +08:00
qiji4215
3d9ab011a8 Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/map/handler/AnimationHandler.kt
 2023-04-19 17:31:47 +08:00
齐济04215
134061533b Merge branch 'master' into 'master' 
Master

See merge request qiji4215/OneMapQS!4
 2023-04-19 17:31:09 +08:00
squallzhjch
6da6a4d101 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
 2023-04-19 17:29:44 +08:00
squallzhjch
c9ae281424 增加数据渲染 2023-04-19 17:28:05 +08:00
qiji4215
a8bf952b3b merge code 2023-04-19 17:26:36 +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
齐济04215
50462651d8 Merge branch 'master' into 'master' 
Master

See merge request qiji4215/OneMapQS!3
 2023-04-19 17:24:32 +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
齐济04215
12223e7a1e Merge branch 'master' into 'master' 
Master

See merge request qiji4215/OneMapQS!2
 2023-04-19 15:42:23 +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
qiji4215
fdb62780ee merge code 2023-04-14 10:00:13 +08:00
squallzhjch
88326d3247 增加质检结果展示页面 2023-04-12 15:07:46 +08:00
qiji4215
c740953f24 集成佳明相机sdk 2023-04-07 13:41:24 +08:00
qiji4215
26982dffbf Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS 
 Conflicts:
	build.gradle
 2023-04-06 10:50:47 +08:00
齐济04215
82aa4ab2c0 Merge branch 'master' into 'master' 
Master

See merge request qiji4215/OneMapQS!1
 2023-04-06 10:49:38 +08:00
squallzhjch
fa4ad254a5 增加realm 在离线地图中的使用 2023-04-06 10:46:19 +08:00
qiji4215
32b6af86c3 merge code 2023-04-06 10:40:22 +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
80a42c8387 feat: 添加Realm-Java依赖 2023-03-31 11:37:33 +08:00
xiaoyan
68551656ac feat: 引入Reaml依赖 2023-03-30 16:13:15 +08:00
squallzhjch
ca1be58db2 增加离线地图下载流程 2023-03-30 16:08:36 +08:00
squallzhjch
3a80a4ee5d 增加离线地图下载流程 2023-03-30 10:50:20 +08:00
xiaoyan
b927edb67c fix: 增加文件选择功能 2023-03-29 17:49:41 +08:00
xiaoyan
0b5fe7468b feat: 增加权限管理和文件选择功能 2023-03-24 16:23:32 +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
6a249a254a Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/BaseActivity.java
	collect-library/src/main/java/com/navinfo/collect/library/data/handler/DataCameraHandler.kt
 2023-03-22 10:28:07 +08:00
squallzhjch
69dcc5e8ea 编译工程 2023-03-22 10:27:37 +08:00
xiaoyan
068721ed4f fix: 删除flutter和ocr的依赖 2023-03-22 10:24:01 +08:00
squallzhjch
f69d668557 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/FlutterBaseActivity.kt
	settings.gradle
 2023-03-22 10:05:24 +08:00
squallzhjch
1f82fc32b1 编译工程 2023-03-22 10:04:30 +08:00
xiaoyan
9f964fab5b fix: 修改配置 2023-03-22 10:02:36 +08:00
squallzhjch
24220e7f83 编译工程 2023-03-22 09:33:13 +08:00
squallzhjch
1b94b361ca 创建工程 2023-03-21 17:06:56 +08:00
squallzhjch
f76c8b050c 创建工程 2023-03-21 16:57:28 +08:00