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 00000000..08bcef0c Binary files /dev/null and b/collect-library/src/main/assets/omdb/arrowDirection/test.png differ diff --git a/collect-library/src/main/assets/omdb/arrowDirection/test.svg b/collect-library/src/main/assets/omdb/arrowDirection/test.svg new file mode 100644 index 00000000..ef91d67e --- /dev/null +++ b/collect-library/src/main/assets/omdb/arrowDirection/test.svg @@ -0,0 +1,15 @@ + + + + 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 00000000..1f2b93a3 Binary files /dev/null and b/collect-library/src/main/assets/omdb/arrowDirection/test_sdf.png differ diff --git a/collect-library/src/main/assets/omdb/object_crosswalk_3014.svg b/collect-library/src/main/assets/omdb/object_crosswalk_3014.svg new file mode 100644 index 00000000..d8aceae7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/object_crosswalk_3014.svg @@ -0,0 +1 @@ + \ 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 6d0cf474..00000000 Binary files a/collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png and /dev/null differ 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 d21b45d8..00000000 Binary files a/collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png and /dev/null differ 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 dcad73bc..00000000 Binary files a/collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png and /dev/null differ 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