|
@@ -5,9 +5,17 @@
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="match_parent">
|
|
|
|
|
|
+ <ImageView
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:adjustViewBounds="true"
|
|
|
+ android:src="@drawable/bg_sparring_course_header"
|
|
|
+ app:layout_constraintLeft_toLeftOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="parent" />
|
|
|
+
|
|
|
<include
|
|
|
android:id="@+id/toolbar_include"
|
|
|
- layout="@layout/common_toolbar_layout" />
|
|
|
+ layout="@layout/common_toolbar_layout_white" />
|
|
|
|
|
|
<androidx.core.widget.NestedScrollView
|
|
|
android:layout_width="match_parent"
|
|
@@ -27,101 +35,118 @@
|
|
|
android:paddingBottom="12dp">
|
|
|
|
|
|
<androidx.constraintlayout.widget.ConstraintLayout
|
|
|
+ android:id="@+id/cs_top_info"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:background="@drawable/bg_white_10dp"
|
|
|
- android:paddingBottom="20dp">
|
|
|
+ android:paddingStart="12dp"
|
|
|
+ android:paddingEnd="12dp"
|
|
|
+ android:paddingBottom="12dp"
|
|
|
+ app:layout_constraintLeft_toLeftOf="parent"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/title_view">
|
|
|
|
|
|
<ImageView
|
|
|
- android:id="@+id/iv_time_icon"
|
|
|
+ android:id="@+id/iv_clock_icon"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginStart="11dp"
|
|
|
- android:layout_marginTop="12dp"
|
|
|
+ android:layout_marginTop="15dp"
|
|
|
android:src="@drawable/icon_clock"
|
|
|
app:layout_constraintLeft_toLeftOf="parent"
|
|
|
app:layout_constraintTop_toTopOf="parent" />
|
|
|
|
|
|
<TextView
|
|
|
- android:id="@+id/tv_course_time"
|
|
|
+ android:id="@+id/tv_time"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
+ android:layout_marginStart="6dp"
|
|
|
android:includeFontPadding="false"
|
|
|
- android:paddingStart="7dp"
|
|
|
android:textColor="@color/color_666666"
|
|
|
android:textSize="@dimen/sp_13"
|
|
|
- app:layout_constraintBottom_toBottomOf="@+id/iv_time_icon"
|
|
|
- app:layout_constraintLeft_toRightOf="@+id/iv_time_icon"
|
|
|
- app:layout_constraintTop_toTopOf="@+id/iv_time_icon"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/iv_clock_icon"
|
|
|
+ app:layout_constraintLeft_toRightOf="@+id/iv_clock_icon"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/iv_clock_icon"
|
|
|
tools:text="2021/09/17 14:00~14:25" />
|
|
|
|
|
|
- <TextView
|
|
|
- android:id="@+id/tv_course_status"
|
|
|
- android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
- android:layout_marginEnd="11dp"
|
|
|
- android:text="已结束"
|
|
|
- android:textColor="@color/color_999999"
|
|
|
- android:textSize="@dimen/sp_14"
|
|
|
- app:layout_constraintBottom_toBottomOf="@+id/iv_time_icon"
|
|
|
- app:layout_constraintRight_toRightOf="parent"
|
|
|
- app:layout_constraintTop_toTopOf="@+id/iv_time_icon" />
|
|
|
-
|
|
|
<View
|
|
|
android:id="@+id/view_line"
|
|
|
- android:layout_width="match_parent"
|
|
|
- android:layout_height="1px"
|
|
|
- android:layout_marginTop="10dp"
|
|
|
+ android:layout_width="0dp"
|
|
|
+ android:layout_height="1dp"
|
|
|
+ android:layout_marginTop="15dp"
|
|
|
android:background="@color/color_f2f2f2"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/iv_time_icon" />
|
|
|
+ app:layout_constraintLeft_toLeftOf="parent"
|
|
|
+ app:layout_constraintRight_toRightOf="parent"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/iv_clock_icon" />
|
|
|
|
|
|
- <com.cooleshow.base.widgets.QMUIRadiusImageView
|
|
|
+ <de.hdodenhof.circleimageview.CircleImageView
|
|
|
android:id="@+id/iv_avatar"
|
|
|
- android:layout_width="54dp"
|
|
|
- android:layout_height="54dp"
|
|
|
- android:layout_marginStart="11dp"
|
|
|
- android:layout_marginTop="17dp"
|
|
|
- app:qmui_corner_radius="5dp"
|
|
|
- app:layout_constraintBottom_toBottomOf="parent"
|
|
|
+ android:layout_width="40dp"
|
|
|
+ android:layout_height="40dp"
|
|
|
+ android:layout_marginTop="12dp"
|
|
|
+ android:src="@drawable/icon_default_head"
|
|
|
app:layout_constraintLeft_toLeftOf="parent"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/view_line" />
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/view_line"
|
|
|
+ app:qmui_corner_radius="5dp" />
|
|
|
|
|
|
<TextView
|
|
|
android:id="@+id/tv_title"
|
|
|
- android:layout_width="wrap_content"
|
|
|
+ android:layout_width="0dp"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_marginStart="10dp"
|
|
|
- android:layout_marginEnd="10dp"
|
|
|
android:ellipsize="end"
|
|
|
android:includeFontPadding="false"
|
|
|
- android:maxLines="2"
|
|
|
+ android:maxLines="1"
|
|
|
android:textColor="@color/color_1a1a1a"
|
|
|
- android:textSize="@dimen/sp_16"
|
|
|
- android:textStyle="bold"
|
|
|
- app:layout_constraintBottom_toTopOf="@+id/tv_course_name"
|
|
|
+ android:textSize="@dimen/sp_15"
|
|
|
+ app:layout_constraintBottom_toTopOf="@+id/tv_name"
|
|
|
+ app:layout_constraintHorizontal_bias="0"
|
|
|
+ app:layout_constraintHorizontal_chainStyle="packed"
|
|
|
app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
|
|
|
- app:layout_constraintRight_toLeftOf="@+id/iv_go_chat"
|
|
|
+ app:layout_constraintRight_toLeftOf="@+id/iv_attendance_status"
|
|
|
app:layout_constraintTop_toTopOf="@+id/iv_avatar"
|
|
|
app:layout_constraintVertical_chainStyle="packed"
|
|
|
- tools:text="张豆豆张豆豆张豆豆张豆" />
|
|
|
-
|
|
|
+ app:layout_constraintWidth_default="wrap"
|
|
|
+ tools:text="VIP定制课-张豆豆VIP定制课-张豆豆" />
|
|
|
|
|
|
<ImageView
|
|
|
- android:id="@+id/iv_go_chat"
|
|
|
+ android:id="@+id/iv_attendance_status"
|
|
|
android:layout_width="wrap_content"
|
|
|
- android:layout_height="wrap_content"
|
|
|
+ android:layout_height="17.1dp"
|
|
|
android:layout_marginStart="5dp"
|
|
|
- android:paddingStart="5dp"
|
|
|
- android:src="@drawable/icon_chat_small"
|
|
|
+ android:layout_marginEnd="5dp"
|
|
|
+ android:adjustViewBounds="true"
|
|
|
+ android:src="@drawable/icon_course_attendance_truancy"
|
|
|
+ android:visibility="gone"
|
|
|
app:layout_constraintBottom_toBottomOf="@+id/tv_title"
|
|
|
app:layout_constraintLeft_toRightOf="@+id/tv_title"
|
|
|
+ app:layout_constraintRight_toRightOf="parent"
|
|
|
app:layout_constraintTop_toTopOf="@+id/tv_title" />
|
|
|
|
|
|
<TextView
|
|
|
+ android:id="@+id/tv_name"
|
|
|
+ android:layout_width="0dp"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginTop="4dp"
|
|
|
+ android:ellipsize="middle"
|
|
|
+ android:includeFontPadding="false"
|
|
|
+ android:singleLine="true"
|
|
|
+ android:textColor="@color/color_999999"
|
|
|
+ android:textSize="@dimen/sp_13"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
|
|
|
+ app:layout_constraintHorizontal_bias="0"
|
|
|
+ app:layout_constraintHorizontal_chainStyle="packed"
|
|
|
+ app:layout_constraintLeft_toLeftOf="@+id/tv_title"
|
|
|
+ app:layout_constraintRight_toLeftOf="@+id/tv_course_name"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tv_title"
|
|
|
+ app:layout_constraintWidth_default="wrap"
|
|
|
+ tools:text="张豆豆张豆豆张豆豆张豆豆张豆豆张豆豆张豆豆张豆豆张豆豆张豆豆张豆豆张豆豆" />
|
|
|
+
|
|
|
+
|
|
|
+ <TextView
|
|
|
android:id="@+id/tv_course_name"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginTop="8dp"
|
|
|
+ android:layout_marginStart="5dp"
|
|
|
+ android:layout_marginEnd="5dp"
|
|
|
android:background="@drawable/shape_couse_type_text_bg"
|
|
|
android:gravity="center"
|
|
|
android:includeFontPadding="false"
|
|
@@ -131,11 +156,25 @@
|
|
|
android:paddingBottom="1.5dp"
|
|
|
android:textColor="@color/color_ff8c00"
|
|
|
android:textSize="@dimen/sp_10"
|
|
|
- app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
|
|
|
- app:layout_constraintLeft_toLeftOf="@+id/tv_title"
|
|
|
- app:layout_constraintTop_toBottomOf="@+id/tv_title"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/tv_name"
|
|
|
+ app:layout_constraintLeft_toRightOf="@+id/tv_name"
|
|
|
+ app:layout_constraintRight_toRightOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/tv_name"
|
|
|
tools:text="单簧管" />
|
|
|
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_course_status"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:textColor="@color/color_999999"
|
|
|
+ android:textSize="@dimen/sp_14"
|
|
|
+ app:layout_constraintBottom_toTopOf="@+id/view_line"
|
|
|
+ app:layout_constraintRight_toRightOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="parent"
|
|
|
+ tools:text="未开始" />
|
|
|
+
|
|
|
+
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
|
|
|
@@ -163,8 +202,8 @@
|
|
|
android:includeFontPadding="false"
|
|
|
android:paddingStart="5dp"
|
|
|
android:text="老师评价"
|
|
|
- android:textColor="@color/color_1a1a1a"
|
|
|
- android:textSize="@dimen/sp_13"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_14"
|
|
|
app:layout_constraintBottom_toBottomOf="@+id/view_title_line"
|
|
|
app:layout_constraintLeft_toRightOf="@+id/view_title_line"
|
|
|
app:layout_constraintTop_toTopOf="@+id/view_title_line" />
|
|
@@ -183,14 +222,15 @@
|
|
|
|
|
|
<TextView
|
|
|
android:id="@+id/tv_teacher_appraisal_empty_text"
|
|
|
- android:layout_width="wrap_content"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_marginEnd="20dp"
|
|
|
+ android:layout_marginStart="20dp"
|
|
|
+ android:drawablePadding="10dp"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginStart="25dp"
|
|
|
android:layout_gravity="center_vertical"
|
|
|
android:drawableLeft="@drawable/icon_teacher_appraisal_empty"
|
|
|
- android:drawablePadding="8dp"
|
|
|
android:gravity="center_vertical"
|
|
|
- android:text="课程结束之后老师会对您的\n学习进行点评哦!"
|
|
|
+ android:text="课程结束之后老师才能对您的学习进行评价哦"
|
|
|
android:textColor="@color/color_999999"
|
|
|
android:textSize="@dimen/sp_13" />
|
|
|
|
|
@@ -230,8 +270,8 @@
|
|
|
android:includeFontPadding="false"
|
|
|
android:paddingStart="5dp"
|
|
|
android:text="学员评价"
|
|
|
- android:textColor="@color/color_1a1a1a"
|
|
|
- android:textSize="@dimen/sp_13"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_14"
|
|
|
app:layout_constraintBottom_toBottomOf="@+id/view_title_line_stu_comment"
|
|
|
app:layout_constraintLeft_toRightOf="@+id/view_title_line_stu_comment"
|
|
|
app:layout_constraintTop_toTopOf="@+id/view_title_line_stu_comment" />
|
|
@@ -259,7 +299,7 @@
|
|
|
android:drawableLeft="@drawable/icon_course_detail_evaluate"
|
|
|
android:drawablePadding="@dimen/dp_2"
|
|
|
android:gravity="center"
|
|
|
- android:text="评价"
|
|
|
+ android:text="评价老师"
|
|
|
android:textColor="@color/color_2dc7aa"
|
|
|
android:textSize="@dimen/sp_14"
|
|
|
android:visibility="gone"
|
|
@@ -280,14 +320,15 @@
|
|
|
|
|
|
<TextView
|
|
|
android:id="@+id/tv_stu_comment_empty_text"
|
|
|
- android:layout_width="wrap_content"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_marginEnd="20dp"
|
|
|
+ android:layout_marginStart="20dp"
|
|
|
+ android:drawablePadding="10dp"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginStart="25dp"
|
|
|
android:layout_gravity="center_vertical"
|
|
|
android:drawableLeft="@drawable/icon_stu_comment_empty"
|
|
|
- android:drawablePadding="8dp"
|
|
|
android:gravity="center_vertical"
|
|
|
- android:text="课程结束之后记得对老师的\n教学进行评价哦"
|
|
|
+ android:text="课程结束之后记得对老师的教学进行评价哦"
|
|
|
android:textColor="@color/color_999999"
|
|
|
android:textSize="@dimen/sp_13" />
|
|
|
|
|
@@ -327,8 +368,8 @@
|
|
|
android:includeFontPadding="false"
|
|
|
android:paddingStart="5dp"
|
|
|
android:text="课后作业"
|
|
|
- android:textColor="@color/color_1a1a1a"
|
|
|
- android:textSize="@dimen/sp_13"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_14"
|
|
|
app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework"
|
|
|
app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework"
|
|
|
app:layout_constraintTop_toTopOf="@+id/view_title_line_homework" />
|
|
@@ -363,14 +404,15 @@
|
|
|
|
|
|
<TextView
|
|
|
android:id="@+id/tv_homework_empty_text"
|
|
|
- android:layout_width="wrap_content"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_marginEnd="20dp"
|
|
|
+ android:layout_marginStart="20dp"
|
|
|
+ android:drawablePadding="10dp"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginStart="25dp"
|
|
|
android:layout_gravity="center_vertical"
|
|
|
android:drawableLeft="@drawable/icon_homework_empty"
|
|
|
- android:drawablePadding="8dp"
|
|
|
android:gravity="center_vertical"
|
|
|
- android:text="课程结束后老师会布置作业哦!"
|
|
|
+ android:text="老师尚未布置作业"
|
|
|
android:textColor="@color/color_999999"
|
|
|
android:textSize="@dimen/sp_13" />
|
|
|
|
|
@@ -410,8 +452,8 @@
|
|
|
android:includeFontPadding="false"
|
|
|
android:paddingStart="5dp"
|
|
|
android:text="作业视频"
|
|
|
- android:textColor="@color/color_1a1a1a"
|
|
|
- android:textSize="@dimen/sp_13"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_14"
|
|
|
app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_video"
|
|
|
app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework_video"
|
|
|
app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_video" />
|
|
@@ -420,13 +462,14 @@
|
|
|
android:id="@+id/tv_edit_homework"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:drawableLeft="@drawable/icon_edit_appraisal"
|
|
|
+ android:drawableLeft="@drawable/icon_set_homework2"
|
|
|
android:drawablePadding="3dp"
|
|
|
android:includeFontPadding="false"
|
|
|
android:paddingTop="5dp"
|
|
|
android:paddingEnd="11dp"
|
|
|
android:paddingBottom="5dp"
|
|
|
- android:text="编辑"
|
|
|
+ android:text="提交作业"
|
|
|
+ tools:visibility="visible"
|
|
|
android:textColor="@color/color_2dc7aa"
|
|
|
android:textSize="@dimen/sp_14"
|
|
|
android:visibility="gone"
|
|
@@ -448,12 +491,13 @@
|
|
|
|
|
|
<TextView
|
|
|
android:id="@+id/tv_homework_video_empty_text"
|
|
|
- android:layout_width="wrap_content"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_marginEnd="20dp"
|
|
|
+ android:layout_marginStart="20dp"
|
|
|
+ android:drawablePadding="10dp"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginStart="25dp"
|
|
|
android:layout_gravity="center_vertical"
|
|
|
android:drawableLeft="@drawable/icon_homework_video_empty"
|
|
|
- android:drawablePadding="8dp"
|
|
|
android:gravity="center_vertical"
|
|
|
android:text="您尚未上传作业视频"
|
|
|
android:textColor="@color/color_999999"
|
|
@@ -495,8 +539,8 @@
|
|
|
android:includeFontPadding="false"
|
|
|
android:paddingStart="5dp"
|
|
|
android:text="作业点评"
|
|
|
- android:textColor="@color/color_1a1a1a"
|
|
|
- android:textSize="@dimen/sp_13"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_14"
|
|
|
app:layout_constraintBottom_toBottomOf="@+id/view_title_line_homework_comment"
|
|
|
app:layout_constraintLeft_toRightOf="@+id/view_title_line_homework_comment"
|
|
|
app:layout_constraintTop_toTopOf="@+id/view_title_line_homework_comment" />
|
|
@@ -531,12 +575,13 @@
|
|
|
|
|
|
<TextView
|
|
|
android:id="@+id/tv_homework_comment_empty_text"
|
|
|
- android:layout_width="wrap_content"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_marginEnd="20dp"
|
|
|
+ android:layout_marginStart="20dp"
|
|
|
+ android:drawablePadding="10dp"
|
|
|
android:layout_height="wrap_content"
|
|
|
- android:layout_marginStart="25dp"
|
|
|
android:layout_gravity="center_vertical"
|
|
|
android:drawableLeft="@drawable/icon_homework_comment"
|
|
|
- android:drawablePadding="8dp"
|
|
|
android:gravity="center_vertical"
|
|
|
android:text="课程结束后上传作业视频会\n得到老师点评哦~"
|
|
|
android:textColor="@color/color_999999"
|