修改专辑筛选流程,去掉字段

institution/src/main/java/com/cooleshow/institution/stu/adapter/SwitchAlbumAdapter.java

@@ -59,7 +59,7 @@ public class SwitchAlbumAdapter extends BaseQuickAdapter<AlbumListBean, BaseView
 
         View cs_root = holder.getView(R.id.cs_root);
         View iv_select = holder.getView(R.id.iv_select);
-        boolean isSelect = TextUtils.equals(albumListBean.getTenantGroupAlbumId(), selectId);
+        boolean isSelect = TextUtils.equals(albumListBean.getId(), selectId);
         if (isSelect) {
             tv_des.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.white));
             iv_select.setVisibility(View.VISIBLE);

institution/src/main/java/com/cooleshow/institution/stu/api/APIService.java

@@ -79,7 +79,7 @@ public interface APIService {
      * @return
      */
     @GET(STUDENT_GROUP + "tenantGroupAlbum/buyAlbumInfoDetail")
-    Observable<BaseResponse<AlbumDetailBean>> getAlbumDetail(@Query("tenantGroupAlbumId") String tenantGroupAlbumId);
+    Observable<BaseResponse<AlbumDetailBean>> getAlbumDetail(@Query("tenantAlbumId") String tenantAlbumId);
 
     /**
      * app首页卡片专辑

institution/src/main/java/com/cooleshow/institution/stu/constants/JGWebConstants.java

@@ -35,9 +35,9 @@ public class JGWebConstants {
     public static final String RANK_BOARD = getBaseUrlH5() + "/#/ranking-list";
     public static final String ACTIVATION_CODE = getBaseUrlH5() + "/#/activation-code";
     public static final String TRAIN_TOOLS = getBaseUrlH5() + "/#/train-tool?subjectType=%s";
-    public static final String TRAIN_TOOLS2 = getBaseUrlH5() + "/#/train-tool?subjectType=%s&albumId=%s&taId=%s";
-    public static final String TRAIN_LIST = getBaseUrlH5() + "/#/train-list?subjectType=%s&albumId=%s&taId=%s";
-    public static final String ACCOMPANY_HELP = getBaseUrlH5() + "/#/lessonCourseware?albumId=%s&taId=%s";
+    public static final String TRAIN_TOOLS2 = getBaseUrlH5() + "/#/train-tool?subjectType=%s&albumId=%s";
+    public static final String TRAIN_LIST = getBaseUrlH5() + "/#/train-list?subjectType=%s&albumId=%s";
+    public static final String ACCOMPANY_HELP = getBaseUrlH5() + "/#/lessonCourseware?albumId=%s";
     //我的乐谱
     public static final String MUSIC_PERSONAL = getBaseUrlH5() + "/#/music-personal";
 

institution/src/main/java/com/cooleshow/institution/stu/constants/JGWebStartHelper.java

@@ -121,17 +121,17 @@ public class JGWebStartHelper {
                 .navigation();
     }
 
-    public static void startTrainTools2(String subjectType,String  albumId,String tenantGroupAlbumId){
+    public static void startTrainTools2(String subjectType,String  albumId){
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
-                .withString(WebConstants.WEB_URL, String.format(JGWebConstants.TRAIN_TOOLS2,subjectType,albumId,tenantGroupAlbumId))
+                .withString(WebConstants.WEB_URL, String.format(JGWebConstants.TRAIN_TOOLS2,subjectType,albumId))
                 .navigation();
     }
 
-    public static void startTrainList(String type,String albumId,String tenantGroupAlbumId){
+    public static void startTrainList(String type,String albumId){
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
-                .withString(WebConstants.WEB_URL, String.format(JGWebConstants.TRAIN_LIST,type,albumId,tenantGroupAlbumId))
+                .withString(WebConstants.WEB_URL, String.format(JGWebConstants.TRAIN_LIST,type,albumId))
                 .navigation();
     }
 
@@ -142,10 +142,10 @@ public class JGWebStartHelper {
                 .navigation();
     }
 
-    public static void startAccompanyHelp(String albumId,String taId) {
+    public static void startAccompanyHelp(String albumId) {
         ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)
-                .withString(WebConstants.WEB_URL, String.format(JGWebConstants.ACCOMPANY_HELP,albumId,taId))
+                .withString(WebConstants.WEB_URL, String.format(JGWebConstants.ACCOMPANY_HELP,albumId))
                 .navigation();
 
     }

institution/src/main/java/com/cooleshow/institution/stu/ui/main/CardAnimFragment.java

@@ -19,22 +19,20 @@ public class CardAnimFragment extends BaseFragment<FgCardAnimLayoutBinding> {
     private int pageType = HomePageType.EMPTY.getValue();
     private String pageTypeValue = HomePageType.EMPTY.getType();
     private String albumId = "";
-    private String tenantGroupAlbumId = "";
     private int mStatus;
 
     private boolean isCanPlay = false;
 
     public static CardAnimFragment newInstance(int type, String typeValue, int status) {
-        return newInstance(type, typeValue, "", "", status);
+        return newInstance(type, typeValue, "", status);
     }
 
-    public static CardAnimFragment newInstance(int type, String typeValue, String albumId, String tenantGroupAlbumId, int status) {
+    public static CardAnimFragment newInstance(int type, String typeValue, String albumId, int status) {
         Bundle bundle = new Bundle();
         bundle.putInt("type", type);
         bundle.putString("typeValue", typeValue);
         bundle.putInt("status", status);
         bundle.putString("albumId", albumId);
-        bundle.putString("tenantGroupAlbumId", tenantGroupAlbumId);
         CardAnimFragment cardAnimFragment = new CardAnimFragment();
         cardAnimFragment.setArguments(bundle);
         return cardAnimFragment;
@@ -53,7 +51,6 @@ public class CardAnimFragment extends BaseFragment<FgCardAnimLayoutBinding> {
             pageTypeValue = arguments.getString("typeValue", HomePageType.EMPTY.getType());
             mStatus = arguments.getInt("status", -1);
             albumId = arguments.getString("albumId", "");
-            tenantGroupAlbumId = arguments.getString("tenantGroupAlbumId", "");
         }
         loadAnim();
         if (mStatus != -1) {
@@ -71,10 +68,10 @@ public class CardAnimFragment extends BaseFragment<FgCardAnimLayoutBinding> {
                 }
                 if (!TextUtils.isEmpty(pageTypeValue)) {
                     if (TextUtils.equals(pageTypeValue, HomePageType.ACCOMPANY_HELP.getType())) {
-                        JGWebStartHelper.startAccompanyHelp(albumId,tenantGroupAlbumId);
+                        JGWebStartHelper.startAccompanyHelp(albumId);
                         return;
                     }
-                    JGWebStartHelper.startTrainList(pageTypeValue, albumId,tenantGroupAlbumId);
+                    JGWebStartHelper.startTrainList(pageTypeValue, albumId);
                 }
             }
         });
@@ -138,7 +135,7 @@ public class CardAnimFragment extends BaseFragment<FgCardAnimLayoutBinding> {
                 if (UiUtils.isFastClick()) {
                     return;
                 }
-                JGWebStartHelper.startTrainTools2(pageTypeValue, albumId,tenantGroupAlbumId);
+                JGWebStartHelper.startTrainTools2(pageTypeValue, albumId);
             }
         });
     }

institution/src/main/java/com/cooleshow/institution/stu/ui/main/HomeCardFragment.java

@@ -53,7 +53,6 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
     private HomeCardPageAdapter mCardPageAdapter;
     private HomeViewModel mHomeViewModel;
     private String defaultAlbumId = "";
-    private String tenantGroupAlbumId = "";
 
     private ViewPager2.OnPageChangeCallback mPageChangeCallback = new ViewPager2.OnPageChangeCallback() {
         @Override
@@ -157,7 +156,7 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
         if (mSwitchAlbumView == null) {
             mSwitchAlbumView = new SwitchAlbumView(getContext());
         }
-        mSwitchAlbumView.setData(tenantGroupAlbumId, allAlbumDatas);
+        mSwitchAlbumView.setData(defaultAlbumId, allAlbumDatas);
         ViewGroup parent = (ViewGroup) mSwitchAlbumView.getParent();
         if (parent != null) {
             parent.removeView(mSwitchAlbumView);
@@ -239,7 +238,7 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
             //合奏训练
             pageList.add(HomePageType.ALL_PRACTICE);
         }
-        if (!isNeedRefresh(data.getId(), data.getTenantGroupAlbumId(), tenantAlbumStatus, pageList)) {
+        if (!isNeedRefresh(data.getId(), tenantAlbumStatus, pageList)) {
             return;
         }
         this.currentPageTypeList = pageList;
@@ -251,7 +250,7 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
         ArrayList<Fragment> list = new ArrayList<>();
         for (int i = 0; i < pageList.size(); i++) {
             HomePageType page = pageList.get(i);
-            CardAnimFragment cardAnimFragment = CardAnimFragment.newInstance(page.getValue(), page.getType(), defaultAlbumId, tenantGroupAlbumId, tenantAlbumStatus);
+            CardAnimFragment cardAnimFragment = CardAnimFragment.newInstance(page.getValue(), page.getType(), defaultAlbumId, tenantAlbumStatus);
             list.add(cardAnimFragment);
         }
         this.currentData = data;
@@ -261,10 +260,7 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
 //        mCardPageAdapter.notifyDataSetChanged();
     }
 
-    private boolean isNeedRefresh(String defaultAlbumId, String tenantGroupAlbumId, int status, ArrayList<HomePageType> pageList) {
-        if (currentData != null && !TextUtils.equals(tenantGroupAlbumId, currentData.getTenantGroupAlbumId())) {
-            return true;
-        }
+    private boolean isNeedRefresh(String defaultAlbumId, int status, ArrayList<HomePageType> pageList) {
         if (currentData != null && !TextUtils.equals(defaultAlbumId, currentData.getId())) {
             return true;
         }
@@ -332,10 +328,9 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
 
     private void setDefaultText(AlbumListBean defaultSelectAlbum) {
         this.defaultAlbumId = defaultSelectAlbum.getId();
-        this.tenantGroupAlbumId = defaultSelectAlbum.getTenantGroupAlbumId();
-        UserHelper.setCustomCache(UserHelper.DEFAULT_ALBUM_ID, tenantGroupAlbumId);
+        UserHelper.setCustomCache(UserHelper.DEFAULT_ALBUM_ID, defaultAlbumId);
         mViewBinding.tvSwitchAlbum.setText(defaultSelectAlbum.getName());
-        getAlbumDetail(defaultSelectAlbum.getTenantGroupAlbumId());
+        getAlbumDetail(defaultSelectAlbum.getId());
     }
 
     private void getAlbumDetail(String tenantGroupAlbumId) {
@@ -349,7 +344,7 @@ public class HomeCardFragment extends BaseMVPFragment<FgHomeCardLayoutBinding, H
         }
         for (int i = 0; i < data.size(); i++) {
             AlbumListBean albumListBean = data.get(i);
-            if (TextUtils.equals(defaultAlbumId, albumListBean.getTenantGroupAlbumId())) {
+            if (TextUtils.equals(defaultAlbumId, albumListBean.getId())) {
                 return albumListBean;
             }
         }