Pq 3 yıl önce
ebeveyn
işleme
5af1ca5574

+ 15 - 6
student/src/main/java/com/cooleshow/student/adapter/HomeworkAdapter.java

@@ -17,6 +17,7 @@ import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.HomeworkListBean;
+import com.cooleshow.student.constants.CourseConstants;
 import com.cooleshow.student.constants.HomeWorkConstants;
 
 import java.util.ArrayList;
@@ -46,8 +47,16 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
         ImageView im_header = helper.getView(R.id.im_header);
         TextView tv_name = helper.getView(R.id.tv_name);
         RecyclerView rv_mark = helper.getView(R.id.rv_mark);
-        GlideUtils.INSTANCE.loadImage(getContext(), item.teacherAvatar, im_header, R.drawable.icon_teacher_default_head);
-        tv_name.setText(item.teacherName);
+        if (TextUtils.equals(item.type, CourseConstants.OTHER_COURSE)) {
+            //陪练课
+            GlideUtils.INSTANCE.loadImage(getContext(), item.teacherAvatar, im_header, R.drawable.icon_teacher_default_head);
+            tv_name.setText(item.teacherName);
+        } else {
+            //琴房课
+            im_header.setImageResource(R.drawable.icon_piano_room_course);
+            tv_name.setText(UiUtils.getPianoCourseName(item.courseGroupName, item.classNum));
+        }
+
         if (!TextUtils.isEmpty(item.subjectName)) {
             rv_mark.setVisibility(View.VISIBLE);
             List<String> markList = new ArrayList<>();
@@ -78,12 +87,12 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
             tv_join_state.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff4e19));
         }
 
-         if (TextUtils.equals(item.homeworkStatus, HomeWorkConstants.COURSE_HOMEWORK_UN_COMMIT)) {
+        if (TextUtils.equals(item.homeworkStatus, HomeWorkConstants.COURSE_HOMEWORK_UN_COMMIT)) {
             tv_submit.setText("去提交");
             tv_submit.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
             tv_submit.setBackgroundResource(R.drawable.bg_2dc7aa_border);
-             tv_submit.setVisibility(View.VISIBLE);
-        }else{
+            tv_submit.setVisibility(View.VISIBLE);
+        } else {
             tv_submit.setVisibility(View.GONE);
         }
 
@@ -95,7 +104,7 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
             tv_state.setVisibility(View.VISIBLE);
             tv_state.setText("已点评");
             tv_state.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_999999));
-        }else {
+        } else {
             tv_state.setVisibility(View.GONE);
         }
     }

+ 3 - 2
student/src/main/java/com/cooleshow/student/ui/work/HomeWorkDetailActivity.java

@@ -19,6 +19,7 @@ import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.VideoThumbnailView;
 import com.cooleshow.student.R;
@@ -175,7 +176,7 @@ public class HomeWorkDetailActivity extends BaseMVPActivity<ActivityHomeworkDeta
         }
         this.mInfoBean = infoBean;
         //时间
-        viewBinding.tvCourseTime.setText(infoBean.classDate);
+        viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime, infoBean.endTime));
         //学生头像
         if (TextUtils.equals(infoBean.courseType, CourseConstants.OTHER_COURSE)) {
             GlideUtils.INSTANCE.loadImage(this, infoBean.teacherAvatar, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
@@ -184,7 +185,7 @@ public class HomeWorkDetailActivity extends BaseMVPActivity<ActivityHomeworkDeta
         } else {
             viewBinding.ivAvatar.setImageResource(R.drawable.icon_piano_room_course);
             //title
-            viewBinding.tvTitle.setText(infoBean.courseGroupName);
+            viewBinding.tvTitle.setText(UiUtils.getPianoCourseName(infoBean.courseGroupName, infoBean.classNum));
         }
 
         //subjectName

+ 1 - 1
student/src/main/res/layout/layout_item_homework.xml

@@ -67,7 +67,7 @@
             android:background="@color/color_f2f2f2"
             app:layout_constraintTop_toBottomOf="@+id/im_clock" />
 
-        <de.hdodenhof.circleimageview.CircleImageView
+        <com.cooleshow.base.widgets.QMUIRadiusImageView
             android:id="@+id/im_header"
             android:layout_width="@dimen/dp_47"
             android:layout_height="@dimen/dp_51"