소스 검색

增加老师端我的曲谱"已购买"tab页面

Pq 3 년 전
부모
커밋
be79adf014

+ 9 - 0
teacher/src/main/java/com/cooleshow/teacher/api/APIService.java

@@ -506,6 +506,15 @@ public interface APIService {
     Observable<BaseResponse<MusicSheetListBean>> queryMusicList(@Body RequestBody body);
 
     /**
+     * 分页查询分页查询
+     *
+     * @param body
+     * @return
+     */
+    @POST(TEACHER_GROUP + "music/sheet/my")
+    Observable<BaseResponse<MusicSheetListBean>> queryBuyMusicList(@Body RequestBody body);
+
+    /**
      * 乐谱分享
      *
      * @return

+ 41 - 0
teacher/src/main/java/com/cooleshow/teacher/presenter/score/MineScorePresenter.java

@@ -64,4 +64,45 @@ public class MineScorePresenter extends BasePresenter<MineScoreContract.MineScor
     }
 
 
+    public void queryBuyMusicSheet(boolean isLoading, String subjectIds, String searchStr, int page, String auditStatus) {
+        if (isLoading && getView() != null) {
+            getView().showLoading();
+        }
+        JSONObject jsonObject = new JSONObject();
+        try {
+            if (!TextUtils.isEmpty(subjectIds) && !TextUtils.equals(subjectIds, "0")) {
+                //全部声部的时候不传这个字段
+                jsonObject.put("subjectIds", subjectIds);
+            }
+//            jsonObject.put("auditStatus", auditStatus);
+            jsonObject.put("idAndName", searchStr);
+            jsonObject.putOpt("page", page);
+            jsonObject.putOpt("rows", Constants.DEFAULT_DATA_SIZE);
+        } catch (JSONException e) {
+            e.printStackTrace();
+        }
+        addSubscribe(create(APIService.class).queryBuyMusicList(RequestBodyUtil.convertToRequestBodyJson(jsonObject.toString())), new BaseObserver<MusicSheetListBean>(getView()) {
+            @Override
+            protected void onSuccess(MusicSheetListBean data) {
+                if (getView() != null) {
+                    getView().queryMusicListSuccess(page, data);
+                }
+            }
+
+            @Override
+            public void onComplete() {
+                super.onComplete();
+                getView().hideLoading();
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+                if (getView() != null) {
+                    getView().queryMusicListError(page);
+                }
+            }
+        });
+    }
+
 }

+ 8 - 4
teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreActivity.java

@@ -62,12 +62,16 @@ import io.rong.imlib.model.Conversation;
 @Route(path = RouterPath.ScoreCenter.TEACHER_MINE_SCORE)
 public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding, MineScoreActPresenter> implements MineScoreActContract.MineScoreActView, View.OnClickListener {
     public static final int SHARE_CHAT_REQUEST_CODE = 500;
+    public static final String TYPE_BUY = "BUY";//已购买
+    public static final String TYPE_PASS = "PASS";//已上架
+    public static final String TYPE_DOING = "DOING";//审核中
+    public static final String TYPE_UNPASS = "UNPASS";//审核失败
     private String currentSubjectId = "";
     private String currentSearchStr = "";
     private TabLayout tabLayout;
     private ViewPager viewPager;
-    private List<String> titles = new ArrayList<String>(Arrays.asList("已上架", "审核中", "审核失败"));
-    private List<String> auditStatusList = new ArrayList<String>(Arrays.asList("PASS", "DOING", "UNPASS"));
+    private List<String> titles = new ArrayList<String>(Arrays.asList("已购买", "已上架", "审核中", "审核失败"));
+    private List<String> auditStatusList = new ArrayList<String>(Arrays.asList(TYPE_BUY,TYPE_PASS, TYPE_DOING, TYPE_UNPASS));
     private List<Fragment> fragments = new ArrayList<>();
     private ArrayList<QuerySubjectBean> subjectBeanList = new ArrayList<>();
     private ShareAction mShareAction;
@@ -131,7 +135,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
      */
     private void selectVocalPart() {
         if (subjectBeanList.size() == 0) {
-            subjectBeanList.add(new QuerySubjectBean("声部", 0));
+            subjectBeanList.add(new QuerySubjectBean("全部声部", 0));
         }
         List<PopMenuBean> popList = new ArrayList<>();
         for (QuerySubjectBean bean : subjectBeanList) {
@@ -208,7 +212,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
             return;
         }
         subjectBeanList.clear();
-        subjectBeanList.add(new QuerySubjectBean("声部", 0));
+        subjectBeanList.add(new QuerySubjectBean("全部声部", 0));
         subjectBeanList.addAll(data);
     }
 

+ 13 - 4
teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreFragment.java

@@ -45,7 +45,7 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
     private String auditStatus = "";
     private String currentSubjectId = "";
     private String currentSearchStr = "";
-//    private String musicianAuthStatus = TeacherInfoConstants.MUSICIAN_STATUS_UNPAALY;
+    //    private String musicianAuthStatus = TeacherInfoConstants.MUSICIAN_STATUS_UNPAALY;
     private MineScoreAdapter mineScoreAdapter;
 
     @Override
@@ -85,7 +85,12 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
     protected void initView(View rootView) {
         auditStatus = getArguments().getString("auditStatus");
         if (TextUtils.isEmpty(auditStatus)) {
-            auditStatus = "PASS";
+            auditStatus = MineScoreActivity.TYPE_PASS;
+        }
+        if (TextUtils.equals(MineScoreActivity.TYPE_BUY, auditStatus)) {
+            mViewBinding.llUploadScore.setVisibility(View.GONE);
+        } else {
+            mViewBinding.llUploadScore.setVisibility(View.VISIBLE);
         }
         RecyclerView rvAddress = mViewBinding.recyclerView;
         mViewBinding.llUploadScore.setOnClickListener(this);
@@ -132,7 +137,7 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
         mineScoreAdapter.setOnItemClickListener((adapter, view, position) -> {
             List<MusicSheetListBean.RowsBean> data = mineScoreAdapter.getData();
             MusicSheetListBean.RowsBean rowsBean = data.get(position);
-            if (TextUtils.equals(rowsBean.auditStatus, "UNPASS")) {
+            if (TextUtils.equals(rowsBean.auditStatus, MineScoreActivity.TYPE_UNPASS)) {
                 ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
                         .withString(WebConstants.WEB_URL, String.format(WebConstants.EDIT_SCORE_PAGE, rowsBean.id))
                         .navigation();
@@ -181,7 +186,11 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
     }
 
     private void queryScore(boolean isLoading) {
-        presenter.queryPageCourseGroup(isLoading, currentSubjectId, currentSearchStr, currentPage, auditStatus);
+        if (TextUtils.equals(MineScoreActivity.TYPE_BUY, auditStatus)) {
+            presenter.queryBuyMusicSheet(isLoading, currentSubjectId, currentSearchStr, currentPage, auditStatus);
+        } else {
+            presenter.queryPageCourseGroup(isLoading, currentSubjectId, currentSearchStr, currentPage, auditStatus);
+        }
     }
 
     public void goSearch(String searchStr, String subjectId) {

+ 1 - 1
teacher/src/main/res/layout/fragment_mine_score.xml

@@ -66,7 +66,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        tools:visibility="visible">
+        tools:visibility="gone">
 
 
         <ImageView