From 31f9358415f143aaa519f55b3b71ce303272304f Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Thu, 31 Aug 2023 10:37:16 +0800 Subject: [PATCH 1/7] merge code --- collect-library/src/main/assets/editormarker.xml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 79440e2f..6c4b67a3 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1968,12 +1968,9 @@ - - + From 6fe9e50b2c0b684652a6b377f1aba6714b68e667 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Thu, 31 Aug 2023 15:19:44 +0800 Subject: [PATCH 2/7] merge code --- .../java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt | 3 ++- vtm | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 5adde8c5..fe7b2ea9 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -474,7 +474,8 @@ class MainViewModel @Inject constructor( GeometryTools.createPoint( point.longitude, point.latitude - ) + ), + buffer = 1.0 ) if (itemList.size == 1) { diff --git a/vtm b/vtm index c5070ba7..1cb18353 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit c5070ba78b73d69af40d33396ad8255f82535dc4 +Subproject commit 1cb18353849477da3a184f3ce48022760e0e4aea From 94c9b8fd4f4b060f2844ff54fdef0a4be5d8f8de Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Fri, 1 Sep 2023 10:26:45 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A6=81=E7=B4=A0?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=8D=95=E6=8D=89=E6=8E=A7=E5=88=B6=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 2 + .../com/navinfo/omqs/bean/ImportConfig.kt | 1 + .../com/navinfo/omqs/db/ImportOMDBHelper.kt | 7 ++ .../com/navinfo/omqs/db/RealmOperateHelper.kt | 28 +++-- .../omqs/ui/activity/map/MainViewModel.kt | 2 +- .../omqs/ui/fragment/itemlist/ItemAdapter.kt | 1 + app/src/main/res/layout/adapter_item.xml | 18 ++- .../omdb/4010/icon_electroniceye_4010.svg | 103 +++++++++++++++++- .../library/data/entity/RenderEntity.kt | 1 + vtm | 2 +- 10 files changed, 150 insertions(+), 15 deletions(-) diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index bd7dcec7..b6ce48bf 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -46,6 +46,7 @@ "name": "道路种别", "zoomMin": 15, "zoomMax": 20, + "catch":false, "checkLinkId": false }, "2010": { @@ -472,6 +473,7 @@ "name": "车道中心线", "zoomMin": 18, "zoomMax": 20, + "catch":false, "transformer": [ { "k": "geometry", diff --git a/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt b/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt index b2cd1aa5..18f8f3b7 100644 --- a/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt +++ b/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt @@ -122,6 +122,7 @@ class TableInfo { val zoomMin: Int = 16 val zoomMax: Int = 21 val checkLinkId: Boolean = true//是否需要校验linkid + val catch: Boolean = true//是否需要捕捉 val name: String = "" var checked : Boolean = true var transformer: MutableList = mutableListOf() diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt index ff43946c..415baa8d 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -229,6 +229,13 @@ class ImportOMDBHelper @AssistedInject constructor( if (!renderEntity.properties.containsKey("name")) { renderEntity.properties["name"] = renderEntity.name; } + + if(currentConfig.catch){ + renderEntity.catch=0 + }else{ + renderEntity.catch=1 + } + //遍历判断只显示与任务Link相关的任务数据 if(currentConfig.checkLinkId){ diff --git a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt index 90d2c841..1eb1a9b4 100644 --- a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt @@ -244,6 +244,7 @@ class RealmOperateHelper() { point: Point, buffer: Double = DEFAULT_BUFFER, bufferType: BUFFER_TYPE = DEFAULT_BUFFER_TYPE, + catchAll: Boolean = true, sort: Boolean = true ): MutableList { val result = mutableListOf() @@ -261,14 +262,25 @@ class RealmOperateHelper() { val yStart = tileYSet.stream().min(Comparator.naturalOrder()).orElse(null) val yEnd = tileYSet.stream().max(Comparator.naturalOrder()).orElse(null) val realm = getRealmDefaultInstance() - // 查询realm中对应tile号的数据 - val realmList = getRealmTools(RenderEntity::class.java, false) - .notEqualTo("table", DataCodeEnum.OMDB_RD_LINK.name) - .greaterThanOrEqualTo("tileX", xStart) - .lessThanOrEqualTo("tileX", xEnd) - .greaterThanOrEqualTo("tileY", yStart) - .lessThanOrEqualTo("tileY", yEnd) - .findAll() + var realmList = mutableListOf() + if(catchAll){ + // 查询realm中对应tile号的数据 + realmList = getRealmTools(RenderEntity::class.java, false) + .greaterThanOrEqualTo("tileX", xStart) + .lessThanOrEqualTo("tileX", xEnd) + .greaterThanOrEqualTo("tileY", yStart) + .lessThanOrEqualTo("tileY", yEnd) + .findAll() + }else{ + // 查询realm中对应tile号的数据 + realmList = getRealmTools(RenderEntity::class.java, false) + .equalTo("catch", "0") + .greaterThanOrEqualTo("tileX", xStart) + .lessThanOrEqualTo("tileX", xEnd) + .greaterThanOrEqualTo("tileY", yStart) + .lessThanOrEqualTo("tileY", yEnd) + .findAll() + } // 将获取到的数据和查询的polygon做相交,只返回相交的数据 val queryResult = realmList?.stream()?.filter { polygon.intersects(it.wkt) diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 4039679a..4e927db6 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -475,7 +475,7 @@ class MainViewModel @Inject constructor( point.longitude, point.latitude ), - buffer = 1.0 + buffer = 1.0, catchAll = false ) if (itemList.size == 1) { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt index 361fd9cb..2fe88f19 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/itemlist/ItemAdapter.kt @@ -23,6 +23,7 @@ class ItemAdapter(private var itemListener: ((Int, RenderEntity) -> Unit?)? = nu val binding = holder.viewBinding as AdapterItemBinding var renderEntity = data[position] binding.root.isSelected = selectPosition == position + binding.itemIndex.text = (position+1).toString() binding.name.text = DataCodeEnum.findTableNameByCode(renderEntity.code) binding.root.setOnClickListener { if (selectPosition != position) { diff --git a/app/src/main/res/layout/adapter_item.xml b/app/src/main/res/layout/adapter_item.xml index b3a2751d..f9136866 100644 --- a/app/src/main/res/layout/adapter_item.xml +++ b/app/src/main/res/layout/adapter_item.xml @@ -1,16 +1,28 @@ - + android:padding="10dp"> + + - \ No newline at end of file + + diff --git a/collect-library/src/main/assets/omdb/4010/icon_electroniceye_4010.svg b/collect-library/src/main/assets/omdb/4010/icon_electroniceye_4010.svg index 074675df..122a28af 100644 --- a/collect-library/src/main/assets/omdb/4010/icon_electroniceye_4010.svg +++ b/collect-library/src/main/assets/omdb/4010/icon_electroniceye_4010.svg @@ -1,4 +1,103 @@ - + - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt index c389d360..ef2ae3d2 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt @@ -62,6 +62,7 @@ open class RenderEntity() : RealmObject(), Parcelable { var zoomMin: Int = 18 //显示最小级别 var zoomMax: Int = 23 //显示最大级别 var enable:Int = 0 // 默认0不是显示 1为渲染显示 2为常显 + var catch:Int = 0 // 0捕捉 1不捕捉 constructor(name: String) : this() { this.name = name diff --git a/vtm b/vtm index 1cb18353..e3d64243 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit 1cb18353849477da3a184f3ce48022760e0e4aea +Subproject commit e3d642433915b478a9f51e4ae7d2414ed24acfaa From 8a1d36b117e98f1a55b0a06de5aab8e145c4eae2 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Fri, 1 Sep 2023 10:34:58 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E4=BA=BA=E8=A1=8C?= =?UTF-8?q?=E9=81=93=E5=AF=B9=E8=B1=A1=E9=9D=A2=E7=BA=B9=E7=90=86=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../personalcenter/PersonalCenterFragment.kt | 2 +- .../src/main/assets/editormarker.xml | 23 +++++++--- .../src/main/assets/omdb/arrowDirection/0.svg | 19 +++++++++ .../src/main/assets/omdb/arrowDirection/1.svg | 24 +++++++++++ .../main/assets/omdb/arrowDirection/10.svg | 21 +++++++++ .../main/assets/omdb/arrowDirection/1025.svg | 19 +++++++++ .../main/assets/omdb/arrowDirection/1026.svg | 19 +++++++++ .../main/assets/omdb/arrowDirection/1027.svg | 20 +++++++++ .../main/assets/omdb/arrowDirection/1028.svg | 19 +++++++++ .../main/assets/omdb/arrowDirection/1029.svg | 20 +++++++++ .../main/assets/omdb/arrowDirection/1032.svg | 19 +++++++++ .../main/assets/omdb/arrowDirection/11.svg | 35 +++++++++++++++ .../main/assets/omdb/arrowDirection/12.svg | 19 +++++++++ .../main/assets/omdb/arrowDirection/128.svg | 16 +++++++ .../main/assets/omdb/arrowDirection/13.svg | 33 +++++++++++++++ .../main/assets/omdb/arrowDirection/14.svg | 22 ++++++++++ .../main/assets/omdb/arrowDirection/1536.svg | 19 +++++++++ .../main/assets/omdb/arrowDirection/16.svg | 18 ++++++++ .../main/assets/omdb/arrowDirection/17.svg | 21 +++++++++ .../src/main/assets/omdb/arrowDirection/2.svg | 16 +++++++ .../main/assets/omdb/arrowDirection/2048.svg | 23 ++++++++++ .../main/assets/omdb/arrowDirection/256.svg | 16 +++++++ .../src/main/assets/omdb/arrowDirection/3.svg | 32 ++++++++++++++ .../main/assets/omdb/arrowDirection/32.svg | 18 ++++++++ .../src/main/assets/omdb/arrowDirection/4.svg | 16 +++++++ .../main/assets/omdb/arrowDirection/4096.svg | 18 ++++++++ .../src/main/assets/omdb/arrowDirection/5.svg | 18 ++++++++ .../main/assets/omdb/arrowDirection/513.svg | 17 ++++++++ .../main/assets/omdb/arrowDirection/514.svg | 17 ++++++++ .../main/assets/omdb/arrowDirection/515.svg | 17 ++++++++ .../main/assets/omdb/arrowDirection/516.svg | 17 ++++++++ .../main/assets/omdb/arrowDirection/517.svg | 17 ++++++++ .../main/assets/omdb/arrowDirection/520.svg | 19 +++++++++ .../src/main/assets/omdb/arrowDirection/6.svg | 19 +++++++++ .../main/assets/omdb/arrowDirection/64.svg | 15 +++++++ .../main/assets/omdb/arrowDirection/65.svg | 22 ++++++++++ .../main/assets/omdb/arrowDirection/66.svg | 18 ++++++++ .../main/assets/omdb/arrowDirection/69.svg | 19 +++++++++ .../src/main/assets/omdb/arrowDirection/7.svg | 40 ++++++++++++++++++ .../src/main/assets/omdb/arrowDirection/8.svg | 22 ++++++++++ .../src/main/assets/omdb/arrowDirection/9.svg | 25 +++++++++++ .../main/assets/omdb/arrowDirection/test.png | Bin 0 -> 396 bytes .../main/assets/omdb/arrowDirection/test.svg | 15 +++++++ .../assets/omdb/arrowDirection/test_sdf.png | Bin 0 -> 194 bytes .../assets/omdb/object_crosswalk_3014.svg | 1 + .../main/assets/omdb/object_symbol_3003_1.svg | 1 + .../main/assets/omdb/object_symbol_3003_2.svg | 1 + .../main/assets/omdb/object_symbol_3003_3.svg | 1 + .../main/assets/omdb/object_symbol_3003_4.svg | 1 + .../main/assets/omdb/object_symbol_3003_9.svg | 1 + .../main/assets/omdb/tex_fill_area_3014_0.svg | 7 --- .../main/assets/omdb/tex_fill_area_3014_1.png | Bin 1491 -> 0 bytes .../main/assets/omdb/tex_fill_area_3014_2.png | Bin 3770 -> 0 bytes .../main/assets/omdb/tex_fill_area_3014_3.png | Bin 11162 -> 0 bytes .../main/assets/omdb/tex_fill_area_3014_4.svg | 10 ----- vtm | 2 +- 56 files changed, 844 insertions(+), 25 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/0.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/1.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/10.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/1025.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/1026.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/1027.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/1028.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/1029.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/1032.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/11.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/12.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/128.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/13.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/14.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/1536.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/16.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/17.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/2.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/2048.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/256.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/3.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/32.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/4.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/4096.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/5.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/513.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/514.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/515.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/516.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/517.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/520.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/6.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/64.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/65.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/66.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/69.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/7.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/8.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/9.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/test.png create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/test.svg create mode 100644 collect-library/src/main/assets/omdb/arrowDirection/test_sdf.png create mode 100644 collect-library/src/main/assets/omdb/object_crosswalk_3014.svg create mode 100644 collect-library/src/main/assets/omdb/object_symbol_3003_1.svg create mode 100644 collect-library/src/main/assets/omdb/object_symbol_3003_2.svg create mode 100644 collect-library/src/main/assets/omdb/object_symbol_3003_3.svg create mode 100644 collect-library/src/main/assets/omdb/object_symbol_3003_4.svg create mode 100644 collect-library/src/main/assets/omdb/object_symbol_3003_9.svg delete mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg delete mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png delete mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png delete mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png delete mode 100644 collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt index 9539a3f1..67cc5b2a 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt @@ -129,7 +129,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit? // 定位到指定位置 niMapController.mMapView.vtmMap.animator() // .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708 )) - .animateTo(GeoPoint( 40.480633792652746, 115.99816629572948 )) + .animateTo(GeoPoint( 40.503796123773355,115.81649866261817)) } R.id.personal_center_menu_open_all_layer -> { MapParamUtils.setDataLayerEnum(DataLayerEnum.SHOW_ALL_LAYERS) diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 45f4d66f..585d2a59 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2326,22 +2326,33 @@ - - - - + - + + + + + + + + + + + + + + + - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/0.svg b/collect-library/src/main/assets/omdb/arrowDirection/0.svg new file mode 100644 index 00000000..57398717 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/0.svg @@ -0,0 +1,19 @@ + + + + 18 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1.svg b/collect-library/src/main/assets/omdb/arrowDirection/1.svg new file mode 100644 index 00000000..a64f8cc5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1.svg @@ -0,0 +1,24 @@ + + + + 1 + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/10.svg b/collect-library/src/main/assets/omdb/arrowDirection/10.svg new file mode 100644 index 00000000..91dc2866 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/10.svg @@ -0,0 +1,21 @@ + + + + 16 + Created with Sketch. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1025.svg b/collect-library/src/main/assets/omdb/arrowDirection/1025.svg new file mode 100644 index 00000000..f5d83583 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1025.svg @@ -0,0 +1,19 @@ + + + + 7 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1026.svg b/collect-library/src/main/assets/omdb/arrowDirection/1026.svg new file mode 100644 index 00000000..47afaa40 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1026.svg @@ -0,0 +1,19 @@ + + + + 4 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1027.svg b/collect-library/src/main/assets/omdb/arrowDirection/1027.svg new file mode 100644 index 00000000..0332107e --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1027.svg @@ -0,0 +1,20 @@ + + + + 5 + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1028.svg b/collect-library/src/main/assets/omdb/arrowDirection/1028.svg new file mode 100644 index 00000000..f950ad4a --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1028.svg @@ -0,0 +1,19 @@ + + + + 2 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1029.svg b/collect-library/src/main/assets/omdb/arrowDirection/1029.svg new file mode 100644 index 00000000..ca19abf8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1029.svg @@ -0,0 +1,20 @@ + + + + 15 + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1032.svg b/collect-library/src/main/assets/omdb/arrowDirection/1032.svg new file mode 100644 index 00000000..71fcf524 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1032.svg @@ -0,0 +1,19 @@ + + + + 13 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/11.svg b/collect-library/src/main/assets/omdb/arrowDirection/11.svg new file mode 100644 index 00000000..8a4a8574 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/11.svg @@ -0,0 +1,35 @@ + + + + 13 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/12.svg b/collect-library/src/main/assets/omdb/arrowDirection/12.svg new file mode 100644 index 00000000..10970bb4 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/12.svg @@ -0,0 +1,19 @@ + + + + 8 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/128.svg b/collect-library/src/main/assets/omdb/arrowDirection/128.svg new file mode 100644 index 00000000..eca7e002 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/128.svg @@ -0,0 +1,16 @@ + + + + 右前拉链式通行复制 2 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/13.svg b/collect-library/src/main/assets/omdb/arrowDirection/13.svg new file mode 100644 index 00000000..2248f986 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/13.svg @@ -0,0 +1,33 @@ + + + + 14 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/14.svg b/collect-library/src/main/assets/omdb/arrowDirection/14.svg new file mode 100644 index 00000000..89ccbf42 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/14.svg @@ -0,0 +1,22 @@ + + + + 15 + Created with Sketch. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1536.svg b/collect-library/src/main/assets/omdb/arrowDirection/1536.svg new file mode 100644 index 00000000..da36d14d --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/1536.svg @@ -0,0 +1,19 @@ + + + + 8 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/16.svg b/collect-library/src/main/assets/omdb/arrowDirection/16.svg new file mode 100644 index 00000000..dc9de12a --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/16.svg @@ -0,0 +1,18 @@ + + + + 10 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/17.svg b/collect-library/src/main/assets/omdb/arrowDirection/17.svg new file mode 100644 index 00000000..8efc962d --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/17.svg @@ -0,0 +1,21 @@ + + + + 17 + Created with Sketch. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/2.svg b/collect-library/src/main/assets/omdb/arrowDirection/2.svg new file mode 100644 index 00000000..dbe6d314 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/2.svg @@ -0,0 +1,16 @@ + + + + 3 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/2048.svg b/collect-library/src/main/assets/omdb/arrowDirection/2048.svg new file mode 100644 index 00000000..4c36bca5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/2048.svg @@ -0,0 +1,23 @@ + + + + 10 + Created with Sketch. + + + + + + + + + + + + X + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/256.svg b/collect-library/src/main/assets/omdb/arrowDirection/256.svg new file mode 100644 index 00000000..34dd6dec --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/256.svg @@ -0,0 +1,16 @@ + + + + 左前拉链式通行复制 2 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/3.svg b/collect-library/src/main/assets/omdb/arrowDirection/3.svg new file mode 100644 index 00000000..8b467a60 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/3.svg @@ -0,0 +1,32 @@ + + + + 5 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/32.svg b/collect-library/src/main/assets/omdb/arrowDirection/32.svg new file mode 100644 index 00000000..e161f55e --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/32.svg @@ -0,0 +1,18 @@ + + + + 11 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/4.svg b/collect-library/src/main/assets/omdb/arrowDirection/4.svg new file mode 100644 index 00000000..38eec524 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/4.svg @@ -0,0 +1,16 @@ + + + + 4 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/4096.svg b/collect-library/src/main/assets/omdb/arrowDirection/4096.svg new file mode 100644 index 00000000..4fea3c82 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/4096.svg @@ -0,0 +1,18 @@ + + + + 11 + Created with Sketch. + + + + + + X + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/5.svg b/collect-library/src/main/assets/omdb/arrowDirection/5.svg new file mode 100644 index 00000000..39dea835 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/5.svg @@ -0,0 +1,18 @@ + + + + 2 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/513.svg b/collect-library/src/main/assets/omdb/arrowDirection/513.svg new file mode 100644 index 00000000..e807a30a --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/513.svg @@ -0,0 +1,17 @@ + + + + 6 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/514.svg b/collect-library/src/main/assets/omdb/arrowDirection/514.svg new file mode 100644 index 00000000..b8009126 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/514.svg @@ -0,0 +1,17 @@ + + + + 3 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/515.svg b/collect-library/src/main/assets/omdb/arrowDirection/515.svg new file mode 100644 index 00000000..b6a8529e --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/515.svg @@ -0,0 +1,17 @@ + + + + 9 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/516.svg b/collect-library/src/main/assets/omdb/arrowDirection/516.svg new file mode 100644 index 00000000..47e7e825 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/516.svg @@ -0,0 +1,17 @@ + + + + 编组 44 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/517.svg b/collect-library/src/main/assets/omdb/arrowDirection/517.svg new file mode 100644 index 00000000..3c06e6cd --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/517.svg @@ -0,0 +1,17 @@ + + + + 14 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/520.svg b/collect-library/src/main/assets/omdb/arrowDirection/520.svg new file mode 100644 index 00000000..dc201de2 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/520.svg @@ -0,0 +1,19 @@ + + + + 12 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/6.svg b/collect-library/src/main/assets/omdb/arrowDirection/6.svg new file mode 100644 index 00000000..def8cadc --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/6.svg @@ -0,0 +1,19 @@ + + + + 9 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/64.svg b/collect-library/src/main/assets/omdb/arrowDirection/64.svg new file mode 100644 index 00000000..8d57f946 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/64.svg @@ -0,0 +1,15 @@ + + + + 提示右后方掉头复制 2 + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/65.svg b/collect-library/src/main/assets/omdb/arrowDirection/65.svg new file mode 100644 index 00000000..7f38e819 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/65.svg @@ -0,0 +1,22 @@ + + + + 提示前方可自行或右后方掉头复制 2 + Created with Sketch. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/66.svg b/collect-library/src/main/assets/omdb/arrowDirection/66.svg new file mode 100644 index 00000000..9a53634b --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/66.svg @@ -0,0 +1,18 @@ + + + + 右右后方掉 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/69.svg b/collect-library/src/main/assets/omdb/arrowDirection/69.svg new file mode 100644 index 00000000..f9a9763e --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/69.svg @@ -0,0 +1,19 @@ + + + + 左直右后方掉 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/7.svg b/collect-library/src/main/assets/omdb/arrowDirection/7.svg new file mode 100644 index 00000000..1d013d5d --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/7.svg @@ -0,0 +1,40 @@ + + + + 12 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/8.svg b/collect-library/src/main/assets/omdb/arrowDirection/8.svg new file mode 100644 index 00000000..a664f773 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/8.svg @@ -0,0 +1,22 @@ + + + + 6 + Created with Sketch. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/9.svg b/collect-library/src/main/assets/omdb/arrowDirection/9.svg new file mode 100644 index 00000000..b11309f3 --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/9.svg @@ -0,0 +1,25 @@ + + + + 7 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/test.png b/collect-library/src/main/assets/omdb/arrowDirection/test.png new file mode 100644 index 0000000000000000000000000000000000000000..08bcef0c379200374c9184f6cdac9e7317631e0f GIT binary patch literal 396 zcmV;70dxL|P)G zS(du4>qSu%48t&B(lpHh-cb}q5lz!{+qUgEj-%r^PMW4^*L9tuD5|0;avaAo3d1lw z9*-}O9y~umfO($hp*aY;ID!w9hVH+D<2asYv)LU4AkXu>X_|;-S>|^z%d%{_Tt2WY z%OclxUBfWUYv3>puk-o*9 + + + Fill 20 + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/arrowDirection/test_sdf.png b/collect-library/src/main/assets/omdb/arrowDirection/test_sdf.png new file mode 100644 index 0000000000000000000000000000000000000000..1f2b93a36a44109af2c99959799d69078f80930d GIT binary patch literal 194 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzCQlc~kP5~(QgxSrylN2d=s`!m z!v;Le2Sq3Tub*iv \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/object_symbol_3003_1.svg b/collect-library/src/main/assets/omdb/object_symbol_3003_1.svg new file mode 100644 index 00000000..09d6f4ff --- /dev/null +++ b/collect-library/src/main/assets/omdb/object_symbol_3003_1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/object_symbol_3003_2.svg b/collect-library/src/main/assets/omdb/object_symbol_3003_2.svg new file mode 100644 index 00000000..fcec6795 --- /dev/null +++ b/collect-library/src/main/assets/omdb/object_symbol_3003_2.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/object_symbol_3003_3.svg b/collect-library/src/main/assets/omdb/object_symbol_3003_3.svg new file mode 100644 index 00000000..3a947ce3 --- /dev/null +++ b/collect-library/src/main/assets/omdb/object_symbol_3003_3.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/object_symbol_3003_4.svg b/collect-library/src/main/assets/omdb/object_symbol_3003_4.svg new file mode 100644 index 00000000..cb7f35c8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/object_symbol_3003_4.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/object_symbol_3003_9.svg b/collect-library/src/main/assets/omdb/object_symbol_3003_9.svg new file mode 100644 index 00000000..0ff7e21d --- /dev/null +++ b/collect-library/src/main/assets/omdb/object_symbol_3003_9.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg b/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg deleted file mode 100644 index 3955f1c3..00000000 --- a/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png deleted file mode 100644 index 6d0cf474c45a2acbaaaf1e116b84523288dc8e29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1491 zcma)+e>Br;9LK-I+K_FfYe`+j%|el*x-5~Cje&ePO;YL;oVQW0{|<}P#po*di|^37p?&S ztaE*Wx)Ps70RTA0$J6~RDOCCi`z$2L6f)1j1?t5)v>u{bJRlX8a;q$B!+R=l+&c&! z%(IODeEXZstjdH12c8XXe>LM=>~7tpiH^H{**EJl{d^0pdRmY0w*AG(jAeAXz`2&jqPb+bl)q~S& zNjhuz6fiNVu^UaBat!TMSm>oLQLS_kC{1>Zd3oPRr4R#!<+=h%--Kq;phZ*N8>DlP z$P~PEb1KFVG!k^Qlfgz%RymI2nI^8fMd&EdflHueH)sb}e}gy($_H&rwTTW-!+n1l zXVAeuW(j=WK=WaT-!%FH8U2TF6f9jd*7A4Z4d;+ZtP z1o;%EJfv5me1Lw$mP9MZm3^~f1ylt;4GtHxhSCD9&2uB#-3OPG=jw_ zTrVNVpdG!5b&MBvsd?O5aVqrd;i95{W*e&eTGchh94ong%P0}uejIh7dX?(NqEkhfq%4!O6>NpPbR6;z+=DtnG`bIQRqQK-L~7`2V>9gnP+eu z&+~`4jerRXFy5%)6M)@N@720P2nyjPZ2Mfz0%Uiei*cE3$a{0wU5d&3?C@?(tlCcm3Bk!moT49R zH&S}8sCxOO!_BoH>Y2gTH6%ieeP1t8@&|EDKKC!STrlkBwe1I-T0mtswQFfwH9`tnRmC*obq`0-@|a*n_);3H$Sqs!n%S!H zvQuUchFt&rnV+~88QI1{6Hs#U7jN-57U?jSm>svz`cb)vpm;L`DUXk&cNe%xCKE%{ zL$YzF=*5Ls$6BY`nk@%}j5D{o#m4k@9j<6rj*fa(AULc7CMVuMrrD--nNy0u;qH4y zRHGJfQR&S6Ock7(KsF4I&^eg2QFQomoboL?sv_4sYlg)3wRtMJpGmMmy)&nj>4irq z`3sPWD&gQBT~UE%lxwudPu3=D?1%N>{RPgtEDhHOXCxt1DFD^SA_Xc>Pm(db)F}c>O_M@R^1& zZ`|PEKtHqIep`#$#`@FF1n1bju|e%8(a0g$mSij3vZ0wRBilG5c+kG`Zd3FwTC4XnJkJX!kzG-Lr~&mVokH6Q># zSjhO_+U>$o)46Fa(0j-&(q(OiyCf{L_JRT5LHiXUc<{jtCZKsG@^_Uv^#~0~^kW~@ zX4W(1r1XwObqQV7{3J9-m0tG!_KMff2>!RH+5N-IXJZBk>M*H8I);XIiq!f*Zu DQSq@K diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png deleted file mode 100644 index d21b45d8a52bfe8a62b29ef50cc09987c6337ffc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3770 zcmeHK`&ZK07S~FxOwG9yDdr>W_OOyhLkmoYL>z0%9)n&{BXd;p{Yp&{j8f4uyVE3* zN)$B}KCtwrhKiM81->d3F~G-wCMuyr%vV8%`ZMnGmvi=7=d91(XMgtD=X{Ee9rd?Z z3tnqvWMmQW6Y7MKk+H~N=dCt1jMW7Xiw%=;+6n)IMz!6WJ{cKVrU#&qzhs@7sSJFb z5VfIj@D{9Z-GcjLBy7#4ts5rocaTvRkKt2~Z@-259W~ZYgS)N&j_gEs>b>x<>x?%R z$d%*Y^>4XiYEkS)UUJ&ErlMNt=+9vc)@y*aiEyP@v){=jQ>i&H5#lqDeOsq%wjFF? zO%+j^+#$2Ylu)*=-dwBnbRLUEX}uxzHv&@Fi0C8~gP}T)U05j{e(t%bpk%=yZRIq* zsfHGNcAj6xWVL~m# z)jd>Vbx>s zCZD$gcBv%&FX9(mS=LE?xc7$;VvlJ8rWItJS?8#JRt0^pKN0Qf8$o5WvOORUvD#$E zZh?O9Y-wURMp{Hs-YE|wsmeEV&4=?-1{MDm5dMfu%f>B24`-2=7JqVZ2=?kGeqdJl z&}jTfg}9Y9C81ChBbtA>e@s(qaGN)VV4;j1NY1B?y%0>}f+@)lV zZCi_u>gOGx&&{=MfTBBe)13#NE!+@jU-VTawwtr2o>Q`Fff_E2<{1AC4I>;=fFx-| z{^WW@Yb!(BX&jxFcya06{EQ zA%5P2*HlQmJLd)q&H{7q=8pW%$sQsNrFOp~QIW$5D`W1t&sQc1&h(Xr=lBrN$+~8mj4{cKd}=t} zO*Wdpf`0!vFnP14-pubNdz%ZWuB2F|U_=48a1}|5?`<6I>tSE|e&`8i+P`dS4LQ3i z>rQU^I*13?DU1|hVy-zIx|C&g<$S>dHxHMl*9Lp7PH$K!U_j{K>4h_!vEg~c3-%%Ko9harV)ku;toDzuNpw| z$vPkD4*K?m@dL@t3BT+)t-s~u?ipT)F1^74E+VGY{NP9iCP7sXR`Vvjf(5+tW`NQ4k5u_qpcd-`U;MDJr8Wv*ZMZwrfK!i`0|&}e)R_&M)x0ym5) z?v7X6%QIoD>#pg&^h*i4BbFj{_0iUM$Q+mEaScs6ex*C@)w-d6e9y_}=QMEqU? zvFm>`86@53TmNo#5LNNP940#XrlzS!Tbq}D_3);KiM&R6kl76Q&;*Bv%<(2FGaCV! z&~<0eweXU%8kH^1yzAi8$r1~ijadD&isKRafYf#KVp&(6 znV*69B-nccBXJF0IFiY@4R5CFkaN3vO&^)k1zjD?j2ewKtdx{RRrie%hOLUgyF(*O z$|kD%u10*6RPSBU(hJ^A5o*cF21aVp{P})-2oJowyHR)TVc!$jfPrVQp#YXamvg#Y zQp-1LxuGog)Bm^U#0tHLMt$TZ*2k)Y-R9|-V9AdgG5wL&st>D@fO#4)yhhTQ&&_8o zB%uf+FE&b^G5|3zPSMX1D7OrS$3_qvx2C>ShhV<`q3vexxax?}#Byv)oS2op2SQhf z^mWQm>y*RMu6l{MinU~8eLHdKw4A!LJ#iipkU@P*!|mbn8MzRM!^D^Ww9d%{1fsg% z^L0MvToS6~gEoU5Ex#|<?@>tW1CNb_emqhr3Nu-6ySFhReSI>`5%m~+`#|< diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png deleted file mode 100644 index dcad73bcb0233306b76b1c181776ad68b2f6968f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11162 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 diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg b/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg deleted file mode 100644 index a1e0761d..00000000 --- a/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/vtm b/vtm index c5070ba7..62d08f68 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit c5070ba78b73d69af40d33396ad8255f82535dc4 +Subproject commit 62d08f68217ef9751e9cc9967aa74ed192ec22c5 From a7f9422d9d927044f67d651d6aea7301bcf67879 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Fri, 1 Sep 2023 13:32:27 +0800 Subject: [PATCH 5/7] merge code --- .../java/com/navinfo/omqs/db/ImportOMDBHelper.kt | 12 ++++++------ .../java/com/navinfo/omqs/db/RealmOperateHelper.kt | 2 +- .../collect/library/data/entity/RenderEntity.kt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt index 415baa8d..38750fa4 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -230,12 +230,6 @@ class ImportOMDBHelper @AssistedInject constructor( renderEntity.properties["name"] = renderEntity.name; } - if(currentConfig.catch){ - renderEntity.catch=0 - }else{ - renderEntity.catch=1 - } - //遍历判断只显示与任务Link相关的任务数据 if(currentConfig.checkLinkId){ @@ -314,6 +308,12 @@ class ImportOMDBHelper @AssistedInject constructor( // 对renderEntity做预处理后再保存 val resultEntity = importConfig.transformProperties(renderEntity) + if(currentConfig.catch){ + renderEntity.catchEnable=0 + }else{ + renderEntity.catchEnable=1 + } + //对code编码需要特殊处理 存在多个属性值时,渲染优先级:SA>PA,存在多个属性值时,渲染优先级:FRONTAGE>MAIN_SIDE_A CCESS if(renderEntity.code == DataCodeEnum.OMDB_LINK_ATTRIBUTE.code){ diff --git a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt index 1eb1a9b4..4315475d 100644 --- a/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt @@ -274,7 +274,7 @@ class RealmOperateHelper() { }else{ // 查询realm中对应tile号的数据 realmList = getRealmTools(RenderEntity::class.java, false) - .equalTo("catch", "0") + .lessThan("catchEnable", 1) .greaterThanOrEqualTo("tileX", xStart) .lessThanOrEqualTo("tileX", xEnd) .greaterThanOrEqualTo("tileY", yStart) diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt index ef2ae3d2..fc4644a3 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt @@ -62,7 +62,7 @@ open class RenderEntity() : RealmObject(), Parcelable { var zoomMin: Int = 18 //显示最小级别 var zoomMax: Int = 23 //显示最大级别 var enable:Int = 0 // 默认0不是显示 1为渲染显示 2为常显 - var catch:Int = 0 // 0捕捉 1不捕捉 + var catchEnable:Int = 0 // 0捕捉 1不捕捉 constructor(name: String) : this() { this.name = name From af294bbf509c8d149144a405d05b2e90e9a05f78 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Fri, 1 Sep 2023 14:24:22 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=9D=86=E7=8A=B6?= =?UTF-8?q?=E7=89=A9=E6=B8=B2=E6=9F=93=E4=B8=BA=E5=9B=BE=E6=A0=87=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 19 ++++++- .../com/navinfo/omqs/db/ImportPreProcess.kt | 50 +++++++++++-------- .../personalcenter/PersonalCenterFragment.kt | 2 +- .../src/main/assets/editormarker.xml | 22 +++++--- .../src/main/assets/omdb/icon_pole_3006.svg | 1 + 5 files changed, 64 insertions(+), 30 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/icon_pole_3006.svg diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index bd7dcec7..03e519c8 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -173,7 +173,7 @@ "name": "文字", "zoomMin": 15, "zoomMax": 20, - "transformer2Code": "" + "transformer": [] }, "3003":{ "table": "OMDB_OBJECT_SYMBOL", @@ -181,7 +181,22 @@ "name": "符号", "zoomMin": 15, "zoomMax": 20, - "transformer2Code": "" + "transformer": [] + }, + "3004":{ + "table": "OMDB_OBJECT_ARROW", + "code": 3004, + "name": "箭头", + "zoomMin": 15, + "zoomMax": 20, + "transformer": [ + { + "k": "geometry", + "v": "~", + "klib": "geometry", + "vlib": "obtainDynamicSrc('assets:omdb/arrowDirection/','.svg','arrowClass')" + } + ] }, "3005":{ "table": "OMDB_TRAFFIC_SIGN", 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 4be80621..b4160ae1 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -610,26 +610,28 @@ class ImportPreProcess { // 获取杆状物的高程数据 val geometry = renderEntity.wkt if (geometry != null) { - var minHeight = Double.MAX_VALUE - var maxHeight = Double.MIN_VALUE - for (coordinate in geometry.coordinates) { - if (coordinate.z < minHeight) { - minHeight = coordinate.z - } - if (coordinate.z > maxHeight) { - maxHeight = coordinate.z - } - } - for (coordinate in geometry.coordinates) { - if (coordinate.z == minHeight) { - coordinate.z = 0.0 - } - if (coordinate.z == maxHeight) { - coordinate.z = 40.0 - } - } - renderEntity.geometry = - WKTWriter(3).write(GeometryTools.createLineString(geometry.coordinates)) +// var minHeight = Double.MAX_VALUE +// var maxHeight = Double.MIN_VALUE +// for (coordinate in geometry.coordinates) { +// if (coordinate.z < minHeight) { +// minHeight = coordinate.z +// } +// if (coordinate.z > maxHeight) { +// maxHeight = coordinate.z +// } +// } +// for (coordinate in geometry.coordinates) { +// if (coordinate.z == minHeight) { +// coordinate.z = 0.0 +// } +// if (coordinate.z == maxHeight) { +// coordinate.z = 40.0 +// } +// } +// renderEntity.geometry = +// WKTWriter(3).write(GeometryTools.createLineString(geometry.coordinates)) + + renderEntity.geometry = GeometryTools.createGeometry(GeoPoint(geometry.coordinates[0].y, geometry.coordinates[0].x)).toString() } } @@ -741,4 +743,12 @@ class ImportPreProcess { Realm.getDefaultInstance().insert(dynamicSrcReference) } } + + /** + * 向当前renderEntity中添加动态属性 + * */ + fun obtainDynamicSrc(renderEntity: RenderEntity, prefix: String, suffix: String, codeName: String) { + val code = renderEntity.properties[codeName] + renderEntity.properties["src"] = "${prefix}${code}${suffix}" + } } \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt index 67cc5b2a..58c38c44 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt @@ -129,7 +129,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit? // 定位到指定位置 niMapController.mMapView.vtmMap.animator() // .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708 )) - .animateTo(GeoPoint( 40.503796123773355,115.81649866261817)) + .animateTo(GeoPoint( 40.50755634913162,115.80235967728436 )) } R.id.personal_center_menu_open_all_layer -> { MapParamUtils.setDataLayerEnum(DataLayerEnum.SHOW_ALL_LAYERS) diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 585d2a59..456b8dd4 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1948,16 +1948,19 @@ + - + + - - - - - - + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/icon_pole_3006.svg b/collect-library/src/main/assets/omdb/icon_pole_3006.svg new file mode 100644 index 00000000..9c70037f --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_pole_3006.svg @@ -0,0 +1 @@ + \ No newline at end of file From 1762b8d165bfaa9df837f4551c19f5714e46a5ae Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Fri, 1 Sep 2023 14:51:12 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=AE=AD=E5=A4=B4?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=B8=B2=E6=9F=93=E6=96=B9=E5=90=91=E5=8F=8A?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collect-library/src/main/assets/editormarker.xml | 2 +- collect-library/src/main/assets/omdb/arrowDirection/0.svg | 2 +- collect-library/src/main/assets/omdb/arrowDirection/1.svg | 2 +- collect-library/src/main/assets/omdb/arrowDirection/10.svg | 2 +- collect-library/src/main/assets/omdb/arrowDirection/11.svg | 6 +++--- collect-library/src/main/assets/omdb/arrowDirection/12.svg | 2 +- collect-library/src/main/assets/omdb/arrowDirection/13.svg | 6 +++--- collect-library/src/main/assets/omdb/arrowDirection/14.svg | 2 +- collect-library/src/main/assets/omdb/arrowDirection/16.svg | 2 +- collect-library/src/main/assets/omdb/arrowDirection/17.svg | 2 +- collect-library/src/main/assets/omdb/arrowDirection/2.svg | 2 +- collect-library/src/main/assets/omdb/arrowDirection/3.svg | 4 ++-- collect-library/src/main/assets/omdb/arrowDirection/4.svg | 2 +- collect-library/src/main/assets/omdb/arrowDirection/5.svg | 2 +- collect-library/src/main/assets/omdb/arrowDirection/6.svg | 2 +- collect-library/src/main/assets/omdb/arrowDirection/7.svg | 6 +++--- collect-library/src/main/assets/omdb/arrowDirection/8.svg | 2 +- collect-library/src/main/assets/omdb/arrowDirection/9.svg | 4 ++-- 18 files changed, 26 insertions(+), 26 deletions(-) diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 813a868a..f07dd1e2 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2357,7 +2357,7 @@ - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/0.svg b/collect-library/src/main/assets/omdb/arrowDirection/0.svg index 57398717..1fe1b76d 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/0.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/0.svg @@ -8,7 +8,7 @@ - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1.svg b/collect-library/src/main/assets/omdb/arrowDirection/1.svg index a64f8cc5..b6309773 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/1.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/1.svg @@ -15,7 +15,7 @@ - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/10.svg b/collect-library/src/main/assets/omdb/arrowDirection/10.svg index 91dc2866..997e5a2c 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/10.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/10.svg @@ -4,7 +4,7 @@ 16 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/11.svg b/collect-library/src/main/assets/omdb/arrowDirection/11.svg index 8a4a8574..776dec2f 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/11.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/11.svg @@ -16,16 +16,16 @@ - + - + - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/12.svg b/collect-library/src/main/assets/omdb/arrowDirection/12.svg index 10970bb4..2808334e 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/12.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/12.svg @@ -4,7 +4,7 @@ 8 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/13.svg b/collect-library/src/main/assets/omdb/arrowDirection/13.svg index 2248f986..2f52b5d9 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/13.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/13.svg @@ -16,15 +16,15 @@ - + - + - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/14.svg b/collect-library/src/main/assets/omdb/arrowDirection/14.svg index 89ccbf42..34714d8d 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/14.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/14.svg @@ -4,7 +4,7 @@ 15 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/16.svg b/collect-library/src/main/assets/omdb/arrowDirection/16.svg index dc9de12a..fa97503c 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/16.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/16.svg @@ -4,7 +4,7 @@ 10 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/17.svg b/collect-library/src/main/assets/omdb/arrowDirection/17.svg index 8efc962d..67721acd 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/17.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/17.svg @@ -4,7 +4,7 @@ 17 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/2.svg b/collect-library/src/main/assets/omdb/arrowDirection/2.svg index dbe6d314..51b45c35 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/2.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/2.svg @@ -4,7 +4,7 @@ 3 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/3.svg b/collect-library/src/main/assets/omdb/arrowDirection/3.svg index 8b467a60..70d151fa 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/3.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/3.svg @@ -16,14 +16,14 @@ - + - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/4.svg b/collect-library/src/main/assets/omdb/arrowDirection/4.svg index 38eec524..af5b7770 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/4.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/4.svg @@ -4,7 +4,7 @@ 4 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/5.svg b/collect-library/src/main/assets/omdb/arrowDirection/5.svg index 39dea835..69b2dc1d 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/5.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/5.svg @@ -4,7 +4,7 @@ 2 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/6.svg b/collect-library/src/main/assets/omdb/arrowDirection/6.svg index def8cadc..ee40261a 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/6.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/6.svg @@ -4,7 +4,7 @@ 9 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/7.svg b/collect-library/src/main/assets/omdb/arrowDirection/7.svg index 1d013d5d..3cb83ead 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/7.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/7.svg @@ -17,21 +17,21 @@ - + - + - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/8.svg b/collect-library/src/main/assets/omdb/arrowDirection/8.svg index a664f773..d9e21f19 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/8.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/8.svg @@ -14,7 +14,7 @@ - + diff --git a/collect-library/src/main/assets/omdb/arrowDirection/9.svg b/collect-library/src/main/assets/omdb/arrowDirection/9.svg index b11309f3..8e6c6b3b 100644 --- a/collect-library/src/main/assets/omdb/arrowDirection/9.svg +++ b/collect-library/src/main/assets/omdb/arrowDirection/9.svg @@ -10,13 +10,13 @@ - + - +