|  | @@ -69,16 +69,16 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
 | 
	
		
			
				|  |  |          mAdapter = new HomePageSheetMusicAdapter();
 | 
	
		
			
				|  |  |          mViewBinding.refreshLayout.setOnRefreshListener(refreshLayout -> {
 | 
	
		
			
				|  |  |              currentPage = 1;
 | 
	
		
			
				|  |  | -            queryList(true);
 | 
	
		
			
				|  |  | +            queryList(false);
 | 
	
		
			
				|  |  |          });
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          mAdapter.getLoadMoreModule().setOnLoadMoreListener(() -> {
 | 
	
		
			
				|  |  | -            //上拉加载
 | 
	
		
			
				|  |  | -            if (hasNext) {
 | 
	
		
			
				|  |  | -                currentPage++;
 | 
	
		
			
				|  |  | -                queryList(false);
 | 
	
		
			
				|  |  | -            } else {
 | 
	
		
			
				|  |  | -                mAdapter.getLoadMoreModule().loadMoreEnd();
 | 
	
		
			
				|  |  | +                //上拉加载
 | 
	
		
			
				|  |  | +                if (hasNext) {
 | 
	
		
			
				|  |  | +                    currentPage++;
 | 
	
		
			
				|  |  | +                    queryList(false);
 | 
	
		
			
				|  |  | +                } else {
 | 
	
		
			
				|  |  | +                    mAdapter.getLoadMoreModule().loadMoreEnd();
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  |          });
 | 
	
		
			
				|  |  |          mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 | 
	
	
		
			
				|  | @@ -144,22 +144,22 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
 | 
	
		
			
				|  |  |       * 选择声部
 | 
	
		
			
				|  |  |       */
 | 
	
		
			
				|  |  |      private void selectVocalPart() {
 | 
	
		
			
				|  |  | -        if (subjectBeanList.size() == 0) {
 | 
	
		
			
				|  |  | -            subjectBeanList.add(new QuerySubjectBean("声部", 0));
 | 
	
		
			
				|  |  | -        }
 | 
	
		
			
				|  |  | -        List<PopMenuBean> popList = new ArrayList<>();
 | 
	
		
			
				|  |  | -        for (QuerySubjectBean bean : subjectBeanList) {
 | 
	
		
			
				|  |  | -            PopMenuBean popMenuBean = new PopMenuBean();
 | 
	
		
			
				|  |  | -            popMenuBean.setActionName(bean.name);
 | 
	
		
			
				|  |  | -            popList.add(popMenuBean);
 | 
	
		
			
				|  |  | -        }
 | 
	
		
			
				|  |  | +//        if (subjectBeanList.size() == 0) {
 | 
	
		
			
				|  |  | +//            subjectBeanList.add(new QuerySubjectBean("全部声部", 0));
 | 
	
		
			
				|  |  | +//        }
 | 
	
		
			
				|  |  | +//        List<PopMenuBean> popList = new ArrayList<>();
 | 
	
		
			
				|  |  | +//        for (QuerySubjectBean bean : subjectBeanList) {
 | 
	
		
			
				|  |  | +//            PopMenuBean popMenuBean = new PopMenuBean();
 | 
	
		
			
				|  |  | +//            popMenuBean.setActionName(bean.name);
 | 
	
		
			
				|  |  | +//            popList.add(popMenuBean);
 | 
	
		
			
				|  |  | +//        }
 | 
	
		
			
				|  |  |          selectSubject();
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      private void selectSubject() {
 | 
	
		
			
				|  |  |          if (subjectBeanList.size() == 0) {
 | 
	
		
			
				|  |  | -            subjectBeanList.add(new QuerySubjectBean("声部", 0));
 | 
	
		
			
				|  |  | +            subjectBeanList.add(new QuerySubjectBean("全部声部", 0));
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          pvOptions = new OptionsPickerBuilder(getContext(), (options1, options2, options3, v) -> {
 | 
	
		
			
				|  |  |              this.currentSelectSubjectPosition = options1;
 | 
	
	
		
			
				|  | @@ -288,7 +288,7 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
 | 
	
		
			
				|  |  |      @Override
 | 
	
		
			
				|  |  |      public void querySubjectItemSuccess(List<QuerySubjectBean> data) {
 | 
	
		
			
				|  |  |          subjectBeanList.clear();
 | 
	
		
			
				|  |  | -        subjectBeanList.add(new QuerySubjectBean("声部", 0));
 | 
	
		
			
				|  |  | +        subjectBeanList.add(new QuerySubjectBean("全部声部", 0));
 | 
	
		
			
				|  |  |          subjectBeanList.addAll(data);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |  
 |