修复部分页面可能存在的空指针的情况

xuexiangjys · xuexiangjys · commit 38335f8d269a · 2020-08-26T00:25:22.000+08:00
diff --git a/app/src/main/java/com/xuexiang/xuidemo/base/BaseFragment.java b/app/src/main/java/com/xuexiang/xuidemo/base/BaseFragment.java
@@ -89,7 +89,6 @@ protected void finishActivity() {
     public void onDestroyView() {
         if (mMessageLoader != null) {
             mMessageLoader.dismiss();
-            mMessageLoader = null;
         }
         super.onDestroyView();
     }
diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/popupwindow/XUIPopupFragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/popupwindow/XUIPopupFragment.java
@@ -87,7 +87,11 @@ private void initNormalPopupIfNeed() {
             textView.setTextColor(ContextCompat.getColor(getContext(), R.color.xui_config_color_content_text));
             textView.setTypeface(XUI.getDefaultTypeface());
             mNormalPopup.setContentView(textView);
-            mNormalPopup.setOnDismissListener(() -> mBtnCommonPopup.setText("显示普通浮层"));
+            mNormalPopup.setOnDismissListener(() -> {
+                if (mBtnCommonPopup != null) {
+                    mBtnCommonPopup.setText("显示普通浮层");
+                }
+            });
         }
     }
 
@@ -108,7 +112,11 @@ private void initListPopupIfNeed() {
                 XToastUtils.toast("Item " + (i + 1));
                 mListPopup.dismiss();
             });
-            mListPopup.setOnDismissListener(() -> mBtnListPopup.setText("显示列表浮层"));
+            mListPopup.setOnDismissListener(() -> {
+                if (mBtnListPopup != null) {
+                    mBtnListPopup.setText("显示列表浮层");
+                }
+            });
         }
     }
 }
diff --git a/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/tablayout/TabLayoutViewPager2Fragment.java b/app/src/main/java/com/xuexiang/xuidemo/fragment/components/tabbar/tablayout/TabLayoutViewPager2Fragment.java
@@ -31,6 +31,7 @@
 import com.google.android.material.tabs.TabLayoutMediator;
 import com.xuexiang.xaop.annotation.SingleClick;
 import com.xuexiang.xpage.annotation.Page;
+import com.xuexiang.xui.utils.ViewUtils;
 import com.xuexiang.xui.utils.WidgetUtils;
 import com.xuexiang.xui.widget.actionbar.TitleBar;
 import com.xuexiang.xuidemo.R;
@@ -145,6 +146,9 @@ public void onAnimationEnd(Animator animation) {
     }
 
     private void refreshAdapter(boolean isShow) {
+        if (viewPager == null) {
+            return;
+        }
         if (isShow) {
             // 动态加载选项卡内容
             for (String page : MultiPage.getPageNames()) {
@@ -160,8 +164,8 @@ private void refreshAdapter(boolean isShow) {
 
 
     private void switchContainer(boolean isShow) {
-        tvTitle.setVisibility(isShow ? View.GONE : View.VISIBLE);
-        viewPager.setVisibility(isShow ? View.VISIBLE : View.GONE);
+        ViewUtils.setVisibility(tvTitle, !isShow);
+        ViewUtils.setVisibility(viewPager, isShow);
     }
 
 
diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/CollectionUtils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/CollectionUtils.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2020 xuexiangjys(xuexiangjys@163.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.xuexiang.xui.utils;
+
+import androidx.annotation.Nullable;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 集合工具类
+ *
+ * @author xuexiang
+ * @since 2020/8/25 11:58 PM
+ */
+public final class CollectionUtils {
+
+    private CollectionUtils() {
+        throw new UnsupportedOperationException("u can't instantiate me...");
+    }
+
+    /**
+     * 集合的索引是否有效
+     *
+     * @param collection 集合
+     * @param index      索引
+     * @return true: 有效，false：无效
+     */
+    public static <E> boolean isIndexValid(final Collection<E> collection, final int index) {
+        return collection != null && index >= 0 && index < collection.size();
+    }
+
+    /**
+     * 获取集合指定索引的元素
+     *
+     * @param list  集合
+     * @param index 索引
+     * @param <E>
+     * @return 集合指定索引的元素
+     */
+    @Nullable
+    public static <E> E getListItem(final List<E> list, final int index) {
+        return isIndexValid(list, index) ? list.get(index) : null;
+    }
+
+    /**
+     * 获取集合的大小
+     *
+     * @param collection 集合
+     * @return 集合的大小
+     */
+    public static <E> int getSize(final Collection<E> collection) {
+        return collection != null ? collection.size() : 0;
+    }
+
+}
diff --git a/xui_lib/src/main/java/com/xuexiang/xui/utils/Utils.java b/xui_lib/src/main/java/com/xuexiang/xui/utils/Utils.java
@@ -33,8 +33,6 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import androidx.annotation.ColorInt;
-import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
 import android.view.ViewGroup;
@@ -44,6 +42,9 @@
 import android.widget.ListView;
 import android.widget.RelativeLayout.LayoutParams;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
+
 import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/crop/CropImageView.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/crop/CropImageView.java
@@ -365,6 +365,9 @@ public Bitmap cropImage() {
      */
     public Bitmap cropImage(boolean isContinueCrop) {
         Bitmap bitmap = getCroppedImage();
+        if (bitmap == null) {
+            return null;
+        }
         setImageBitmap(bitmap);
         if (!isContinueCrop) {
             setCropOverlayViewVisibility(GONE);
@@ -379,6 +382,9 @@ public Bitmap cropImage(boolean isContinueCrop) {
      * @return 剪切区域图
      */
     public Bitmap getCroppedImage() {
+        if (mBitmap == null) {
+            return null;
+        }
 
         final Rect displayedImageRect = ImageViewUtil.getBitmapRectCenterInside(mBitmap, mImageView);
 
@@ -517,6 +523,9 @@ public void setAspectRatio(int aspectRatioX, int aspectRatioY) {
      *                旋转度数
      */
     public void rotateImage(int degrees) {
+        if (mBitmap == null) {
+            return;
+        }
         Matrix matrix = new Matrix();
         matrix.postRotate(degrees);
         mBitmap = Bitmap.createBitmap(mBitmap, 0, 0, mBitmap.getWidth(), mBitmap.getHeight(), matrix, true);
@@ -536,6 +545,9 @@ public void rotateImage(int degrees) {
      * @author jarlen
      */
     public void reverseImage(CropImageType.REVERSE_TYPE type) {
+        if (mBitmap == null) {
+            return;
+        }
         Matrix matrix = new Matrix();
 
         if (type == CropImageType.REVERSE_TYPE.UP_DOWN) {
diff --git a/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/PreviewActivity.java b/xui_lib/src/main/java/com/xuexiang/xui/widget/imageview/preview/ui/PreviewActivity.java
@@ -32,6 +32,7 @@
 import androidx.viewpager.widget.ViewPager;
 
 import com.xuexiang.xui.R;
+import com.xuexiang.xui.utils.CollectionUtils;
 import com.xuexiang.xui.widget.imageview.preview.MediaLoader;
 import com.xuexiang.xui.widget.imageview.preview.PreviewBuilder;
 import com.xuexiang.xui.widget.imageview.preview.enitity.IPreviewInfo;
@@ -211,16 +212,17 @@ public void onPageScrollStateChanged(int state) {
         mViewPager.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
             @Override
             public void onGlobalLayout() {
-                mViewPager.getViewTreeObserver().removeGlobalOnLayoutListener(this);
-                BasePhotoFragment fragment = fragments.get(mCurrentIndex);
-                fragment.transformIn();
+                mViewPager.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                BasePhotoFragment fragment = CollectionUtils.getListItem(fragments, mCurrentIndex);
+                if (fragment != null) {
+                    fragment.transformIn();
+                }
             }
         });
-
     }
 
     private int getImgSize() {
-        return mImgUrls != null ? mImgUrls.size() : 0;
+        return CollectionUtils.getSize(mImgUrls);
     }
 
     /***退出预览的动画***/

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ protected void finishActivity() {`
`89`	`89`	`public void onDestroyView() {`
`90`	`90`	`if (mMessageLoader != null) {`
`91`	`91`	`mMessageLoader.dismiss();`
`92`		`- mMessageLoader = null;`
`93`	`92`	`}`
`94`	`93`	`super.onDestroyView();`
`95`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,11 @@ private void initNormalPopupIfNeed() {`
`87`	`87`	`textView.setTextColor(ContextCompat.getColor(getContext(), R.color.xui_config_color_content_text));`
`88`	`88`	`textView.setTypeface(XUI.getDefaultTypeface());`
`89`	`89`	`mNormalPopup.setContentView(textView);`
`90`		`- mNormalPopup.setOnDismissListener(() -> mBtnCommonPopup.setText("显示普通浮层"));`
	`90`	`+ mNormalPopup.setOnDismissListener(() -> {`
	`91`	`+ if (mBtnCommonPopup != null) {`
	`92`	`+ mBtnCommonPopup.setText("显示普通浮层");`
	`93`	`+ }`
	`94`	`+ });`
`91`	`95`	`}`
`92`	`96`	`}`
`93`	`97`
`@@ -108,7 +112,11 @@ private void initListPopupIfNeed() {`
`108`	`112`	`XToastUtils.toast("Item " + (i + 1));`
`109`	`113`	`mListPopup.dismiss();`
`110`	`114`	`});`
`111`		`- mListPopup.setOnDismissListener(() -> mBtnListPopup.setText("显示列表浮层"));`
	`115`	`+ mListPopup.setOnDismissListener(() -> {`
	`116`	`+ if (mBtnListPopup != null) {`
	`117`	`+ mBtnListPopup.setText("显示列表浮层");`
	`118`	`+ }`
	`119`	`+ });`
`112`	`120`	`}`
`113`	`121`	`}`
`114`	`122`	`}`