From 06f097bd439af6f4cf8759092a458c0971f0e91f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 3 Aug 2020 14:57:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86V2X=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=B1=95=E7=A4=BA=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E5=88=97=E8=A1=A8=E4=B8=AD=E7=9A=84=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/entity/V2XEventShowEntity.java | 18 +- .../common/entity/V2XMessageEntity.java | 2 + .../common/entity/V2XWindowTypeEnum.java | 27 --- .../v2x/adapter/ScenarioHistoryAdapter.java | 44 +++- .../v2x/adapter/V2XRoadEventAdapter.java | 14 +- .../v2x/adapter/V2XSeekHelpAdapter.java | 224 ------------------ .../ScenarioHistoryFatigueDrivingVH.java | 29 +++ .../holder/ScenarioHistoryIllegalParkVH.java | 2 +- .../ScenarioHistoryOtherSeekHelpVH.java | 29 +++ .../holder/ScenarioHistoryPushEventVH.java | 29 +++ .../holder/ScenarioHistoryRoadEventVH.java | 29 +++ .../adapter/holder/V2XFatigueDrivingVH.java | 6 +- .../adapter/holder/V2XOtherSeekHelpVH.java | 7 +- .../v2x/adapter/holder/V2XRoadEventVH.java | 3 +- .../v2x/fragment/ScenarioHistoryFragment.java | 3 +- .../fatigue/V2XFatigueDrivingWindow.java | 4 +- .../scene/park/V2XIllegalParkWindow.java | 4 +- .../scene/push/V2XPushEventWindow.java | 4 +- .../scene/road/V2XRoadEventWindow.java | 4 +- .../scene/seek/V2XSeekHelpWindow.java | 4 +- ...2x_help_bg.xml => v2x_alert_window_bg.xml} | 7 +- .../main/res/layout/item_v2x_event_detail.xml | 6 +- .../item_v2x_event_detail_stub_live.xml | 2 +- .../res/layout/item_v2x_fatigue_driving.xml | 2 +- .../main/res/layout/item_v2x_fault_help.xml | 2 +- .../res/layout/item_v2x_illegal_parking.xml | 2 +- .../main/res/layout/item_v2x_live_video.xml | 3 +- .../res/layout/item_v2x_push_event_detail.xml | 2 +- .../res/layout/view_video_layout_normal.xml | 2 +- .../res/values-xhdpi-1920x1000/dimens.xml | 3 + .../src/main/res/values-xhdpi/dimens.xml | 4 + .../src/main/res/values/dimens.xml | 5 + 32 files changed, 222 insertions(+), 304 deletions(-) delete mode 100644 modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWindowTypeEnum.java delete mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/V2XSeekHelpAdapter.java create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryFatigueDrivingVH.java create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryOtherSeekHelpVH.java create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryPushEventVH.java create mode 100644 modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryRoadEventVH.java rename modules/mogo-module-v2x/src/main/res/drawable/{v2x_help_bg.xml => v2x_alert_window_bg.xml} (67%) diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XEventShowEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XEventShowEntity.java index e0ee2e5bec..4b6d621d60 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XEventShowEntity.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XEventShowEntity.java @@ -109,14 +109,16 @@ public class V2XEventShowEntity implements Serializable { @IntDef(value = { - V2XWindowTypeEnum.DEFAULT_WINDOW, - V2XWindowTypeEnum.LIVE_CAR_WINDOW, - V2XWindowTypeEnum.ROAD_EVENT_WINDOW, - V2XWindowTypeEnum.PUSH_EVENT_WINDOW, - V2XWindowTypeEnum.ANIMATION_WINDOW, - V2XWindowTypeEnum.FATIGUE_DRIVING_WINDOW, - V2XWindowTypeEnum.SEEK_HELP_WINDOW, - V2XWindowTypeEnum.ILLEGAL_PARK_WINDOW, + V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_WARNING, + V2XMessageEntity.V2XTypeEnum.ALERT_SEEK_WARNING, + V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING, + V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_WINDOW_WARNING, + V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_TOAST_WARNING, + V2XMessageEntity.V2XTypeEnum.ALERT_PUSH_LIVE_CAR_WARNING, + V2XMessageEntity.V2XTypeEnum.ALERT_ANIMATION_WARNING, + V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_LIVE_CAR_WARNING, + V2XMessageEntity.V2XTypeEnum.ALERT_ILLEGAL_PARK_WARNING, + V2XMessageEntity.V2XTypeEnum.ALERT_CAR_FOR_HELP, }) @Target({ ElementType.PARAMETER, diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java index 3e52d000f7..6dcf23400f 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XMessageEntity.java @@ -80,6 +80,8 @@ public class V2XMessageEntity implements Serializable { * V2X 场景类型 */ public interface V2XTypeEnum { + // 默认展示详情 + int DEFAULT_WINDOW = 0; // 道路事件预警 int ALERT_ROAD_WARNING = 1_000; // 他车求助预警 diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWindowTypeEnum.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWindowTypeEnum.java deleted file mode 100644 index f8ed519770..0000000000 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/entity/V2XWindowTypeEnum.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.mogo.module.common.entity; - -/** - * author : donghongyu - * e-mail : 1358506549@qq.com - * date : 2020/3/31 4:53 PM - * desc : V2X 道路提醒类型 - * version: 1.0 - */ -public interface V2XWindowTypeEnum { - // 默认展示详情 - int DEFAULT_WINDOW = 0; - // 直播 - int LIVE_CAR_WINDOW = 1; - // 道路事件详情 - int ROAD_EVENT_WINDOW = 2; - // 推送事件详情 - int PUSH_EVENT_WINDOW = 3; - // 演示动画场景 - int ANIMATION_WINDOW = 4; - // 疲劳驾驶 - int FATIGUE_DRIVING_WINDOW = 5; - // 他人故障求助 - int SEEK_HELP_WINDOW = 6; - // 违章停车 - int ILLEGAL_PARK_WINDOW = 7; -} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java index ba63d8f8a7..09119e6e51 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/ScenarioHistoryAdapter.java @@ -6,8 +6,12 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import com.mogo.module.common.entity.V2XHistoryScenarioData; -import com.mogo.module.common.entity.V2XWindowTypeEnum; +import com.mogo.module.common.entity.V2XMessageEntity; +import com.mogo.module.v2x.adapter.holder.ScenarioHistoryFatigueDrivingVH; import com.mogo.module.v2x.adapter.holder.ScenarioHistoryIllegalParkVH; +import com.mogo.module.v2x.adapter.holder.ScenarioHistoryOtherSeekHelpVH; +import com.mogo.module.v2x.adapter.holder.ScenarioHistoryPushEventVH; +import com.mogo.module.v2x.adapter.holder.ScenarioHistoryRoadEventVH; import java.util.ArrayList; @@ -29,21 +33,55 @@ public class ScenarioHistoryAdapter extends RecyclerView.Adapter { - private static final String TAG = V2XSeekHelpAdapter.class.getSimpleName(); - private List itemList; - private LayoutInflater mInflater; - - public V2XSeekHelpAdapter(Context context) { - itemList = new ArrayList<>(); - mInflater = LayoutInflater.from(context); - } - - public void addDataList(List list) { - if (itemList == null) { - itemList = new ArrayList<>(); - } - itemList.addAll(list); - } - - public void addData(V2XMarkerEntity entity) { - if (itemList == null) { - itemList = new ArrayList<>(); - } - itemList.add(entity); - } - - public void removeData(V2XMarkerEntity entity) { - if (itemList != null) { - itemList.remove(entity); - } - } - - public void removeData(int position) { - if (isPositionValid(position)) { - itemList.remove(position); - } - } - - public void clearData() { - if (itemList != null) { - itemList.clear(); - } - } - - public boolean isPositionValid(int position) { - return position > -1 && itemList != null && itemList.size() > position; - } - - @NonNull - @Override - public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { - View view = mInflater.inflate(R.layout.item_v2x_fault_help, parent, false); - return new MyViewHolder(view); - } - - @Override - public void onBindViewHolder(@NonNull MyViewHolder holder, int position) { - if (isPositionValid(position)) { - V2XMarkerEntity entity = itemList.get(position); - if (entity != null) { - V2XMarkerEntity.UserInfoBean infoBean = entity.getUserInfo(); - if (infoBean != null) { - long time = entity.getCreateTime(); - SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.CHINA); - String eventDistance = String.format("%d", entity.getDistance()); - String eventTime = String.format("%s发布求助信息", sdf.format(new Date(time))); - holder.initView(infoBean.getHeadImgUrl(), infoBean.getDisplayName(), eventDistance, eventTime); - } - } - Log.d(TAG, "onBindViewHolder position=$position, entity= " + entity); - setCallData(holder.ivCall, entity); - //setCallDataWait(holder.ivCall, entity); - holder.ivNavi.setOnClickListener(v -> { - if (mListener != null && !V2XUtils.isFastClick()) { - - mListener.onViewNaviClick(entity.getLat(), entity.getLon()); - } - }); - } - } - - private void setCallData(ImageView ivCall, V2XMarkerEntity entity) { - ICarsChattingProvider provider = V2XServiceManager.getCarsChattingProvider(); - // 判断是否可以打电话 - ChartingUtil.isCanCall(b -> { - if (b) { - // 判断是否可以打电话 - ChartingUtil.isOnLine(entity.getSn(), b1 -> { - if (b1) { - ivCall.setVisibility(VISIBLE); - } else { - ivCall.setVisibility(GONE); - } - }); - } else { - ivCall.setVisibility(GONE); - } - }); - ivCall.setOnClickListener(v -> { - if (!V2XUtils.isFastClick()) { - provider.isOnLine(V2XConst.MODULE_NAME, ivCall.getContext(), entity.getSn(), new ICallChatResponse() { - @Override - public void isOnLine(boolean isOnline, @Nullable String s) { - provider.canCall(V2XConst.MODULE_NAME, ivCall.getContext(), new ICallChatResponse() { - @Override - public void canCall(boolean canCall) { - Logger.d(TAG, "调用车聊聊，查询状态! SN=" + entity.getSn() + " is online: " + isOnline + " canCall: " + canCall + ", thread: " + Thread.currentThread().getName()); - V2XUtils.runOnUiThread(() -> { - if (mListener != null && isOnline && canCall) { - mListener.onViewChatClick(entity); - } - }); - - } - }); - } - } - ); - } - }); - } - - @Override - public int getItemCount() { - return itemList != null ? itemList.size() : 0; - } - - static class MyViewHolder extends RecyclerView.ViewHolder { - MogoImageView ivHead; - TextView tvName; - TextView tvDistance; - TextView tvEventTime; - ImageView ivCall; - ImageView ivNavi; - - MyViewHolder(@NonNull View itemView) { - super(itemView); - ivHead = itemView.findViewById(R.id.ivFaultHelpHead); - tvName = itemView.findViewById(R.id.tvFaultHelpName); - tvDistance = itemView.findViewById(R.id.tvFaultHelpDistance); - tvEventTime = itemView.findViewById(R.id.tvFaultHelpEventTime); - ivCall = itemView.findViewById(R.id.ivFaultHelpEventCall); - ivNavi = itemView.findViewById(R.id.ivFaultHelpEventNavi); - } - - void initView(String headUrl, String name, String distance, String eventTime) { - if (!TextUtils.isEmpty(headUrl)) { - V2XServiceManager.getImageLoader() - .displayImage(headUrl, ivHead); - } - tvName.setText(name); - tvDistance.setText(distance); - SpanUtils.with(tvDistance) - .append("" + distance) - .setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_80)) - .append("M") - .setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_30)) - .create(); - tvEventTime.setText(eventTime); - } - } - - private OnViewClickListener mListener; - - public void setOnViewClickListener(OnViewClickListener listener) { - mListener = listener; - } - - public interface OnViewClickListener { - /** - * 点击事件，打电话给车聊聊 - * - * @param entity - */ - void onViewChatClick(V2XMarkerEntity entity); - - /** - * 点击事件，导航去故障车位置 - */ - void onViewNaviClick(double lat, double lng); - } -} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryFatigueDrivingVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryFatigueDrivingVH.java new file mode 100644 index 0000000000..e88d749cd7 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryFatigueDrivingVH.java @@ -0,0 +1,29 @@ +package com.mogo.module.v2x.adapter.holder; + +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; + +import com.mogo.module.common.entity.V2XHistoryScenarioData; +import com.mogo.module.v2x.R; + +/** + * @author donghongyu + */ +public class ScenarioHistoryFatigueDrivingVH extends V2XBaseViewHolder { + public ScenarioHistoryFatigueDrivingVH(@NonNull ViewGroup viewGroup) { + super(LayoutInflater.from(viewGroup.getContext()) + .inflate(R.layout.item_v2x_fatigue_driving, viewGroup, false)); + } + + @Override + public void initView(V2XHistoryScenarioData viewData) { + + } + + @Override + public void delayedCloseWindow() { + + } +} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryIllegalParkVH.java index 5bfeef7c7f..01623ab3f8 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryIllegalParkVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryIllegalParkVH.java @@ -14,7 +14,7 @@ import com.mogo.module.v2x.R; public class ScenarioHistoryIllegalParkVH extends V2XBaseViewHolder { public ScenarioHistoryIllegalParkVH(@NonNull ViewGroup viewGroup) { super(LayoutInflater.from(viewGroup.getContext()) - .inflate(R.layout.module_v2x_event_share_item, viewGroup, false)); + .inflate(R.layout.item_v2x_illegal_parking, viewGroup, false)); } @Override diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryOtherSeekHelpVH.java new file mode 100644 index 0000000000..7b4ecc046f --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryOtherSeekHelpVH.java @@ -0,0 +1,29 @@ +package com.mogo.module.v2x.adapter.holder; + +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; + +import com.mogo.module.common.entity.V2XHistoryScenarioData; +import com.mogo.module.v2x.R; + +/** + * @author donghongyu + */ +public class ScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder { + public ScenarioHistoryOtherSeekHelpVH(@NonNull ViewGroup viewGroup) { + super(LayoutInflater.from(viewGroup.getContext()) + .inflate(R.layout.item_v2x_fault_help, viewGroup, false)); + } + + @Override + public void initView(V2XHistoryScenarioData viewData) { + + } + + @Override + public void delayedCloseWindow() { + + } +} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryPushEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryPushEventVH.java new file mode 100644 index 0000000000..b88e443088 --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryPushEventVH.java @@ -0,0 +1,29 @@ +package com.mogo.module.v2x.adapter.holder; + +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; + +import com.mogo.module.common.entity.V2XHistoryScenarioData; +import com.mogo.module.v2x.R; + +/** + * @author donghongyu + */ +public class ScenarioHistoryPushEventVH extends V2XBaseViewHolder { + public ScenarioHistoryPushEventVH(@NonNull ViewGroup viewGroup) { + super(LayoutInflater.from(viewGroup.getContext()) + .inflate(R.layout.item_v2x_push_event_detail, viewGroup, false)); + } + + @Override + public void initView(V2XHistoryScenarioData viewData) { + + } + + @Override + public void delayedCloseWindow() { + + } +} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryRoadEventVH.java new file mode 100644 index 0000000000..2392692fbc --- /dev/null +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/ScenarioHistoryRoadEventVH.java @@ -0,0 +1,29 @@ +package com.mogo.module.v2x.adapter.holder; + +import android.view.LayoutInflater; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; + +import com.mogo.module.common.entity.V2XHistoryScenarioData; +import com.mogo.module.v2x.R; + +/** + * @author donghongyu + */ +public class ScenarioHistoryRoadEventVH extends V2XBaseViewHolder { + public ScenarioHistoryRoadEventVH(@NonNull ViewGroup viewGroup) { + super(LayoutInflater.from(viewGroup.getContext()) + .inflate(R.layout.item_v2x_event_detail, viewGroup, false)); + } + + @Override + public void initView(V2XHistoryScenarioData viewData) { + + } + + @Override + public void delayedCloseWindow() { + + } +} diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java index 6946962e2d..f3d5c12454 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XFatigueDrivingVH.java @@ -98,9 +98,9 @@ public class V2XFatigueDrivingVH extends V2XBaseViewHolder { SpanUtils.with(mTvAddressDistance) .append("" + (int) mV2XPushMessageEntity.getDistance()) - .setFontSize((int) itemView.getResources().getDimension(R.dimen.dp_80)) - .append("M") - .setFontSize((int) itemView.getResources().getDimension(R.dimen.dp_30)) + .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text)) + .append("m") + .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title)) .create(); } diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java index 6a05862ceb..9a823dea8d 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XOtherSeekHelpVH.java @@ -16,7 +16,6 @@ import com.mogo.module.common.entity.V2XEventShowEntity; import com.mogo.module.common.entity.V2XPushMessageEntity; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XServiceManager; -import com.mogo.module.v2x.scenario.scene.fatigue.V2XFatigueDrivingScenario; import com.mogo.module.v2x.scenario.scene.seek.V2XSeekHelpScenario; import com.mogo.module.v2x.utils.ChartingUtil; import com.mogo.module.v2x.utils.SpanUtils; @@ -171,9 +170,9 @@ public class V2XOtherSeekHelpVH extends V2XBaseViewHolder { tvName.setText(mV2XPushMessageEntity.getDisplayName()); SpanUtils.with(tvDistance) .append("" + (int) mV2XPushMessageEntity.getDistance()) - .setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_80)) - .append("M") - .setFontSize((int) tvDistance.getResources().getDimension(R.dimen.dp_30)) + .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_text)) + .append("m") + .setFontSize((int) itemView.getResources().getDimension(R.dimen.module_v2x_event_distance_title)) .create(); SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.CHINA); String eventTime = String.format("%s发布求助信息", diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java index e2d5f53149..aa46a1c0ef 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XRoadEventVH.java @@ -15,7 +15,6 @@ import com.mogo.module.common.entity.V2XEventShowEntity; import com.mogo.module.common.entity.V2XLiveCarInfoEntity; import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XRoadEventEntity; -import com.mogo.module.common.entity.V2XWindowTypeEnum; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.entity.net.V2XUserInfoRes; @@ -257,7 +256,7 @@ public class V2XRoadEventVH extends V2XBaseViewHolder { List eventShowEntityArrayList = new ArrayList<>(); for (V2XLiveCarInfoEntity v2XLiveCarInfoRes : v2XEventShowEntity.getV2XLiveCarList()) { V2XEventShowEntity showEntity = new V2XEventShowEntity(); - showEntity.setViewType(V2XWindowTypeEnum.LIVE_CAR_WINDOW); + showEntity.setViewType(V2XMessageEntity.V2XTypeEnum.ALERT_ROAD_LIVE_CAR_WARNING); showEntity.setV2XLiveCarInfoRes(v2XLiveCarInfoRes); showEntity.setV2XRoadEventEntity(mV2XRoadEventEntity); eventShowEntityArrayList.add(showEntity); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java index 94d75d505a..a8d22597a6 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/ScenarioHistoryFragment.java @@ -14,6 +14,7 @@ import com.mogo.module.v2x.adapter.ScenarioHistoryAdapter; import com.mogo.module.v2x.presenter.ScenarioHistoryPresenter; import com.mogo.module.v2x.utils.V2XSQLiteUtils; import com.mogo.utils.logger.Logger; +import com.mogo.utils.network.utils.GsonUtil; import java.util.ArrayList; import java.util.List; @@ -49,7 +50,7 @@ public class ScenarioHistoryFragment mRecyclerView.setLayoutManager(layoutManager); List v2XHistoryScenarioData = V2XSQLiteUtils.getScenarioHistoryData(); - Logger.d("ScenarioHistoryFragment", "查询到历史消息：" + v2XHistoryScenarioData); + Logger.d("ScenarioHistoryFragment", "查询到历史消息：" + GsonUtil.jsonFromObject(v2XHistoryScenarioData)); mV2XHistoryScenarioData.clear(); mV2XHistoryScenarioData.addAll(v2XHistoryScenarioData); mScenarioHistoryAdapter.notifyDataSetChanged(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java index 7b037675eb..6ee3125cf4 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/fatigue/V2XFatigueDrivingWindow.java @@ -13,8 +13,8 @@ import androidx.recyclerview.widget.PagerSnapHelper; import androidx.recyclerview.widget.RecyclerView; import com.mogo.module.common.entity.V2XEventShowEntity; +import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.common.entity.V2XPushMessageEntity; -import com.mogo.module.common.entity.V2XWindowTypeEnum; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XServiceManager; import com.mogo.module.v2x.adapter.V2XRoadEventAdapter; @@ -106,7 +106,7 @@ public class V2XFatigueDrivingWindow extends RelativeLayout //Logger.d(MODULE_NAME, "V2X===推送消息：" + v2XRoadEventEntity); V2XEventShowEntity v2XEventShowEntity = new V2XEventShowEntity(); v2XEventShowEntity.setV2XPushMessageEntity(mV2XPushMessageEntity); - v2XEventShowEntity.setViewType(V2XWindowTypeEnum.FATIGUE_DRIVING_WINDOW); + v2XEventShowEntity.setViewType(V2XMessageEntity.V2XTypeEnum.ALERT_FATIGUE_DRIVING); mItemList.add(v2XEventShowEntity); // 刷新列表 mV2XRoadEventAdapter.notifyDataSetChanged(); diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java index 0f70e68b2d..df0018b338 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/park/V2XIllegalParkWindow.java @@ -15,7 +15,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.mogo.module.common.entity.MarkerExploreWay; import com.mogo.module.common.entity.V2XEventShowEntity; -import com.mogo.module.common.entity.V2XWindowTypeEnum; +import com.mogo.module.common.entity.V2XMessageEntity; import com.mogo.module.v2x.R; import com.mogo.module.v2x.V2XConst; import com.mogo.module.v2x.V2XServiceManager; @@ -112,7 +112,7 @@ public class V2XIllegalParkWindow extends RelativeLayout implements IV2XWindow - + - \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml index cac876ff3f..22106657c8 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#3F4057" + android:background="@drawable/v2x_alert_window_bg" android:paddingStart="@dimen/dp_15" android:paddingTop="@dimen/dp_15" android:paddingBottom="@dimen/dp_15" @@ -14,7 +14,7 @@ android:id="@+id/rlRoadEventImg" android:layout_width="wrap_content" android:layout_height="match_parent" - android:background="#3F4057" + android:background="#5E6079" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -24,7 +24,7 @@ android:id="@+id/ivEventImg" android:layout_width="@dimen/module_v2x_event_image_width" android:layout_height="@dimen/module_v2x_event_image_height" - android:background="#FF484C61" + android:background="#5E6079" android:scaleType="center" app:miv_failureHolder="@drawable/icon_default_black_logo" app:miv_overlayImageId="@drawable/icon_default_black_logo" diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml index e7411814d7..20bacf4ae4 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_event_detail_stub_live.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="#3D4053" + android:background="@drawable/v2x_alert_window_bg" android:gravity="center" app:roundLayoutRadius="@dimen/dp_40" tools:layout_height="@dimen/dp_382"> diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml index 47500e63f7..b29ed0861c 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml @@ -5,7 +5,7 @@ android:id="@+id/rlContent" android:layout_width="match_parent" android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground" - android:background="@color/live_video_background_color" + android:background="@drawable/v2x_alert_window_bg" android:paddingStart="@dimen/dp_40" android:paddingEnd="@dimen/dp_40" app:roundLayoutRadius="@dimen/dp_40"> diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml index caf8d41175..328ace0186 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fault_help.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground" - android:background="@drawable/v2x_fault_help_bg" + android:background="@drawable/v2x_alert_window_bg" android:paddingStart="@dimen/dp_40" android:paddingEnd="@dimen/dp_40" app:roundLayoutRadius="@dimen/dp_40"> diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml index d6a8abbf4e..1b4a3cddb9 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml @@ -5,7 +5,7 @@ android:id="@+id/rlContent" android:layout_width="match_parent" android:layout_height="@dimen/module_v2x_fatigue_driving_window_height_ground" - android:background="@color/live_video_background_color" + android:background="@drawable/v2x_alert_window_bg" android:paddingStart="@dimen/dp_40" android:paddingEnd="@dimen/dp_40" app:roundLayoutRadius="@dimen/dp_40"> diff --git a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml index 62dcccdbe0..a2c65f66b0 100644 --- a/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml +++ b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_live_video.xml @@ -3,7 +3,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + > 270px 480px + + 60px + 40px diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml index a4d8454187..e479a28dae 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml @@ -17,4 +17,8 @@ 320px 480px + + + 60px + 40px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index 3105233703..2574346deb 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -19,4 +19,9 @@ 175px 262px + + 34px + 22px + +