修改老师端收入筛选类型

teacher/src/main/java/com/cooleshow/teacher/adapter/IncomeFilterAdapter.java

@@ -8,6 +8,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.IncomeFilterBean;
+import com.cooleshow.teacher.constants.IncomeType;
 
 /**
  * 创建日期：2022/5/23 15:03
@@ -15,7 +16,7 @@ import com.cooleshow.teacher.bean.IncomeFilterBean;
  * @author Ryan
  * 类说明：
  */
-public class IncomeFilterAdapter extends BaseQuickAdapter<IncomeFilterBean, BaseViewHolder> {
+public class IncomeFilterAdapter extends BaseQuickAdapter<IncomeType, BaseViewHolder> {
     private int selectPosition = -1;
 
     public IncomeFilterAdapter(int layoutResId) {
@@ -23,8 +24,8 @@ public class IncomeFilterAdapter extends BaseQuickAdapter<IncomeFilterBean, Base
     }
 
     @Override
-    protected void convert(@NonNull BaseViewHolder holder, IncomeFilterBean bean) {
-        holder.setText(R.id.tv_title, bean.showText);
+    protected void convert(@NonNull BaseViewHolder holder, IncomeType bean) {
+        holder.setText(R.id.tv_title, bean.getText());
         TextView tv_title = holder.getView(R.id.tv_title);
         if (getItemPosition(bean) == selectPosition) {
             tv_title.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));

teacher/src/main/java/com/cooleshow/teacher/adapter/MineIncomeAdapter.java

@@ -53,10 +53,6 @@ public class MineIncomeAdapter extends BaseQuickAdapter<UserAccountBean.RowsBean
             tv_time.setText(item.timeDay);
         }
         switch (item.bizType) {
-            case "PIANO_ROOM_CLASS":
-                im_state.setImageResource(R.drawable.icon_income_item_piano);
-                tv_date.setText(UiUtils.getCourseTimeString(item.startTime, item.endTime));
-                break;
             case "VIP":
                 im_state.setImageResource(R.drawable.icon_income_item_vip);
                 tv_date.setText(UiUtils.getCourseTimeString(item.startTime, item.endTime));

teacher/src/main/java/com/cooleshow/teacher/adapter/VIPCourseGroupDetailAdapter.java

@@ -13,6 +13,8 @@ import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.VIPCourseGroupDetailListBean;
 import com.cooleshow.teacher.constants.CourseConstants;
 
+import java.util.ArrayList;
+
 import androidx.annotation.NonNull;
 
 /**
@@ -32,7 +34,11 @@ public class VIPCourseGroupDetailAdapter extends BaseQuickAdapter<VIPCourseGroup
         TextView tv_course_status = holder.getView(R.id.tv_course_status);
 
         ImageView iv_avatar = holder.getView(R.id.iv_avatar);
-        GlideUtils.INSTANCE.loadImage(getContext(), data.getAvatar(), iv_avatar, R.drawable.icon_teacher_default_head);
+        ArrayList<VIPCourseGroupDetailListBean.CourseStudentVosBean> courseStudentVos = data.getCourseStudentVos();
+        if (courseStudentVos != null && courseStudentVos.size() > 0) {
+            VIPCourseGroupDetailListBean.CourseStudentVosBean courseStudentVosBean = courseStudentVos.get(0);
+            GlideUtils.INSTANCE.loadImage(getContext(), courseStudentVosBean.getAvatar(), iv_avatar, R.drawable.icon_teacher_default_head);
+        }
 
         holder.setText(R.id.tv_title, data.getCourseGroupName());
 

teacher/src/main/java/com/cooleshow/teacher/constants/IncomeType.java

@@ -0,0 +1,52 @@
+package com.cooleshow.teacher.constants;
+
+import com.contrarywind.interfaces.IPickerViewData;
+
+/**
+ * Author by pq, Date on 2024/6/24.
+ */
+public enum IncomeType implements IPickerViewData {
+    ALL("", "全部收入"),
+    VIP("VIP", "VIP课"),
+    PRACTICE("PRACTICE", "趣纠课"),
+    LIVE("LIVE", "直播课"),
+    VIDEO("VIDEO", "视频课"),
+    MUSIC("MUSIC", "乐谱"),
+    LIVE_SHARE("LIVE_SHARE", "直播课推荐"),
+    VIDEO_SHARE("VIDEO_SHARE", "视频课推荐"),
+    MUSIC_SHARE("MUSIC_SHARE", "乐谱推荐"),
+    VIP_SHARE("VIP_SHARE", "小酷Ai推荐"),
+    MALL_SHARE("MALL_SHARE", "商品推荐"),
+    ACTI_REGIST_SHARE("ACTI_REGIST_SHARE", "活动推广"),
+    ALBUM_SHARE("ALBUM_SHARE", "专辑分润");
+
+    IncomeType(String id, String value) {
+        this.id = id;
+        this.value = value;
+    }
+
+    private String id;
+    private String value;
+
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getText() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String getPickerViewText() {
+        return getText();
+    }
+}

teacher/src/main/java/com/cooleshow/teacher/ui/income/MineIncomeActivity.java

@@ -39,6 +39,7 @@ import com.cooleshow.teacher.bean.AccountDetailBean;
 import com.cooleshow.teacher.bean.CourseFilterStatusBean;
 import com.cooleshow.teacher.bean.IncomeFilterBean;
 import com.cooleshow.teacher.bean.UserAccountBean;
+import com.cooleshow.teacher.constants.IncomeType;
 import com.cooleshow.teacher.contract.MineIncomeContract;
 import com.cooleshow.teacher.databinding.ActivityMineIncomeBinding;
 import com.cooleshow.teacher.presenter.income.MineIncomePresenter;
@@ -46,6 +47,7 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -64,33 +66,24 @@ public class MineIncomeActivity extends BaseMVPActivity<ActivityMineIncomeBindin
 
     @Override
     public void onClick(View view) {
-        switch (view.getId()) {
-            case com.cooleshow.base.R.id.tv_right_text:
-                ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
-                        .withString(WebConstants.WEB_URL, WebConstants.TEACHER_INCOME)
-                        .navigation();
-                break;
-            case R.id.tv_date:
-                showTimeSelectPicker();
-                break;
-            case R.id.tv_income_type:
-//                initPop(viewBinding.tvIncomeType);
-                showIncomeTypeFilter();
-                break;
-            case R.id.tv_withdrawal:
-                ARouter.getInstance().build(RouterPath.IncomeCenter.TEACHER_MINE_WITHDRAWAL)
-                        .navigation();
-                break;
-            case R.id.view_frozen_amount:
-                //冻结金额
-                ARouter.getInstance().build(RouterPath.IncomeCenter.TEACHER_FROZEN_AMOUNT)
-                        .navigation();
-                break;
-            case R.id.view_pending_amount:
-                //待入账金额
-                ARouter.getInstance().build(RouterPath.IncomeCenter.TEACHER_PENDING_AMOUNT)
-                        .navigation();
-                break;
+        int id = view.getId();
+        if (id == com.cooleshow.base.R.id.tv_right_text) {
+            ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
+                    .withString(WebConstants.WEB_URL, WebConstants.TEACHER_INCOME)
+                    .navigation();
+        } else if (id == R.id.tv_date) {
+            showTimeSelectPicker();
+        } else if (id == R.id.tv_income_type) {//                initPop(viewBinding.tvIncomeType);
+            showIncomeTypeFilter();
+        } else if (id == R.id.tv_withdrawal) {
+            ARouter.getInstance().build(RouterPath.IncomeCenter.TEACHER_MINE_WITHDRAWAL)
+                    .navigation();
+        } else if (id == R.id.view_frozen_amount) {//冻结金额
+            ARouter.getInstance().build(RouterPath.IncomeCenter.TEACHER_FROZEN_AMOUNT)
+                    .navigation();
+        } else if (id == R.id.view_pending_amount) {//待入账金额
+            ARouter.getInstance().build(RouterPath.IncomeCenter.TEACHER_PENDING_AMOUNT)
+                    .navigation();
         }
 
     }
@@ -176,22 +169,24 @@ public class MineIncomeActivity extends BaseMVPActivity<ActivityMineIncomeBindin
         reBuildFilter(null, "");
     }
 
-    private ArrayList<IncomeFilterBean> mFilterStatusBeans;
+    private ArrayList<IncomeType> mFilterStatusBeans;
 
     private void buildDefaultStatusFilterList() {
         mFilterStatusBeans = new ArrayList<>();
-        mFilterStatusBeans.add(new IncomeFilterBean("", "全部收入"));
-        mFilterStatusBeans.add(new IncomeFilterBean("PRACTICE", "陪练课"));
-        mFilterStatusBeans.add(new IncomeFilterBean("LIVE", "直播课"));
-        mFilterStatusBeans.add(new IncomeFilterBean("VIDEO", "视频课"));
-        mFilterStatusBeans.add(new IncomeFilterBean("MUSIC", "乐谱"));
-        mFilterStatusBeans.add(new IncomeFilterBean("LIVE_SHARE", "直播课推荐"));
-        mFilterStatusBeans.add(new IncomeFilterBean("VIDEO_SHARE", "视频课推荐"));
-        mFilterStatusBeans.add(new IncomeFilterBean("MUSIC_SHARE", "乐谱推荐"));
-        mFilterStatusBeans.add(new IncomeFilterBean("VIP_SHARE", "小酷Ai推荐"));
-        mFilterStatusBeans.add(new IncomeFilterBean("MALL_SHARE", "商品推荐"));
-        mFilterStatusBeans.add(new IncomeFilterBean("ACTI_REGIST_SHARE", "活动推广"));
-        mFilterStatusBeans.add(new IncomeFilterBean("ALBUM_SHARE", "专辑分润"));
+        IncomeType[] values = IncomeType.values();
+        mFilterStatusBeans.addAll(Arrays.asList(values));
+//        mFilterStatusBeans.add(new IncomeFilterBean("", "全部收入"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("PRACTICE", "陪练课"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("LIVE", "直播课"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("VIDEO", "视频课"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("MUSIC", "乐谱"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("LIVE_SHARE", "直播课推荐"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("VIDEO_SHARE", "视频课推荐"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("MUSIC_SHARE", "乐谱推荐"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("VIP_SHARE", "小酷Ai推荐"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("MALL_SHARE", "商品推荐"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("ACTI_REGIST_SHARE", "活动推广"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("ALBUM_SHARE", "专辑分润"));
 
     }
 
@@ -333,9 +328,9 @@ public class MineIncomeActivity extends BaseMVPActivity<ActivityMineIncomeBindin
                 public void onOptionsSelect(int options1, int option2, int options3, View v) {
                     //返回的分别是三个级别的选中位置
                     if (options1 < mFilterStatusBeans.size()) {
-                        IncomeFilterBean incomeFilterBean = mFilterStatusBeans.get(options1);
-                        viewBinding.tvIncomeType.setText(incomeFilterBean.showText);
-                        reBuildFilter(currentSelectDate, incomeFilterBean.value);
+                        IncomeType incomeFilterBean = mFilterStatusBeans.get(options1);
+                        viewBinding.tvIncomeType.setText(incomeFilterBean.getText());
+                        reBuildFilter(currentSelectDate, incomeFilterBean.getId());
                     }
                 }
             }).setLayoutRes(com.cooleshow.base.R.layout.pickerview_options_default_layout, new CustomListener() {

teacher/src/main/java/com/cooleshow/teacher/ui/income/PendingAmountActivity.java

@@ -28,6 +28,7 @@ import com.cooleshow.teacher.adapter.OtherAmountListAdapter;
 import com.cooleshow.teacher.bean.AccountDetailBean;
 import com.cooleshow.teacher.bean.IncomeFilterBean;
 import com.cooleshow.teacher.bean.UserAccountBean;
+import com.cooleshow.teacher.constants.IncomeType;
 import com.cooleshow.teacher.contract.FrozenAmountContract;
 import com.cooleshow.teacher.databinding.ActivityFrozenAmountLayoutBinding;
 import com.cooleshow.teacher.databinding.ActivityPendingAmountLayoutBinding;
@@ -35,6 +36,7 @@ import com.cooleshow.teacher.presenter.income.FrozenAmountPresenter;
 import com.cooleshow.teacher.presenter.income.PendingAmountPresenter;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -55,7 +57,7 @@ public class PendingAmountActivity extends BaseMVPActivity<ActivityPendingAmount
     private String currentFilterDate;
     private Date currentSelectDate;
     private TimePickerView pvTime;
-    private ArrayList<IncomeFilterBean> mFilterStatusBeans;
+    private ArrayList<IncomeType> mFilterStatusBeans;
     private OptionsPickerView mIncomeTypeSelector;
 
     @Override
@@ -111,18 +113,20 @@ public class PendingAmountActivity extends BaseMVPActivity<ActivityPendingAmount
 
     private void buildDefaultStatusFilterList() {
         mFilterStatusBeans = new ArrayList<>();
-        mFilterStatusBeans.add(new IncomeFilterBean("", "全部类型"));
-        mFilterStatusBeans.add(new IncomeFilterBean("PRACTICE", "陪练课"));
-        mFilterStatusBeans.add(new IncomeFilterBean("LIVE", "直播课"));
-        mFilterStatusBeans.add(new IncomeFilterBean("VIDEO", "视频课"));
-        mFilterStatusBeans.add(new IncomeFilterBean("MUSIC", "乐谱"));
-        mFilterStatusBeans.add(new IncomeFilterBean("LIVE_SHARE", "直播课推荐"));
-        mFilterStatusBeans.add(new IncomeFilterBean("VIDEO_SHARE", "视频课推荐"));
-        mFilterStatusBeans.add(new IncomeFilterBean("MUSIC_SHARE", "乐谱推荐"));
-        mFilterStatusBeans.add(new IncomeFilterBean("VIP_SHARE", "小酷Ai推荐"));
-        mFilterStatusBeans.add(new IncomeFilterBean("MALL_SHARE", "商品推荐"));
-        mFilterStatusBeans.add(new IncomeFilterBean("ACTI_REGIST_SHARE", "活动推广"));
-        mFilterStatusBeans.add(new IncomeFilterBean("ALBUM_SHARE", "专辑分润"));
+        IncomeType[] values = IncomeType.values();
+        mFilterStatusBeans.addAll(Arrays.asList(values));
+//        mFilterStatusBeans.add(new IncomeFilterBean("", "全部类型"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("PRACTICE", "陪练课"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("LIVE", "直播课"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("VIDEO", "视频课"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("MUSIC", "乐谱"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("LIVE_SHARE", "直播课推荐"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("VIDEO_SHARE", "视频课推荐"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("MUSIC_SHARE", "乐谱推荐"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("VIP_SHARE", "小酷Ai推荐"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("MALL_SHARE", "商品推荐"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("ACTI_REGIST_SHARE", "活动推广"));
+//        mFilterStatusBeans.add(new IncomeFilterBean("ALBUM_SHARE", "专辑分润"));
     }
 
 
@@ -275,9 +279,9 @@ public class PendingAmountActivity extends BaseMVPActivity<ActivityPendingAmount
                 public void onOptionsSelect(int options1, int option2, int options3, View v) {
                     //返回的分别是三个级别的选中位置
                     if (options1 < mFilterStatusBeans.size()) {
-                        IncomeFilterBean incomeFilterBean = mFilterStatusBeans.get(options1);
-                        viewBinding.tvIncomeType.setText(incomeFilterBean.showText);
-                        reBuildFilter(currentSelectDate, incomeFilterBean.value);
+                        IncomeType incomeFilterBean = mFilterStatusBeans.get(options1);
+                        viewBinding.tvIncomeType.setText(incomeFilterBean.getText());
+                        reBuildFilter(currentSelectDate, incomeFilterBean.getId());
                     }
                 }
             }).setLayoutRes(com.cooleshow.base.R.layout.pickerview_options_default_layout, new CustomListener() {