From 22dd151d44785ea9b2c4d377eb9176b2cd34e125 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Mon, 17 Aug 2020 17:03:47 +0800 Subject: [PATCH] 1. bugfix: NPE --- .../src/main/java/com/mogo/module/apps/AppsAdapter.java | 3 +++ .../src/main/res/layout/module_apps_item_app.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java index 77f41bccd3..4a5535bf59 100644 --- a/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java +++ b/modules/mogo-module-apps/src/main/java/com/mogo/module/apps/AppsAdapter.java @@ -53,6 +53,9 @@ public class AppsAdapter extends BaseAdapter { holder = ( ( AppViewHolder ) convertView.getTag() ); } AppInfo appInfo = getItem( position ); + if ( appInfo == null ) { + return holder.mItemView; + } if ( appInfo.getIconResId() <= 0 ) { if ( appInfo.getIcon() != null ) { holder.mIcon.setImageDrawable( appInfo.getIcon() ); diff --git a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml index 49c0dd467e..0e89455b55 100644 --- a/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml +++ b/modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml @@ -10,7 +10,7 @@ android:id="@+id/module_apps_id_app_icon" android:layout_width="@dimen/module_apps_navigation_icon_width" android:scaleType="fitXY" - android:src="@drawable/module_apps_ic_im" + android:src="@drawable/module_apps_ic_default_icon" android:layout_height="@dimen/module_apps_navigation_icon_height" />