Sfoglia il codice sorgente

[feat]键盘插件,修改动画器的创建方式

hezihao 7 mesi fa
parent
commit
2012b105b9

+ 3 - 3
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/component/base/AnimationComponent.kt

@@ -25,7 +25,7 @@ abstract class AnimationComponent @JvmOverloads constructor(
 
     init {
         // 创建组件动画执行器
-        mComponentAnimator = getComponentAnimator().newInstance() as ComponentAnimator
+        mComponentAnimator = getComponentAnimator()
         mComponentAnimator.attachUIComponent(this)
     }
 
@@ -52,9 +52,9 @@ abstract class AnimationComponent @JvmOverloads constructor(
     /**
      * 获取组件的动画执行器
      */
-    protected open fun getComponentAnimator(): Class<*> {
+    protected open fun getComponentAnimator(): ComponentAnimator {
         // 默认不使用动画,进行切换
-        return NoAnimationAnimator::class.java
+        return NoAnimationAnimator()
     }
 
     /**

+ 3 - 2
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/component/child/impl/AiChatComponent.kt

@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.atmob.keyboard_android.R
 import com.atmob.keyboard_android.component.base.BaseUIComponent
+import com.atmob.keyboard_android.component.base.animator.ComponentAnimator
 import com.atmob.keyboard_android.component.base.animator.impl.TransitionAnimator
 import com.atmob.keyboard_android.component.child.IAiChatComponent
 import com.atmob.keyboard_android.component.item.AiChatViewBinder
@@ -97,9 +98,9 @@ abstract class AiChatComponent<T : IAiChatComponent> @JvmOverloads constructor(
         setupViewModel()
     }
 
-    override fun getComponentAnimator(): Class<*> {
+    override fun getComponentAnimator(): ComponentAnimator {
         return if (Constants.COMPONENT_ANIMATOR_ENABLE) {
-            TransitionAnimator::class.java
+            TransitionAnimator()
         } else {
             super.getComponentAnimator()
         }

+ 3 - 2
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/component/child/impl/KeyboardSelectComponent.kt

@@ -8,6 +8,7 @@ import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.atmob.keyboard_android.R
 import com.atmob.keyboard_android.component.base.BaseUIComponent
+import com.atmob.keyboard_android.component.base.animator.ComponentAnimator
 import com.atmob.keyboard_android.component.base.animator.impl.TransitionAnimator
 import com.atmob.keyboard_android.component.child.IKeyboardSelectComponent
 import com.atmob.keyboard_android.component.item.EmptyPlaceholderViewBinder
@@ -105,9 +106,9 @@ class KeyboardSelectComponent @JvmOverloads constructor(
         setData()
     }
 
-    override fun getComponentAnimator(): Class<*> {
+    override fun getComponentAnimator(): ComponentAnimator {
         return if (Constants.COMPONENT_ANIMATOR_ENABLE) {
-            TransitionAnimator::class.java
+            TransitionAnimator()
         } else {
             super.getComponentAnimator()
         }

+ 3 - 2
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/component/child/impl/SettingComponent.kt

@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.view.View
 import com.atmob.keyboard_android.R
 import com.atmob.keyboard_android.component.base.BaseUIComponent
+import com.atmob.keyboard_android.component.base.animator.ComponentAnimator
 import com.atmob.keyboard_android.component.base.animator.impl.TransitionAnimator
 import com.atmob.keyboard_android.component.child.ISettingComponent
 import com.atmob.keyboard_android.constant.Constants
@@ -71,9 +72,9 @@ class SettingComponent @JvmOverloads constructor(
         KeyboardHolder.getKeyboardService()?.getKeyboardViewModel()?.updateSettingPageShowing(false)
     }
 
-    override fun getComponentAnimator(): Class<*> {
+    override fun getComponentAnimator(): ComponentAnimator {
         return if (Constants.COMPONENT_ANIMATOR_ENABLE) {
-            TransitionAnimator::class.java
+            TransitionAnimator()
         } else {
             super.getComponentAnimator()
         }

+ 3 - 2
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/component/page/impl/LoginPageComponent.kt

@@ -7,6 +7,7 @@ import com.atmob.keyboard_android.R
 import com.atmob.keyboard_android.component.ComponentConstant
 import com.atmob.keyboard_android.component.annotation.Component
 import com.atmob.keyboard_android.component.base.BaseUIComponent
+import com.atmob.keyboard_android.component.base.animator.ComponentAnimator
 import com.atmob.keyboard_android.component.base.animator.impl.TransitionAnimator
 import com.atmob.keyboard_android.component.page.ILoginPageComponent
 import com.atmob.keyboard_android.constant.Constants
@@ -59,9 +60,9 @@ class LoginPageComponent @JvmOverloads constructor(
         KeyboardHolder.getKeyboardService()?.getKeyboardViewModel()?.updateLoginPageShowing(false)
     }
 
-    override fun getComponentAnimator(): Class<*> {
+    override fun getComponentAnimator(): ComponentAnimator {
         return if (Constants.COMPONENT_ANIMATOR_ENABLE) {
-            TransitionAnimator::class.java
+            TransitionAnimator()
         } else {
             super.getComponentAnimator()
         }

+ 3 - 2
plugins/keyboard_android/android/src/main/kotlin/com/atmob/keyboard_android/component/page/impl/VipPageComponent.kt

@@ -5,6 +5,7 @@ import android.util.AttributeSet
 import android.view.View
 import com.atmob.keyboard_android.R
 import com.atmob.keyboard_android.component.base.BaseUIComponent
+import com.atmob.keyboard_android.component.base.animator.ComponentAnimator
 import com.atmob.keyboard_android.component.base.animator.impl.TransitionAnimator
 import com.atmob.keyboard_android.component.page.IVipPageComponent
 import com.atmob.keyboard_android.constant.Constants
@@ -58,9 +59,9 @@ class VipPageComponent @JvmOverloads constructor(
             ?.updateVipPageShowing(false)
     }
 
-    override fun getComponentAnimator(): Class<*> {
+    override fun getComponentAnimator(): ComponentAnimator {
         return if (Constants.COMPONENT_ANIMATOR_ENABLE) {
-            TransitionAnimator::class.java
+            TransitionAnimator()
         } else {
             super.getComponentAnimator()
         }