发布2.9.18

junixapp · Dec 29, 2022 · ceee6e1 · ceee6e1
1 parent a8a41ca
commit ceee6e1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -65,9 +65,9 @@ dependencies {
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.recyclerview:recyclerview:1.2.1'
 //    implementation "androidx.viewpager2:viewpager2:1.0.0"
-    implementation "com.umeng.umsdk:common:9.4.0"
-    implementation "com.umeng.umsdk:asms:1.2.3" // asms包依赖(必选)
-    implementation "com.umeng.umsdk:apm:1.3.1" // U-APM产品包依赖(必选)
+    implementation "com.umeng.umsdk:common:9.4.4"
+    implementation "com.umeng.umsdk:asms:1.4.1" // asms包依赖(必选)
+    implementation "com.umeng.umsdk:apm:1.5.2" // U-APM产品包依赖(必选)
 
     implementation project(':library')
 //    implementation 'com.github.li-xiaojun:XPopup:2.9.0'

diff --git a/app/src/main/java/com/lxj/xpopupdemo/fragment/QuickStartDemo.java b/app/src/main/java/com/lxj/xpopupdemo/fragment/QuickStartDemo.java
@@ -307,9 +307,9 @@ public void onSelect(int position, String text) {
                 new XPopup.Builder(getContext())
                         .hasShadowBg(false)
                         .moveUpToKeyboard(false) //如果不加这个，评论弹窗会移动到软键盘上面
-//                        .isViewMode(true)
+                        .isViewMode(true)
                         .isDestroyOnDismiss(true) //对于只使用一次的弹窗，推荐设置这个
-//                        .isThreeDrag(true) //是否开启三阶拖拽，如果设置enableDrag(false)则无效
+                        .isThreeDrag(true) //是否开启三阶拖拽，如果设置enableDrag(false)则无效
                         .asCustom(new ZhihuCommentPopup(getContext()))
                         .show();
                 break;

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.xpopup_version = "2.9.17"
+    ext.xpopup_version = "2.9.18"
     repositories {
         google()
         mavenCentral()

diff --git a/library/build.gradle b/library/build.gradle
@@ -26,5 +26,5 @@ dependencies {
     implementation 'com.github.li-xiaojun:EasyAdapter:1.2.8'
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view-androidx:3.10.0'
-    implementation 'com.github.mmin18:realtimeblurview:1.2.1'
+    annotationProcessor "androidx.lifecycle:lifecycle-compiler:2.3.1"
 }
diff --git a/library/src/main/java/com/lxj/xpopup/util/XPopupUtils.java b/library/src/main/java/com/lxj/xpopup/util/XPopupUtils.java
@@ -172,7 +172,9 @@ public static void applyPopupSize(final ViewGroup content, final int maxWidth, f
                                       final int popupWidth, final int popupHeight, final Runnable afterApplySize) {
         content.post(() -> {
             ViewGroup.LayoutParams params = content.getLayoutParams();
+            if(content==null) return;
             View implView = content.getChildAt(0);
+            if(implView==null) return;
             ViewGroup.LayoutParams implParams = implView.getLayoutParams();
             // 假设默认Content宽是match，高是wrap
             int w = content.getMeasuredWidth();