Merge branch 'master' of https://github.com/chaychan/BottomBarLayout

library/src/main/java/com/chaychan/library/BottomBarItem.java

@@ -171,7 +171,7 @@ public class BottomBarItem extends LinearLayout {
     }
 
     public void setStatus(boolean isSelected) {
-        mImageView.setImageResource(isSelected ? mIconSelectedResourceId : mIconNormalResourceId);
+        mImageView.setImageDrawable(getResources().getDrawable(isSelected ? mIconSelectedResourceId : mIconNormalResourceId));
         mTextView.setTextColor(isSelected ? mTextColorSelected : mTextColorNormal);
     }
 

library/src/main/java/com/chaychan/library/BottomBarLayout.java

@@ -119,11 +119,11 @@ public class BottomBarLayout extends LinearLayout implements ViewPager.OnPageCha
     }
 
     /**
-     * 重置所有按钮的状态
+     * 重置当前按钮的状态
      */
     private void resetState() {
-        for (int i = 0; i < mChildCount; i++) {
-            mItemViews.get(i).setStatus(false);
+        if (mCurrentItem < mItemViews.size()){
+            mItemViews.get(mCurrentItem).setStatus(false);
         }
     }