From 0af1732524dfa89f337f68514750308ab7e42a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Mon, 14 Sep 2020 19:09:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=20http://jira.zhidaohulia?=
 =?UTF-8?q?n.com/browse/FX-438=20http://jira.zhidaohulian.com/browse/FX-44?=
 =?UTF-8?q?3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/codeStyles/Project.xml                  | 15 ++++--
 .../V2XScenarioHistoryIllegalParkVH.java      |  1 +
 .../V2XScenarioHistoryOtherSeekHelpVH.java    |  2 +-
 .../holder/V2XScenarioHistoryRoadEventVH.java |  4 +-
 .../mogo/module/v2x/view/HeartLikeView.java   | 50 +++++++++++--------
 .../mogo/module/v2x/view/HeartUnLikeView.java | 48 ++++++++++--------
 6 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 663459aa50..0d156937bb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -3,9 +3,18 @@
     <JetCodeStyleSettings>
       <option name="PACKAGES_TO_USE_STAR_IMPORTS">
         <value>
-          <package name="java.util" withSubpackages="false" static="false" />
-          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
-          <package name="io.ktor" withSubpackages="true" static="false" />
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
         </value>
       </option>
     </JetCodeStyleSettings>
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java
index 03d346838b..e32d6aef52 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryIllegalParkVH.java
@@ -100,6 +100,7 @@ public class V2XScenarioHistoryIllegalParkVH extends V2XBaseViewHolder<V2XHistor
             v2XHistoryScenarioData.setEventJsonData(mOldScenarioData.getEventJsonData());
             v2XHistoryScenarioData.setDispose(true);
             V2XSQLiteUtils.updateScenarioHistoryData(mOldScenarioData, v2XHistoryScenarioData);
+            mOldScenarioData.setDispose(true);
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
index 8d87d3a058..a8189bcc72 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryOtherSeekHelpVH.java
@@ -159,7 +159,6 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
     @Override
     public void delayedCloseWindow() {
         try {
-
             hideControlButton(View.GONE);
             // 进行数据库存储
             V2XHistoryScenarioData v2XHistoryScenarioData = new V2XHistoryScenarioData();
@@ -168,6 +167,7 @@ public class V2XScenarioHistoryOtherSeekHelpVH extends V2XBaseViewHolder<V2XHist
             v2XHistoryScenarioData.setEventJsonData(mOldScenarioData.getEventJsonData());
             v2XHistoryScenarioData.setDispose(true);
             V2XSQLiteUtils.updateScenarioHistoryData(mOldScenarioData, v2XHistoryScenarioData);
+            mOldScenarioData.setDispose(true);
 
             V2XEventPanelFragment.Companion.getInstance().hidePanel();
         } catch (Exception e) {
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
index 78e5513721..c392ecc22a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/adapter/holder/V2XScenarioHistoryRoadEventVH.java
@@ -105,7 +105,9 @@ public class V2XScenarioHistoryRoadEventVH extends V2XBaseViewHolder<V2XHistoryS
             v2XHistoryScenarioData.setTriggerTime(mOldScenarioData.getTriggerTime());
             v2XHistoryScenarioData.setEventJsonData(mOldScenarioData.getEventJsonData());
             v2XHistoryScenarioData.setDispose(true);
-            V2XSQLiteUtils.updateScenarioHistoryData(mOldScenarioData,v2XHistoryScenarioData);
+            V2XSQLiteUtils.updateScenarioHistoryData(mOldScenarioData, v2XHistoryScenarioData);
+
+            mOldScenarioData.setDispose(true);
         } catch (Exception e) {
             e.printStackTrace();
         }
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java
index 536fb26610..9966c37b11 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartLikeView.java
@@ -24,6 +24,8 @@ public class HeartLikeView extends LinearLayout {
     private AnimatorSet mAnimatorSet;
     private OnClickCallListener mOnClickCallListener;
 
+    private boolean isAnimator = false;
+
     public HeartLikeView(Context context) {
         this(context, null);
     }
@@ -38,35 +40,39 @@ public class HeartLikeView extends LinearLayout {
         mIllegalParkingLike = findViewById(R.id.ivIllegalParkingLike);
 
         setOnClickListener(v -> {
-            if (mAnimatorSet == null) {
-                mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(),
-                        R.anim.v2x_like_heart_animation);
-                mAnimatorSet.setTarget(mIllegalParkingLike);
-            }
-            mAnimatorSet.addListener(new Animator.AnimatorListener() {
-                @Override
-                public void onAnimationStart(Animator animation) {
-
+            if (!isAnimator) {
+                isAnimator = true;
+                if (mAnimatorSet == null) {
+                    mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(),
+                            R.anim.v2x_like_heart_animation);
+                    mAnimatorSet.setTarget(mIllegalParkingLike);
                 }
+                mAnimatorSet.addListener(new Animator.AnimatorListener() {
+                    @Override
+                    public void onAnimationStart(Animator animation) {
 
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    if (mOnClickCallListener != null) {
-                        mOnClickCallListener.onClicked(HeartLikeView.this);
                     }
-                }
 
-                @Override
-                public void onAnimationCancel(Animator animation) {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        isAnimator = false;
+                        if (mOnClickCallListener != null) {
+                            mOnClickCallListener.onClicked(HeartLikeView.this);
+                        }
+                    }
 
-                }
+                    @Override
+                    public void onAnimationCancel(Animator animation) {
 
-                @Override
-                public void onAnimationRepeat(Animator animation) {
+                    }
 
-                }
-            });
-            mAnimatorSet.start();
+                    @Override
+                    public void onAnimationRepeat(Animator animation) {
+
+                    }
+                });
+                mAnimatorSet.start();
+            }
         });
     }
 
diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java
index 65524495b3..129b23e03a 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/view/HeartUnLikeView.java
@@ -23,6 +23,7 @@ public class HeartUnLikeView extends LinearLayout {
     private ImageView mIllegalParkingUnLike;
     private AnimatorSet mAnimatorSet;
     private OnClickCallListener mOnClickCallListener;
+    private boolean isAnimator = false;
 
     public HeartUnLikeView(Context context) {
         this(context, null);
@@ -38,35 +39,40 @@ public class HeartUnLikeView extends LinearLayout {
         mIllegalParkingUnLike = findViewById(R.id.ivIllegalParkingUnLike);
 
         setOnClickListener(v -> {
-            if (mAnimatorSet == null) {
-                mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(),
-                        R.anim.v2x_unlike_heart_animation);
-                mAnimatorSet.setTarget(mIllegalParkingUnLike);
-            }
-            mAnimatorSet.addListener(new Animator.AnimatorListener() {
-                @Override
-                public void onAnimationStart(Animator animation) {
+            if (!isAnimator) {
+                isAnimator = true;
 
+                if (mAnimatorSet == null) {
+                    mAnimatorSet = (AnimatorSet) AnimatorInflater.loadAnimator(getContext(),
+                            R.anim.v2x_unlike_heart_animation);
+                    mAnimatorSet.setTarget(mIllegalParkingUnLike);
                 }
+                mAnimatorSet.addListener(new Animator.AnimatorListener() {
+                    @Override
+                    public void onAnimationStart(Animator animation) {
 
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    if (mOnClickCallListener != null) {
-                        mOnClickCallListener.onClicked(HeartUnLikeView.this);
                     }
-                }
 
-                @Override
-                public void onAnimationCancel(Animator animation) {
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
+                        isAnimator = false;
+                        if (mOnClickCallListener != null) {
+                            mOnClickCallListener.onClicked(HeartUnLikeView.this);
+                        }
+                    }
 
-                }
+                    @Override
+                    public void onAnimationCancel(Animator animation) {
 
-                @Override
-                public void onAnimationRepeat(Animator animation) {
+                    }
 
-                }
-            });
-            mAnimatorSet.start();
+                    @Override
+                    public void onAnimationRepeat(Animator animation) {
+
+                    }
+                });
+                mAnimatorSet.start();
+            }
         });
     }