xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
250 Commits 2 Branches 0 Tags
f99517b386ad7b9f64adbd3b271474992fa61a59
Commit Graph
96 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
qiji4215 f99517b386 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-26 13:56:32 +08:00
qiji4215 46268b3549 增加点击事件返回联动 2023-05-26 10:51:24 +08:00
qiji4215 d1aab7aabb Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-26 10:24:12 +08:00
qiji4215 3c0fe6b1b1 merge code 2023-05-26 10:24:00 +08:00
qiji4215 e86b0696b6 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/res/layout/text_item_select.xml
 2023-05-26 09:59:24 +08:00
qiji4215 6af2479dbd Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-19 17:25:10 +08:00
qiji4215 24f58b7872 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-19 17:14:12 +08:00
qiji4215 2807b2f689 增加登录接口和问题回传接口变更 2023-05-19 17:12:19 +08:00
qiji4215 c42045ba45 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/res/layout/fragment_evaluation_result.xml
 2023-05-19 09:28:50 +08:00
qiji4215 4ec107b359 merge code 2023-05-19 09:27:11 +08:00
qiji4215 e6c2c3f76d 增加删除确认窗体2增加返回箭头 2023-05-11 16:36:35 +08:00
qiji4215 09c6d741ca Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-08 11:11:57 +08:00
qiji4215 9f8349506a merge code 2023-05-08 11:11:12 +08:00
qiji4215 2e732faa38 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-08 11:00:27 +08:00
qiji4215 077d5bb32f 修改同步逻辑 2023-05-08 10:59:58 +08:00
qiji4215 8b20da237b Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 18:43:38 +08:00
qiji4215 96ee3d1ec5 merge code 2023-05-06 18:43:19 +08:00
qiji4215 4a9174e8dd Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 18:25:05 +08:00
qiji4215 07e9309951 merge code 2023-05-06 18:24:45 +08:00
qiji4215 33c6d1aa16 修改背景底色 2023-05-06 17:30:12 +08:00
qiji4215 d1fba662b4 merge code 2023-05-06 17:23:49 +08:00
qiji4215 c5d9e70776 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 17:19:42 +08:00
qiji4215 c9e8512f19 merge code 2023-05-06 17:19:27 +08:00
qiji4215 0127c554f3 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:45:38 +08:00
qiji4215 0cb8cfbba3 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:42:59 +08:00
qiji4215 c7fb2eafc8 merge code 2023-05-06 16:42:36 +08:00
qiji4215 9970f98e90 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:28:24 +08:00
qiji4215 6840e4d965 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-06 16:24:01 +08:00
qiji4215 2c2a141b95 merge code 2023-05-06 16:23:45 +08:00
qiji4215 1d1fe13ab4 merge code 2023-05-06 16:01:51 +08:00
qiji4215 be9e582048 解决冲突 2023-05-06 15:28:39 +08:00
qiji4215 a260d94561 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/res/menu/personal_center_menu.xml
 2023-05-06 15:26:51 +08:00
qiji4215 451fe92e37 更换图标 2023-05-06 15:25:16 +08:00
qiji4215 dd5435f24e merge code 2023-05-06 15:01:46 +08:00
qiji4215 bfd9df9d8a merge code 2023-05-06 14:57:04 +08:00
qiji4215 e4729d2202 美化报告下拉菜单 2023-05-06 10:55:26 +08:00
qiji4215 0ac805302d UI美化质检报告页面 2023-05-06 10:20:16 +08:00
qiji4215 9929423a3b Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 16:58:22 +08:00
qiji4215 6b1ac4df9b merge code 2023-05-05 16:58:03 +08:00
qiji4215 af79ae4146 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 14:48:00 +08:00
qiji4215 0cce793b9e 更新资源 2023-05-05 14:47:43 +08:00
qiji4215 eb84e153ff Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 14:33:23 +08:00
qiji4215 ad59a0efac merge code 2023-05-05 14:33:08 +08:00
qiji4215 79af59bb02 优化地图界面UI 2023-05-05 14:23:23 +08:00
qiji4215 186d24bf22 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-05 11:03:23 +08:00
qiji4215 6dec79f763 美化质检问题界面及logo 2023-05-05 11:03:05 +08:00
qiji4215 b31f301ae6 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-05-04 18:03:44 +08:00
qiji4215 dfbdc1500f 提交资源文件 2023-05-04 18:03:11 +08:00
qiji4215 2ab18451e3 Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 
 Conflicts:
	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 15:06:45 +08:00
qiji4215 70a2ff072e ui资源 2023-05-04 14:53:54 +08:00
qiji4215 ebfdd778b9 增加录音点击播放业务 2023-05-04 13:54:09 +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
qiji4215 977b4b54da 增加问题回传业务 2023-04-27 12:16:05 +08:00
qiji4215 ad1156a4fc Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-04-27 10:34:08 +08:00
qiji4215 f78daabed3 merge code 2023-04-27 10:33:20 +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
qiji4215 a81e2f5d82 修改轨迹存储异常 2023-04-26 10:46:12 +08:00
qiji4215 cba2c8868b Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS 2023-04-25 17:59:17 +08:00
qiji4215 77ac36515b merge code 2023-04-25 17:58:19 +08:00
qiji4215 51ffecd35a 修改定位不连续问题 2023-04-25 16:22:36 +08:00
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