From 556b5f22d7d366e18e6a66f831936da5befccbf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Sat, 1 Aug 2020 17:16:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E8=B5=84=E6=BA=90=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adapter/holder/V2XFatigueDrivingVH.java   |  2 +-
 .../v2x/adapter/holder/V2XIllegalParkVH.java  |  2 +-
 .../listener/V2XMessageListener_401009.java   | 12 ++------
 .../scene/livecar/V2XPushLiveCarWindow.java   |  2 +-
 .../scene/livecar/V2XRoadLiveCarWindow.java   |  2 +-
 ...iving.xml => item_v2x_fatigue_driving.xml} |  0
 ...rking.xml => item_v2x_illegal_parking.xml} |  0
 ...video.xml => item_v2x_push_live_video.xml} |  0
 ....xml => item_v2x_road_live_car_detail.xml} |  0
 .../src/main/res/layout/toast_view.xml        | 21 -------------
 .../layout/toast_view_feedback_img_text.xml   | 30 -------------------
 11 files changed, 7 insertions(+), 64 deletions(-)
 rename modules/mogo-module-v2x/src/main/res/layout/{window_fatigue_driving.xml => item_v2x_fatigue_driving.xml} (100%)
 rename modules/mogo-module-v2x/src/main/res/layout/{window_illegal_parking.xml => item_v2x_illegal_parking.xml} (100%)
 rename modules/mogo-module-v2x/src/main/res/layout/{window_push_live_video.xml => item_v2x_push_live_video.xml} (100%)
 rename modules/mogo-module-v2x/src/main/res/layout/{window_road_live_car_detail.xml => item_v2x_road_live_car_detail.xml} (100%)
 delete mode 100644 modules/mogo-module-v2x/src/main/res/layout/toast_view.xml
 delete mode 100644 modules/mogo-module-v2x/src/main/res/layout/toast_view_feedback_img_text.xml

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 d163f00047..6946962e2d 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
@@ -41,7 +41,7 @@ public class V2XFatigueDrivingVH extends V2XBaseViewHolder<V2XEventShowEntity> {
 
     public V2XFatigueDrivingVH(ViewGroup viewGroup) {
         super(LayoutInflater.from(viewGroup.getContext())
-                .inflate(R.layout.window_fatigue_driving, viewGroup, false));
+                .inflate(R.layout.item_v2x_fatigue_driving, viewGroup, false));
         mTvAddress = itemView.findViewById(R.id.tvAddress);
         mTvAddressDistance = itemView.findViewById(R.id.tvAddressDistance);
         mIvToNav = itemView.findViewById(R.id.ivToNav);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
index 80578e6dfa..934ce73686 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XIllegalParkVH.java
@@ -43,7 +43,7 @@ public class V2XIllegalParkVH extends V2XBaseViewHolder<V2XEventShowEntity> {
 
     public V2XIllegalParkVH(ViewGroup viewGroup) {
         super(LayoutInflater.from(viewGroup.getContext())
-                .inflate(R.layout.window_illegal_parking, viewGroup, false));
+                .inflate(R.layout.item_v2x_illegal_parking, viewGroup, false));
 
         mAddressTv = itemView.findViewById(R.id.tvAddress);
         mIllegalNumTv = itemView.findViewById(R.id.tvIllegalNum);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401009.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401009.java
index 2b081aba24..8b49a3a3a9 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401009.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/listener/V2XMessageListener_401009.java
@@ -1,15 +1,11 @@
 package com.mogo.module.v2x.listener;
 
-import android.view.Gravity;
-import android.view.LayoutInflater;
-
-import com.mogo.module.v2x.R;
-import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.common.entity.V2XPushMessageEntity;
+import com.mogo.module.v2x.V2XServiceManager;
 import com.mogo.module.v2x.entity.net.V2XGiveLike;
 import com.mogo.module.v2x.utils.ADASUtils;
-import com.mogo.module.v2x.utils.ToastUtils;
 import com.mogo.service.connection.IMogoOnMessageListener;
+import com.mogo.utils.TipToast;
 import com.mogo.utils.logger.Logger;
 
 import static com.mogo.module.v2x.V2XConst.MODULE_NAME;
@@ -40,11 +36,9 @@ public class V2XMessageListener_401009 implements IMogoOnMessageListener<V2XGive
             v2XAlarmMessage.setExpireTime(20000);
             v2XAlarmMessage.setSceneId("000000");
             ADASUtils.broadcastToADAS_TTS(V2XServiceManager.getContext(), v2XAlarmMessage);
+            TipToast.tip(message.getResult());
         } catch (Exception e) {
             e.printStackTrace();
         }
-
-        ToastUtils.setGravity(Gravity.CENTER, 0, 0);
-        ToastUtils.showCustomLong(LayoutInflater.from(V2XServiceManager.getContext()).inflate(R.layout.toast_view_feedback_img_text, null));
     }
 }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java
index 1b231e1db0..92eaba72d8 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XPushLiveCarWindow.java
@@ -60,7 +60,7 @@ public class V2XPushLiveCarWindow extends RelativeLayout implements IV2XWindow<V
 
     public void initView(Context context) {
         Logger.w(MODULE_NAME, "初始化直播小窗口View。。。。。");
-        LayoutInflater.from(context).inflate(R.layout.window_push_live_video, this);
+        LayoutInflater.from(context).inflate(R.layout.item_v2x_push_live_video, this);
         // 详情列表
         mV2XLiveGSYVideoView = findViewById(R.id.videoPlayer);
         mIvReportHead = findViewById(R.id.ivReportHead);
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarWindow.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarWindow.java
index 90936e2281..c8fad1177a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarWindow.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/scenario/scene/livecar/V2XRoadLiveCarWindow.java
@@ -97,7 +97,7 @@ public class V2XRoadLiveCarWindow extends RelativeLayout
     private void initView(Context context) {
         Logger.w(MODULE_NAME, "V2X===初始化道路直播视图");
         // 填充布局
-        LayoutInflater.from(context).inflate(R.layout.window_road_live_car_detail, this);
+        LayoutInflater.from(context).inflate(R.layout.item_v2x_road_live_car_detail, this);
 
         mTvEventStubClose = findViewById(R.id.tvEventStubClose);
         mRecyclerView = findViewById(R.id.rvRoadEventList);
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/layout/window_fatigue_driving.xml
rename to modules/mogo-module-v2x/src/main/res/layout/item_v2x_fatigue_driving.xml
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/layout/window_illegal_parking.xml
rename to modules/mogo-module-v2x/src/main/res/layout/item_v2x_illegal_parking.xml
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_push_live_video.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/layout/window_push_live_video.xml
rename to modules/mogo-module-v2x/src/main/res/layout/item_v2x_push_live_video.xml
diff --git a/modules/mogo-module-v2x/src/main/res/layout/window_road_live_car_detail.xml b/modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/layout/window_road_live_car_detail.xml
rename to modules/mogo-module-v2x/src/main/res/layout/item_v2x_road_live_car_detail.xml
diff --git a/modules/mogo-module-v2x/src/main/res/layout/toast_view.xml b/modules/mogo-module-v2x/src/main/res/layout/toast_view.xml
deleted file mode 100644
index 5d768119c9..0000000000
--- a/modules/mogo-module-v2x/src/main/res/layout/toast_view.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="@dimen/dp_94"
-    android:background="@drawable/v2x_feedback_bg"
-    android:gravity="center_vertical">
-
-    <TextView
-        android:id="@+id/tvFeedbackContent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginStart="@dimen/dp_37"
-        android:layout_marginTop="@dimen/dp_6"
-        android:layout_marginEnd="@dimen/dp_42"
-        android:layout_marginBottom="@dimen/dp_6"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_34"
-        tools:text="一位车主反馈信息真棒！" />
-</LinearLayout>
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/layout/toast_view_feedback_img_text.xml b/modules/mogo-module-v2x/src/main/res/layout/toast_view_feedback_img_text.xml
deleted file mode 100644
index c0b5bce01c..0000000000
--- a/modules/mogo-module-v2x/src/main/res/layout/toast_view_feedback_img_text.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="@dimen/dp_94"
-    android:background="@drawable/v2x_feedback_bg"
-    android:gravity="center_vertical">
-
-    <ImageView
-        android:id="@+id/ivFeedbackIcon"
-        android:layout_width="@dimen/dp_43"
-        android:layout_height="@dimen/dp_43"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="@dimen/dp_27"
-        android:src="@drawable/v2x_icon_zan2" />
-
-    <TextView
-        android:id="@+id/tvFeedbackContent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginStart="@dimen/dp_37"
-        android:layout_marginTop="@dimen/dp_6"
-        android:layout_marginEnd="@dimen/dp_42"
-        android:layout_marginBottom="@dimen/dp_6"
-        android:text="一位车主反馈信息真棒！"
-        android:textColor="@android:color/white"
-        android:textSize="@dimen/dp_24"
-        tools:text="一位车主反馈信息真棒！" />
-</LinearLayout>
\ No newline at end of file