发布3.0.3版本

xuexiangjys · Dec 15, 2020 · 2b80ca6 · 2b80ca6
1 parent 6b4a89b
commit 2b80ca6
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -78,8 +78,8 @@ allprojects {
 dependencies {
   ...
   // XPage
-  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.2'
-  annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.2'
+  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.3'
+  annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.3'
   // ButterKnife的sdk
   implementation 'com.jakewharton:butterknife:10.1.0'
   annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
@@ -108,8 +108,8 @@ apply plugin: 'kotlin-kapt'
 dependencies {
   ...
   //XPage
-  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.2'
-  kapt 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.2'
+  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.3'
+  kapt 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.3'
   //ButterKnife的sdk
   implementation 'com.jakewharton:butterknife:10.1.0'
   kapt 'com.jakewharton:butterknife-compiler:10.1.0'

diff --git a/app/src/main/res/layout/fragment_test_edittext.xml b/app/src/main/res/layout/fragment_test_edittext.xml
@@ -32,6 +32,24 @@
             android:layout_marginTop="16dp" />
 
 
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp" />
+
+
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp" />
+
+
+        <EditText
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp" />
+
+
     </LinearLayout>
 
 

diff --git a/docs/README.md b/docs/README.md
@@ -47,8 +47,8 @@ allprojects {
 dependencies {
   ...
   // XPage
-  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.2'
-  annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.2'
+  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.3'
+  annotationProcessor 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.3'
   // ButterKnife的sdk
   implementation 'com.jakewharton:butterknife:10.1.0'
   annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
@@ -77,8 +77,8 @@ apply plugin: 'kotlin-kapt'
 dependencies {
   ...
   //XPage
-  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.2'
-  kapt 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.2'
+  implementation 'com.github.xuexiangjys.XPage:xpage-lib:3.0.3'
+  kapt 'com.github.xuexiangjys.XPage:xpage-compiler:3.0.3'
   //ButterKnife的sdk
   implementation 'com.jakewharton:butterknife:10.1.0'
   kapt 'com.jakewharton:butterknife-compiler:10.1.0'

diff --git a/xpage-lib/src/main/java/com/xuexiang/xpage/utils/Utils.java b/xpage-lib/src/main/java/com/xuexiang/xpage/utils/Utils.java
@@ -186,23 +186,9 @@ private static boolean isTouchView(View view, MotionEvent event) {
         if (view == null || event == null) {
             return false;
         }
-        int[] location = new int[2];
-        view.getLocationOnScreen(location);
-        int left = location[0];
-        int top = location[1];
-        int right = left + view.getMeasuredWidth();
-        int bottom = top + view.getMeasuredHeight();
-        return event.getY() >= top && event.getY() <= bottom && event.getX() >= left
-                && event.getX() <= right;
-    }
-
-    /**
-     * 输入键盘是否在显示
-     *
-     * @param activity 应用窗口
-     */
-    public static boolean isSoftInputShow(Activity activity) {
-        return activity != null && isSoftInputShow(activity.getWindow());
+        Rect rect = new Rect();
+        view.getGlobalVisibleRect(rect);
+        return rect.contains((int) event.getX(), (int) event.getY());
     }
 
     /**