Merge remote-tracking branch 'origin/master'

CymChad · Jul 19, 2019 · 276d625 · 276d625
2 parents 4a00016 + 141a31c
commit 276d625
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java b/library/src/main/java/com/chad/library/adapter/base/BaseQuickAdapter.java
@@ -788,8 +788,9 @@ protected int getDefItemViewType(int position) {
         return super.getItemViewType(position);
     }
 
+    @NonNull
     @Override
-    public K onCreateViewHolder(ViewGroup parent, int viewType) {
+    public K onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         K baseViewHolder = null;
         this.mContext = parent.getContext();
         this.mLayoutInflater = LayoutInflater.from(mContext);
@@ -1008,9 +1009,7 @@ public void onBindViewHolder(@NonNull K holder, int position, @NonNull List<Obje
         //Do not move position, need to change before LoadMoreView binding
         autoLoadMore(position);
         int viewType = holder.getItemViewType();
-        System.out.println("---------->>> viewType " + viewType);
-        System.out.println("---------->>> position " + position);
-        System.out.println("---------->>> getHeaderLayoutCount()  " + getHeaderLayoutCount());
+
         switch (viewType) {
             case 0:
                 convertPayloads(holder, getItem(position - getHeaderLayoutCount()), payloads);
@@ -1036,9 +1035,6 @@ private void bindViewClickListener(final BaseViewHolder baseViewHolder) {
             return;
         }
         final View view = baseViewHolder.itemView;
-        if (view == null) {
-            return;
-        }
         if (getOnItemClickListener() != null) {
             view.setOnClickListener(new View.OnClickListener() {
                 @Override