From 1fc3c0a0e9206838bb262cc1ced4e6a109f6a028 Mon Sep 17 00:00:00 2001
From: renwj <renwenjie@zhidaoauto.com>
Date: Fri, 1 Apr 2022 18:17:19 +0800
Subject: [PATCH] =?UTF-8?q?[feedback]=E4=BC=98=E5=8C=96=E5=8A=A8=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/function/chat/facade/media/MedialControlFacade.kt  | 2 ++
 .../com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/media/MedialControlFacade.kt b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/media/MedialControlFacade.kt
index 99d04bc74c..6f117e8519 100644
--- a/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/media/MedialControlFacade.kt
+++ b/core/function-impl/mogo-core-function-chat/src/main/java/com/mogo/eagle/core/function/chat/facade/media/MedialControlFacade.kt
@@ -55,6 +55,8 @@ internal object MedialControlFacade : IMoGoMediaFacade {
             }
         } catch (t: Throwable) {
             log(ChatConsts.TAG, "释放MediaPlay异常: $t")
+        } finally {
+            player.set(null)
         }
     }
 
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt
index b654967248..11c549a3bf 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/ext/BadCaseExt.kt
@@ -13,7 +13,7 @@ import android.transition.Slide
 import android.util.TypedValue
 import android.view.*
 import android.view.WindowManager.LayoutParams
-import android.view.animation.OvershootInterpolator
+import android.view.animation.AccelerateDecelerateInterpolator
 import android.widget.PopupWindow
 import android.widget.PopupWindow.INPUT_METHOD_NEEDED
 import android.widget.TextView
@@ -116,8 +116,8 @@ internal fun Context.pop(content: View, width: Int, height: Int, key: String, on
         }
         if (VERSION.SDK_INT >= VERSION_CODES.M) {
             val transition = Slide(Gravity.START).also {
-                it.interpolator = OvershootInterpolator()
-                it.duration = 300
+                it.interpolator = AccelerateDecelerateInterpolator()
+                it.duration = 200
             }
             pop.enterTransition = transition
             pop.exitTransition = transition