From a8f1755d426f2abf998fd99899b62beb153ff18e Mon Sep 17 00:00:00 2001 From: li-xiaojun <16167479@qq.com> Date: Thu, 7 Mar 2019 13:20:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=831.4.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- library/build.gradle | 2 +- .../src/main/java/com/lxj/xpopup/core/BasePopupView.java | 7 +++++++ .../src/main/java/com/lxj/xpopup/util/KeyboardUtils.java | 2 +- .../java/com/lxj/xpopup/widget/PhotoViewContainer.java | 4 ---- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index cdaae5b4..aef74417 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ ## 使用 首先需要添加Gradle依赖: ```groovy -implementation 'com.lxj:xpopup:1.4.4' +implementation 'com.lxj:xpopup:1.4.5' ``` 为了方便使用,已经内置了几种常见弹窗的实现: diff --git a/library/build.gradle b/library/build.gradle index bd5f323f..53a78709 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -33,7 +33,7 @@ publish { userOrg = 'li-xiaojun' groupId = 'com.lxj' artifactId = 'xpopup' - publishVersion = '1.4.4' + publishVersion = '1.4.5' repoName = 'jrepo' desc = '功能强大,UI简洁,交互优雅的通用弹窗!可以替代Dialog,PopupWindow,PopupMenu,BottomSheet,DrawerLayout等组件,自带十几种效果良好的动画, 支持完全的UI和动画自定义!' website = 'https://github.com/li-xiaojun/XPopup' diff --git a/library/src/main/java/com/lxj/xpopup/core/BasePopupView.java b/library/src/main/java/com/lxj/xpopup/core/BasePopupView.java index 3102c172..4943e776 100644 --- a/library/src/main/java/com/lxj/xpopup/core/BasePopupView.java +++ b/library/src/main/java/com/lxj/xpopup/core/BasePopupView.java @@ -345,6 +345,13 @@ protected void dismissWith(Runnable runnable){ dismiss(); } + public boolean isShow(){ + return popupStatus==PopupStatus.Show; + } + public boolean isDismiss(){ + return popupStatus==PopupStatus.Dismiss; + } + /** * 消失动画执行完毕后执行 */ diff --git a/library/src/main/java/com/lxj/xpopup/util/KeyboardUtils.java b/library/src/main/java/com/lxj/xpopup/util/KeyboardUtils.java index 20880ce6..1e04d6e8 100644 --- a/library/src/main/java/com/lxj/xpopup/util/KeyboardUtils.java +++ b/library/src/main/java/com/lxj/xpopup/util/KeyboardUtils.java @@ -17,7 +17,7 @@ */ public final class KeyboardUtils { - private static int sDecorViewInvisibleHeightPre; + private static int sDecorViewInvisibleHeightPre; private static ViewTreeObserver.OnGlobalLayoutListener onGlobalLayoutListener; private static OnSoftInputChangedListener onSoftInputChangedListener; diff --git a/library/src/main/java/com/lxj/xpopup/widget/PhotoViewContainer.java b/library/src/main/java/com/lxj/xpopup/widget/PhotoViewContainer.java index 1e80b7c4..1845cb24 100644 --- a/library/src/main/java/com/lxj/xpopup/widget/PhotoViewContainer.java +++ b/library/src/main/java/com/lxj/xpopup/widget/PhotoViewContainer.java @@ -9,14 +9,10 @@ import android.support.v4.view.ViewPager; import android.support.v4.widget.ViewDragHelper; import android.util.AttributeSet; -import android.util.Log; import android.view.MotionEvent; import android.view.View; -import android.view.ViewGroup; import android.widget.FrameLayout; - import com.lxj.xpopup.interfaces.OnDragChangeListener; -import com.lxj.xpopup.util.XPopupUtils; /** * wrap ViewPager, process drag event.