From eef77eaf04e23fba8d534514d371cd62ac112edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 14 Jan 2020 19:09:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86Marker=20Info?= =?UTF-8?q?=E7=9A=84=E5=B1=95=E5=BC=80=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/marker/MapMarkerInfoView.java | 54 ++++++++++++------- .../main/res/layout/view_map_marker_info.xml | 8 +-- 2 files changed, 39 insertions(+), 23 deletions(-) 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 fc1dfb5c17..d3951cd95d 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 @@ -28,7 +28,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView { private String TAG = "MapMarkerInfoView"; private TextView tvMarkerContent; - private ConstraintLayout llMarkerContent; + private ConstraintLayout clMarkerContent; private ImageView ivReverseTriangle; public MapMarkerInfoView(Context context) { @@ -52,7 +52,7 @@ public class MapMarkerInfoView extends MapMarkerBaseView { LayoutInflater.from(context).inflate(R.layout.view_map_marker_info, this); ivUserHead = findViewById(R.id.ivUserHead); ivIcon = findViewById(R.id.ivIcon); - llMarkerContent = findViewById(R.id.llMarkerContent); + clMarkerContent = findViewById(R.id.clMarkerContent); ivReverseTriangle = findViewById(R.id.ivReverseTriangle); ivCar = findViewById(R.id.ivCar); tvMarkerContent = findViewById(R.id.tvMarkerContent); @@ -64,50 +64,66 @@ public class MapMarkerInfoView extends MapMarkerBaseView { Object bindObj = markerShowEntity.getBindObj(); switch (markerShowEntity.getMarkerType()) { - case ServiceConst - .CARD_TYPE_CARS_CHATTING: - ivIcon.setVisibility(View.GONE); - case ServiceConst - .CARD_TYPE_USER_DATA: + case ServiceConst.CARD_TYPE_CARS_CHATTING: + case ServiceConst.CARD_TYPE_USER_DATA: + ivUserHead.setVisibility(View.VISIBLE); ivIcon.setVisibility(View.GONE); if (bindObj instanceof MarkerOnlineCar) { if (((MarkerOnlineCar) bindObj).getUserInfo().getGenderValue() == 0) { - llMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_blue_info); ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_blue); } else { - llMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_purple_info); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_purple_info); ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_purple); } } loadImageWithMarker(markerShowEntity); + ivCar.setImageResource(R.drawable.icon_map_marker_car_blue); + ivCar.setRotation((float) markerShowEntity.getMarkerLocation().getAngle()); break; - case ServiceConst - .CARD_TYPE_ROAD_CONDITION: + case ServiceConst.CARD_TYPE_ROAD_CONDITION: + ivUserHead.setVisibility(View.GONE); + ivIcon.setVisibility(View.VISIBLE); + + ivUserHead.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); + ivCar.setImageResource(R.drawable.icon_map_marker_location_blue); break; - case ServiceConst - .CARD_TYPE_SHARE_MUSIC: + case ServiceConst.CARD_TYPE_NOVELTY: + ivUserHead.setVisibility(View.GONE); + ivIcon.setVisibility(View.VISIBLE); + + 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); + ivCar.setImageResource(R.drawable.icon_map_marker_location_blue); + break; + case ServiceConst.CARD_TYPE_SHARE_MUSIC: + ivUserHead.setVisibility(View.GONE); + ivIcon.setVisibility(View.VISIBLE); + if (bindObj instanceof MarkerShareMusic) { // 2 为书籍听书，3 为新闻,1 为qq音乐,int switch (((MarkerShareMusic) bindObj).getShareType()) { case 1: - ivUserHead.setImageResource(R.drawable.icon_map_marker_misic); + ivIcon.setImageResource(R.drawable.icon_map_marker_misic); break; case 2: - ivUserHead.setImageResource(R.drawable.icon_map_marker_book); + ivIcon.setImageResource(R.drawable.icon_map_marker_book); break; case 3: - ivUserHead.setImageResource(R.drawable.icon_map_marker_news); + ivIcon.setImageResource(R.drawable.icon_map_marker_news); break; } } - llMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_purple_info); + clMarkerContent.setBackgroundResource(R.drawable.bg_map_marker_purple_info); ivReverseTriangle.setImageResource(R.drawable.bg_shape_reverse_triangle_purple); + ivCar.setImageResource(R.drawable.icon_map_marker_location_blue); break; } - - ivCar.setRotation((float) markerShowEntity.getMarkerLocation().getAngle()); if (!TextUtils.isEmpty(markerShowEntity.getTextContent())) { tvMarkerContent.setText(markerShowEntity.getTextContent()); } 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 98b0ee5561..2d988677b1 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 @@ -19,7 +19,7 @@ app:layout_constraintTop_toBottomOf="@+id/ivReverseTriangle" /> + app:layout_constraintEnd_toEndOf="@+id/clMarkerContent" + app:layout_constraintStart_toStartOf="@+id/clMarkerContent" + app:layout_constraintTop_toBottomOf="@+id/clMarkerContent" /> \ No newline at end of file