diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/data/DataServer.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/data/DataServer.java index 691ce1047..617d67aee 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/data/DataServer.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/data/DataServer.java @@ -1,13 +1,8 @@ package com.chad.baserecyclerviewadapterhelper.data; -import com.chad.baserecyclerviewadapterhelper.entity.DelegateMultiEntity; import com.chad.baserecyclerviewadapterhelper.entity.DiffUtilDemoEntity; -import com.chad.baserecyclerviewadapterhelper.entity.MySection; -import com.chad.baserecyclerviewadapterhelper.entity.ProviderMultiEntity; -import com.chad.baserecyclerviewadapterhelper.entity.QuickMultipleEntity; import com.chad.baserecyclerviewadapterhelper.entity.Status; -import com.chad.baserecyclerviewadapterhelper.entity.Video; import java.util.ArrayList; import java.util.List; @@ -52,70 +47,7 @@ public static List addData(List list, int dataSize) { return list; } -// public static List getSampleData() { -// List list = new ArrayList<>(); -// list.add(new MySection(true, "Section 1", true)); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// list.add(new MySection(true, "Section 2", false)); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// list.add(new MySection(true, "Section 3", false)); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// list.add(new MySection(true, "Section 4", false)); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// list.add(new MySection(true, "Section 5", false)); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// list.add(new MySection(new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); -// return list; -// } -// public static List getSectionMultiData() { -// List list = new ArrayList<>(); -// Video video = new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD); -// -// // add section data -// list.add(new SectionMultipleItem(true, "Section 1", true)); -// // add multiple type item data ---start--- -// list.add(new SectionMultipleItem(SectionMultipleItem.TEXT, new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, "video_id_0"))); -// list.add(new SectionMultipleItem(SectionMultipleItem.TEXT, new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, "video_id_1"))); -// list.add(new SectionMultipleItem(SectionMultipleItem.IMG_TEXT, new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, "video_id_2"))); -// // ---end--- -// -// list.add(new SectionMultipleItem(true, "Section 2", false)); -// list.add(new SectionMultipleItem(SectionMultipleItem.IMG_TEXT, video)); -// list.add(new SectionMultipleItem(SectionMultipleItem.IMG_TEXT, video)); -// list.add(new SectionMultipleItem(SectionMultipleItem.TEXT, video)); -// list.add(new SectionMultipleItem(SectionMultipleItem.TEXT, video)); -// list.add(new SectionMultipleItem(true, "Section 3", false)); -// list.add(new SectionMultipleItem(SectionMultipleItem.IMG_TEXT, video)); -// list.add(new SectionMultipleItem(true, "Section 4", false)); -// list.add(new SectionMultipleItem(SectionMultipleItem.TEXT, video)); -// list.add(new SectionMultipleItem(true, "Section 5", false)); -// list.add(new SectionMultipleItem(SectionMultipleItem.IMG_TEXT, video)); -// list.add(new SectionMultipleItem(SectionMultipleItem.IMG_TEXT, video)); -// list.add(new SectionMultipleItem(SectionMultipleItem.IMG_TEXT, video)); -// return list; -// } - - public static List getSectionData() { - List list = new ArrayList<>(); - for (int i = 0; i < 8; i++) { - list.add(new MySection(true, "Section " + i)); - list.add(new MySection(false, new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); - list.add(new MySection(false, new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); - list.add(new MySection(false, new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); - list.add(new MySection(false, new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); - list.add(new MySection(false, new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); - list.add(new MySection(false, new Video(HTTPS_AVATARS1_GITHUBUSERCONTENT_COM_LINK, CYM_CHAD))); - } - return list; - } public static List getStrData() { List list = new ArrayList<>(); @@ -129,48 +61,7 @@ public static List getStrData() { return list; } - public static List getMultipleItemData() { - List list = new ArrayList<>(); - for (int i = 0; i <= 4; i++) { - list.add(new QuickMultipleEntity(QuickMultipleEntity.IMG, QuickMultipleEntity.IMG_SPAN_SIZE)); - list.add(new QuickMultipleEntity(QuickMultipleEntity.TEXT, QuickMultipleEntity.TEXT_SPAN_SIZE, CYM_CHAD)); - list.add(new QuickMultipleEntity(QuickMultipleEntity.IMG_TEXT, QuickMultipleEntity.IMG_TEXT_SPAN_SIZE)); - list.add(new QuickMultipleEntity(QuickMultipleEntity.IMG_TEXT, QuickMultipleEntity.IMG_TEXT_SPAN_SIZE_MIN)); - list.add(new QuickMultipleEntity(QuickMultipleEntity.IMG_TEXT, QuickMultipleEntity.IMG_TEXT_SPAN_SIZE_MIN)); - } - - return list; - } - - public static List getDelegateMultiItemData() { - List list = new ArrayList<>(); - for (int i = 0; i <= 40; i++) { - list.add(new DelegateMultiEntity()); - } - return list; - } - - public static List getProviderMultiItemData() { - List list = new ArrayList<>(); - for (int i = 0; i <= 40; i++) { - list.add(new ProviderMultiEntity()); - } - return list; - } -// -// public static List getNormalMultipleEntities() { -// List list = new ArrayList<>(); -// for (int i = 0; i <= 4; i++) { -// list.add(new NormalMultipleEntity(NormalMultipleEntity.SINGLE_IMG)); -// list.add(new NormalMultipleEntity(NormalMultipleEntity.SINGLE_TEXT,CHAY_CHAN)); -// list.add(new NormalMultipleEntity(NormalMultipleEntity.TEXT_IMG,CHAY_CHAN)); -// list.add(new NormalMultipleEntity(NormalMultipleEntity.TEXT_IMG,CYM_CHAD)); -// list.add(new NormalMultipleEntity(NormalMultipleEntity.TEXT_IMG,CHAY_CHAN)); -// } -// return list; -// } -// public static List getDiffUtilDemoEntities() { List list = new ArrayList<>(); for (int i = 0; i < 10; i++){ diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/ClickEntity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/ClickEntity.java index ce908a747..d3bb0ddb9 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/ClickEntity.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/ClickEntity.java @@ -14,8 +14,6 @@ */ package com.chad.baserecyclerviewadapterhelper.entity; -import com.chad.library.adapter.base.entity.MultiItemEntity; - /** * 文 件 名: ClickEntity * 创 建 人: Allen @@ -24,7 +22,7 @@ * 修改时间： * 修改备注： */ -public class ClickEntity implements MultiItemEntity { +public class ClickEntity { public static final int CLICK_ITEM_VIEW = 1; public static final int CLICK_ITEM_CHILD_VIEW = 2; public static final int LONG_CLICK_ITEM_VIEW = 3; @@ -35,7 +33,6 @@ public ClickEntity(final int type) { this.type = type; } - @Override public int getItemType() { return type; } diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/HomeEntity.kt b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/HomeEntity.kt index 6a162767b..2251545b7 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/HomeEntity.kt +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/HomeEntity.kt @@ -1,7 +1,5 @@ package com.chad.baserecyclerviewadapterhelper.entity -import com.chad.library.adapter.base.entity.SectionEntity - /** * @author: limuyang * @date: 2019-12-06 diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/MySection.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/MySection.java deleted file mode 100644 index a8f60bd65..000000000 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/MySection.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.chad.baserecyclerviewadapterhelper.entity; - -import com.chad.library.adapter.base.entity.JSectionEntity; - -/** - * https://github.com/CymChad/BaseRecyclerViewAdapterHelper - *

- * java请自定义类，继承于JSectionEntity抽象类。封装一遍自己的数据类 - *

- * kotlin，数据类请直接实现SectionEntity接口即可，无需封装。 - */ -public class MySection extends JSectionEntity { - private boolean isHeader; - private Object object; - - public MySection(boolean isHeader, Object object) { - this.isHeader = isHeader; - this.object = object; - } - - public Object getObject() { - return object; - } - - @Override - public boolean isHeader() { - return isHeader; - } - -} diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/QuickMultipleEntity.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/QuickMultipleEntity.java deleted file mode 100644 index d02b6a475..000000000 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/QuickMultipleEntity.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.chad.baserecyclerviewadapterhelper.entity; - -import com.chad.library.adapter.base.entity.MultiItemEntity; - -/** - * https://github.com/CymChad/BaseRecyclerViewAdapterHelper - */ -public class QuickMultipleEntity implements MultiItemEntity { - public static final int TEXT = 1; - public static final int IMG = 2; - public static final int IMG_TEXT = 3; - public static final int TEXT_SPAN_SIZE = 3; - public static final int IMG_SPAN_SIZE = 1; - public static final int IMG_TEXT_SPAN_SIZE = 4; - public static final int IMG_TEXT_SPAN_SIZE_MIN = 2; - private int itemType; - private int spanSize; - - public QuickMultipleEntity(int itemType, int spanSize, String content) { - this.itemType = itemType; - this.spanSize = spanSize; - this.content = content; - } - - public QuickMultipleEntity(int itemType, int spanSize) { - this.itemType = itemType; - this.spanSize = spanSize; - } - - public int getSpanSize() { - return spanSize; - } - - public void setSpanSize(int spanSize) { - this.spanSize = spanSize; - } - - private String content; - - public String getContent() { - return content; - } - - public void setContent(String content) { - this.content = content; - } - - @Override - public int getItemType() { - return itemType; - } -} diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/section/ItemNode.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/section/ItemNode.java deleted file mode 100644 index 25b6ff78f..000000000 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/section/ItemNode.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.chad.baserecyclerviewadapterhelper.entity.node.section; - -import androidx.annotation.DrawableRes; -import com.chad.library.adapter.base.entity.node.BaseNode; -import org.jetbrains.annotations.Nullable; -import java.util.List; - -public class ItemNode extends BaseNode { - - private int img; - private String name; - - public ItemNode(@DrawableRes int img, String name) { - this.img = img; - this.name = name; - } - - @DrawableRes - public int getImg() { - return img; - } - - public void setImg(@DrawableRes int img) { - this.img = img; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Nullable - @Override - public List getChildNode() { - return null; - } -} diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/section/RootFooterNode.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/section/RootFooterNode.java deleted file mode 100644 index 8d3fa9943..000000000 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/section/RootFooterNode.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.chad.baserecyclerviewadapterhelper.entity.node.section; - -import com.chad.library.adapter.base.entity.node.BaseNode; - -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class RootFooterNode extends BaseNode { - - private String title; - - public RootFooterNode(String title) { - this.title = title; - } - - public String getTitle() { - return title; - } - - @Nullable - @Override - public List getChildNode() { - return null; - } -} diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/section/RootNode.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/section/RootNode.java deleted file mode 100644 index 444ab1ebf..000000000 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/section/RootNode.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.chad.baserecyclerviewadapterhelper.entity.node.section; - -import com.chad.library.adapter.base.entity.node.BaseExpandNode; -import com.chad.library.adapter.base.entity.node.BaseNode; -import com.chad.library.adapter.base.entity.node.NodeFooterImp; -import org.jetbrains.annotations.Nullable; -import java.util.List; - -public class RootNode extends BaseExpandNode implements NodeFooterImp { - - private List childNode; - private String title; - - public RootNode(List childNode, String title) { - this.childNode = childNode; - this.title = title; - } - - public String getTitle() { - return title; - } - - /** - * {@link BaseNode} - * 重写此方法，获取子节点。如果没有子节点，返回 null 或者 空数组 - * @return child nodes - */ - @Nullable - @Override - public List getChildNode() { - return childNode; - } - - /** - * {@link NodeFooterImp} - * （可选实现） - * 重写此方法，获取脚部节点 - * @return - */ - @Nullable - @Override - public BaseNode getFooterNode() { - return new RootFooterNode("显示更多..."); - } -} diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/tree/FirstNode.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/tree/FirstNode.java deleted file mode 100644 index ab505ff8a..000000000 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/tree/FirstNode.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.chad.baserecyclerviewadapterhelper.entity.node.tree; - -import com.chad.library.adapter.base.entity.node.BaseExpandNode; -import com.chad.library.adapter.base.entity.node.BaseNode; - -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class FirstNode extends BaseExpandNode { - - private List childNode; - private String title; - - public FirstNode(List childNode, String title) { - this.childNode = childNode; - this.title = title; - - setExpanded(false); - } - - public String getTitle() { - return title; - } - - - @Nullable - @Override - public List getChildNode() { - return childNode; - } -} diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/tree/SecondNode.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/tree/SecondNode.java deleted file mode 100644 index 6296914fa..000000000 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/tree/SecondNode.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.chad.baserecyclerviewadapterhelper.entity.node.tree; - -import com.chad.library.adapter.base.entity.node.BaseExpandNode; -import com.chad.library.adapter.base.entity.node.BaseNode; - -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class SecondNode extends BaseExpandNode { - - private List childNode; - private String title; - - public SecondNode(List childNode, String title) { - this.childNode = childNode; - this.title = title; - - setExpanded(false); - } - - public String getTitle() { - return title; - } - - @Nullable - @Override - public List getChildNode() { - return childNode; - } -} diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/tree/ThirdNode.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/tree/ThirdNode.java deleted file mode 100644 index 469a8c2ee..000000000 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/entity/node/tree/ThirdNode.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.chad.baserecyclerviewadapterhelper.entity.node.tree; - -import com.chad.library.adapter.base.entity.node.BaseNode; - -import org.jetbrains.annotations.Nullable; - -import java.util.List; - -public class ThirdNode extends BaseNode { - private String title; - - public ThirdNode(String title) { - this.title = title; - } - - public String getTitle() { - return title; - } - - @Nullable - @Override - public List getChildNode() { - return null; - } -} diff --git a/library/src/main/java/com/chad/library/adapter/base/entity/JSectionEntity.java b/library/src/main/java/com/chad/library/adapter/base/entity/JSectionEntity.java deleted file mode 100644 index 0d7a03572..000000000 --- a/library/src/main/java/com/chad/library/adapter/base/entity/JSectionEntity.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.chad.library.adapter.base.entity; - -/** - * 仅供java使用 - * - * 由于java无法实现{@link SectionEntity}中的默认接口实现，所以使用抽象类再封装一次，用于提供默认实现。 - */ -public abstract class JSectionEntity implements SectionEntity { - - /** - * 用于返回item类型，除了头布局外，默认只有 NORMAL_TYPE 一种布局 - * 如果需要实现 item 多布局，请重写此方法，返回自己的type - */ - @Override - public int getItemType() { - if (isHeader()) { - return SectionEntity.Companion.HEADER_TYPE; - } else { - // 拷贝 重写此处，返回自己的多布局类型 - return SectionEntity.Companion.NORMAL_TYPE; - } - } -} diff --git a/library/src/main/java/com/chad/library/adapter/base/entity/MultiItemEntity.kt b/library/src/main/java/com/chad/library/adapter/base/entity/MultiItemEntity.kt deleted file mode 100644 index 3a2bc4241..000000000 --- a/library/src/main/java/com/chad/library/adapter/base/entity/MultiItemEntity.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.chad.library.adapter.base.entity - -/** - * 多布局类型 - */ -interface MultiItemEntity { - val itemType: Int -} diff --git a/library/src/main/java/com/chad/library/adapter/base/entity/SectionEntity.kt b/library/src/main/java/com/chad/library/adapter/base/entity/SectionEntity.kt deleted file mode 100644 index f2b89c57b..000000000 --- a/library/src/main/java/com/chad/library/adapter/base/entity/SectionEntity.kt +++ /dev/null @@ -1,23 +0,0 @@ -package com.chad.library.adapter.base.entity - - -/** - * 带头部布局的实体类接口 - * 实体类请继承此接口；如果使用java，请使用[JSectionEntity]抽象类 - */ -interface SectionEntity : MultiItemEntity { - - val isHeader: Boolean - - /** - * 用于返回item类型，除了头布局外，默认只有[NORMAL_TYPE]一种布局 - * 如果需要实现 item 多布局，请重写此方法，返回自己的type - */ - override val itemType: Int - get() = if (isHeader) HEADER_TYPE else NORMAL_TYPE - - companion object { - const val NORMAL_TYPE = -100 - const val HEADER_TYPE = -99 - } -} diff --git a/library/src/main/java/com/chad/library/adapter/base/entity/node/BaseExpandNode.kt b/library/src/main/java/com/chad/library/adapter/base/entity/node/BaseExpandNode.kt deleted file mode 100644 index c4af8116b..000000000 --- a/library/src/main/java/com/chad/library/adapter/base/entity/node/BaseExpandNode.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.chad.library.adapter.base.entity.node - -abstract class BaseExpandNode : BaseNode() { - var isExpanded: Boolean = true - -} \ No newline at end of file diff --git a/library/src/main/java/com/chad/library/adapter/base/entity/node/BaseNode.kt b/library/src/main/java/com/chad/library/adapter/base/entity/node/BaseNode.kt deleted file mode 100644 index 33b529a56..000000000 --- a/library/src/main/java/com/chad/library/adapter/base/entity/node/BaseNode.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.chad.library.adapter.base.entity.node - -abstract class BaseNode { - - /** - * 重写此方法，获取子节点。如果没有子节点，返回 null 或者 空数组 - * - * 如果返回 null，则无法对子节点的数据进行新增和删除等操作 - */ - abstract val childNode: MutableList? - -} \ No newline at end of file diff --git a/library/src/main/java/com/chad/library/adapter/base/entity/node/NodeFooterImp.kt b/library/src/main/java/com/chad/library/adapter/base/entity/node/NodeFooterImp.kt deleted file mode 100644 index d43aa003a..000000000 --- a/library/src/main/java/com/chad/library/adapter/base/entity/node/NodeFooterImp.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.chad.library.adapter.base.entity.node - -/** - * 如果需要，可以实现此接口，返回脚部节点 - */ -interface NodeFooterImp { - /** - * 返回脚部节点 - * @return BaseNode? 如果返回 null，则代表没有脚部节点 - */ - val footerNode: BaseNode? -} \ No newline at end of file diff --git a/library/src/main/java/com/chad/library/adapter/base/provider/BaseItemProvider.kt b/library/src/main/java/com/chad/library/adapter/base/provider/BaseItemProvider.kt deleted file mode 100644 index 667aba2f6..000000000 --- a/library/src/main/java/com/chad/library/adapter/base/provider/BaseItemProvider.kt +++ /dev/null @@ -1,127 +0,0 @@ -//package com.chad.library.adapter.base.provider -// -//import android.content.Context -//import android.view.View -//import android.view.ViewGroup -//import androidx.annotation.IdRes -//import androidx.annotation.LayoutRes -//import com.chad.library.adapter.base.BaseProviderMultiAdapter -//import com.chad.library.adapter.base.util.getItemView -//import com.chad.library.adapter.base.viewholder.BaseViewHolder -//import java.lang.ref.WeakReference -// -///** -// * [BaseProviderMultiAdapter] 的Provider基类 -// * @param T 数据类型 -// */ -//abstract class BaseItemProvider { -// -// lateinit var context: Context -// -// private var weakAdapter: WeakReference>? = null -// private val clickViewIds by lazy(LazyThreadSafetyMode.NONE) { ArrayList() } -// private val longClickViewIds by lazy(LazyThreadSafetyMode.NONE) { ArrayList() } -// -// internal fun setAdapter(adapter: BaseProviderMultiAdapter) { -// weakAdapter = WeakReference(adapter) -// } -// -// open fun getAdapter(): BaseProviderMultiAdapter? { -// return weakAdapter?.get() -// } -// -// abstract val itemViewType: Int -// -// abstract val layoutId: Int -// @LayoutRes -// get -// -// abstract fun convert(helper: BaseViewHolder, item: T) -// -// open fun convert(helper: BaseViewHolder, item: T, payloads: List) {} -// -// /** -// * （可选重写）创建 ViewHolder。 -// * 默认实现返回[BaseViewHolder]，可重写返回自定义 ViewHolder -// * -// * @param parent -// */ -// open fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder { -// return BaseViewHolder(parent.getItemView(layoutId)) -// } -// -// /** -// * （可选重写）ViewHolder创建完毕以后的回掉方法。 -// * @param viewHolder VH -// */ -// open fun onViewHolderCreated(viewHolder: BaseViewHolder, viewType: Int) {} -// -// /** -// * Called when a view created by this [BaseItemProvider] has been attached to a window. -// * 当此[BaseItemProvider]出现在屏幕上的时候，会调用此方法 -// * -// * This can be used as a reasonable signal that the view is about to be seen -// * by the user. If the [BaseItemProvider] previously freed any resources in -// * [onViewDetachedFromWindow][.onViewDetachedFromWindow] -// * those resources should be restored here. -// * -// * @param holder Holder of the view being attached -// */ -// open fun onViewAttachedToWindow(holder: BaseViewHolder) {} -// -// /** -// * Called when a view created by this [BaseItemProvider] has been detached from its -// * window. -// * 当此[BaseItemProvider]从屏幕上移除的时候，会调用此方法 -// * -// * Becoming detached from the window is not necessarily a permanent condition; -// * the consumer of an Adapter's views may choose to cache views offscreen while they -// * are not visible, attaching and detaching them as appropriate. -// * -// * @param holder Holder of the view being detached -// */ -// open fun onViewDetachedFromWindow(holder: BaseViewHolder) {} -// -// /** -// * item 若想实现条目点击事件则重写该方法 -// * @param helper VH -// * @param data T -// * @param position Int -// */ -// open fun onClick(helper: BaseViewHolder, view: View, data: T, position: Int) {} -// -// /** -// * item 若想实现条目长按事件则重写该方法 -// * @param helper VH -// * @param data T -// * @param position Int -// * @return Boolean -// */ -// open fun onLongClick(helper: BaseViewHolder, view: View, data: T, position: Int): Boolean { -// return false -// } -// -// open fun onChildClick(helper: BaseViewHolder, view: View, data: T, position: Int) {} -// -// open fun onChildLongClick(helper: BaseViewHolder, view: View, data: T, position: Int): Boolean { -// return false -// } -// -// fun addChildClickViewIds(@IdRes vararg ids: Int) { -// ids.forEach { -// this.clickViewIds.add(it) -// } -// } -// -// fun getChildClickViewIds() = this.clickViewIds -// -// fun addChildLongClickViewIds(@IdRes vararg ids: Int) { -// ids.forEach { -// this.longClickViewIds.add(it) -// } -// } -// -// fun getChildLongClickViewIds() = this.longClickViewIds -// -// -//} \ No newline at end of file diff --git a/library/src/main/java/com/chad/library/adapter/base/provider/BaseNodeProvider.kt b/library/src/main/java/com/chad/library/adapter/base/provider/BaseNodeProvider.kt deleted file mode 100644 index 71a08f60b..000000000 --- a/library/src/main/java/com/chad/library/adapter/base/provider/BaseNodeProvider.kt +++ /dev/null @@ -1,12 +0,0 @@ -//package com.chad.library.adapter.base.provider -// -//import com.chad.library.adapter.base.BaseNodeAdapter -//import com.chad.library.adapter.base.entity.node.BaseNode -// -//abstract class BaseNodeProvider : BaseItemProvider() { -// -// override fun getAdapter(): BaseNodeAdapter? { -// return super.getAdapter() as? BaseNodeAdapter -// } -// -//} \ No newline at end of file diff --git a/library/src/main/java/com/chad/library/adapter/base/viewholder/EmptyLayoutVH.kt b/library/src/main/java/com/chad/library/adapter/base/viewholder/EmptyLayoutVH.kt index b06ad214f..778cbd0cd 100644 --- a/library/src/main/java/com/chad/library/adapter/base/viewholder/EmptyLayoutVH.kt +++ b/library/src/main/java/com/chad/library/adapter/base/viewholder/EmptyLayoutVH.kt @@ -24,8 +24,7 @@ internal class EmptyLayoutVH(private val emptyLayout:FrameLayout ): RecyclerView if (view.layoutParams == null) { view.layoutParams = FrameLayout.LayoutParams( - FrameLayout.LayoutParams.WRAP_CONTENT, - FrameLayout.LayoutParams.WRAP_CONTENT + FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT ).apply { gravity = Gravity.CENTER }