日常提交:2022-08-08.

walgr · Aug 8, 2022 · fc26f5e · fc26f5e
1 parent 25000e3
commit fc26f5e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/Quick/src/main/java/com/wpf/app/quick/widgets/dialog/QuickDialog.kt b/Quick/src/main/java/com/wpf/app/quick/widgets/dialog/QuickDialog.kt
@@ -9,6 +9,7 @@ import android.os.Bundle
 import android.view.View
 import androidx.annotation.LayoutRes
 import com.wpf.app.quick.helper.DialogSizeHelper
+import com.wpf.app.quickbind.QuickBind
 
 /**
  * Created by 王朋飞 on 2022/6/16.
@@ -46,18 +47,18 @@ abstract class QuickDialog : Dialog, DialogSize, DialogLifecycle {
     }
 
     private var mView: View? = null
-    override fun onCreate(savedInstanceState: Bundle) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         dealSize()
         mView = layoutView ?: View.inflate(context, layoutId, null)
         setContentView(mView!!)
-        val window = getWindow()
         if (window != null) {
             if (initDialogAnim() != DialogSize.NO_SET) {
-                window.setWindowAnimations(initDialogAnim())
+                window!!.setWindowAnimations(initDialogAnim())
             }
-            window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+            window!!.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
         }
+        QuickBind.bind(this)
         initView(mView)
     }
     protected var mScreenWidth = 0
@@ -69,6 +70,10 @@ abstract class QuickDialog : Dialog, DialogSize, DialogLifecycle {
         mScreenHeight = size.y
     }
 
+    override fun getView(): View? {
+        return mView
+    }
+
     abstract fun initView(view: View?)
 
     protected var mNewWidth = DialogSize.NO_SET

diff --git a/Quick/src/main/java/com/wpf/app/quick/widgets/dialog/QuickDialogFragment.kt b/Quick/src/main/java/com/wpf/app/quick/widgets/dialog/QuickDialogFragment.kt
@@ -60,9 +60,9 @@ abstract class QuickDialogFragment @JvmOverloads constructor(
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         dealSize()
+        QuickBind.bind(this)
         initView(view)
         onDialogOpen()
-        QuickBind.bind(this)
     }
 
     abstract fun initView(view: View?)

diff --git a/gradle.properties b/gradle.properties
@@ -28,7 +28,7 @@ android.nonTransitiveRClass=true
 IS_REMOTE=true
 IS_ONLY_PLUGIN=false
 GROUP=com.wpf.app.quick
-VERSION_NAME=0.2.13
+VERSION_NAME=0.2.14
 
 POM_DESCRIPTION=Quick Android.