소스 검색

优化首页部分loading

Pq 3 달 전
부모
커밋
b1b13ac27a

+ 2 - 2
teacher/src/main/java/com/cooleshow/teacher/contract/CourseTableContract.java

@@ -22,9 +22,9 @@ public interface CourseTableContract {
     }
 
     interface Presenter {
-        void getCourseScheduleDateByMonth(String month);
+        void getCourseScheduleDateByMonth(String month,boolean isShowLoading);
 
-        void getCourseSchedulesWithDate(Date date);
+        void getCourseSchedulesWithDate(Date date,boolean isShowLoading);
 
         void updateCourseTime(Date date, String courseId);
     }

+ 4 - 4
teacher/src/main/java/com/cooleshow/teacher/presenter/main/CourseTablePresenter.java

@@ -26,8 +26,8 @@ public class CourseTablePresenter extends BasePresenter<CourseTableContract.Cour
      * @param month
      */
     @Override
-    public void getCourseScheduleDateByMonth(String month) {
-        if (getView() != null) {
+    public void getCourseScheduleDateByMonth(String month, boolean isShowLoading) {
+        if (isShowLoading && getView() != null) {
             getView().showLoading();
         }
         JSONObject jsonObject = new JSONObject();
@@ -61,8 +61,8 @@ public class CourseTablePresenter extends BasePresenter<CourseTableContract.Cour
      * @param date
      */
     @Override
-    public void getCourseSchedulesWithDate(Date date) {
-        if (getView() != null) {
+    public void getCourseSchedulesWithDate(Date date, boolean isShowLoading) {
+        if (isShowLoading && getView() != null) {
             getView().showLoading();
         }
         JSONObject jsonObject = new JSONObject();

+ 9 - 2
teacher/src/main/java/com/cooleshow/teacher/presenter/main/HomePresenter.java

@@ -151,11 +151,18 @@ public class HomePresenter extends BasePresenter<HomeContract.HomeView> implemen
         });
     }
 
+    public void appHome() {
+        appHome(false);
+    }
+
     /**
      * 获取App首页入口信息
      */
-    public void appHome() {
-        getView().showLoading();
+    public void appHome(boolean isShowLoading) {
+        if (isShowLoading && getView() != null) {
+            getView().showLoading();
+        }
+
         JSONObject jsonObject = new JSONObject();
         try {
             jsonObject.putOpt("platform", "android");

+ 8 - 8
teacher/src/main/java/com/cooleshow/teacher/ui/main/CourseTableFragment.kt

@@ -147,7 +147,7 @@ class CourseTableFragment :
             gotoCourseDetail(position);
         }
         mViewBinding.refreshLayout.setOnRefreshListener {
-            queryCurrentDataCourse()
+            queryCurrentDataCourse(false)
         }
         mViewBinding.refreshLayout.isEnabled = false
     }
@@ -263,20 +263,20 @@ class CourseTableFragment :
         calendarDate =
             TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"))
         setMontAndDay(year, month, day)
-        queryCurrentDataCourse()
+        queryCurrentDataCourse(true)
     }
 
     override fun onResume() {
         super.onResume()
-        queryCurrentDataCourse()
+        queryCurrentDataCourse(false)
     }
 
     /**
      * 查询当前选择日期的课程
      */
-    private fun queryCurrentDataCourse() {
-        presenter.getCourseScheduleDateByMonth(calendarDate)
-        presenter.getCourseSchedulesWithDate(currentSelectDate)
+    private fun queryCurrentDataCourse(isShowLoading: Boolean) {
+        presenter.getCourseScheduleDateByMonth(calendarDate,isShowLoading)
+        presenter.getCourseSchedulesWithDate(currentSelectDate,isShowLoading)
     }
 
     override fun onCalendarIntercept(calendar: com.haibin.calendarview.Calendar?): Boolean {
@@ -293,7 +293,7 @@ class CourseTableFragment :
     override fun onMonthChange(year: Int, month: Int) {
         setMontAndDay(year, month, day)
         presenter?.let {
-            presenter.getCourseScheduleDateByMonth(getMonth(year, month))
+            presenter.getCourseScheduleDateByMonth(getMonth(year, month),true)
         }
     }
 
@@ -345,7 +345,7 @@ class CourseTableFragment :
         if (isDetached) {
             return;
         }
-        queryCurrentDataCourse();
+        queryCurrentDataCourse(true);
     }
 
     /**

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/main/NewHomeFragmentV2.java

@@ -649,7 +649,8 @@ public class NewHomeFragmentV2 extends BaseMVPFragment<FgNewHomeV2LayoutBinding,
 
         //机构模式下专辑配置 不等于0为已配置 显示相应入口
         tenantAlbumStatus = teacherUserInfo.getTenantAlbumStatus();
-        presenter.appHome();
+        boolean isShowLoading = menuAdapter.getCount() == 0;
+        presenter.appHome(isShowLoading);
     }
 
     private void handleVipStyle(TeacherUserInfo userInfo) {