修改部分问题

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

@@ -72,14 +72,18 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
             showTimeSelectPicker();
         }
         if (id == R.id.tv_search) {
-            currentPage = 1;
             search = mViewBinding.etTargetName.getText().toString().trim();
-            queryCourse(false);
+            refresh(true);
             return;
         }
 
     }
 
+    private void refresh(boolean isShowLoading) {
+        currentPage = 1;
+        queryCourse(isShowLoading);
+    }
+
     @Override
     protected FragmentHomeworkBinding getLayoutView() {
         return FragmentHomeworkBinding.inflate(getLayoutInflater());
@@ -112,9 +116,13 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
     @Override
     protected void initData() {
         initListener();
-        currentPage = 1;
         reBuildFilter(null);
-        queryCourse(true);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refresh(true);
     }
 
     private void initListener(){
@@ -152,8 +160,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         mViewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() {
             @Override
             public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-                currentPage = 1;
-                queryCourse(true);
+                refresh(false);
             }
         });
 
@@ -243,6 +250,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         if (pvTime == null) {
             pvTime = new TimePickerBuilder(requireContext(), (date, v) -> {//选中事件回调
                 reBuildFilter(date);
+                queryCourse(false);
             }).setLayoutRes(com.cooleshow.base.R.layout.pickerview_default_layout, new CustomListener() {
                         @Override
                         public void customLayout(View v) {
@@ -294,6 +302,5 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         currentFilterDate = targetDateTimeStr;
         currentPage = 1;
         mViewBinding.tvDate.setText(currentFilterDate);
-        queryCourse(true);
     }
 }

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

@@ -72,9 +72,8 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         }
 
         if (id == R.id.tv_search) {
-            currentPage = 1;
             search = mViewBinding.etTargetName.getText().toString().trim();
-            queryCourse(false);
+            refresh(true);
             return;
         }
     }
@@ -106,7 +105,6 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
 
     @Override
     protected void initData() {
-        currentPage = 1;
         initListener();
         reBuildFilter(null);
     }
@@ -154,8 +152,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         });
 
         mViewBinding.refreshLayout.setOnRefreshListener(refreshLayout -> {
-            currentPage = 1;
-            queryCourse(false);
+            refresh(false);
         });
 
         mViewBinding.refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() {
@@ -172,11 +169,16 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         });
     }
 
+    private void refresh(boolean isShowLoading) {
+        currentPage = 1;
+        queryCourse(isShowLoading);
+    }
+
 
     @Override
     public void onResume() {
         super.onResume();
-        queryCourse(false);
+        refresh(true);
     }
 
     /**
@@ -249,7 +251,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         if (pvTime == null) {
             pvTime = new TimePickerBuilder(requireContext(), (date, v) -> {//选中事件回调
                 reBuildFilter(date);
-                queryCourse(true);
+                queryCourse(false);
             }).setLayoutRes(com.cooleshow.base.R.layout.pickerview_default_layout, v -> {
                         //自定义布局中的控件初始化及事件处理
                         final TextView tvSubmit = v.findViewById(com.cooleshow.base.R.id.tv_finish);