diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt index 44c3049..2b417f2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt @@ -260,7 +260,7 @@ return infoWindow } } - "请不要点击多个位置点".show() + "无法查看聚合点,请放大比例后再查看".show() return null } @@ -285,7 +285,7 @@ } override fun onDestroy() { - mapView.onDestroy(); + mapView.onDestroy() super.onDestroy() } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt index 44c3049..2b417f2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt @@ -260,7 +260,7 @@ return infoWindow } } - "请不要点击多个位置点".show() + "无法查看聚合点,请放大比例后再查看".show() return null } @@ -285,7 +285,7 @@ } override fun onDestroy() { - mapView.onDestroy(); + mapView.onDestroy() super.onDestroy() } diff --git a/app/src/main/res/drawable/ic_3d.xml b/app/src/main/res/drawable/ic_3d.xml index 507445b..bb22b7f 100644 --- a/app/src/main/res/drawable/ic_3d.xml +++ b/app/src/main/res/drawable/ic_3d.xml @@ -4,15 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:pathData="M682.67,519.04l-61.87,41.17 -1.07,202.03 61.23,-41.17a220.8,220.8 0,0 0,68.27 -74.45A186.88,186.88 0,0 0,776.11 554.67q0.21,-99.41 -93.44,-35.63zM720.85,640a133.12,133.12 0,0 1,-42.67 46.72l-21.33,13.87v-131.41l21.33,-13.87a47.79,47.79 0,0 1,42.67 -11.31c10.67,4.05 16,16.21 16,36.27a128,128 0,0 1,-16 59.73zM378.67,663.25a133.12,133.12 0,0 0,-39.47 -35.63q46.08,13.65 44.8,-26.24a78.08,78.08 0,0 0,-21.33 -47.57A189.65,189.65 0,0 0,308.05 512a151.89,151.89 0,0 0,-56.32 -18.35v34.99a81.92,81.92 0,0 1,45.23 10.24c23.89,12.37 36.27,27.09 36.69,44.37s-14.72,19.63 -45.87,3.41l-19.2,-9.81v32.64l21.33,10.67a144.21,144.21 0,0 1,38.83 27.52,45.44 45.44,0 0,1 14.51,29.01c0,9.39 -3.41,14.72 -10.88,15.79a58.03,58.03 0,0 1,-31.15 -8.53,184.53 184.53,0 0,1 -54.83,-42.67l1.28,37.33a234.67,234.67 0,0 0,58.24 40.11,112.21 112.21,0 0,0 64,17.28c16,-2.56 23.47,-13.44 22.83,-32.85a71.47,71.47 0,0 0,-14.08 -39.89z" + android:fillColor="@color/white" /> - - + android:pathData="M853.33,278.61L544,100.48a64,64 0,0 0,-64 0L171.73,278.61a64,64 0,0 0,-32 55.25v356.27a64,64 0,0 0,32 55.25l308.27,178.13a64,64 0,0 0,64 0L853.33,745.39a64,64 0,0 0,32 -55.25v-356.27a64,64 0,0 0,-32 -55.25zM501.33,137.39a21.33,21.33 0,0 1,21.33 0l298.67,171.95L512,487.47 203.73,309.33zM193.07,708.48a21.33,21.33 0,0 1,-10.67 -18.35L182.4,346.24L490.67,524.37v356.05zM830.93,708.48L533.33,880.43L533.33,524.37l308.27,-178.13v343.89a21.33,21.33 0,0 1,-9.6 18.35z" + android:fillColor="@color/white" /> diff --git a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt index 44c3049..2b417f2 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/MapActivity.kt @@ -260,7 +260,7 @@ return infoWindow } } - "请不要点击多个位置点".show() + "无法查看聚合点,请放大比例后再查看".show() return null } @@ -285,7 +285,7 @@ } override fun onDestroy() { - mapView.onDestroy(); + mapView.onDestroy() super.onDestroy() } diff --git a/app/src/main/res/drawable/ic_3d.xml b/app/src/main/res/drawable/ic_3d.xml index 507445b..bb22b7f 100644 --- a/app/src/main/res/drawable/ic_3d.xml +++ b/app/src/main/res/drawable/ic_3d.xml @@ -4,15 +4,9 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:pathData="M682.67,519.04l-61.87,41.17 -1.07,202.03 61.23,-41.17a220.8,220.8 0,0 0,68.27 -74.45A186.88,186.88 0,0 0,776.11 554.67q0.21,-99.41 -93.44,-35.63zM720.85,640a133.12,133.12 0,0 1,-42.67 46.72l-21.33,13.87v-131.41l21.33,-13.87a47.79,47.79 0,0 1,42.67 -11.31c10.67,4.05 16,16.21 16,36.27a128,128 0,0 1,-16 59.73zM378.67,663.25a133.12,133.12 0,0 0,-39.47 -35.63q46.08,13.65 44.8,-26.24a78.08,78.08 0,0 0,-21.33 -47.57A189.65,189.65 0,0 0,308.05 512a151.89,151.89 0,0 0,-56.32 -18.35v34.99a81.92,81.92 0,0 1,45.23 10.24c23.89,12.37 36.27,27.09 36.69,44.37s-14.72,19.63 -45.87,3.41l-19.2,-9.81v32.64l21.33,10.67a144.21,144.21 0,0 1,38.83 27.52,45.44 45.44,0 0,1 14.51,29.01c0,9.39 -3.41,14.72 -10.88,15.79a58.03,58.03 0,0 1,-31.15 -8.53,184.53 184.53,0 0,1 -54.83,-42.67l1.28,37.33a234.67,234.67 0,0 0,58.24 40.11,112.21 112.21,0 0,0 64,17.28c16,-2.56 23.47,-13.44 22.83,-32.85a71.47,71.47 0,0 0,-14.08 -39.89z" + android:fillColor="@color/white" /> - - + android:pathData="M853.33,278.61L544,100.48a64,64 0,0 0,-64 0L171.73,278.61a64,64 0,0 0,-32 55.25v356.27a64,64 0,0 0,32 55.25l308.27,178.13a64,64 0,0 0,64 0L853.33,745.39a64,64 0,0 0,32 -55.25v-356.27a64,64 0,0 0,-32 -55.25zM501.33,137.39a21.33,21.33 0,0 1,21.33 0l298.67,171.95L512,487.47 203.73,309.33zM193.07,708.48a21.33,21.33 0,0 1,-10.67 -18.35L182.4,346.24L490.67,524.37v356.05zM830.93,708.48L533.33,880.43L533.33,524.37l308.27,-178.13v343.89a21.33,21.33 0,0 1,-9.6 18.35z" + android:fillColor="@color/white" /> diff --git a/app/src/main/res/layout/item_map_popup.xml b/app/src/main/res/layout/item_map_popup.xml index 76fa79a..727cf35 100644 --- a/app/src/main/res/layout/item_map_popup.xml +++ b/app/src/main/res/layout/item_map_popup.xml @@ -2,7 +2,7 @@ + android:pathData="M682.67,519.04l-61.87,41.17 -1.07,202.03 61.23,-41.17a220.8,220.8 0,0 0,68.27 -74.45A186.88,186.88 0,0 0,776.11 554.67q0.21,-99.41 -93.44,-35.63zM720.85,640a133.12,133.12 0,0 1,-42.67 46.72l-21.33,13.87v-131.41l21.33,-13.87a47.79,47.79 0,0 1,42.67 -11.31c10.67,4.05 16,16.21 16,36.27a128,128 0,0 1,-16 59.73zM378.67,663.25a133.12,133.12 0,0 0,-39.47 -35.63q46.08,13.65 44.8,-26.24a78.08,78.08 0,0 0,-21.33 -47.57A189.65,189.65 0,0 0,308.05 512a151.89,151.89 0,0 0,-56.32 -18.35v34.99a81.92,81.92 0,0 1,45.23 10.24c23.89,12.37 36.27,27.09 36.69,44.37s-14.72,19.63 -45.87,3.41l-19.2,-9.81v32.64l21.33,10.67a144.21,144.21 0,0 1,38.83 27.52,45.44 45.44,0 0,1 14.51,29.01c0,9.39 -3.41,14.72 -10.88,15.79a58.03,58.03 0,0 1,-31.15 -8.53,184.53 184.53,0 0,1 -54.83,-42.67l1.28,37.33a234.67,234.67 0,0 0,58.24 40.11,112.21 112.21,0 0,0 64,17.28c16,-2.56 23.47,-13.44 22.83,-32.85a71.47,71.47 0,0 0,-14.08 -39.89z" + android:fillColor="@color/white" /> - - + android:pathData="M853.33,278.61L544,100.48a64,64 0,0 0,-64 0L171.73,278.61a64,64 0,0 0,-32 55.25v356.27a64,64 0,0 0,32 55.25l308.27,178.13a64,64 0,0 0,64 0L853.33,745.39a64,64 0,0 0,32 -55.25v-356.27a64,64 0,0 0,-32 -55.25zM501.33,137.39a21.33,21.33 0,0 1,21.33 0l298.67,171.95L512,487.47 203.73,309.33zM193.07,708.48a21.33,21.33 0,0 1,-10.67 -18.35L182.4,346.24L490.67,524.37v356.05zM830.93,708.48L533.33,880.43L533.33,524.37l308.27,-178.13v343.89a21.33,21.33 0,0 1,-9.6 18.35z" + android:fillColor="@color/white" /> diff --git a/app/src/main/res/layout/item_map_popup.xml b/app/src/main/res/layout/item_map_popup.xml index 76fa79a..727cf35 100644 --- a/app/src/main/res/layout/item_map_popup.xml +++ b/app/src/main/res/layout/item_map_popup.xml @@ -2,7 +2,7 @@ + android:pathData="M682.67,519.04l-61.87,41.17 -1.07,202.03 61.23,-41.17a220.8,220.8 0,0 0,68.27 -74.45A186.88,186.88 0,0 0,776.11 554.67q0.21,-99.41 -93.44,-35.63zM720.85,640a133.12,133.12 0,0 1,-42.67 46.72l-21.33,13.87v-131.41l21.33,-13.87a47.79,47.79 0,0 1,42.67 -11.31c10.67,4.05 16,16.21 16,36.27a128,128 0,0 1,-16 59.73zM378.67,663.25a133.12,133.12 0,0 0,-39.47 -35.63q46.08,13.65 44.8,-26.24a78.08,78.08 0,0 0,-21.33 -47.57A189.65,189.65 0,0 0,308.05 512a151.89,151.89 0,0 0,-56.32 -18.35v34.99a81.92,81.92 0,0 1,45.23 10.24c23.89,12.37 36.27,27.09 36.69,44.37s-14.72,19.63 -45.87,3.41l-19.2,-9.81v32.64l21.33,10.67a144.21,144.21 0,0 1,38.83 27.52,45.44 45.44,0 0,1 14.51,29.01c0,9.39 -3.41,14.72 -10.88,15.79a58.03,58.03 0,0 1,-31.15 -8.53,184.53 184.53,0 0,1 -54.83,-42.67l1.28,37.33a234.67,234.67 0,0 0,58.24 40.11,112.21 112.21,0 0,0 64,17.28c16,-2.56 23.47,-13.44 22.83,-32.85a71.47,71.47 0,0 0,-14.08 -39.89z" + android:fillColor="@color/white" /> - - + android:pathData="M853.33,278.61L544,100.48a64,64 0,0 0,-64 0L171.73,278.61a64,64 0,0 0,-32 55.25v356.27a64,64 0,0 0,32 55.25l308.27,178.13a64,64 0,0 0,64 0L853.33,745.39a64,64 0,0 0,32 -55.25v-356.27a64,64 0,0 0,-32 -55.25zM501.33,137.39a21.33,21.33 0,0 1,21.33 0l298.67,171.95L512,487.47 203.73,309.33zM193.07,708.48a21.33,21.33 0,0 1,-10.67 -18.35L182.4,346.24L490.67,524.37v356.05zM830.93,708.48L533.33,880.43L533.33,524.37l308.27,-178.13v343.89a21.33,21.33 0,0 1,-9.6 18.35z" + android:fillColor="@color/white" /> diff --git a/app/src/main/res/layout/item_map_popup.xml b/app/src/main/res/layout/item_map_popup.xml index 76fa79a..727cf35 100644 --- a/app/src/main/res/layout/item_map_popup.xml +++ b/app/src/main/res/layout/item_map_popup.xml @@ -2,7 +2,7 @@