From 468d8b7000d6dddc5833bea67c994eb47f925be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Fri, 13 Nov 2020 10:51:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89=E7=82=B9=E5=87=BB=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=AF=BC=E8=87=B4ugc=E6=95=B0=E6=8D=AE=E8=BF=87?=
 =?UTF-8?q?=E5=A4=9A=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/v2x/adapter/holder/V2XEventUgcVH.java   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
index 00050ea54b..6962c8e1e9 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XEventUgcVH.java
@@ -14,7 +14,6 @@ import com.mogo.module.common.entity.V2XEventShowEntity;
 import com.mogo.module.common.entity.V2XRoadEventEntity;
 import com.mogo.module.v2x.R;
 import com.mogo.module.v2x.V2XServiceManager;
-import com.mogo.module.v2x.alarm.V2XEarlyWarningServer;
 import com.mogo.module.v2x.scenario.scene.ugc.V2XEventUgcScenario;
 import com.mogo.module.v2x.utils.EventTypeUtils;
 import com.mogo.module.v2x.utils.V2XUtils;
@@ -54,6 +53,10 @@ public class V2XEventUgcVH extends V2XBaseViewHolder<V2XEventShowEntity> {
     private V2XEventShowEntity mV2XEventShowEntity;
 
 
+    // 判断用户是否点击了，如果没有点击的话就自动设置为无效
+    private boolean isFeedbackClick;
+
+
     public V2XEventUgcVH(ViewGroup viewGroup) {
         super(LayoutInflater.from(viewGroup.getContext())
                 .inflate(R.layout.item_v2x_event_ugc, viewGroup, false));
@@ -85,6 +88,11 @@ public class V2XEventUgcVH extends V2XBaseViewHolder<V2XEventShowEntity> {
 
                         .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_YES_UN_WAKEUP)
                         .unRegisterUnWakeVoice(V2XVoiceConstants.COMMAND_ZHIDAO_V2X_FEEDBACK_SHI_GONG_NO_UN_WAKEUP);
+
+                // 如果用户没有点击则自动设置为无效
+                if (!isFeedbackClick) {
+                    manualMarkingTrafficJam(0);
+                }
             }
         });
     }
@@ -93,7 +101,7 @@ public class V2XEventUgcVH extends V2XBaseViewHolder<V2XEventShowEntity> {
     public void initView(V2XEventShowEntity v2XEventShowEntity) {
         try {
             Log.w(MODULE_NAME + "_" + TAG, "v2XEventShowEntity=" + GsonUtil.jsonFromObject(v2XEventShowEntity));
-
+            isFeedbackClick = false;
             if (v2XEventShowEntity == null) {
                 return;
             }
@@ -127,12 +135,14 @@ public class V2XEventUgcVH extends V2XBaseViewHolder<V2XEventShowEntity> {
                 ivEventReportTrue.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
+                        isFeedbackClick = true;
                         manualMarkingTrafficJam(1);
                     }
                 });
                 ivEventReportErr.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
+                        isFeedbackClick = true;
                         manualMarkingTrafficJam(0);
                     }
                 });