Merge branch 'sheep_develop' of 10.8.230.114:xmy_android/small_sheep_android into sheep_develop

app/src/main/java/com/sheep/gamegroup/model/entity/UserFootprint.java

@@ -1,5 +1,7 @@
 package com.sheep.gamegroup.model.entity;
 
+import android.support.annotation.Nullable;
+
 import com.kfzs.duanduan.utils.NumberFormatUtils;
 import com.sheep.gamegroup.util.string.SpannableSb;
 import com.sheep.jiuyan.samllsheep.R;
@@ -141,4 +143,9 @@ public class UserFootprint {
         }
         return spannableSb.getSsb();
     }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        return obj instanceof UserFootprint && ((UserFootprint) obj).getId() == id;
+    }
 }

app/src/main/java/com/sheep/gamegroup/view/fragment/BaseListFragment4.java

@@ -170,7 +170,7 @@ public abstract class BaseListFragment4<T> extends BaseFragment {
     protected List<T> newList;
 
     protected void loadList(List<T> addList) {
-        ListUtil.addAllItem(list, addList);
+        ListUtil.addAll(list, addList);
         newList = addList;
         notifyDataSetChanged();
     }