xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
88 Commits 2 Branches 0 Tags
e29854d650c24a276b13933994205e6c70e19c5e
Commit Graph
33 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
qiji4215 9fb85862db 修改兼容性，解决sdk版本无法使用相机和权限校验问题 2023-04-25 14:54: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
qiji4215 5d7adb0aa7 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-04-24 10:58:26 +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
qiji4215 51bd47842a Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-04-21 17:20:54 +08:00
qiji4215 8e4f8459d5 增加轨迹存储渲染业务 2023-04-21 17:20:34 +08:00
qiji4215 e4e8866ad6 merge code 2023-04-21 15:06:19 +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
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
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
齐济04215 12223e7a1e Merge branch 'master' into 'master' 
Master

See merge request qiji4215/OneMapQS!2
 2023-04-19 15:42:23 +08:00
qiji4215 3876ab9f38 增加佳明相机业务 2023-04-19 15:41:33 +08:00
qiji4215 fdb62780ee merge code 2023-04-14 10:00:13 +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
qiji4215 32b6af86c3 merge code 2023-04-06 10:40:22 +08:00