修改琴房课和小组课图片路径获取

BaseLibrary/src/main/java/com/cooleshow/base/constanst/CourseType.java

@@ -52,6 +52,9 @@ public enum CourseType implements IPickerViewData, IFilterViewData {
         if (TextUtils.equals(type, CourseType.PIANO_ROOM_CLASS.getId())) {
             return com.cooleshow.base.R.drawable.icon_piano_room_course;
         }
+        if (TextUtils.equals(type, CourseType.GROUP.getId())) {
+            return com.cooleshow.base.R.drawable.icon_group_course_avatar_112_112;
+        }
         return -1;
     }
 }

student/src/main/java/com/cooleshow/student/adapter/CourseTableListAdapter.kt

@@ -82,7 +82,7 @@ class CourseTableListAdapter(layoutResId: Int) :
         }
         else if (TextUtils.equals(CourseType.GROUP.id, data?.courseType)) {
             //小组课
-            ivAvatar.setImageResource(R.drawable.icon_group_course_avatar_112_112)
+            ivAvatar.setImageResource(com.cooleshow.base.R.drawable.icon_group_course_avatar_112_112)
             val count: String = if (!TextUtils.isEmpty(data?.payCount)) data!!.payCount else "0"
             tvBuyNum.text = count + "人"
             viewLine2.setVisible(false)

student/src/main/java/com/cooleshow/student/adapter/HomeworkAdapter.java

@@ -46,13 +46,14 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
 
         ImageView im_header = helper.getView(R.id.iv_avatar);
 
-        helper.setText(R.id.tv_title,item.courseGroupName);
+        helper.setText(R.id.tv_title, item.courseGroupName);
 
         TextView tv_name = helper.getView(R.id.tv_name);
         tv_name.setText(item.teacherName);
-        if (TextUtils.equals(item.type, CourseType.PIANO_ROOM_CLASS.getId())) {
+        int avatarByType = CourseType.getAvatarByType(item.type);
+        if (avatarByType != -1) {
             //琴房课
-            im_header.setImageResource(com.cooleshow.base.R.drawable.icon_piano_room_course);
+            im_header.setImageResource(avatarByType);
         } else {
             //陪练课
             GlideUtils.INSTANCE.loadImage(getContext(), item.teacherAvatar, im_header, R.drawable.icon_teacher_default_head);

student/src/main/java/com/cooleshow/student/ui/work/HomeWorkDetailActivity.java

@@ -160,8 +160,9 @@ public class HomeWorkDetailActivity extends BaseMVPActivity<ActivityHomeworkDeta
         //时间
         viewBinding.tvTime.setText(UiUtils.getCourseTimeString(infoBean.startTime, infoBean.endTime));
         //学生头像
-        if (TextUtils.equals(infoBean.courseType, CourseType.PIANO_ROOM_CLASS.getId())) {
-            viewBinding.ivAvatar.setImageResource(com.cooleshow.base.R.drawable.icon_piano_room_course);
+        int avatarByType = CourseType.getAvatarByType(infoBean.courseType);
+        if (avatarByType != -1) {
+            viewBinding.ivAvatar.setImageResource(avatarByType);
             viewBinding.tvTitle.setText(infoBean.courseGroupName);
         } else {
             GlideUtils.INSTANCE.loadImage(this, infoBean.teacherAvatar, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);

teacher/src/main/java/com/cooleshow/teacher/adapter/CourseTableListAdapter.kt

@@ -93,7 +93,7 @@ class CourseTableListAdapter(layoutResId: Int) :
             baseViewHolder.setText(R.id.tv_title, data?.name);
         }else if(TextUtils.equals(CourseType.GROUP.id, data?.courseType)){
             //小组课
-            ivAvatar.setImageResource(R.drawable.icon_group_course_avatar_112_112)
+            ivAvatar.setImageResource(com.cooleshow.base.R.drawable.icon_group_course_avatar_112_112)
             tvBuyNum.text = data?.payCount + "人"
             viewLine2.setVisible(true)
             tvBuyNum.setVisible(true)

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

@@ -51,8 +51,9 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
         helper.setText(R.id.tv_title, item.courseGroupName);
         TextView tv_name = helper.getView(R.id.tv_name);
         tv_name.setText(item.studentName);
-        if (TextUtils.equals(item.type, CourseType.PIANO_ROOM_CLASS.getId())) {
-            im_header.setImageResource(com.cooleshow.base.R.drawable.icon_piano_room_course);
+        int avatarByType = CourseType.getAvatarByType(item.type);
+        if (avatarByType != -1) {
+            im_header.setImageResource(avatarByType);
         } else {
             GlideUtils.INSTANCE.loadImage(getContext(), item.studentAvatar, im_header, R.drawable.icon_teacher_default_head);
         }

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

@@ -7,6 +7,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.cooleshow.base.constanst.CourseType;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GlideUtils;
@@ -101,7 +102,8 @@ public class PianoRoomCourseHomeWorkActivity extends BaseMVPActivity<ActivityPia
             return;
         }
         //学生头像
-        viewBinding.ivAvatar.setImageResource(com.cooleshow.base.R.drawable.icon_piano_room_course);
+        int avatarByType = CourseType.getAvatarByType(infoBean.courseType);
+        viewBinding.ivAvatar.setImageResource(avatarByType);
         //title
         viewBinding.tvTitle.setText(UserHelper.getStudentName(infoBean.studentName, studentId));
         //subjectName

teacher/src/main/java/com/cooleshow/teacher/ui/work/AssignHomeworkActivity.java

@@ -105,9 +105,9 @@ public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomewo
         viewBinding.tvTitle.setText(bean.courseGroupName);
         viewBinding.tvName.setText(bean.studentName);
         //subjectName
-        if (TextUtils.equals(bean.courseType, CourseType.PIANO_ROOM_CLASS.getId())) {
-            //琴房课
-            viewBinding.ivAvatar.setImageResource(com.cooleshow.base.R.drawable.icon_piano_room_course);
+        int avatarByType = CourseType.getAvatarByType(bean.courseType);
+        if (avatarByType != -1) {
+            viewBinding.ivAvatar.setImageResource(avatarByType);
         } else {
             //陪练课
             GlideUtils.INSTANCE.loadImage(this, bean.studentAvatar, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);