From 121983100069f2ed604e2c8db4f6caef9278af35 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 19 Oct 2023 11:01:01 +0800
Subject: [PATCH] [feat] [snoar]

---
 .../mogo/och/bus/ui/adapter/OpenItemAnimator.java    | 12 ++++++------
 .../och/common/module/wigets/OCHStockBlurView.java   |  8 ++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java
index 1571739e3b..292137eec6 100644
--- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java
+++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/ui/adapter/OpenItemAnimator.java
@@ -34,13 +34,13 @@ public class OpenItemAnimator extends DefaultItemAnimator {
     private ArrayList<ChangeInfo> mPendingChanges = new ArrayList<>();
 
     ArrayList<ArrayList<RecyclerView.ViewHolder>> mAdditionsList = new ArrayList<>();
-    ArrayList<ArrayList<MoveInfo>> mMovesList = new ArrayList<>();
-    ArrayList<ArrayList<ChangeInfo>> mChangesList = new ArrayList<>();
+    private ArrayList<ArrayList<MoveInfo>> mMovesList = new ArrayList<>();
+    private ArrayList<ArrayList<ChangeInfo>> mChangesList = new ArrayList<>();
 
-    ArrayList<RecyclerView.ViewHolder> mAddAnimations = new ArrayList<>();
-    ArrayList<RecyclerView.ViewHolder> mMoveAnimations = new ArrayList<>();
-    ArrayList<RecyclerView.ViewHolder> mRemoveAnimations = new ArrayList<>();
-    ArrayList<RecyclerView.ViewHolder> mChangeAnimations = new ArrayList<>();
+    private ArrayList<RecyclerView.ViewHolder> mAddAnimations = new ArrayList<>();
+    private ArrayList<RecyclerView.ViewHolder> mMoveAnimations = new ArrayList<>();
+    private ArrayList<RecyclerView.ViewHolder> mRemoveAnimations = new ArrayList<>();
+    private ArrayList<RecyclerView.ViewHolder> mChangeAnimations = new ArrayList<>();
 
     private static class MoveInfo {
         public RecyclerView.ViewHolder holder;
diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHStockBlurView.java b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHStockBlurView.java
index d6820011e5..ea20446982 100644
--- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHStockBlurView.java
+++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/wigets/OCHStockBlurView.java
@@ -149,9 +149,11 @@ public class OCHStockBlurView extends View {
 			} finally {
 				if (!r) {
 					release();
-					return false;
 				}
 			}
+			if (!r) {
+				return false;
+			}
 		}
 
 		if (dirty) {
@@ -216,7 +218,9 @@ public class OCHStockBlurView extends View {
 				}
 			}
 			if(onece) {
-				mDecorView.getViewTreeObserver().removeOnPreDrawListener(this);
+				if(mDecorView!=null) {
+					mDecorView.getViewTreeObserver().removeOnPreDrawListener(this);
+				}
 			}
 			return true;
 		}