Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
707e083684
@ -417,8 +417,7 @@ public class LiveChatAdapter extends RecyclerView.Adapter {
|
|||||||
*/
|
*/
|
||||||
public boolean isSlideToBottom(RecyclerView recyclerView) {
|
public boolean isSlideToBottom(RecyclerView recyclerView) {
|
||||||
if (recyclerView == null) return false;
|
if (recyclerView == null) return false;
|
||||||
if (recyclerView.computeVerticalScrollExtent() + recyclerView.computeVerticalScrollOffset()
|
if (recyclerView.computeVerticalScrollExtent() + recyclerView.computeVerticalScrollOffset() >= recyclerView.computeVerticalScrollRange())
|
||||||
>= recyclerView.computeVerticalScrollRange())
|
|
||||||
return true;
|
return true;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -95,7 +95,7 @@ public class SearchResultsViewHolder extends RecyclerView.ViewHolder {
|
|||||||
leave.setText(model.getLevelAnchor());
|
leave.setText(model.getLevelAnchor());
|
||||||
ImgLoader.display(itemView.getContext(), imgUrl, contribute);
|
ImgLoader.display(itemView.getContext(), imgUrl, contribute);
|
||||||
}
|
}
|
||||||
|
isLive.setVisibility(model.getIslive() == 0 ? View.GONE : View.VISIBLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (model.getSex() == 2) {
|
if (model.getSex() == 2) {
|
||||||
|
Loading…
Reference in New Issue
Block a user