fix hide() method invalid and when drag outside of screen,the window …

…disappeared
jackleeforce · Sep 12, 2018 · 9a26c8d · 9a26c8d
1 parent 23d9b73
commit 9a26c8d
Show file tree

Hide file tree

Showing 9 changed files with 62 additions and 13 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/floatwindow/build.gradle b/floatwindow/build.gradle
@@ -35,4 +35,4 @@ dependencies {
 // JitPack Maven
 apply plugin: 'com.github.dcendents.android-maven'
 // Your Group
-group='com.github.yhaolpz'
+group='com.github.lijiahua'
diff --git a/floatwindow/src/main/java/com/yhao/floatwindow/IFloatWindowImpl.java b/floatwindow/src/main/java/com/yhao/floatwindow/IFloatWindowImpl.java
@@ -98,9 +98,9 @@ public void show() {
 
     @Override
     public void hide() {
-        if (once || !isShow) {
-            return;
-        }
+//        if (once || !isShow) {
+//            return;
+//        }
         getView().setVisibility(View.INVISIBLE);
         isShow = false;
         if (mB.mViewStateListener != null) {
@@ -207,6 +207,15 @@ public boolean onTouch(View v, MotionEvent event) {
                                 changeY = event.getRawY() - lastY;
                                 newX = (int) (mFloatView.getX() + changeX);
                                 newY = (int) (mFloatView.getY() + changeY);
+
+                                if (newY < 0 - Util.getStatusBarHeight(mB.mApplicationContext)) {
+                                    newY = 0 - Util.getStatusBarHeight(mB.mApplicationContext);
+                                }
+                                int i = Util.getScreenHeight(mB.mApplicationContext) - Util.getStatusBarHeight(mB.mApplicationContext) -  v.getHeight();
+                                if (newY > i) {
+                                    newY = i;
+                                }
+
                                 mFloatView.updateXY(newX, newY);
                                 if (mB.mViewStateListener != null) {
                                     mB.mViewStateListener.onPositionUpdate(newX, newY);

diff --git a/floatwindow/src/main/java/com/yhao/floatwindow/Util.java b/floatwindow/src/main/java/com/yhao/floatwindow/Util.java
@@ -46,6 +46,16 @@ static int getScreenHeight(Context context) {
         return sPoint.y;
     }
 
+    static int getStatusBarHeight(Context context) {
+        int height = 0;
+        int resourceId = context.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            height = context.getResources().getDimensionPixelSize(resourceId);
+        }
+
+        return height;
+    }
+
     static boolean isViewVisible(View view) {
         return view.getGlobalVisibleRect(new Rect());
     }

diff --git a/sample/src/main/java/com/example/yhao/floatwindow/BaseApplication.java b/sample/src/main/java/com/example/yhao/floatwindow/BaseApplication.java
@@ -39,14 +39,15 @@ public void onCreate() {
                 .setHeight(Screen.width, 0.2f)
                 .setX(Screen.width, 0.8f)
                 .setY(Screen.height, 0.3f)
-                .setMoveType(MoveType.slide,100,-100)
+                .setMoveType(MoveType.slide)
                 .setMoveStyle(500, new BounceInterpolator())
-                .setFilter(true, A_Activity.class, C_Activity.class)
                 .setViewStateListener(mViewStateListener)
                 .setPermissionListener(mPermissionListener)
                 .setDesktopShow(true)
                 .build();
 
+        //FloatWindow.get().hide();
+
 
         imageView.setOnClickListener(new View.OnClickListener() {
             @Override