From aaa10c39af333d91beb12e858f495b06cb8d3fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 13 Feb 2020 16:46:11 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG=20=E8=A7=A3=E5=86=B3U?= =?UTF-8?q?I=E8=B5=B0=E6=9F=A5=E6=8F=90=E5=87=BA=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/marker/MapMarkerBaseView.java | 3 +- .../bg_shape_reverse_triangle_blue.xml | 2 + .../main/res/drawable/ic_reverse_triangle.xml | 9 ++ .../src/main/res/layout/view_map_marker.xml | 88 ++++++++++--------- .../main/res/layout/view_map_marker_info.xml | 57 ++++++------ 5 files changed, 93 insertions(+), 66 deletions(-) create mode 100644 modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java index d0d225b4fb..aaa63c8edb 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerBaseView.java @@ -5,6 +5,7 @@ import android.graphics.Bitmap; import android.text.TextUtils; import android.util.AttributeSet; import android.widget.ImageView; +import android.widget.LinearLayout; import androidx.annotation.Nullable; import androidx.constraintlayout.widget.ConstraintLayout; @@ -25,7 +26,7 @@ import com.mogo.utils.logger.Logger; * desc : 地图上抽离的Marker的共性 * version: 1.0 */ -public abstract class MapMarkerBaseView extends ConstraintLayout { +public abstract class MapMarkerBaseView extends LinearLayout { private String TAG = "MapMarkerBaseView"; protected Context mContext; diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml index b752a1633a..ae2ee542cc 100644 --- a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_blue.xml @@ -8,6 +8,8 @@ android:pivotY="15%" android:toDegrees="45" > + diff --git a/modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml b/modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml new file mode 100644 index 0000000000..bdb5fb7337 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/ic_reverse_triangle.xml @@ -0,0 +1,9 @@ + + + diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml index cc0f489a99..52a06b7549 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml @@ -1,12 +1,58 @@ - + + + + + + + + + + - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml index ae9abe9dfe..7aa4fa03d4 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml @@ -1,26 +1,19 @@ - - - - + app:layout_constraintTop_toBottomOf="@+id/clMarkerContent" > + - \ No newline at end of file + + + + \ No newline at end of file From 302bb2512d8afc3773344028f2c9e43bfd76b23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 13 Feb 2020 18:22:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG=20=E3=80=90=E6=96=B0?= =?UTF-8?q?=E9=B2=9C=E4=BA=8B=E3=80=91=E5=9C=B0=E5=9B=BEpoi=E7=82=B9?= =?UTF-8?q?=E7=BB=98=E5=88=B6=E4=B8=8E=E8=AE=BE=E8=AE=A1=E5=9B=BE=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=20http://jira.zhidaohulian.com/projects/UI/i?= =?UTF-8?q?ssues/UI-268=3Ffilter=3Dallopenissues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- .../common/entity/MarkerPoiTypeEnum.java | 10 +++++- .../service/marker/MapMarkerInfoView.java | 30 ++++++++++++++++-- .../service/marker/MapMarkerManager.java | 4 +-- .../module/service/marker/MapMarkerView.java | 26 ++++++++++++--- .../bg_map_marker_dark_green.png | Bin 0 -> 8464 bytes .../res/drawable-xhdpi/bg_map_marker_red.png | Bin 0 -> 8551 bytes .../res/drawable-xhdpi/icon_map_marker_4s.png | Bin 0 -> 2108 bytes .../icon_map_marker_pondingl.png | Bin 0 -> 2808 bytes .../icon_map_marker_road_block_up.png | Bin 2507 -> 2454 bytes .../icon_map_marker_road_check.png | Bin 2534 -> 2540 bytes .../icon_map_marker_road_work.png | Bin 0 -> 2457 bytes .../drawable-xhdpi/icon_map_marker_shop.png | Bin 0 -> 2809 bytes .../icon_map_marker_shop_discount.png | Bin 0 -> 3123 bytes .../bg_map_marker_dark_green_info.xml | 15 +++++++++ .../res/drawable/bg_map_marker_red_info.xml | 15 +++++++++ .../bg_shape_reverse_triangle_dark_green.xml | 15 +++++++++ .../bg_shape_reverse_triangle_red.xml | 15 +++++++++ 18 files changed, 121 insertions(+), 11 deletions(-) create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_green.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_red.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_4s.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_pondingl.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_work.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop.png create mode 100644 modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_shop_discount.png create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_green_info.xml create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_map_marker_red_info.xml create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_green.xml create mode 100644 modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_red.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 2dc54c489f..707ee6e613 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java index 5045d0d203..43e0a20977 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/MarkerPoiTypeEnum.java @@ -17,5 +17,13 @@ public interface MarkerPoiTypeEnum { //商场打折 public String SHOP_DISCOUNT = "10004"; //4S店 - public String FOURS_SHOP = "10005"; + public String FOURS_4S = "10005"; + //施工 + public String FOURS_ROAD_WORK = "10006"; + //拥堵 + public String FOURS_BLOCK_UP = "10007"; + //积水 + public String FOURS_PONDING = "10008"; + //超市打折 + public String FOURS_SHOP_FREE = "10009"; } \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java index d6237fd22b..1912d00ff5 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerInfoView.java @@ -122,10 +122,34 @@ public class MapMarkerInfoView extends MapMarkerBaseView { ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue); break; case MarkerPoiTypeEnum.SHOP_DISCOUNT: - + ivIcon.setImageResource(R.drawable.icon_map_marker_shop_discount); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_red_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_red); break; - case MarkerPoiTypeEnum.FOURS_SHOP: - + case MarkerPoiTypeEnum.FOURS_4S: + ivIcon.setImageResource(R.drawable.icon_map_marker_4s); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_blue_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue); + break; + case MarkerPoiTypeEnum.FOURS_ROAD_WORK: + ivIcon.setImageResource(R.drawable.icon_map_marker_road_work); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_blue_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_blue); + break; + case MarkerPoiTypeEnum.FOURS_BLOCK_UP: + ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue); + break; + case MarkerPoiTypeEnum.FOURS_PONDING: + ivIcon.setImageResource(R.drawable.icon_map_marker_pondingl); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue); + break; + case MarkerPoiTypeEnum.FOURS_SHOP_FREE: + ivIcon.setImageResource(R.drawable.icon_map_marker_shop); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_dark_green_info); + ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_dark_green); break; default: ivIcon.setImageResource(R.drawable.icon_map_marker_road_check); diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 3a9f2e0340..c3c47e28d5 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -167,7 +167,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag case MarkerPoiTypeEnum.SHOP_DISCOUNT: properties.put("type", 9); break; - case MarkerPoiTypeEnum.FOURS_SHOP: + case MarkerPoiTypeEnum.FOURS_4S: properties.put("type", 10); break; } @@ -404,7 +404,7 @@ public class MapMarkerManager implements IMogoMarkerClickListener, IMogoOnMessag case MarkerPoiTypeEnum.SHOP_DISCOUNT: num_shop_discount++; break; - case MarkerPoiTypeEnum.FOURS_SHOP: + case MarkerPoiTypeEnum.FOURS_4S: num_fours_shop++; break; } diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java index 6043598951..05719857d9 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java @@ -45,7 +45,7 @@ public class MapMarkerView extends MapMarkerBaseView { public MapMarkerView(Context context, MarkerShowEntity markerShowEntity, MogoMarkerOptions options) { super(context); - mOptions=options; + mOptions = options; updateView(markerShowEntity); } @@ -108,10 +108,28 @@ public class MapMarkerView extends MapMarkerBaseView { ivBg.setImageResource(R.drawable.bg_map_marker_dark_blue); break; case MarkerPoiTypeEnum.SHOP_DISCOUNT: - + ivIcon.setImageResource(R.drawable.icon_map_marker_shop_discount); + ivBg.setImageResource(R.drawable.bg_map_marker_red); break; - case MarkerPoiTypeEnum.FOURS_SHOP: - + case MarkerPoiTypeEnum.FOURS_4S: + ivIcon.setImageResource(R.drawable.icon_map_marker_4s); + ivBg.setImageResource(R.drawable.bg_map_marker_blue); + break; + case MarkerPoiTypeEnum.FOURS_ROAD_WORK: + ivIcon.setImageResource(R.drawable.icon_map_marker_road_work); + ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_blue); + break; + case MarkerPoiTypeEnum.FOURS_BLOCK_UP: + ivIcon.setImageResource(R.drawable.icon_map_marker_road_block_up); + ivBg.setBackgroundResource(R.drawable.bg_map_marker_blue); + break; + case MarkerPoiTypeEnum.FOURS_PONDING: + ivIcon.setImageResource(R.drawable.icon_map_marker_pondingl); + ivBg.setBackgroundResource(R.drawable.bg_map_marker_blue); + break; + case MarkerPoiTypeEnum.FOURS_SHOP_FREE: + ivIcon.setImageResource(R.drawable.icon_map_marker_shop); + ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_green); break; default: ivIcon.setImageResource(R.drawable.icon_map_marker_road_check); diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_green.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/bg_map_marker_dark_green.png new file mode 100644 index 0000000000000000000000000000000000000000..09788c99bf691e33a7cbacea89f01698166cec8c GIT binary patch literal 8464 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 %!I6bv1e_Hnv5)dhsj%2!746f~Xd# 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 KMNUMnLSTXn=z}!? literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png b/modules/mogo-module-service/src/main/res/drawable-xhdpi/icon_map_marker_road_block_up.png index cbe3fe5b660cb498fdaf8427f4fb6b6d76795150..29fd407dcac57611c18d8f8fbfd827d1ec91076a 100644 GIT binary patch delta 2430 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ⅆSKbq(JcX3 zS%Ey~lClDsI+qpzlcP6GcwK2{>ARb+qDPLsLdUVZYXXKdsZ!uKmXL6krI@Ny#P*EH z3gH#b`3zP%`nyNR>8e3IA3?nOSeuEh8RR40`qUIKc11xd zCWbaq+LKWRD}SZ4C8x5?Ly54L1W3kMsc^tLbd*73T4=}OsRu% zA8(rihI72}yHDe>e|6N2^rdCP+~?!r@WL5-JvU27bNIdGMa#_+AWHkp&+C0C zE?7w3oV0=j#&-qZqvOsz%{U7*Q_Rt9agiLaLL0J9=0oth)>J8*jkfUg&00$mIVVBPBAM22;e z{X-@bTJfJSl{^IC{9#}_-j#Ra34RZPF+)iWGhBe& z(`RT@MoZ~rgehQ&R`t~ae#G2mlKaenvR@2sH}AC#IBN2=UwQ(&cDDc!aMEhH3`s9X z)|I}l9*?ke^>_>Ve;8KwH(9$~3O?Pmt0eM(aep7LAr6>d0ODaJ+h6Wb5g}-xEVhz0@vHk?&|pvyoGNVH=Db zLZE0kTqZUv{a~Pc5qIGn_w;B~C)yA7@!Tk;D76)U-wa3F>vdFNcC`i%4Fvs*a7i;% zS%2R8TxL*QF_yu{z#tV;LAD`tB3Dlz^FQqbEc=p_bN{>vPj34p75<4puMDf($TUM^ zl1fS&9}9$n3m$S$uO;i+R*s%ftG3s1h1n#6D5S~WjY>^Pm2@?At-`*pGRyE`rN?DO z@V(v$QgNOySNk=Wtgm(oHi(rkOGWPl|9@cS9E81ft=MER;qg>YL%oqDd)IKC59{@` z>Wwc+g~j*=rHnf` z^4r)^a()QKI{|rx7+^5kVRX;(Y_-1h*s(Sxw#h+=Hp2Y9cTaH*fh5tISK>6D+bPae6a4!LL ze0x&(I^pvVcIKyuGJn~uRKrg+kn2)61KkXCGtkXIHv`=aT%;NJA7^%5P7r_7R{#J2 M07*qoM6N<$f}Ui%%>V!Z delta 2468 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� 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 N002ovPDHLkV1i?)=i&eW literal 0 HcmV?d00001 diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_green_info.xml b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_green_info.xml new file mode 100644 index 0000000000..2573e98bc5 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_dark_green_info.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_red_info.xml b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_red_info.xml new file mode 100644 index 0000000000..3a95793bae --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_map_marker_red_info.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_green.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_green.xml new file mode 100644 index 0000000000..d1dc477344 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_dark_green.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_red.xml b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_red.xml new file mode 100644 index 0000000000..3fd0165fc5 --- /dev/null +++ b/modules/mogo-module-service/src/main/res/drawable/bg_shape_reverse_triangle_red.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + From 7dd1ffb82c21e81c3d31c0e38e4c60b50f0f857f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 13 Feb 2020 18:25:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG=20=E3=80=90=E6=96=B0?= =?UTF-8?q?=E9=B2=9C=E4=BA=8B=E3=80=91=E5=9C=B0=E5=9B=BEpoi=E7=82=B9?= =?UTF-8?q?=E7=BB=98=E5=88=B6=E4=B8=8E=E8=AE=BE=E8=AE=A1=E5=9B=BE=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=20http://jira.zhidaohulian.com/projects/UI/i?= =?UTF-8?q?ssues/UI-268=3Ffilter=3Dallopenissues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/res/layout/view_map_marker_info.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml index 7aa4fa03d4..e5fa9b4e91 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker_info.xml @@ -36,6 +36,7 @@ android:layout_width="@dimen/dp_76" android:layout_height="@dimen/dp_76" android:layout_gravity="center" + android:layout_marginLeft="@dimen/dp_10" android:visibility="invisible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" From da6c0387dfe70443180d21378885d3ef2cffb2cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Thu, 13 Feb 2020 18:43:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3BUG=20=E3=80=90=E6=96=B0?= =?UTF-8?q?=E9=B2=9C=E4=BA=8B=E3=80=91=E5=9C=B0=E5=9B=BEpoi=E7=82=B9?= =?UTF-8?q?=E7=BB=98=E5=88=B6=E4=B8=8E=E8=AE=BE=E8=AE=A1=E5=9B=BE=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4=20http://jira.zhidaohulian.com/projects/UI/i?= =?UTF-8?q?ssues/UI-268=3Ffilter=3Dallopenissues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/service/marker/MapMarkerView.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java index 05719857d9..5a72bf418d 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerView.java @@ -90,7 +90,6 @@ public class MapMarkerView extends MapMarkerBaseView { ivUserHead.setVisibility(View.INVISIBLE); ivIcon.setVisibility(View.VISIBLE); - ivBg.setImageResource(R.drawable.bg_map_marker_green); ivCar.setImageResource(R.drawable.icon_map_marker_location_blue); if (bindObj instanceof MarkerNoveltyInfo) { @@ -132,8 +131,8 @@ public class MapMarkerView extends MapMarkerBaseView { ivBg.setBackgroundResource(R.drawable.bg_map_marker_dark_green); break; default: - ivIcon.setImageResource(R.drawable.icon_map_marker_road_check); - ivBg.setImageResource(R.drawable.bg_map_marker_green); +// ivIcon.setImageResource(R.drawable.icon_map_marker_road_check); +// ivBg.setImageResource(R.drawable.bg_map_marker_green); break; } }