Merge branch 'v2.2.0/test' into v2.2.0/test_old_fix

app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageHandler.kt

@@ -33,13 +33,11 @@ class RedPackageHandler : RoomHandler() {
 
     override fun onStart(context: RoomContext) {
         super.onStart(context)
-        logD("Handler onStart ${hashCode()}","MAAAX")
         registerSignaling()
     }
 
     override fun onStop(context: RoomContext) {
         super.onStop(context)
-        logD("Handler onStop ${hashCode()}","MAAAX")
     }
 
     override fun onStateChanged(source: LifecycleOwner, event: Lifecycle.Event) {
@@ -93,7 +91,6 @@ class RedPackageHandler : RoomHandler() {
             .subscribe({ data ->
                 handleRoomRedPackage(data, false)
             }, {
-                logD("Handler requestLatestRoomRedPackage null","MAAAX")
                 if (it.message == "No RedPackage") {
                     updateIcon(null)
                 } else {
@@ -107,7 +104,6 @@ class RedPackageHandler : RoomHandler() {
      * @param isSignaling 是否来自信令？
      */
     private fun handleRoomRedPackage(data: RedPackageNotifyInfo, isSignaling: Boolean) {
-        logD("Handler handleRoomRedPackage isSignaling:$isSignaling","MAAAX")
         tryShowOpenDialog(data, isSignaling)
         updateIcon(data)
     }
@@ -116,7 +112,6 @@ class RedPackageHandler : RoomHandler() {
      * 更新红包入口图标
      */
     private fun updateIcon(data: RedPackageNotifyInfo?) {
-        logD("Handler updateIcon","MAAAX")
         iconLiveData.postValue(data)
     }
 

app/src/main/java/com/yizhuan/erban/avroom/redpackage/RedPackageWidget.kt

@@ -126,7 +126,6 @@ class RedPackageWidget : FrameLayoutRoomWidget, RoomWidget {
 
     override fun onStart(roomView: RoomView) {
         super.onStart(roomView)
-        logD("Widget onStart", "MAAAX")
         roomView.getActivity()?.let {
             this.dialogManager = DialogManager(it)
             this.dialogManager?.setCanceledOnClickOutside(false)
@@ -135,10 +134,8 @@ class RedPackageWidget : FrameLayoutRoomWidget, RoomWidget {
 
     override fun onInitialize(roomView: RoomView, roomContext: RoomContext) {
         super.onInitialize(roomView, roomContext)
-        logD("Widget onInitialize", "MAAAX")
         val lifecycleOwner = roomView.getLifecycleOwner()
         redPackageHandler?.iconLiveData?.observe(lifecycleOwner) {
-            logD("Widget iconLiveData $it", "MAAAX")
             loadData(it)
         }
     }
@@ -223,7 +220,6 @@ class RedPackageWidget : FrameLayoutRoomWidget, RoomWidget {
 
     override fun onStop() {
         super.onStop()
-        logD("Widget onStop", "MAAAX")
         this.dialogManager?.dismissDialog()
         this.dialogManager = null
         this.roomView = null
@@ -231,7 +227,6 @@ class RedPackageWidget : FrameLayoutRoomWidget, RoomWidget {
 
     override fun onUnbindContext() {
         super.onUnbindContext()
-        logD("Widget onUnbindContext", "MAAAX")
         compositeDisposable.dispose()
         stopCountDown()
         loadData(null)
@@ -239,7 +234,6 @@ class RedPackageWidget : FrameLayoutRoomWidget, RoomWidget {
 
     override fun onBindContext(roomContext: RoomContext) {
         super.onBindContext(roomContext)
-        logD("Widget onBindContext", "MAAAX")
     }
 
     private fun stopCountDown() {

app/src/main/java/com/yizhuan/erban/avroom/redpackage/open/RedPackageOpenDialog.kt

@@ -9,7 +9,7 @@ import android.annotation.SuppressLint
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
-import android.view.animation.AccelerateDecelerateInterpolator
+import android.view.animation.LinearInterpolator
 import androidx.core.view.isVisible
 import com.chuhai.utils.ServiceTime
 import com.chuhai.utils.ktx.getColorById
@@ -492,10 +492,10 @@ class RedPackageOpenDialog : BaseDialog<RedPackageOpenDialogBinding>(), ILog {
         isValidOfBtnAnimator = false
         btnAnimator = ObjectAnimator.ofFloat(v, "rotationY", 0f, 360f)
         btnAnimator?.let {
-            it.duration = 1500
+            it.duration = 600
             it.repeatCount = ValueAnimator.INFINITE
             it.repeatMode = ValueAnimator.RESTART
-            it.interpolator = AccelerateDecelerateInterpolator()
+            it.interpolator = LinearInterpolator()
             it.addListener(object : AnimatorListenerAdapter() {
                 override fun onAnimationRepeat(animation: Animator) {
                     super.onAnimationRepeat(animation)