Browse Source

增加首页默认声部字段兼容性问题

Pq 2 years ago
parent
commit
aa75da7ba3

+ 11 - 1
teacher/src/main/java/com/cooleshow/teacher/bean/TeacherUserInfo.java

@@ -1,5 +1,7 @@
 package com.cooleshow.teacher.bean;
 
+import android.text.TextUtils;
+
 import java.io.Serializable;
 
 /**
@@ -88,6 +90,14 @@ public class TeacherUserInfo implements Serializable {
     public boolean isSettlement;
     public String tag;//用于显示老师徽章
     public int isVip;//0非会员 1会员
-    public String defaultSubject;//当前声部id
+    private String defaultSubject;//当前声部id 为0表示没有默认声部id
     public String defaultSubjectName;//当前声部name
+
+    public String getDefaultSubject() {
+        if (!TextUtils.equals(defaultSubject, "0")) {
+            return defaultSubject;
+        }
+        return "";
+    }
+
 }

+ 3 - 0
teacher/src/main/java/com/cooleshow/teacher/presenter/main/HomePresenter.java

@@ -253,6 +253,9 @@ public class HomePresenter extends BasePresenter<HomeContract.HomeView> implemen
      * 同步当前声部id
      */
     public void syncSubjectFilter(String currentSubjectId) {
+        if (TextUtils.isEmpty(currentSubjectId)) {
+            return;
+        }
         Map<String, String> params = new HashMap<>();
         params.put("subjectId", currentSubjectId);
         addSubscribe(create(APIService.class).syncSubjectFilter(params), new BaseObserver<Object>(getView()) {

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

@@ -531,7 +531,7 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
             return;
         }
         //处理声部
-        currentSubjectId = teacherUserInfo.defaultSubject;
+        currentSubjectId = teacherUserInfo.getDefaultSubject();
         mViewBinding.tvCurrentSubject.setText(!TextUtils.isEmpty(teacherUserInfo.defaultSubjectName) ? teacherUserInfo.defaultSubjectName : "全部");
         handleSubjects(teacherUserInfo.subjectName, teacherUserInfo.subjectId);
         refreshMusicData();