xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
304 Commits 2 Branches 0 Tags
236f422fa157d466907403f58453eb347c715ff6
Commit Graph
96 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
squallzhjch 236f422fa1 修改冲突代码 2023-06-16 15:29:01 +08:00
squallzhjch 89c7fd4585 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/assets/editormarker.xml
	vtm
 2023-06-16 15:24:02 +08:00
squallzhjch 083a6fd57a 调整离线地图UI，任务列表UI，个人中心UI 2023-06-16 15:16:10 +08:00
squallzhjch 6cd9bab9e1 调整中控联动UI 2023-06-14 14:42:34 +08:00
squallzhjch 876d5bef44 调整中控联动UI 2023-06-14 14:06:13 +08:00
squallzhjch 46fa06d1a8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/navinfo/omqs/ui/fragment/console/ConsoleFragment.kt
	app/src/main/java/com/navinfo/omqs/ui/fragment/layermanager/LayerManagerFragment.kt
 2023-06-14 13:51:43 +08:00
squallzhjch e352a34ef9 调整中控联动UI 2023-06-14 13:47:49 +08:00
squallzhjch 4ddabe7a94 增加中控页面 2023-06-09 16:58:08 +08:00
squallzhjch 5665638120 增加中控页面 2023-06-09 13:38:40 +08:00
squallzhjch c6bf940dc4 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	vtm
 2023-06-02 14:20:18 +08:00
squallzhjch e4f28405dc 解决冲突 2023-06-02 14:18:49 +08:00
squallzhjch ebc4ddf5a9 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	app/src/main/res/layout/adapter_sign.xml
 2023-06-02 14:17:05 +08:00
squallzhjch d68e7bd768 调整UI 2023-06-02 14:12:25 +08:00
squallzhjch b8015a8b20 调整任务列表的UI， 
增加任务列表和道路link的筛选功能
调整问题原因面板的UI
增加经纬度定位功能
 2023-05-31 15:47:38 +08:00
squallzhjch e9735ee4d8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-26 17:45:56 +08:00
squallzhjch 8d6bb8c6e8 修改普通交限的道路渲染 2023-05-26 17:45:36 +08:00
squallzhjch 75a6d56471 调整看板 2023-05-26 17:23:47 +08:00
squallzhjch d5d251c85e Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-26 15:16:19 +08:00
squallzhjch dae344afc2 调整看板 2023-05-26 15:16:09 +08:00
squallzhjch c94eb5654d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-26 14:01:49 +08:00
squallzhjch 10ec7a1e04 增加经纬度定位功能 2023-05-26 14:01:36 +08:00
squallzhjch 59bc0f544b 调整UI 
调整道路属性面板
 2023-05-26 10:51:36 +08:00
squallzhjch b6bbcad634 调整UI 
调整道路属性面板
 2023-05-26 10:06:58 +08:00
squallzhjch 4e997b8632 调整UI 
调整道路属性面板
 2023-05-24 15:57:52 +08:00
squallzhjch d89ad95a17 调整UI 
增加道路属性面板
 2023-05-23 14:03:36 +08:00
squallzhjch 6d0f36068d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-23 09:48:21 +08:00
squallzhjch dc6b4b91e5 调整UI 
增加道路属性面板
 2023-05-23 09:48:07 +08:00
squallzhjch 00f39555ab 修改条件限速 
修改数据上传下载地址
 2023-05-19 17:23:45 +08:00
squallzhjch ebe5ecc689 增加条件点限速，可变点限速面板展示功能 2023-05-19 15:54:15 +08:00
squallzhjch a21a9bd09c Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-18 17:17:18 +08:00
squallzhjch 4749bc66cd 1、优化地图主页布局，适配2560尺寸 
2、优化右侧面板UI
3、修改评测任务列表UI
4、增加当前任务UI及相关功能
 2023-05-18 17:17:08 +08:00
squallzhjch a13e1f660d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt
 2023-05-08 14:33:52 +08:00
squallzhjch 840bd24b7c 修改离线地图下载，数据下载安装 2023-05-08 14:26:12 +08:00
squallzhjch 94ce90b680 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 16:42:35 +08:00
squallzhjch 4c09d95670 修改任务线宽 2023-05-06 16:42:21 +08:00
squallzhjch eae10036c8 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-06 16:13:28 +08:00
squallzhjch 51be5bd178 修改任务线颜色 2023-05-06 16:13:12 +08:00
squallzhjch 8e4d1c7e0e Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/res/layout/adapter_task_list.xml
 2023-05-06 15:39:31 +08:00
squallzhjch 3733634eb5 修改面板快捷新增时的种类联动 2023-05-06 15:38:27 +08:00
squallzhjch fbff312f41 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
 2023-05-06 14:31:05 +08:00
squallzhjch 8501f64b2c 修改线选择 2023-05-06 14:30:30 +08:00
squallzhjch 9f7bf771c2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/res/layout/activity_main.xml
 2023-05-06 11:03:57 +08:00
squallzhjch d86ec46943 修改任务线刷新，数据安装刷新 2023-05-06 11:01:50 +08:00
squallzhjch 752550f376 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 16:52:43 +08:00
squallzhjch 3a1e1bc9d6 修改数据上传 2023-05-05 16:52:07 +08:00
squallzhjch 5826922bb9 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/tools/LayerConfigUtils.kt
 2023-05-05 15:15:07 +08:00
squallzhjch d3fd50f941 修改数据上传 2023-05-05 15:14:20 +08:00
squallzhjch 611385c145 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
 2023-05-05 14:34:46 +08:00
squallzhjch 4d4549557d 修改数据上传 2023-05-05 14:33:54 +08:00
squallzhjch b98e8b1614 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-05 10:08:30 +08:00
squallzhjch 2c44ac045d 优化提前显示面板 2023-05-05 10:08:19 +08:00
squallzhjch 4280c0bf0b 优化提前显示面板 2023-05-05 10:07:55 +08:00
squallzhjch 53bb2f3ca6 解决代码冲突 2023-05-04 14:55:19 +08:00
squallzhjch 4b3adaaa97 解决代码冲突 2023-05-04 14:51:44 +08:00
squallzhjch 1726c93c9d Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-05-04 14:18:33 +08:00
squallzhjch eace5d2521 Merge branch 'master' of 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/activity/map/SignAdapter.kt
	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 14:18:10 +08:00
squallzhjch ebbb9b99b2 增加看板进数据编辑页面 2023-05-04 14:10:30 +08:00
squallzhjch efe5d43555 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 2023-04-28 16:03:52 +08:00
squallzhjch 894732ee45 修改定位，修改提前看板 2023-04-28 16:03:40 +08:00
squallzhjch 3dc650a76b Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt
 2023-04-27 15:03:32 +08:00
squallzhjch b028975221 增加高亮图层 2023-04-27 15:01:57 +08:00
squallzhjch 92a9f9d6c4 修改道路捕捉 2023-04-27 10:12:29 +08:00
squallzhjch 4119fa2309 合并代码 2023-04-26 15:19:36 +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
squallzhjch 153156d07c 合并代码 2023-04-25 15:35:50 +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
squallzhjch 385e0032c2 Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
 2023-04-24 15:36:25 +08:00
squallzhjch b446a2562a 修改UI部分 2023-04-24 15:34:44 +08:00
squallzhjch b5a3d72107 解决冲突 2023-04-23 16:42:57 +08:00
squallzhjch 9fd2d0fe8a Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/OMQSApplication.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
 2023-04-23 16:41:04 +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
squallzhjch d46f5f4223 增加地图捕捉数据功能 2023-04-21 14:22:12 +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 d8735d67d6 增加地图捕捉数据功能 2023-04-21 14:10:15 +08:00
squallzhjch ab5cb7a078 增加地图捕捉数据功能 2023-04-21 14:10:05 +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
squallzhjch a9def220ce 增加数据渲染 2023-04-19 15:40:00 +08:00
squallzhjch 88326d3247 增加质检结果展示页面 2023-04-12 15:07:46 +08:00
squallzhjch fa4ad254a5 增加realm 在离线地图中的使用 2023-04-06 10:46:19 +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
squallzhjch ca1be58db2 增加离线地图下载流程 2023-03-30 16:08:36 +08:00
squallzhjch 3a80a4ee5d 增加离线地图下载流程 2023-03-30 10:50:20 +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
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
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