[6.3.0]

[动画、]

OCH/common/common/src/main/java/com/mogo/och/common/module/manager/xiaozhimanager/ZhiViewmanager.kt

@@ -21,8 +21,8 @@ object ZhiViewmanager {
     val loveAni = AniData(AniType.loveAni, R.array.xiaozhi_love, false, true,12)
 
     val warnAni = AniData(AniType.warnAni, R.array.xiaozhi_warn, false, true,12)
-    val normal2warnAni = AniData(AniType.normal2warnAni, R.array.xiaozhi_normal_warn, false, true,12)
-    val warn2normalAni = AniData(AniType.warn2normalAni, R.array.xiaozhi_normal_warn, false, false,12)
+    val normal2warnAni = AniData(AniType.normal2warnAni, R.array.xiaozhi_normal_warn, false, true,24)
+    val warn2normalAni = AniData(AniType.warn2normalAni, R.array.xiaozhi_normal_warn, false, false,24)
 
 
     enum class AniType{

OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FrameAnimatorContainer.kt

@@ -105,23 +105,20 @@ class FrameAnimatorContainer (resId: Int,
     private val next: Int
         get() {
             mIndex++
-            var isPlayOnce = false
             if (mIndex >= mFrames.size){
                 mIndex = 0
                 if(isOnce){// 一次性动画 播放完毕后直接结束
                     stop()
                 }
-                isPlayOnce = true
-
+            }
+            if(mIndex==mFrames.size-1){
+                mOnAnimationStoppedListener?.playOnce()
             }
             val nextInfo= if(sequence){// 倒叙
                 mFrames[mIndex]
             }else{
                 mFrames[mFrames.size-1-mIndex]
             }
-            if(isPlayOnce){// 锁定nextInfo 在回调中可能会修改mFrames值
-                mOnAnimationStoppedListener?.playOnce()
-            }
             return nextInfo
         }
 

OCH/common/common/src/main/res/xiaozhi/values/arrays.xml

@@ -85,8 +85,6 @@
         <item>@drawable/xiaozhi_think_29</item>
         <item>@drawable/xiaozhi_think_30</item>
         <item>@drawable/xiaozhi_think_31</item>
-<!--        <item>@drawable/xiaozhi_think_32</item>-->
-        <item>@drawable/xiaozhi_warn_033</item>
         <item>@drawable/xiaozhi_think_34</item>
         <item>@drawable/xiaozhi_think_35</item>
         <item>@drawable/xiaozhi_think_36</item>