|
@@ -21,20 +21,20 @@
|
|
|
app:layout_constraintTop_toTopOf="parent" />
|
|
|
|
|
|
<TextView
|
|
|
- app:layout_constraintRight_toLeftOf="@+id/iv_scan"
|
|
|
android:id="@+id/tv_teacher_name"
|
|
|
android:layout_width="0dp"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_marginTop="24dp"
|
|
|
android:layout_marginEnd="40dp"
|
|
|
+ android:ellipsize="end"
|
|
|
android:includeFontPadding="false"
|
|
|
- android:text="您好"
|
|
|
android:maxLines="1"
|
|
|
- android:ellipsize="end"
|
|
|
+ android:text="您好"
|
|
|
android:textColor="@color/color_1a1a1a"
|
|
|
android:textSize="@dimen/sp_22"
|
|
|
android:textStyle="bold"
|
|
|
app:layout_constraintLeft_toLeftOf="parent"
|
|
|
+ app:layout_constraintRight_toLeftOf="@+id/iv_scan"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/view_status_bar"
|
|
|
tools:text="您好,李老师李老师李老师李老师李老师" />
|
|
|
|
|
@@ -230,13 +230,7 @@
|
|
|
app:layout_constraintTop_toTopOf="@+id/iv_style_badge" />
|
|
|
|
|
|
<TextView
|
|
|
- android:visibility="gone"
|
|
|
android:id="@+id/tv_cert_fail_tip"
|
|
|
- app:layout_constraintCircleAngle="58"
|
|
|
- app:layout_constraintCircleRadius="35dp"
|
|
|
- app:layout_constraintCircle="@+id/iv_cert"
|
|
|
- android:textColor="@color/white"
|
|
|
- android:textSize="@dimen/sp_10"
|
|
|
android:layout_width="wrap_content"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:background="@drawable/bg_red_8dp_border_1dp"
|
|
@@ -245,7 +239,13 @@
|
|
|
android:paddingTop="1dp"
|
|
|
android:paddingEnd="7dp"
|
|
|
android:paddingBottom="1dp"
|
|
|
- android:text="认证失败" />
|
|
|
+ android:text="认证失败"
|
|
|
+ android:textColor="@color/white"
|
|
|
+ android:textSize="@dimen/sp_10"
|
|
|
+ android:visibility="gone"
|
|
|
+ app:layout_constraintCircle="@+id/iv_cert"
|
|
|
+ app:layout_constraintCircleAngle="58"
|
|
|
+ app:layout_constraintCircleRadius="35dp" />
|
|
|
|
|
|
<View
|
|
|
android:id="@+id/view_cert_red_point"
|
|
@@ -564,15 +564,143 @@
|
|
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
|
|
|
+
|
|
|
<androidx.constraintlayout.widget.ConstraintLayout
|
|
|
- android:id="@+id/cl_hot_track"
|
|
|
+ android:id="@+id/cl_recommend_track"
|
|
|
android:layout_width="match_parent"
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_marginTop="@dimen/dp_18"
|
|
|
- android:visibility="visible"
|
|
|
+ android:visibility="gone"
|
|
|
app:layout_constraintTop_toBottomOf="@+id/cl_hot_album">
|
|
|
|
|
|
<View
|
|
|
+ android:id="@+id/tv_recommend_track_line"
|
|
|
+ android:layout_width="4dp"
|
|
|
+ android:layout_height="17dp"
|
|
|
+ android:layout_marginStart="25dp"
|
|
|
+ android:background="@drawable/shape_course_title_tag_bg"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/tv_recommend_track"
|
|
|
+ app:layout_constraintLeft_toLeftOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/tv_recommend_track" />
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_recommend_track"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginLeft="@dimen/dp_6"
|
|
|
+ android:gravity="center"
|
|
|
+ android:text="推荐曲目"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_18"
|
|
|
+ android:textStyle="bold"
|
|
|
+ app:layout_constraintLeft_toRightOf="@+id/tv_recommend_track_line"
|
|
|
+ app:layout_constraintTop_toTopOf="parent" />
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_recommend_track_more"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginRight="@dimen/dp_14"
|
|
|
+ android:background="@drawable/shape_1a2dc7aa_10dp"
|
|
|
+ android:drawableEnd="@drawable/icon_arrow_right_green"
|
|
|
+ android:drawablePadding="5dp"
|
|
|
+ android:gravity="center"
|
|
|
+ android:paddingStart="7dp"
|
|
|
+ android:paddingTop="2dp"
|
|
|
+ android:paddingEnd="5dp"
|
|
|
+ android:paddingBottom="2dp"
|
|
|
+ android:text="更多"
|
|
|
+ android:textColor="@color/color_2dc7aa"
|
|
|
+ android:textSize="@dimen/sp_12"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/tv_recommend_track"
|
|
|
+ app:layout_constraintRight_toRightOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/tv_recommend_track" />
|
|
|
+
|
|
|
+ <androidx.recyclerview.widget.RecyclerView
|
|
|
+ android:id="@+id/rv_recommend_track"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginTop="12dp"
|
|
|
+ android:overScrollMode="never"
|
|
|
+ android:paddingLeft="@dimen/dp_14"
|
|
|
+ android:scrollbars="none"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tv_recommend_track" />
|
|
|
+
|
|
|
+ </androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
+
|
|
|
+
|
|
|
+ <androidx.constraintlayout.widget.ConstraintLayout
|
|
|
+ android:id="@+id/cl_latest_track"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginTop="@dimen/dp_18"
|
|
|
+ android:visibility="gone"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/cl_recommend_track">
|
|
|
+
|
|
|
+ <View
|
|
|
+ android:id="@+id/tv_latest_track_line"
|
|
|
+ android:layout_width="4dp"
|
|
|
+ android:layout_height="17dp"
|
|
|
+ android:layout_marginStart="25dp"
|
|
|
+ android:background="@drawable/shape_course_title_tag_bg"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/tv_latest_track"
|
|
|
+ app:layout_constraintLeft_toLeftOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/tv_latest_track" />
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_latest_track"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginLeft="@dimen/dp_6"
|
|
|
+ android:gravity="center"
|
|
|
+ android:text="最新曲目"
|
|
|
+ android:textColor="@color/color_333333"
|
|
|
+ android:textSize="@dimen/sp_18"
|
|
|
+ android:textStyle="bold"
|
|
|
+ app:layout_constraintLeft_toRightOf="@+id/tv_latest_track_line"
|
|
|
+ app:layout_constraintTop_toTopOf="parent" />
|
|
|
+
|
|
|
+ <TextView
|
|
|
+ android:id="@+id/tv_latest_track_more"
|
|
|
+ android:layout_width="wrap_content"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginRight="@dimen/dp_14"
|
|
|
+ android:background="@drawable/shape_1a2dc7aa_10dp"
|
|
|
+ android:drawableEnd="@drawable/icon_arrow_right_green"
|
|
|
+ android:drawablePadding="5dp"
|
|
|
+ android:gravity="center"
|
|
|
+ android:paddingStart="7dp"
|
|
|
+ android:paddingTop="2dp"
|
|
|
+ android:paddingEnd="5dp"
|
|
|
+ android:paddingBottom="2dp"
|
|
|
+ android:text="更多"
|
|
|
+ android:textColor="@color/color_2dc7aa"
|
|
|
+ android:textSize="@dimen/sp_12"
|
|
|
+ app:layout_constraintBottom_toBottomOf="@+id/tv_latest_track"
|
|
|
+ app:layout_constraintRight_toRightOf="parent"
|
|
|
+ app:layout_constraintTop_toTopOf="@+id/tv_latest_track" />
|
|
|
+
|
|
|
+ <androidx.recyclerview.widget.RecyclerView
|
|
|
+ android:id="@+id/rv_latest_track"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginTop="12dp"
|
|
|
+ android:overScrollMode="never"
|
|
|
+ android:paddingLeft="@dimen/dp_14"
|
|
|
+ android:scrollbars="none"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/tv_latest_track" />
|
|
|
+
|
|
|
+ </androidx.constraintlayout.widget.ConstraintLayout>
|
|
|
+
|
|
|
+ <androidx.constraintlayout.widget.ConstraintLayout
|
|
|
+ android:id="@+id/cl_hot_track"
|
|
|
+ android:layout_width="match_parent"
|
|
|
+ android:layout_height="wrap_content"
|
|
|
+ android:layout_marginTop="@dimen/dp_18"
|
|
|
+ android:visibility="gone"
|
|
|
+ app:layout_constraintTop_toBottomOf="@+id/cl_latest_track">
|
|
|
+
|
|
|
+ <View
|
|
|
android:id="@+id/tv_hot_track_line"
|
|
|
android:layout_width="4dp"
|
|
|
android:layout_height="17dp"
|
|
@@ -588,7 +716,7 @@
|
|
|
android:layout_height="wrap_content"
|
|
|
android:layout_marginLeft="@dimen/dp_6"
|
|
|
android:gravity="center"
|
|
|
- android:text="热门曲目"
|
|
|
+ android:text="最热曲目"
|
|
|
android:textColor="@color/color_333333"
|
|
|
android:textSize="@dimen/sp_18"
|
|
|
android:textStyle="bold"
|