BaseItemProvider新增支持注解或重写方法返回viewType和layout的id;修复itemProvider覆盖onItemClickListener回调的问题，如有设置onItemClickListener则不回调到itemProvider的onClick方法中，长按事件如同

Author: chaychan

app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/provider/TextItemProvider.java

@@ -22,6 +22,23 @@
 )
 public class TextItemProvider extends BaseItemProvider<NormalMultipleEntity,BaseViewHolder> {
 
+   /*
+        使用注解返回对应的viewType和layout，或者重写getViewType()和getLayout()
+        Use annotations to return the corresponding viewType and layout, or override getViewType() and getLayout()
+
+        @Override
+        public int getViewType() {
+            return DemoMultipleItemRvAdapter.TYPE_TEXT;
+        }
+    */
+
+    /*
+        @Override
+        public int getLayout() {
+            return R.layout.item_text_view;
+        }
+    */
+
     @Override
     public void convert(BaseViewHolder helper, NormalMultipleEntity data, int position) {
         helper.setText(R.id.tv, data.content);

library/src/main/java/com/chad/library/adapter/base/MultipleItemRvAdapter.java

@@ -54,7 +54,12 @@ protected int getItemType(T t) {
             provider.mData = mData;
 
             ItemProviderTag tag = provider.getClass().getAnnotation(ItemProviderTag.class);
-            getMultiTypeDelegate().registerItemType(key, tag.layout());
+            if (tag == null){
+                getMultiTypeDelegate().registerItemType(key, provider.getLayout());
+            }else{
+                getMultiTypeDelegate().registerItemType(key, tag.layout());
+            }
+
         }
     }
 
@@ -76,20 +81,37 @@ protected void convert(V helper, T item) {
     }
 
     private void bindClick(final V helper, final T item, final int position, final BaseItemProvider provider) {
+        OnItemClickListener clickListener = getOnItemClickListener();
+        OnItemLongClickListener longClickListener = getOnItemLongClickListener();
+
+        if (clickListener != null && longClickListener != null){
+            //如果已经设置了子条目点击监听和子条目长按监听
+            // If you have set up a sub-entry click monitor and sub-entries long press listen
+            return;
+        }
+
         View itemView = helper.itemView;
 
-        itemView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                provider.onClick(helper, item, position);
-            }
-        });
+        if (clickListener == null){
+            //如果没有设置点击监听，则回调给itemProvider
+            //Callback to itemProvider if no click listener is set
+            itemView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    provider.onClick(helper, item, position);
+                }
+            });
+        }
 
-        itemView.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                return provider.onLongClick(helper, item, position);
-            }
-        });
+        if (longClickListener == null){
+            //如果没有设置长按监听，则回调给itemProvider
+            // If you do not set a long press listener, callback to the itemProvider
+            itemView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    return provider.onLongClick(helper, item, position);
+                }
+            });
+        }
     }
 }

library/src/main/java/com/chad/library/adapter/base/provider/BaseItemProvider.java

@@ -20,7 +20,23 @@ public abstract class BaseItemProvider<T,V extends BaseViewHolder> {
 
     public abstract void convert(V helper, T data, int position);
 
-    public abstract void onClick(V helper, T data, int position);
-
-    public abstract boolean onLongClick(V helper, T data, int position);
+    //子类若想实现条目点击事件则重写该方法
+    //Subclasses override this method if you want to implement an item click event
+    public void onClick(V helper, T data, int position){};
+
+    //子类若想实现条目长按事件则重写该方法
+    //Subclasses override this method if you want to implement an item long press event
+    public boolean onLongClick(V helper, T data, int position){return false;};
+
+    //如果没有使用注解返回layout则重写该方法
+    //Rewrite this method if you did not use annotations to return layout
+    public int getLayout(){
+        return 0;
+    }
+
+    //如果没有使用注解返回viewType则重写该方法
+    //Rewrite this method if you did not use annotations to return viewType
+    public int getViewType(){
+        return 0;
+    }
 }

library/src/main/java/com/chad/library/adapter/base/util/ItemProviderAnnotationException.java

@@ -17,11 +17,13 @@ public class ProviderDelegate {
 
     public void registerProvider(BaseItemProvider provider){
         ItemProviderTag tag = provider.getClass().getAnnotation(ItemProviderTag.class);
+        int viewType;
         if (tag == null){
-            throw new ItemProviderAnnotationException("ItemProviderTag not def layout");
+            viewType = provider.getViewType();
+        }else{
+            viewType = tag.viewType();
         }
 
-        int viewType = tag.viewType();
         if (mItemProviders.get(viewType) == null){
             mItemProviders.put(viewType,provider);
         }