修改老师端subjectId参数类型

tclive/src/main/java/com/daya/tclive/bean/LiveRoomInfoBean.java

@@ -43,7 +43,7 @@ public class LiveRoomInfoBean implements Parcelable {
     public String speakerImUserId;
     public String speakerName;
     public String speakerPic;
-    public int subjectId;
+    public String subjectId;
     public String type;//房间类型 live直播课  temp临时直播间
     private LiveRoomConfigBean liveRoomConfig;
     private String userSig;
@@ -238,7 +238,7 @@ public class LiveRoomInfoBean implements Parcelable {
         dest.writeString(this.speakerId);
         dest.writeString(this.speakerName);
         dest.writeString(this.speakerPic);
-        dest.writeInt(this.subjectId);
+        dest.writeString(this.subjectId);
         dest.writeString(this.type);
         dest.writeParcelable(this.liveRoomConfig, flags);
         dest.writeString(this.userSig);
@@ -260,7 +260,7 @@ public class LiveRoomInfoBean implements Parcelable {
         this.speakerId = source.readString();
         this.speakerName = source.readString();
         this.speakerPic = source.readString();
-        this.subjectId = source.readInt();
+        this.subjectId = source.readString();
         this.type = source.readString();
         this.liveRoomConfig = source.readParcelable(LiveRoomConfigBean.class.getClassLoader());
         this.userSig = source.readString();

teacher/src/main/java/com/cooleshow/teacher/bean/QuerySubjectBean.java

@@ -43,7 +43,7 @@ public class QuerySubjectBean implements IPickerViewData, IFilterViewData, IComm
 			"updateTime": ""
      */
 
-    public QuerySubjectBean(String name, int id) {
+    public QuerySubjectBean(String name, String id) {
         this.id = id;
         this.name = name;
     }
@@ -52,10 +52,10 @@ public class QuerySubjectBean implements IPickerViewData, IFilterViewData, IComm
     public String createTime;
     public boolean delFlag;
     public String desc;
-    public int id;
+    public String id;
     public String img;
     public String name;
-    public int parentSubjectId;
+    public String parentSubjectId;
     public String parentSubjectName;
     public List<QuerySubjectBean> subjects;
     public String updateTime;

teacher/src/main/java/com/cooleshow/teacher/contract/PianoRoomCourseContract.java

@@ -15,6 +15,6 @@ public interface PianoRoomCourseContract {
     }
 
     interface Presenter {
-        void queryPianoRoomCourseList(boolean isShowLoading,String month, String status, int subjectId,int page);
+        void queryPianoRoomCourseList(boolean isShowLoading,String month, String status, String subjectId,int page);
     }
 }

teacher/src/main/java/com/cooleshow/teacher/contract/SparringCourseContract.java

@@ -14,6 +14,6 @@ public interface SparringCourseContract {
     }
 
     interface Presenter {
-        void querySparringCourse(boolean isShowLoading,String month, String status, int subjectId,int page);
+        void querySparringCourse(boolean isShowLoading,String month, String status, String subjectId,int page);
     }
 }

teacher/src/main/java/com/cooleshow/teacher/presenter/course/PianoRoomCoursePresenter.java

@@ -1,5 +1,7 @@
 package com.cooleshow.teacher.presenter.course;
 
+import android.text.TextUtils;
+
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
@@ -21,7 +23,7 @@ import org.json.JSONObject;
 public class PianoRoomCoursePresenter extends BasePresenter<PianoRoomCourseContract.PianoRoomCourseView> implements PianoRoomCourseContract.Presenter {
 
     @Override
-    public void queryPianoRoomCourseList(boolean isShowLoading, String month, String status, int subjectId, int page) {
+    public void queryPianoRoomCourseList(boolean isShowLoading, String month, String status, String subjectId, int page) {
         if (isShowLoading && getView() != null) {
             getView().showLoading();
         }
@@ -29,7 +31,7 @@ public class PianoRoomCoursePresenter extends BasePresenter<PianoRoomCourseContr
         try {
             jsonObject.putOpt("month", month);
             jsonObject.putOpt("status", status);
-            if (subjectId != 0) {
+            if (!TextUtils.isEmpty(subjectId)) {
                 jsonObject.putOpt("subjectId", subjectId);
             }
             jsonObject.putOpt("page", page);

teacher/src/main/java/com/cooleshow/teacher/presenter/course/SparringCoursePresenter.java

@@ -1,5 +1,7 @@
 package com.cooleshow.teacher.presenter.course;
 
+import android.text.TextUtils;
+
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.presenter.BasePresenter;
 import com.cooleshow.base.rx.BaseObserver;
@@ -19,7 +21,7 @@ import org.json.JSONObject;
 public class SparringCoursePresenter extends BasePresenter<SparringCourseContract.SparringCourseView> implements SparringCourseContract.Presenter {
 
     @Override
-    public void querySparringCourse(boolean isShowLoading, String month, String status, int subjectId, int page) {
+    public void querySparringCourse(boolean isShowLoading, String month, String status, String subjectId, int page) {
         if (isShowLoading && getView() != null) {
             getView().showLoading();
         }
@@ -28,7 +30,7 @@ public class SparringCoursePresenter extends BasePresenter<SparringCourseContrac
         entry.status=status;
         entry.page=page;
         entry.rows= Constants.DEFAULT_DATA_SIZE;
-        if (subjectId != 0) {
+        if (!TextUtils.isEmpty(subjectId)) {
             entry.subjectId = String.valueOf(subjectId);
         }
         addSubscribe(create(APIService.class).getSparringCourses(entry), new BaseObserver<SparringCourseListBean>(getView()) {

teacher/src/main/java/com/cooleshow/teacher/ui/course/InterestCourseGroupFragment.java

@@ -244,7 +244,7 @@ public class InterestCourseGroupFragment extends BaseMVPFragment<FgInterestCours
 
     public void querySubjectItemSuccess(List<QuerySubjectBean> data) {
         subjectBeanList.clear();
-        subjectBeanList.add(new QuerySubjectBean("全部", 0));
+        subjectBeanList.add(new QuerySubjectBean("全部", ""));
         subjectBeanList.addAll(data);
     }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/course/LiveCourseGroupFragment.java

@@ -285,7 +285,7 @@ public class LiveCourseGroupFragment extends BaseMVPFragment<FragmentLiveCourseL
 
     public void querySubjectItemSuccess(List<QuerySubjectBean> data) {
         subjectBeanList.clear();
-        subjectBeanList.add(new QuerySubjectBean("全部", 0));
+        subjectBeanList.add(new QuerySubjectBean("全部", ""));
         subjectBeanList.addAll(data);
     }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoCourseGroupFragment.java

@@ -247,7 +247,7 @@ public class PianoCourseGroupFragment extends BaseMVPFragment<FgPianoCourseGroup
 
     public void querySubjectItemSuccess(List<QuerySubjectBean> data) {
         subjectBeanList.clear();
-        subjectBeanList.add(new QuerySubjectBean("全部", 0));
+        subjectBeanList.add(new QuerySubjectBean("全部", ""));
         subjectBeanList.addAll(data);
     }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseFragment.java

@@ -64,7 +64,7 @@ public class PianoRoomCourseFragment extends BaseMVPFragment<FragmentPianoRoomCo
     private String currentCourseFilterStatus = CourseConstants.COURSE_FILTER_ALL;
     private String currentFilterDate;
     private Date currentSelectDate;
-    private int currentSubjectId;
+    private String currentSubjectId;
     private int currentPage;
     private boolean hasNext = true;
     private PianoRoomCourseListAdapter mAdapter;
@@ -330,7 +330,7 @@ public class PianoRoomCourseFragment extends BaseMVPFragment<FragmentPianoRoomCo
         if (v.getId() == R.id.tv_agency) {
             //选择声部
             if (subjectBeanList.size() == 0) {
-                subjectBeanList.add(new QuerySubjectBean("全部声部", 0));
+                subjectBeanList.add(new QuerySubjectBean("全部声部", ""));
             }
             List<PopMenuBean> popList = new ArrayList<>();
             for (QuerySubjectBean bean : subjectBeanList) {
@@ -362,7 +362,7 @@ public class PianoRoomCourseFragment extends BaseMVPFragment<FragmentPianoRoomCo
 
     public void querySubjectItemSuccess(List<QuerySubjectBean> data) {
         subjectBeanList.clear();
-        subjectBeanList.add(new QuerySubjectBean("全部声部", 0));
+        subjectBeanList.add(new QuerySubjectBean("全部声部", ""));
         subjectBeanList.addAll(data);
     }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseFragment.java

@@ -58,7 +58,7 @@ public class SparringCourseFragment extends BaseMVPFragment<FragmentSparringCour
     private String currentCourseFilterStatus = CourseConstants.COURSE_FILTER_ALL;
     private String currentFilterDate;
     private Date currentSelectDate;
-    private int currentSubjectId;
+    private String currentSubjectId;
     private int currentPage;
     private boolean hasNext = true;
     private SparringCourseListAdapter mAdapter;
@@ -310,7 +310,7 @@ public class SparringCourseFragment extends BaseMVPFragment<FragmentSparringCour
         if (v.getId() == R.id.tv_agency) {
             //选择声部
             if (subjectBeanList.size() == 0) {
-                subjectBeanList.add(new QuerySubjectBean("全部声部", 0));
+                subjectBeanList.add(new QuerySubjectBean("全部声部", ""));
             }
             List<PopMenuBean> popList = new ArrayList<>();
             for (QuerySubjectBean bean : subjectBeanList) {
@@ -342,7 +342,7 @@ public class SparringCourseFragment extends BaseMVPFragment<FragmentSparringCour
 
     public void querySubjectItemSuccess(List<QuerySubjectBean> data) {
         subjectBeanList.clear();
-        subjectBeanList.add(new QuerySubjectBean("全部声部", 0));
+        subjectBeanList.add(new QuerySubjectBean("全部声部", ""));
         subjectBeanList.addAll(data);
     }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/course/VIPCourseGroupFragment.java

@@ -243,7 +243,7 @@ public class VIPCourseGroupFragment extends BaseMVPFragment<FgVipCourseLayoutBin
 
     public void querySubjectItemSuccess(List<QuerySubjectBean> data) {
         subjectBeanList.clear();
-        subjectBeanList.add(new QuerySubjectBean("全部", 0));
+        subjectBeanList.add(new QuerySubjectBean("全部", ""));
         subjectBeanList.addAll(data);
     }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/course/VideoCourseGroupFragment.java

@@ -215,7 +215,7 @@ public class VideoCourseGroupFragment extends BaseMVPFragment<FragmentVideoCours
 
     public void querySubjectItemSuccess(List<QuerySubjectBean> data) {
         subjectBeanList.clear();
-        subjectBeanList.add(new QuerySubjectBean("全部", 0));
+        subjectBeanList.add(new QuerySubjectBean("全部", ""));
         subjectBeanList.addAll(data);
     }
 

teacher/src/main/java/com/cooleshow/teacher/ui/homepage/SheetMusicPageFragment.java

@@ -52,7 +52,7 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
     private EmptyViewLayout mEmptyView;
     private View mCertTipView;
     private List<QuerySubjectBean> subjectBeanList = new ArrayList<>();
-    private int currentSubjectId = 0;
+    private String currentSubjectId = "";
     private String mIdNames;
     private String teacherCertStatus = TeacherInfoConstants.ENTRY_STATUS_UNPAALY;
     private OptionsPickerView pvOptions;
@@ -159,7 +159,7 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
 
     private void selectSubject() {
         if (subjectBeanList.size() == 0) {
-            subjectBeanList.add(new QuerySubjectBean("全部声部", 0));
+            subjectBeanList.add(new QuerySubjectBean("全部声部", ""));
         }
         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("全部声部", ""));
         subjectBeanList.addAll(data);
     }
 

teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreActivity.java

@@ -169,7 +169,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
      */
     private void selectVocalPart() {
         if (subjectBeanList.size() == 0) {
-            subjectBeanList.add(new QuerySubjectBean("全部声部", 0));
+            subjectBeanList.add(new QuerySubjectBean("全部声部", ""));
         }
         List<PopMenuBean> popList = new ArrayList<>();
         for (QuerySubjectBean bean : subjectBeanList) {
@@ -271,7 +271,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
             return;
         }
         subjectBeanList.clear();
-        subjectBeanList.add(new QuerySubjectBean("全部声部", 0));
+        subjectBeanList.add(new QuerySubjectBean("全部声部", ""));
         subjectBeanList.addAll(data);
     }