修复bug

BaseLibrary/src/main/java/com/cooleshow/base/adapter/AddressListAdapter.java

@@ -24,8 +24,8 @@ public class AddressListAdapter extends BaseQuickAdapter<AddressBean, BaseViewHo
 
     private OnDelClickListener mDelClickListener;
 
-    public AddressListAdapter(List<AddressBean> data) {
-        super(R.layout.layout_address_item, data);
+    public AddressListAdapter() {
+        super(R.layout.layout_address_item);
     }
 
 

BaseLibrary/src/main/java/com/cooleshow/base/ui/activity/set/AddressListActivity.java

@@ -56,7 +56,6 @@ public class AddressListActivity extends BaseMVPActivity<ActivityAddressListBind
         mIsCheckAddress = getIntent().getBooleanExtra(BaseConstant.CHECK_ADDRESS, false);
     }
 
-    private List<AddressBean> dataList = new ArrayList<>();
 
     @Override
     protected void initView() {
@@ -65,12 +64,12 @@ public class AddressListActivity extends BaseMVPActivity<ActivityAddressListBind
         RecyclerView rvAddress = viewBinding.rvAddress;
         LinearLayoutManager manager = new LinearLayoutManager(this);
         rvAddress.setLayoutManager(manager);
-        addressListAdapter = new AddressListAdapter(dataList);
+        addressListAdapter = new AddressListAdapter();
         setEmptyView();
         rvAddress.setAdapter(addressListAdapter);
         addressListAdapter.setDelClickListener(position -> {
             delPosition = position;
-            AddressBean addressBean = dataList.get(position);
+            AddressBean addressBean = addressListAdapter.getData().get(position);
             showTipDialog(addressBean);
 
         });
@@ -134,14 +133,16 @@ public class AddressListActivity extends BaseMVPActivity<ActivityAddressListBind
 
     @Override
     public void companyAddressListSuccess(List<AddressBean> data) {
-        dataList.clear();
-        dataList.addAll(data);
+        addressListAdapter.getData().clear();
         addressListAdapter.notifyDataSetChanged();
+        addressListAdapter.setNewInstance(data);
     }
 
     @Override
     public void delAddress() {
-        dataList.remove(delPosition);
-        if (addressListAdapter != null) addressListAdapter.notifyItemRangeRemoved(delPosition, 1);
+        if (addressListAdapter != null) {
+            addressListAdapter.getData().remove(delPosition);
+            addressListAdapter.notifyItemRangeRemoved(delPosition, 1);
+        }
     }
 }

student/src/main/java/com/cooleshow/student/adapter/HomeworkAdapter.java

@@ -31,8 +31,8 @@ import java.util.List;
  */
 public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
-    public HomeworkAdapter(List<HomeworkListBean.RowsBean> data) {
-        super(R.layout.layout_item_homework, data);
+    public HomeworkAdapter() {
+        super(R.layout.layout_item_homework);
         addChildClickViewIds(R.id.iv_go_chat);
     }
 

student/src/main/java/com/cooleshow/student/ui/work/HomeWorkFragment.java

@@ -76,7 +76,6 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
 
     private String submit = "";
     private HomeworkAdapter homeworkAdapter;
-    List<HomeworkListBean.RowsBean> dataList = new ArrayList<>();
 
     @Override
     protected void initView(View rootView) {
@@ -85,7 +84,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         RecyclerView rvAddress = mViewBinding.recyclerView;
         LinearLayoutManager manager = new LinearLayoutManager(getContext());
         rvAddress.setLayoutManager(manager);
-        homeworkAdapter = new HomeworkAdapter(dataList);
+        homeworkAdapter = new HomeworkAdapter();
         LayoutInflater inflater = LayoutInflater.from(getContext());
         View emptyLayout = inflater.inflate(R.layout.layout_empty_conent, null);
         homeworkAdapter.setEmptyView(emptyLayout);
@@ -175,16 +174,17 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         }
         if (data != null) {
             if (page == 1) {
-                dataList.clear();
                 mViewBinding.refreshLayout.finishRefresh();
+                homeworkAdapter.getData().clear();
+                homeworkAdapter.notifyDataSetChanged();
                 if (data.rows != null && data.rows.size() > 0) {
                     checkHasNext(data.rows.size());
-                    dataList.addAll(data.rows);
+                    homeworkAdapter.setNewInstance(data.rows);
                 }
-                homeworkAdapter.notifyDataSetChanged();
             } else {
                 if (data.rows != null && data.rows.size() > 0) {
                     homeworkAdapter.getLoadMoreModule().loadMoreComplete();
+                    homeworkAdapter.addData(data.rows);
                     checkHasNext(data.rows.size());
                 } else {
                     homeworkAdapter.getLoadMoreModule().loadMoreEnd();

teacher/src/main/java/com/cooleshow/teacher/adapter/HomeworkAdapter.java

@@ -34,8 +34,8 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
 
     private String mDecorate;
 
-    public HomeworkAdapter(List<HomeworkListBean.RowsBean> data) {
-        super(R.layout.layout_item_homework, data);
+    public HomeworkAdapter() {
+        super(R.layout.layout_item_homework);
         addChildClickViewIds(R.id.iv_go_chat);
     }
 

teacher/src/main/java/com/cooleshow/teacher/adapter/MineIncomeAdapter.java

@@ -28,8 +28,8 @@ import java.util.List;
  */
 public class MineIncomeAdapter extends BaseQuickAdapter<UserAccountBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
-    public MineIncomeAdapter(List<UserAccountBean.RowsBean> data) {
-        super(R.layout.layout_mine_income_item, data);
+    public MineIncomeAdapter() {
+        super(R.layout.layout_mine_income_item);
     }
 
 

teacher/src/main/java/com/cooleshow/teacher/adapter/MineLiveCourseAdapter.java

@@ -25,8 +25,8 @@ import java.util.List;
  */
 public class MineLiveCourseAdapter extends BaseQuickAdapter<MineLiveCourseListBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
-    public MineLiveCourseAdapter(List<MineLiveCourseListBean.RowsBean> data) {
-        super(R.layout.layout_mine_live_course_item, data);
+    public MineLiveCourseAdapter() {
+        super(R.layout.layout_mine_live_course_item);
     }
 
 

teacher/src/main/java/com/cooleshow/teacher/adapter/MineScoreAdapter.java

@@ -31,8 +31,8 @@ import java.util.List;
  */
 public class MineScoreAdapter extends BaseQuickAdapter<MusicSheetListBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
-    public MineScoreAdapter(List<MusicSheetListBean.RowsBean> data) {
-        super(R.layout.layout_mine_score_item, data);
+    public MineScoreAdapter() {
+        super(R.layout.layout_mine_score_item);
     }
 
 

teacher/src/main/java/com/cooleshow/teacher/adapter/MineVideoCourseAdapter.java

@@ -25,8 +25,8 @@ import java.util.List;
  */
 public class MineVideoCourseAdapter extends BaseQuickAdapter<VideoCourseListBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
-    public MineVideoCourseAdapter(List<VideoCourseListBean.RowsBean> data) {
-        super(R.layout.layout_mine_video_course_item, data);
+    public MineVideoCourseAdapter() {
+        super(R.layout.layout_mine_video_course_item);
     }
 
 

teacher/src/main/java/com/cooleshow/teacher/adapter/WithdrawalRecordAdapter.java

@@ -23,8 +23,8 @@ import java.util.List;
  */
 public class WithdrawalRecordAdapter extends BaseQuickAdapter<WithdrawalRecordBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
-    public WithdrawalRecordAdapter(List<WithdrawalRecordBean.RowsBean> data) {
-        super(R.layout.layout_withdrawal_record_item, data);
+    public WithdrawalRecordAdapter() {
+        super(R.layout.layout_withdrawal_record_item);
     }
 
 

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineLiveCourseFragment.java

@@ -87,7 +87,6 @@ public class MineLiveCourseFragment extends BaseMVPFragment<FragmentMineLiveCour
 
     private String type = "";
     private MineLiveCourseAdapter mineLiveCourseAdapter;
-    List<MineLiveCourseListBean.RowsBean> dataList = new ArrayList<>();
 
     @Override
     protected void initView(View rootView) {
@@ -95,7 +94,7 @@ public class MineLiveCourseFragment extends BaseMVPFragment<FragmentMineLiveCour
         RecyclerView rvAddress = mViewBinding.recyclerView;
         LinearLayoutManager manager = new LinearLayoutManager(getContext());
         rvAddress.setLayoutManager(manager);
-        mineLiveCourseAdapter = new MineLiveCourseAdapter(dataList);
+        mineLiveCourseAdapter = new MineLiveCourseAdapter();
         LayoutInflater inflater = LayoutInflater.from(getContext());
         View emptyLayout = inflater.inflate(R.layout.empty_mine_live_course, null);
         TextView tv_create = emptyLayout.findViewById(R.id.tv_create);
@@ -157,16 +156,17 @@ public class MineLiveCourseFragment extends BaseMVPFragment<FragmentMineLiveCour
         }
         if (data != null) {
             if (page == 1) {
-                dataList.clear();
                 mViewBinding.refreshLayout.finishRefresh();
+                mineLiveCourseAdapter.getData().clear();
+                mineLiveCourseAdapter.notifyDataSetChanged();
                 if (data.rows != null && data.rows.size() > 0) {
                     checkHasNext(data.rows.size());
-                    dataList.addAll(data.rows);
+                    mineLiveCourseAdapter.setNewInstance(data.rows);
                 }
-                mineLiveCourseAdapter.notifyDataSetChanged();
             } else {
                 if (data.rows != null && data.rows.size() > 0) {
                     mineLiveCourseAdapter.getLoadMoreModule().loadMoreComplete();
+                    mineLiveCourseAdapter.addData(data.rows);
                     checkHasNext(data.rows.size());
                 } else {
                     mineLiveCourseAdapter.getLoadMoreModule().loadMoreEnd();

teacher/src/main/java/com/cooleshow/teacher/ui/course/MineVideoCourseFragment.java

@@ -83,7 +83,6 @@ public class MineVideoCourseFragment extends BaseMVPFragment<FragmentMineVideoCo
 
     private String auditStatus = "";
     private MineVideoCourseAdapter mineVideoCourseAdapter;
-    List<VideoCourseListBean.RowsBean> dataList = new ArrayList<>();
 
     @Override
     protected void initView(View rootView) {
@@ -91,7 +90,7 @@ public class MineVideoCourseFragment extends BaseMVPFragment<FragmentMineVideoCo
         RecyclerView rvAddress = mViewBinding.recyclerView;
         LinearLayoutManager manager = new GridLayoutManager(getContext(), 2);
         rvAddress.setLayoutManager(manager);
-        mineVideoCourseAdapter = new MineVideoCourseAdapter(dataList);
+        mineVideoCourseAdapter = new MineVideoCourseAdapter();
         LayoutInflater inflater = LayoutInflater.from(getContext());
         View emptyLayout = inflater.inflate(R.layout.empty_mine_video_course, null);
         TextView tv_create = emptyLayout.findViewById(R.id.tv_create);
@@ -159,16 +158,17 @@ public class MineVideoCourseFragment extends BaseMVPFragment<FragmentMineVideoCo
         }
         if (data != null) {
             if (page == 1) {
-                dataList.clear();
                 mViewBinding.refreshLayout.finishRefresh();
+                mineVideoCourseAdapter.getData().clear();
+                mineVideoCourseAdapter.notifyDataSetChanged();
                 if (data.rows != null && data.rows.size() > 0) {
                     checkHasNext(data.rows.size());
-                    dataList.addAll(data.rows);
+                    mineVideoCourseAdapter.setNewInstance(data.rows);
                 }
-                mineVideoCourseAdapter.notifyDataSetChanged();
             } else {
                 if (data.rows != null && data.rows.size() > 0) {
                     mineVideoCourseAdapter.getLoadMoreModule().loadMoreComplete();
+                    mineVideoCourseAdapter.addData(data.rows);
                     checkHasNext(data.rows.size());
                 } else {
                     mineVideoCourseAdapter.getLoadMoreModule().loadMoreEnd();

teacher/src/main/java/com/cooleshow/teacher/ui/homepage/VideoCoursePageFragment.java

@@ -37,7 +37,6 @@ import java.util.List;
  */
 public class VideoCoursePageFragment extends BaseMVPFragment<FragmentVideoCoursePageLayoutBinding, VideoCoursePagePresenter> implements VideoCoursePageContract.VideoCoursePageView, View.OnClickListener {
     private MineVideoCourseAdapter mineVideoCourseAdapter;
-    List<VideoCourseListBean.RowsBean> dataList = new ArrayList<>();
 
     @Override
     protected void initView(View rootView) {
@@ -46,7 +45,7 @@ public class VideoCoursePageFragment extends BaseMVPFragment<FragmentVideoCourse
         RecyclerView rvAddress = mViewBinding.recyclerView;
         GridLayoutManager manager = new GridLayoutManager(getContext(), 2);
         rvAddress.setLayoutManager(manager);
-        mineVideoCourseAdapter = new MineVideoCourseAdapter(dataList);
+        mineVideoCourseAdapter = new MineVideoCourseAdapter();
         EmptyViewLayout mEmptyView = new EmptyViewLayout(getContext());
         mEmptyView.setContent(com.cooleshow.base.R.drawable.icon_empty_course, "暂无课程~");
         mineVideoCourseAdapter.setEmptyView(mEmptyView);
@@ -125,11 +124,11 @@ public class VideoCoursePageFragment extends BaseMVPFragment<FragmentVideoCourse
                         .navigation();
                 break;
             case R.id.tv_open:
-                if (mViewBinding.tvOpen.getText().toString().equals("去认证")){
+                if (mViewBinding.tvOpen.getText().toString().equals("去认证")) {
                     ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
                             .withString(WebConstants.WEB_URL, WebConstants.TEACHER_CERT)
                             .navigation();
-                }else if (mViewBinding.tvOpen.getText().toString().equals("立即开通")){
+                } else if (mViewBinding.tvOpen.getText().toString().equals("立即开通")) {
                     ARouter.getInstance()
                             .build(RouterPath.WebCenter.ACTIVITY_HTML)
                             .withString(WebConstants.WEB_URL, WebConstants.TEACHER_OPEN_LIVE)
@@ -147,16 +146,17 @@ public class VideoCoursePageFragment extends BaseMVPFragment<FragmentVideoCourse
         }
         if (data != null) {
             if (page == 1) {
-                dataList.clear();
                 mViewBinding.refreshLayout.finishRefresh();
+                mineVideoCourseAdapter.getData().clear();
+                mineVideoCourseAdapter.notifyDataSetChanged();
                 if (data.rows != null && data.rows.size() > 0) {
                     checkHasNext(data.rows.size());
-                    dataList.addAll(data.rows);
+                    mineVideoCourseAdapter.setNewInstance(data.rows);
                 }
-                mineVideoCourseAdapter.notifyDataSetChanged();
             } else {
                 if (data.rows != null && data.rows.size() > 0) {
                     mineVideoCourseAdapter.getLoadMoreModule().loadMoreComplete();
+                    mineVideoCourseAdapter.addData(data.rows);
                     checkHasNext(data.rows.size());
                 } else {
                     mineVideoCourseAdapter.getLoadMoreModule().loadMoreEnd();

teacher/src/main/java/com/cooleshow/teacher/ui/income/MineIncomeActivity.java

@@ -76,6 +76,7 @@ public class MineIncomeActivity extends BaseMVPActivity<ActivityMineIncomeBindin
         }
 
     }
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -83,7 +84,6 @@ public class MineIncomeActivity extends BaseMVPActivity<ActivityMineIncomeBindin
     }
 
     private MineIncomeAdapter mineIncomeAdapter;
-    List<UserAccountBean.RowsBean> dataList = new ArrayList<>();
 
     @Override
     protected void initView() {
@@ -98,7 +98,7 @@ public class MineIncomeActivity extends BaseMVPActivity<ActivityMineIncomeBindin
         RecyclerView rvAddress = viewBinding.recyclerView;
         LinearLayoutManager manager = new LinearLayoutManager(this);
         rvAddress.setLayoutManager(manager);
-        mineIncomeAdapter = new MineIncomeAdapter(dataList);
+        mineIncomeAdapter = new MineIncomeAdapter();
         LayoutInflater inflater = LayoutInflater.from(this);
         View emptyLayout = inflater.inflate(R.layout.layout_empty_conent, null);
         mineIncomeAdapter.setEmptyView(emptyLayout);
@@ -196,16 +196,17 @@ public class MineIncomeActivity extends BaseMVPActivity<ActivityMineIncomeBindin
     public void userAccountPageSuccess(int page, UserAccountBean data) {
         if (data != null) {
             if (page == 1) {
-                dataList.clear();
                 viewBinding.refreshLayout.finishRefresh();
+                mineIncomeAdapter.getData().clear();
+                mineIncomeAdapter.notifyDataSetChanged();
                 if (data.rows != null && data.rows.size() > 0) {
                     checkHasNext(data.rows.size());
-                    dataList.addAll(data.rows);
+                    mineIncomeAdapter.setNewInstance(data.rows);
                 }
-                mineIncomeAdapter.notifyDataSetChanged();
             } else {
                 if (data.rows != null && data.rows.size() > 0) {
                     mineIncomeAdapter.getLoadMoreModule().loadMoreComplete();
+                    mineIncomeAdapter.addData(data.rows);
                     checkHasNext(data.rows.size());
                 } else {
                     mineIncomeAdapter.getLoadMoreModule().loadMoreEnd();
@@ -233,27 +234,27 @@ public class MineIncomeActivity extends BaseMVPActivity<ActivityMineIncomeBindin
             pvTime = new TimePickerBuilder(this, (date, v) -> {//选中事件回调
                 reBuildFilter(date, currentIncomeFilterStatus);
             }).setLayoutRes(com.cooleshow.base.R.layout.pickerview_default_layout, new CustomListener() {
+                @Override
+                public void customLayout(View v) {
+                    //自定义布局中的控件初始化及事件处理
+                    final TextView tvSubmit = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_finish);
+                    TextView ivCancel = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_cancel);
+                    tvSubmit.setOnClickListener(new View.OnClickListener() {
                         @Override
-                        public void customLayout(View v) {
-                            //自定义布局中的控件初始化及事件处理
-                            final TextView tvSubmit = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_finish);
-                            TextView ivCancel = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_cancel);
-                            tvSubmit.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    pvTime.returnData();
-                                    pvTime.dismiss();
-                                }
-                            });
-                            ivCancel.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    pvTime.dismiss();
-                                }
-                            });
-
+                        public void onClick(View v) {
+                            pvTime.returnData();
+                            pvTime.dismiss();
                         }
-                    })
+                    });
+                    ivCancel.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            pvTime.dismiss();
+                        }
+                    });
+
+                }
+            })
                     .setLineSpacingMultiplier(2.5f)
                     .setType(new boolean[]{true, true, false, false, false, false})// 默认全部显示
                     .setTextColorCenter(getResources().getColor(com.cooleshow.base.R.color.color_1a1a1a))//设置选中项的颜色

teacher/src/main/java/com/cooleshow/teacher/ui/income/WithdrawalRecordActivity.java

@@ -66,13 +66,14 @@ public class WithdrawalRecordActivity extends BaseMVPActivity<ActivityWithdrawal
                 break;
         }
     }
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         StatusBarUtil.setStatusBarDarkTheme(this, true);
     }
+
     private WithdrawalRecordAdapter withdrawalRecordAdapter;
-    List<WithdrawalRecordBean.RowsBean> dataList = new ArrayList<>();
 
     @Override
     protected void initView() {
@@ -83,10 +84,10 @@ public class WithdrawalRecordActivity extends BaseMVPActivity<ActivityWithdrawal
         RecyclerView rvAddress = viewBinding.recyclerView;
         LinearLayoutManager manager = new LinearLayoutManager(this);
         rvAddress.setLayoutManager(manager);
-        withdrawalRecordAdapter = new WithdrawalRecordAdapter(dataList);
+        withdrawalRecordAdapter = new WithdrawalRecordAdapter();
         LayoutInflater inflater = LayoutInflater.from(this);
         View emptyLayout = inflater.inflate(R.layout.layout_empty_conent, null);
-        ImageView im_empty_logo=emptyLayout.findViewById(R.id.im_empty_logo);
+        ImageView im_empty_logo = emptyLayout.findViewById(R.id.im_empty_logo);
         im_empty_logo.setBackgroundResource(R.drawable.icon_empty_content);
         withdrawalRecordAdapter.setEmptyView(emptyLayout);
         rvAddress.setAdapter(withdrawalRecordAdapter);
@@ -171,27 +172,27 @@ public class WithdrawalRecordActivity extends BaseMVPActivity<ActivityWithdrawal
             pvTime = new TimePickerBuilder(this, (date, v) -> {//选中事件回调
                 reBuildFilter(date, currentWithdrawalFilterStatus);
             }).setLayoutRes(com.cooleshow.base.R.layout.pickerview_default_layout, new CustomListener() {
+                @Override
+                public void customLayout(View v) {
+                    //自定义布局中的控件初始化及事件处理
+                    final TextView tvSubmit = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_finish);
+                    TextView ivCancel = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_cancel);
+                    tvSubmit.setOnClickListener(new View.OnClickListener() {
                         @Override
-                        public void customLayout(View v) {
-                            //自定义布局中的控件初始化及事件处理
-                            final TextView tvSubmit = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_finish);
-                            TextView ivCancel = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_cancel);
-                            tvSubmit.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    pvTime.returnData();
-                                    pvTime.dismiss();
-                                }
-                            });
-                            ivCancel.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    pvTime.dismiss();
-                                }
-                            });
-
+                        public void onClick(View v) {
+                            pvTime.returnData();
+                            pvTime.dismiss();
+                        }
+                    });
+                    ivCancel.setOnClickListener(new View.OnClickListener() {
+                        @Override
+                        public void onClick(View v) {
+                            pvTime.dismiss();
                         }
-                    })
+                    });
+
+                }
+            })
                     .setLineSpacingMultiplier(2.5f)
                     .setType(new boolean[]{true, true, false, false, false, false})// 默认全部显示
                     .setTextColorCenter(getResources().getColor(com.cooleshow.base.R.color.color_1a1a1a))//设置选中项的颜色
@@ -267,18 +268,19 @@ public class WithdrawalRecordActivity extends BaseMVPActivity<ActivityWithdrawal
 
     @Override
     public void withdrawalPageSuccess(int page, WithdrawalRecordBean data) {
-        if (data != null) {
+        if (data != null && withdrawalRecordAdapter != null) {
             if (page == 1) {
-                dataList.clear();
+                withdrawalRecordAdapter.getData().clear();
                 viewBinding.refreshLayout.finishRefresh();
+                withdrawalRecordAdapter.notifyDataSetChanged();
                 if (data.rows != null && data.rows.size() > 0) {
                     checkHasNext(data.rows.size());
-                    dataList.addAll(data.rows);
+                    withdrawalRecordAdapter.setNewInstance(data.rows);
                 }
-                withdrawalRecordAdapter.notifyDataSetChanged();
             } else {
                 if (data.rows != null && data.rows.size() > 0) {
                     withdrawalRecordAdapter.getLoadMoreModule().loadMoreComplete();
+                    withdrawalRecordAdapter.addData(data.rows);
                     checkHasNext(data.rows.size());
                 } else {
                     withdrawalRecordAdapter.getLoadMoreModule().loadMoreEnd();

teacher/src/main/java/com/cooleshow/teacher/ui/message/MessageBoxActivity.java

@@ -105,7 +105,6 @@ public class MessageBoxActivity extends BaseMVPActivity<ActivityMessageBoxBindin
     }
 
     private MessageBoxAdapter messageBoxAdapter;
-//    List<SystemMessageBean.RowsBean> dataList = new ArrayList<>();
 
     @Override
     protected void initView() {

teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreFragment.java

@@ -46,7 +46,6 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
     private String currentSearchStr = "";
     private String musicianAuthStatus = TeacherInfoConstants.MUSICIAN_STATUS_UNPAALY;
     private MineScoreAdapter mineScoreAdapter;
-    List<MusicSheetListBean.RowsBean> dataList = new ArrayList<>();
 
     @Override
     public void onClick(View view) {
@@ -86,17 +85,17 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
     protected void initView(View rootView) {
         auditStatus = getArguments().getString("auditStatus");
         musicianAuthStatus = getArguments().getString("musicianAuthStatus");
-        if(TextUtils.isEmpty(auditStatus)){
+        if (TextUtils.isEmpty(auditStatus)) {
             auditStatus = "PASS";
         }
-        if(TextUtils.isEmpty(musicianAuthStatus)){
+        if (TextUtils.isEmpty(musicianAuthStatus)) {
             musicianAuthStatus = TeacherInfoConstants.MUSICIAN_STATUS_PASS;
         }
         RecyclerView rvAddress = mViewBinding.recyclerView;
         mViewBinding.llUploadScore.setOnClickListener(this);
         LinearLayoutManager manager = new LinearLayoutManager(getContext());
         rvAddress.setLayoutManager(manager);
-        mineScoreAdapter = new MineScoreAdapter(dataList);
+        mineScoreAdapter = new MineScoreAdapter();
         LayoutInflater inflater = LayoutInflater.from(getContext());
         View emptyLayout = inflater.inflate(R.layout.layout_empty_conent, null);
         ImageView im_empty_logo = emptyLayout.findViewById(R.id.im_empty_logo);
@@ -206,16 +205,17 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
         }
         if (data != null) {
             if (page == 1) {
-                dataList.clear();
                 mViewBinding.refreshLayout.finishRefresh();
+                mineScoreAdapter.getData().clear();
+                mineScoreAdapter.notifyDataSetChanged();
                 if (data.rows != null && data.rows.size() > 0) {
                     checkHasNext(data.rows.size());
-                    dataList.addAll(data.rows);
+                    mineScoreAdapter.setNewInstance(data.rows);
                 }
-                mineScoreAdapter.notifyDataSetChanged();
             } else {
                 if (data.rows != null && data.rows.size() > 0) {
                     mineScoreAdapter.getLoadMoreModule().loadMoreComplete();
+                    mineScoreAdapter.addData(data.rows);
                     checkHasNext(data.rows.size());
                 } else {
                     mineScoreAdapter.getLoadMoreModule().loadMoreEnd();

teacher/src/main/java/com/cooleshow/teacher/ui/work/HomeWorkFragment.java

@@ -49,7 +49,6 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
     private int currentPage;
     private String decorate = "";
     private HomeworkAdapter homeworkAdapter;
-    private List<HomeworkListBean.RowsBean> dataList = new ArrayList<>();
     private boolean hasNext = true;
     private TimePickerView pvTime;
     private Date currentSelectDate;
@@ -89,7 +88,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         RecyclerView rvAddress = mViewBinding.recyclerView;
         LinearLayoutManager manager = new LinearLayoutManager(getContext());
         rvAddress.setLayoutManager(manager);
-        homeworkAdapter = new HomeworkAdapter(dataList);
+        homeworkAdapter = new HomeworkAdapter();
         homeworkAdapter.setDecorate(decorate);
         LayoutInflater inflater = LayoutInflater.from(getContext());
         View emptyLayout = inflater.inflate(R.layout.layout_empty_conent, null);
@@ -176,16 +175,17 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         }
         if (data != null) {
             if (page == 1) {
-                dataList.clear();
                 mViewBinding.refreshLayout.finishRefresh();
+                homeworkAdapter.getData().clear();
+                homeworkAdapter.notifyDataSetChanged();
                 if (data.rows != null && data.rows.size() > 0) {
                     checkHasNext(data.rows.size());
-                    dataList.addAll(data.rows);
+                    homeworkAdapter.setNewInstance(data.rows);
                 }
-                homeworkAdapter.notifyDataSetChanged();
             } else {
                 if (data.rows != null && data.rows.size() > 0) {
                     homeworkAdapter.getLoadMoreModule().loadMoreComplete();
+                    homeworkAdapter.addData(data.rows);
                     checkHasNext(data.rows.size());
                 } else {
                     homeworkAdapter.getLoadMoreModule().loadMoreEnd();