优化createdResult回调

princekin-f · Apr 8, 2020 · 03e3ee9 · 03e3ee9
1 parent c2c5857
commit 03e3ee9
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 10 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ allprojects {
 - **在应用模块的`build.gradle`添加：**
 ```
 dependencies {
-    implementation 'com.github.princekin-f:EasyFloat:1.3.0'
+    implementation 'com.github.princekin-f:EasyFloat:1.3.1'
 }
 ```
 

diff --git a/UpdateDoc.md b/UpdateDoc.md
@@ -1,4 +1,7 @@
 ## 版本更新日志
+#### v 1.3.1:
+- 优化`createdResult`回调。
+
 #### v 1.3.0：
 - 可动态适配虚拟导航栏：`setDisplayHeight(displayHeight: OnDisplayHeight)`
 

diff --git a/easyfloat/src/main/java/com/lzf/easyfloat/widget/appfloat/AppFloatManager.kt b/easyfloat/src/main/java/com/lzf/easyfloat/widget/appfloat/AppFloatManager.kt
@@ -92,14 +92,14 @@ internal class AppFloatManager(val context: Context, var config: FloatConfig) {
                 // 如果设置了过滤当前页，或者设置仅后台显示，隐藏浮窗，否则执行入场动画
                 if (config.filterSelf || config.showPattern == ShowPattern.BACKGROUND)
                     setVisible(View.GONE) else enterAnim(floatingView)
+
+                // 设置callbacks
+                config.layoutView = floatingView
+                config.invokeView?.invoke(floatingView)
+                config.callbacks?.createdResult(true, null, floatingView)
+                config.floatCallbacks?.builder?.createdResult?.invoke(true, null, floatingView)
             }
         }
-
-        // 设置callbacks
-        config.layoutView = floatingView
-        config.invokeView?.invoke(floatingView)
-        config.callbacks?.createdResult(true, null, floatingView)
-        config.floatCallbacks?.builder?.createdResult?.invoke(true, null, floatingView)
     }
 
     /**

diff --git a/example/release/EasyFloat.apk b/example/release/EasyFloat.apk
diff --git a/example/src/main/java/com/lzf/easyfloat/example/activity/MainActivity.kt b/example/src/main/java/com/lzf/easyfloat/example/activity/MainActivity.kt
@@ -191,6 +191,21 @@ class MainActivity : AppCompatActivity(), View.OnClickListener {
 
                         override fun onStopTrackingTouch(seekBar: SeekBar?) {}
                     })
+
+//                // 解决 ListView 拖拽滑动冲突
+//                it.findViewById<ListView>(R.id.lv_test).apply {
+//                    adapter = ArrayAdapter(
+//                        this@MainActivity, R.layout.item_simple_list,
+//                        arrayOf("A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "...")
+//                    )
+//
+//                    // 监听 ListView 的触摸事件，手指触摸时关闭拖拽，手指离开重新开启拖拽
+//                    setOnTouchListener { _, event ->
+//                        logger.e(event.action)
+//                        EasyFloat.appFloatDragEnable(event?.action == MotionEvent.ACTION_UP)
+//                        false
+//                    }
+//                }
             })
             .show()
     }

diff --git a/example/src/main/res/layout/float_app.xml b/example/src/main/res/layout/float_app.xml
@@ -58,4 +58,10 @@
             android:max="100"
             android:progress="66" />
 
+<!--    <ListView-->
+<!--            android:id="@+id/lv_test"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="120dp"-->
+<!--            android:layout_below="@id/seekBar" />-->
+
 </RelativeLayout>
diff --git a/example/src/main/res/layout/item_simple_list.xml b/example/src/main/res/layout/item_simple_list.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/tv_item"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@color/green"
+        android:gravity="center"
+        android:padding="10dp"
+        android:text="哈哈"
+        android:textColor="@color/white">
+
+</TextView>