From 1d0611b7e9e38b98be67037823594c4c29154d2a Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Fri, 1 Dec 2023 14:32:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E9=81=93=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=8D=E6=B8=B2=E6=9F=932=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=97=E8=A1=A8=E8=BF=9E=E7=BB=AD=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/omqs/db/ImportPreProcess.kt | 7 ++- .../http/taskdownload/TaskDownloadScope.kt | 2 + .../java/com/navinfo/omqs/util/SignUtil.kt | 2 +- .../main/res/menu/personal_center_menu.xml | 2 +- .../src/main/assets/editormarker.xml | 26 ++++++----- .../src/main/assets/omdb/icon_2092_acc_e.svg | 25 ++++++++++- .../src/main/assets/omdb/icon_3010_0.svg | 43 +++++++++++++++++++ .../src/main/assets/omdb/icon_3010_1.svg | 43 +++++++++++++++++++ .../src/main/assets/omdb/icon_bike.svg | 1 + 9 files changed, 134 insertions(+), 17 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/icon_3010_0.svg create mode 100644 collect-library/src/main/assets/omdb/icon_3010_1.svg create mode 100644 collect-library/src/main/assets/omdb/icon_bike.svg diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt index 6bc10a98..f0d8cee0 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -286,10 +286,10 @@ class ImportPreProcess { startReference.properties["type"] = "s${if (renderEntity.properties["laneType"]!!.toInt() and (0b1000) > 0) "_dec" else "_acc"}" startReference.properties["geometry"] = startReference.geometry - listResult.add(startReference) + startReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(startReference.properties)) + renderEntity.referenceEntitys.add(startReference) val endReference = ReferenceEntity() -// endReference.renderEntityId = renderEntity.id endReference.name = "${renderEntity.name}参考点" endReference.code = renderEntity.code endReference.table = renderEntity.table @@ -305,9 +305,8 @@ class ImportPreProcess { endReference.properties["type"] = "e${if (renderEntity.properties["laneType"]!!.toInt() and (0b1000) > 0) "_dec" else "_acc"}" endReference.properties["geometry"] = endReference.geometry + endReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(endReference.properties)) renderEntity.referenceEntitys.add(endReference) - //listResult.add(endReference) - //insertData(listResult) } } diff --git a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt index 8e7a5889..4f682b40 100644 --- a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt +++ b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt @@ -177,6 +177,8 @@ class TaskDownloadScope( override fun onComplete() { taskBean.status = FileDownloadStatus.DONE downloadData.postValue(taskBean) + //移除当前任务，进行下一个任务下载逻辑 + downloadManager.launchNext(taskBean.id) //任务与当前一致，需要更新渲染图层 if (MapParamUtils.getTaskId() == taskBean.id) { downloadManager.mapController.layerManagerHandler.updateOMDBVectorTileLayer() diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt index 3f23e271..d0eb6560 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt @@ -85,7 +85,7 @@ class SignUtil { } //全封闭 DataCodeEnum.OMDB_CON_ACCESS.code -> { - if (data.properties["conAccess"] === "1") "全封闭" else "" + if (data.properties["conAccess"] == "1") "全封闭" else "" } //匝道 DataCodeEnum.OMDB_RAMP_1.code, diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml index ea501dd6..f98ddb5f 100644 --- a/app/src/main/res/menu/personal_center_menu.xml +++ b/app/src/main/res/menu/personal_center_menu.xml @@ -64,7 +64,7 @@ + android:title="版本：24QE1_V1.2.3_20231201_A" /> diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 5f831d59..6da9f562 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1797,7 +1797,12 @@ - + + + + + + @@ -2179,23 +2184,24 @@ - + + - + - + - + - + diff --git a/collect-library/src/main/assets/omdb/icon_2092_acc_e.svg b/collect-library/src/main/assets/omdb/icon_2092_acc_e.svg index 0dec78b2..dd758dd1 100644 --- a/collect-library/src/main/assets/omdb/icon_2092_acc_e.svg +++ b/collect-library/src/main/assets/omdb/icon_2092_acc_e.svg @@ -1 +1,24 @@ - \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_3010_0.svg b/collect-library/src/main/assets/omdb/icon_3010_0.svg new file mode 100644 index 00000000..f8babad6 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_3010_0.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_3010_1.svg b/collect-library/src/main/assets/omdb/icon_3010_1.svg new file mode 100644 index 00000000..384bff2f --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_3010_1.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_bike.svg b/collect-library/src/main/assets/omdb/icon_bike.svg new file mode 100644 index 00000000..3ad5d240 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_bike.svg @@ -0,0 +1 @@ + \ No newline at end of file