[1.4.0-feature] MVVM封装Loading优化

crazyqiang · crazyqiang · commit 48ea35bb3989 · 2021-10-23T18:39:21.000+08:00
diff --git a/app/src/main/java/org/ninetripods/mq/study/jetpack/mvvm/base/BaseMvvmFragment.kt b/app/src/main/java/org/ninetripods/mq/study/jetpack/mvvm/base/BaseMvvmFragment.kt
@@ -53,7 +53,7 @@ abstract class BaseMvvmFragment<VM : BaseViewModel> : BaseFragment(), IStatusVie
 
     override fun showLoadingView(isShow: Boolean) {
         if (isShow) {
-            mLoadingDialog.showDialog(requireContext(), false)
+            mLoadingDialog.showDialog()
         } else {
             mLoadingDialog.dismissDialog()
         }
diff --git a/app/src/main/java/org/ninetripods/mq/study/jetpack/mvvm/base/widget/LoadingDialog.kt b/app/src/main/java/org/ninetripods/mq/study/jetpack/mvvm/base/widget/LoadingDialog.kt
@@ -4,20 +4,28 @@ import android.app.Activity
 import android.app.Dialog
 import android.content.Context
 import android.view.animation.Animation
+import android.view.animation.Animation.INFINITE
+import android.view.animation.LinearInterpolator
 import android.view.animation.RotateAnimation
 import android.widget.ImageView
 import org.ninetripods.mq.study.R
 
-class LoadingDialog(context: Context, canNotCancel: Boolean) : Dialog(
-    context,
+class LoadingDialog(val mContext: Context, private val isCancelable: Boolean) : Dialog(
+    mContext,
     R.style.LoadingDialog
 ) {
-
-    private var loadingDialog: LoadingDialog? = null
+    private var imageView: ImageView
 
     init {
         setContentView(R.layout.layout_loading_view)
-        val imageView: ImageView = findViewById(R.id.iv_image)
+        imageView = findViewById(R.id.iv_image)
+    }
+
+    /**
+     * &#23637;&#31034;Loading
+     */
+    fun showDialog() {
+        if (mContext is Activity && mContext.isFinishing) return
         val animation: Animation = RotateAnimation(
             0f,
             360f,
@@ -27,26 +35,19 @@ class LoadingDialog(context: Context, canNotCancel: Boolean) : Dialog(
             0.5f
         )
         animation.duration = 2000
-        animation.repeatCount = 10
+        animation.repeatCount = INFINITE
+        animation.interpolator = LinearInterpolator()
         animation.fillAfter = true
         imageView.startAnimation(animation)
+        setCancelable(isCancelable)
+        show()
     }
 
-    fun showDialog(context: Context, isCancel: Boolean) {
-        if (context is Activity) {
-            if (context.isFinishing) {
-                return
-            }
-        }
-
-        if (loadingDialog == null) {
-            loadingDialog = LoadingDialog(context, isCancel)
-        }
-        loadingDialog?.show()
-    }
-
+    /**
+     * &#20851;&#38381;Loading
+     */
     fun dismissDialog() {
-        loadingDialog?.dismiss()
+        dismiss()
     }
 
 }
diff --git a/app/src/main/java/org/ninetripods/mq/study/jetpack/mvvm/base/widget/StatusViewOwner.kt b/app/src/main/java/org/ninetripods/mq/study/jetpack/mvvm/base/widget/StatusViewOwner.kt
@@ -7,6 +7,9 @@ import android.view.ViewGroup
 import org.ninetripods.mq.study.R
 import org.ninetripods.mq.study.kotlin.ktx.showToast
 
+/**
+ * &#21152;&#36733;&#20013;&#12289;&#31354;&#35270;&#22270;&#12289;&#38169;&#35823;&#35270;&#22270;&#38598;&#21512;
+ */
 class StatusViewOwner(
     var context: Activity,
     private var mMainView: View? = null,
@@ -25,6 +28,9 @@ class StatusViewOwner(
         mChildViewIndex = mMainView?.let { getParentView(it)?.indexOfChild(it) } ?: 0
     }
 
+    /**
+     * &#23637;&#31034;&#20027;&#35270;&#22270;
+     */
     override fun showMainView() {
         if (mLastShowView != null) {
             removeView(mLastShowView)
@@ -33,6 +39,9 @@ class StatusViewOwner(
         mMainView?.visibility = View.VISIBLE
     }
 
+    /**
+     * &#31354;&#35270;&#22270;
+     */
     override fun showEmptyView() {
         val emptyView =
             LayoutInflater.from(context).inflate(R.layout.lib_dialog_default_empty, null)
@@ -42,6 +51,9 @@ class StatusViewOwner(
         showCustomView(emptyView)
     }
 
+    /**
+     * &#38169;&#35823;&#35270;&#22270;
+     */
     override fun showErrorView(errMsg: String) {
         showToast(errMsg)
         val errView = LayoutInflater.from(context).inflate(R.layout.lib_dialog_default_error, null)
@@ -51,9 +63,12 @@ class StatusViewOwner(
         showCustomView(errView)
     }
 
+    /**
+     * &#21152;&#36733;&#20013;
+     */
     override fun showLoadingView(isShow: Boolean) {
         if (isShow) {
-            mLoadingDialog.showDialog(context, false)
+            mLoadingDialog.showDialog()
         } else {
             mLoadingDialog.dismissDialog()
         }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ abstract class BaseMvvmFragment<VM : BaseViewModel> : BaseFragment(), IStatusVie`
`53`	`53`
`54`	`54`	`override fun showLoadingView(isShow: Boolean) {`
`55`	`55`	`if (isShow) {`
`56`		`- mLoadingDialog.showDialog(requireContext(), false)`
	`56`	`+ mLoadingDialog.showDialog()`
`57`	`57`	`} else {`
`58`	`58`	`mLoadingDialog.dismissDialog()`
`59`	`59`	`}`