From 0427fb2e09a6fb85119bb09225bfe598c5e27d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Tue, 24 Nov 2020 17:09:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=B7=BB=E5=8A=A0F=E8=BD=A6=E6=9C=BA?= =?UTF-8?q?=E9=81=93=E8=B7=AF=E4=BA=8B=E4=BB=B6=E5=8F=8A=E4=BB=96=E8=BD=A6?= =?UTF-8?q?=E6=B1=82=E5=8A=A9=E7=9A=84=E5=8A=A8=E7=94=BBUI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/impl/MoGoV2XMarkerManager.java | 20 ++++++++++--- .../module/v2x/marker/V2XMarkerEventView.java | 30 ------------------- .../v2x/marker/V2XMarkerRoadEventView.kt | 4 +-- .../main/res/layout/view_marker_event_car.xml | 15 +--------- 4 files changed, 18 insertions(+), 51 deletions(-) delete mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerEventView.java diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java index 6ab7028046..f11c1374d8 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/manager/impl/MoGoV2XMarkerManager.java @@ -16,6 +16,9 @@ import com.mogo.module.common.entity.MarkerLocation; import com.mogo.module.common.entity.MarkerNoveltyInfo; import com.mogo.module.common.entity.MarkerOnlineCar; import com.mogo.module.common.entity.MarkerShowEntity; +import com.mogo.module.common.entity.V2XPoiTypeEnum; +import com.mogo.module.common.entity.V2XRoadEventEntity; +import com.mogo.module.common.utils.CarSeries; import com.mogo.module.service.ServiceConst; import com.mogo.module.service.Utils; import com.mogo.module.service.marker.IMarkerView; @@ -25,8 +28,6 @@ import com.mogo.module.v2x.MoGoV2XServicePaths; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.entity.net.V2XSpecialCarRes.V2XMarkerEntity; -import com.mogo.module.common.entity.V2XPoiTypeEnum; -import com.mogo.module.common.entity.V2XRoadEventEntity; import com.mogo.module.v2x.listener.V2XMarkerClickListener; import com.mogo.module.v2x.manager.IMoGoV2XMarkerManager; import com.mogo.module.v2x.marker.V2XMarkerAdapter; @@ -250,7 +251,13 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { optionsRipple.anchor(0.5f, 0.5f); // 由于性能问题，D车机不使用事件扩散动画 - optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity)); + if (!CarSeries.isF8xxSeries()) { + optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity)); + } else { + optionsRipple.icons(V2XMarkerAdapter.getV2XRoadEventViewGif(context, roadEventEntity)); + optionsRipple.period(3); + } + mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple); // 当前Marker设置为最上面 mAlarmInfoMarker.setToTop(); @@ -526,7 +533,12 @@ public class MoGoV2XMarkerManager implements IMoGoV2XMarkerManager { optionsRipple.anchor(0.5f, 0.5f); // 由于性能问题，D车机不使用事件扩散动画 - optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity)); + if (!CarSeries.isF8xxSeries()) { + optionsRipple.icon(V2XMarkerAdapter.getV2XRoadEventViewPng(context, roadEventEntity)); + } else { + optionsRipple.icons(V2XMarkerAdapter.getV2XRoadEventViewGif(context, roadEventEntity)); + optionsRipple.period(3); + } mAlarmInfoMarker = V2XServiceManager.getMarkerManager().addMarker(V2X_EVENT_ALARM_POI, optionsRipple); // 当前Marker设置为最上面 diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerEventView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerEventView.java deleted file mode 100644 index 902676fce3..0000000000 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerEventView.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.mogo.module.v2x.marker; - -import android.content.Context; -import android.util.AttributeSet; -import android.widget.LinearLayout; - -import androidx.annotation.Nullable; -import androidx.constraintlayout.widget.ConstraintLayout; - -public class V2XMarkerEventView extends LinearLayout { - - - public V2XMarkerEventView(Context context) { - this(context,null); - } - - public V2XMarkerEventView(Context context, @Nullable AttributeSet attrs) { - this(context, attrs,0); - } - - public V2XMarkerEventView(Context context, @Nullable AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - initView(); - } - - private void initView() { - - } - -} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt index 2efee0e7e2..8e8a638d1b 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/marker/V2XMarkerRoadEventView.kt @@ -6,6 +6,7 @@ import android.graphics.Bitmap import android.view.LayoutInflater import android.view.View import androidx.constraintlayout.widget.ConstraintLayout +import com.mogo.module.common.entity.MarkerExploreWay import com.mogo.module.common.entity.V2XPoiTypeEnum import com.mogo.module.common.entity.V2XRoadEventEntity import com.mogo.module.service.utils.ViewUtils @@ -101,17 +102,14 @@ class V2XMarkerRoadEventView(context: Context, alarmInfo: V2XRoadEventEntity) : // 故障车辆 V2XPoiTypeEnum.ALERT_CAR_TROUBLE_WARNING.toString() -> { ivCar.setImageResource(R.drawable.icon_car_red) - ivCarTop.visibility = View.VISIBLE } // 取快递 V2XPoiTypeEnum.ALERT_TRAFFIC_EXPRESS -> { ivCar.setImageResource(R.drawable.v_to_x_marker_express) - ivBg.visibility = View.GONE } // 顺风车 V2XPoiTypeEnum.ALERT_TRAFFIC_TAXI -> { ivCar.setImageResource(R.drawable.v_to_x_marker_taxi) - ivBg.visibility = View.GONE } } } diff --git a/modules/mogo-module-v2x/src/main/res/layout/view_marker_event_car.xml b/modules/mogo-module-v2x/src/main/res/layout/view_marker_event_car.xml index 231eec52a2..79c46cd09d 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/view_marker_event_car.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/view_marker_event_car.xml @@ -24,24 +24,11 @@ android:id="@+id/ivCar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:rotation="90" + android:rotation="45" app:layout_constraintBottom_toBottomOf="@+id/ivBg" app:layout_constraintEnd_toEndOf="@+id/ivBg" app:layout_constraintStart_toStartOf="@+id/ivBg" app:layout_constraintTop_toTopOf="@+id/ivBg" tools:src="@drawable/v_to_x_warning_car_red" /> - \ No newline at end of file