| 
					
				 | 
			
			
				@@ -73,12 +73,12 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         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())); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -169,16 +169,17 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             mViewBinding.headerView.getLeftText().setText(bean.name); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             queryList(true); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }).setLayoutRes(com.cooleshow.base.R.layout.pickerview_address_layout, 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(v12 -> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                pvOptions.returnData(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                pvOptions.dismiss(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            ivCancel.setOnClickListener(v1 -> pvOptions.dismiss()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    //自定义布局中的控件初始化及事件处理 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    final TextView tvSubmit = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_finish); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    tvSubmit.setText(getContext().getString(com.cooleshow.base.R.string.confirm_str)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    TextView ivCancel = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_cancel); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    tvSubmit.setOnClickListener(v12 -> { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        pvOptions.returnData(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        pvOptions.dismiss(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    }); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    ivCancel.setOnClickListener(v1 -> pvOptions.dismiss()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        }).setTextColorOut(getResources().getColor(com.cooleshow.base.R.color.color_aaaaaa)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                }).setTextColorOut(getResources().getColor(com.cooleshow.base.R.color.color_aaaaaa)) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .setDividerColor(Color.TRANSPARENT) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 .setBgColor(Color.TRANSPARENT).isDialog(false).build(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         pvOptions.setPicker(subjectBeanList); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -319,12 +320,12 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(id == R.id.tv_filter){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (id == R.id.tv_filter) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //声部筛选 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             selectVocalPart(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        if(id == R.id.tv_search){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (id == R.id.tv_search) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             mViewBinding.headerView.clearEditFocus(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             musicSearch(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             return; 
			 |