修改老师端个人主页样式,视屏课和乐谱

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

@@ -22,6 +22,7 @@ import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.HomePageSheetMusicListBean;
 
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 
 /**
  * Author by pq, Date on 2022/5/10.
@@ -29,40 +30,46 @@ import androidx.annotation.NonNull;
 public class HomePageSheetMusicAdapter extends BaseQuickAdapter<HomePageSheetMusicListBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
 
-    public HomePageSheetMusicAdapter(int layoutResId) {
-        super(layoutResId);
+    public HomePageSheetMusicAdapter() {
+        super(R.layout.item_home_page_sheet_music_layout);
     }
 
     @Override
     protected void convert(@NonNull BaseViewHolder holder, HomePageSheetMusicListBean.RowsBean bean) {
         //曲谱名称
-        holder.setText(R.id.tv_title, bean.musicSheetName);
+        holder.setText(R.id.tv_name, bean.musicSheetName);
         //音乐人
-        holder.setText(R.id.tv_author, bean.composer);
+        holder.setText(R.id.tv_upload_author,String.format("作曲：%s", bean.composer));
         //创建人
-        holder.setText(R.id.tv_nickname, bean.addName);
-        ImageView iv_img = holder.getView(R.id.iv_img);
+        ImageView iv_img = holder.getView(R.id.im_music_mark);
         if (!TextUtils.isEmpty(bean.titleImg)) {
             GlideUtils.INSTANCE.loadImage(getContext(), bean.titleImg, iv_img, R.drawable.icon_music_mark);
         } else {
             iv_img.setImageResource(R.drawable.icon_music_mark);
         }
 
-        ImageView cir_avatar = holder.getView(R.id.cir_avatar);
-        GlideUtils.INSTANCE.loadImage(getContext(), bean.addUserAvatar, cir_avatar, R.drawable.icon_teacher_default_head);
-
-        ImageView iv_enter = holder.getView(R.id.iv_enter);
-        if (TextUtils.equals(bean.chargeType, SheetMusicConstants.SHEET_MUSIC_CHARGE_TYPE_VIP)) {
-            iv_enter.setImageResource(com.cooleshow.base.R.drawable.icon_music_vip);
-        } else if (TextUtils.equals(bean.chargeType, SheetMusicConstants.SHEET_MUSIC_CHARGE_TYPE_CHARGE)) {
-            iv_enter.setImageResource(com.cooleshow.base.R.drawable.icon_music_order);
-        } else {
-            iv_enter.setImageResource(com.cooleshow.base.R.drawable.icon_music_free);
+        TextView mTvTag = holder.getView(R.id.tv_tag);
+        switch (bean.chargeType) {
+            case "FREE":
+                mTvTag.setText("免费");
+                mTvTag.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_01b84f));
+                mTvTag.setBackgroundResource(R.drawable.shape_01b84f_border);
+                break;
+            case "VIP":
+                mTvTag.setText("会员");
+                mTvTag.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_cd863e));
+                mTvTag.setBackgroundResource(R.drawable.shape_cd863e_border);
+                break;
+            case "CHARGE":
+                mTvTag.setText("点播");
+                mTvTag.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_3591ce));
+                mTvTag.setBackgroundResource(R.drawable.shape_3591ce_border);
+                break;
         }
 
         //subject
         try {
-            LinearLayout ll_subject_container = holder.getView(R.id.ll_subject_container);
+            LinearLayout ll_subject_container = holder.getView(R.id.ll_music_subject);
             ll_subject_container.removeAllViews();
             String[] subjectNames = UiUtils.splitSubjectName(bean.subjectNames);
             for (int i = 0; i < subjectNames.length; i++) {
@@ -71,6 +78,23 @@ public class HomePageSheetMusicAdapter extends BaseQuickAdapter<HomePageSheetMus
         } catch (Exception e) {
             e.printStackTrace();
         }
+
+        View view_line = holder.getView(R.id.view_line);
+        int position = holder.getLayoutPosition();
+        int size = getData().size();
+        view_line.setVisibility(position == size - 1 ? View.INVISIBLE : View.VISIBLE);
+        ConstraintLayout cs_root = holder.getView(R.id.cs_root);
+        if (size == 1) {
+            cs_root.setBackgroundResource(com.cooleshow.base.R.drawable.shape_10dp_white);
+        } else {
+            if (position == 0) {
+                cs_root.setBackgroundResource(com.cooleshow.base.R.drawable.bg_white_top_10dp);
+            } else if (position == size - 1) {
+                cs_root.setBackgroundResource(com.cooleshow.base.R.drawable.bg_white_bottom_10dp);
+            } else {
+                cs_root.setBackgroundColor(getContext().getResources().getColor(R.color.white));
+            }
+        }
     }
 
     @NonNull
@@ -82,6 +106,8 @@ public class HomePageSheetMusicAdapter extends BaseQuickAdapter<HomePageSheetMus
     private void createSubjectView(ViewGroup container, String text) {
         TextView textView = (TextView) LayoutInflater.from(getContext()).inflate(com.cooleshow.base.R.layout.view_subject_item_layout, container, false);
         textView.setText(text);
+        textView.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
+        textView.setBackgroundResource(com.cooleshow.base.R.drawable.shape_effbf9_9dp);
         LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         if (container.getChildCount() >= 1) {
             params.setMargins(SizeUtils.dp2px(4), 0, 0, 0);

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

@@ -69,32 +69,33 @@ public class MineScoreAdapter extends BaseQuickAdapter<MusicSheetListBean.RowsBe
             tv_upload_author.setText(String.format("作曲：%s", item.composer));
         }
         TextView tv_status_tip = helper.getView(R.id.tv_status_tip);
+        View iv_play=helper.getView(R.id.iv_play);
         if (TextUtils.equals(scoreStatus, MineScoreActivity.TYPE_PASS)) {
             tv_status_tip.setText("下架");
             tv_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_008ae0));
             tv_status_tip.setVisibility(View.VISIBLE);
-            im_music_mark.setVisibility(View.GONE);
+            iv_play.setVisibility(View.GONE);
             tv_status_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(com.cooleshow.base.R.drawable.icon_arrow_right_small_blue), null);
         } else if (TextUtils.equals(scoreStatus, MineScoreActivity.TYPE_DOING)) {
             tv_status_tip.setText("审核中");
             tv_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
             tv_status_tip.setVisibility(View.VISIBLE);
-            im_music_mark.setVisibility(View.GONE);
+            iv_play.setVisibility(View.GONE);
             tv_status_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
         } else if (TextUtils.equals(scoreStatus, MineScoreActivity.TYPE_UNPASS)) {
             tv_status_tip.setText("修改");
             tv_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff4e19));
             tv_status_tip.setVisibility(View.VISIBLE);
-            im_music_mark.setVisibility(View.GONE);
+            iv_play.setVisibility(View.GONE);
             tv_status_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(com.cooleshow.base.R.drawable.icon_arrow_right_small_red), null);
         } else if (TextUtils.equals(scoreStatus, MineScoreActivity.TYPE_OUT_SALE)) {
             tv_status_tip.setText("上架");
             tv_status_tip.setTextColor(getContext().getResources().getColor(com.cooleshow.base.R.color.color_ff4e19));
             tv_status_tip.setVisibility(View.VISIBLE);
-            im_music_mark.setVisibility(View.GONE);
+            iv_play.setVisibility(View.GONE);
             tv_status_tip.setCompoundDrawablesWithIntrinsicBounds(null, null, getContext().getResources().getDrawable(com.cooleshow.base.R.drawable.icon_arrow_right_small_red), null);
         } else {
-            im_music_mark.setVisibility(View.VISIBLE);
+            iv_play.setVisibility(View.VISIBLE);
             tv_status_tip.setVisibility(View.GONE);
         }
 

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

@@ -66,6 +66,11 @@ public class MineVideoCourseAdapter extends BaseQuickAdapter<VideoCourseListBean
         TextView tv_operate_tip = helper.getView(R.id.tv_operate_tip);
         View view_divide_bottom = helper.getView(R.id.view_divide_bottom);
         TextView tv_course_status_tip = helper.getView(R.id.tv_course_status_tip);
+        if(TextUtils.isEmpty(auditStatus)){
+            tv_operate_tip.setVisibility(View.GONE);
+            tv_course_status_tip.setVisibility(View.GONE);
+            return;
+        }
         if (TextUtils.equals(auditStatus, MineVideoCourseActivity.TYPE_PASS)) {
             //已上架
             tv_operate_tip.setVisibility(View.VISIBLE);

teacher/src/main/java/com/cooleshow/teacher/ui/homepage/SheetMusicPageFragment.java

@@ -51,13 +51,13 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
 
     @Override
     protected void initView(View rootView) {
-        mViewBinding.viewUploadBg.setOnClickListener(this);
+        mViewBinding.tvUploadSheetMusic.setOnClickListener(this);
         presenter.querySubjectItem();
     }
 
     @Override
     protected void initData() {
-        mAdapter = new HomePageSheetMusicAdapter(R.layout.item_home_page_sheet_music_layout);
+        mAdapter = new HomePageSheetMusicAdapter();
         mViewBinding.refreshLayout.setOnRefreshListener(refreshLayout -> {
             currentPage = 1;
             queryList(true);
@@ -278,9 +278,10 @@ public class SheetMusicPageFragment extends BaseMVPFragment<FragmentSheetMusicPa
             WebStartHelper.startCertPage();
             return;
         }
-        if (v.getId() == R.id.view_upload_bg) {
+        if (v.getId() == R.id.tv_upload_sheet_music) {
             //上传乐谱
             WebStartHelper.startUploadSheetMusicPage();
+            return;
         }
     }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/homepage/VideoCoursePageFragment.java

@@ -42,6 +42,7 @@ public class VideoCoursePageFragment extends BaseMVPFragment<FragmentVideoCourse
     protected void initView(View rootView) {
         mViewBinding.llCreateVideo.setOnClickListener(this);
         mViewBinding.tvOpen.setOnClickListener(this);
+        mViewBinding.tvCreateVideoCourse.setOnClickListener(this);
         RecyclerView rvAddress = mViewBinding.recyclerView;
         GridLayoutManager manager = new GridLayoutManager(getContext(), 2);
         rvAddress.setLayoutManager(manager);
@@ -117,7 +118,7 @@ public class VideoCoursePageFragment extends BaseMVPFragment<FragmentVideoCourse
     @Override
     public void onClick(View view) {
         switch (view.getId()) {
-            case R.id.ll_create_video:
+            case R.id.tv_create_video_course:
                 ARouter.getInstance()
                         .build(RouterPath.WebCenter.ACTIVITY_HTML)
                         .withString(WebConstants.WEB_URL, WebConstants.TEACHER_VIDEO_CREATE)

teacher/src/main/res/layout/fragment_sheet_music_page_layout.xml

@@ -5,60 +5,55 @@
     android:layout_height="match_parent"
     android:paddingTop="14dp">
 
+    <View
+        app:layout_constraintRight_toRightOf="parent"
+        android:layout_marginEnd="14dp"
+        android:layout_marginStart="14dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:id="@+id/view_top_bg"
+        android:background="@drawable/bg_white_10dp"
+        android:layout_width="match_parent"
+        android:layout_height="56dp"/>
+
     <com.cooleshow.teacher.widgets.CourseSearchView
+        android:layout_marginEnd="10dp"
         android:id="@+id/search_view"
-        android:layout_width="match_parent"
+        android:layout_width="0dp"
+        app:layout_constraintLeft_toLeftOf="@+id/view_top_bg"
+        app:layout_constraintRight_toLeftOf="@+id/tv_upload_sheet_music"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/view_top_bg"
+        app:layout_constraintTop_toTopOf="@+id/view_top_bg"
         app:left_search_text="声部"
         app:search_edit_hint="请输入曲目名称" />
 
-    <View
-        android:id="@+id/view_upload_bg"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:layout_marginStart="@dimen/dp_14"
-        android:layout_marginTop="@dimen/dp_15"
-        android:layout_marginEnd="@dimen/dp_14"
-        android:background="@drawable/bg_white_10dp_border_e5e5e5"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/search_view" />
-
     <TextView
         android:id="@+id/tv_upload_sheet_music"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableRight="@drawable/icon_arrow_right"
-        android:drawablePadding="6dp"
-        android:text="上传乐谱"
-        android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp_15"
-        app:layout_constraintBottom_toBottomOf="@+id/view_upload_bg"
-        app:layout_constraintLeft_toLeftOf="@+id/view_upload_bg"
-        app:layout_constraintRight_toRightOf="@+id/view_upload_bg"
-        app:layout_constraintTop_toTopOf="@+id/view_upload_bg" />
-
-    <ImageView
-        android:id="@+id/iv_icon_upload"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="2dp"
-        android:src="@drawable/icon_upload_sheet_music"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_upload_sheet_music"
-        app:layout_constraintRight_toLeftOf="@+id/tv_upload_sheet_music"
-        app:layout_constraintTop_toTopOf="@+id/tv_upload_sheet_music" />
+        android:layout_marginEnd="14dp"
+        android:drawableRight="@drawable/icon_arrow_right_small_green"
+        android:drawablePadding="5dp"
+        android:gravity="center"
+        android:text="创建课程"
+        android:textStyle="bold"
+        android:textSize="@dimen/sp_16"
+        android:textColor="@color/color_2dc7aa"
+        app:layout_constraintBottom_toBottomOf="@+id/view_top_bg"
+        app:layout_constraintRight_toRightOf="@+id/view_top_bg"
+        app:layout_constraintTop_toTopOf="@+id/view_top_bg" />
 
     <com.scwang.smart.refresh.layout.SmartRefreshLayout
         android:id="@+id/refreshLayout"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/view_upload_bg">
-
+        app:layout_constraintTop_toBottomOf="@+id/view_top_bg">
 
 
         <androidx.recyclerview.widget.RecyclerView
+            android:paddingTop="12dp"
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -71,7 +66,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:visibility="gone"
-        app:constraint_referenced_ids="search_view,refreshLayout,view_upload_bg,iv_icon_upload,tv_upload_sheet_music,view_upload_bg" />
+        app:constraint_referenced_ids="view_top_bg,search_view,refreshLayout,tv_upload_sheet_music" />
 
     <ViewStub
         android:id="@+id/vs_no_cert"

teacher/src/main/res/layout/fragment_video_course_page_layout.xml

@@ -13,36 +13,46 @@
         android:orientation="vertical">
 
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/ll_create_video"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_40"
+            android:layout_height="@dimen/dp_56"
             android:layout_marginLeft="14dp"
             android:layout_marginTop="14dp"
             android:layout_marginRight="14dp"
-            android:background="@drawable/bg_border_e5_radius"
+            android:background="@drawable/bg_white_10dp"
             android:gravity="center"
             android:orientation="horizontal">
 
-            <ImageView
-                android:layout_width="@dimen/dp_26"
-                android:layout_height="@dimen/dp_26"
-                android:background="@drawable/icon_video_course" />
-
             <TextView
+                android:layout_marginStart="14dp"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:textStyle="bold"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="2dp"
-                android:text="创建视频课"
+                android:text="我的视频课"
                 android:textColor="@color/black_333"
-                android:textSize="@dimen/sp_15" />
+                android:textSize="@dimen/sp_18" />
 
-            <ImageView
-                android:layout_width="6dp"
-                android:layout_height="11dp"
-                android:layout_marginLeft="8dp"
-                android:background="@drawable/icon_go_right" />
-        </LinearLayout>
+            <TextView
+                android:id="@+id/tv_create_video_course"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="14dp"
+                android:drawableRight="@drawable/icon_arrow_right_small_green"
+                android:drawablePadding="5dp"
+                android:gravity="center"
+                android:text="创建课程"
+                android:textStyle="bold"
+                android:textSize="@dimen/sp_16"
+                android:textColor="@color/color_2dc7aa"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.scwang.smart.refresh.layout.SmartRefreshLayout
             android:id="@+id/refreshLayout"
@@ -50,7 +60,6 @@
             android:layout_height="match_parent">
 
 
-
             <androidx.recyclerview.widget.RecyclerView
                 android:layout_marginStart="7dp"
                 android:layout_marginEnd="7dp"

teacher/src/main/res/layout/item_home_page_sheet_music_layout.xml

@@ -2,101 +2,140 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/cs_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="12dp"
     android:layout_marginStart="14dp"
-    android:layout_marginEnd="14dp"
-    android:background="@drawable/bg_white_10dp"
-    android:paddingStart="11dp"
-    android:paddingEnd="11dp"
-    android:paddingBottom="10dp">
+    android:layout_marginEnd="14dp">
+
 
     <com.cooleshow.base.widgets.QMUIRadiusImageView
-        app:qmui_corner_radius="5dp"
-        android:id="@+id/iv_img"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:src="@drawable/icon_sheet_music_img"
+        android:id="@+id/im_music_mark"
+        android:layout_width="@dimen/dp_48"
+        android:layout_height="@dimen/dp_48"
+        android:layout_marginLeft="14dp"
+        android:layout_marginTop="17dp"
+        android:src="@drawable/icon_music_mark"
         app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:qmui_corner_radius="5dp" />
 
     <TextView
-        android:id="@+id/tv_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="14dp"
-        android:includeFontPadding="false"
-        android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp_14"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/tv_author"
-        app:layout_constraintLeft_toRightOf="@+id/iv_img"
-        app:layout_constraintTop_toTopOf="@+id/iv_img"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="Exodus(出埃及记)" />
+        android:id="@+id/tv_tag"
+        android:layout_width="30dp"
+        android:layout_height="17dp"
+        android:layout_marginStart="11dp"
+        android:background="@drawable/shape_01b84f_border"
+        android:gravity="center"
+        android:text="免费"
+        android:textSize="@dimen/sp_10"
+        app:layout_constraintBottom_toTopOf="@+id/tv_upload_author"
+        app:layout_constraintLeft_toRightOf="@+id/im_music_mark"
+        app:layout_constraintTop_toTopOf="@+id/im_music_mark"
+        app:layout_constraintVertical_chainStyle="packed" />
 
     <TextView
-        android:id="@+id/tv_author"
-        android:layout_width="wrap_content"
+        android:id="@+id/tv_upload_author"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="25dp"
+        android:ellipsize="end"
         android:includeFontPadding="false"
-        android:textColor="@color/color_6a6a6a"
+        android:maxLines="1"
+        android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_12"
-        app:layout_constraintBottom_toBottomOf="@+id/iv_img"
-        app:layout_constraintLeft_toLeftOf="@+id/tv_title"
-        app:layout_constraintTop_toBottomOf="@+id/tv_title"
-        tools:text="沃伊切赫·基拉尔" />
+        app:layout_constraintBottom_toBottomOf="@+id/im_music_mark"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_tag"
+        app:layout_constraintTop_toBottomOf="@+id/tv_tag"
+        tools:text="上传者：一把剑走天涯" />
 
-    <View
-        android:id="@+id/view_line"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="10dp"
-        android:background="@color/color_f2f2f2"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iv_img" />
-
-    <ImageView
-        android:id="@+id/iv_enter"
-        android:layout_width="wrap_content"
+    <TextView
+        android:id="@+id/tv_name"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:src="@drawable/icon_music_order"
-        app:layout_constraintBottom_toTopOf="@+id/view_line"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/cir_avatar"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_marginStart="9dp"
-        android:layout_marginTop="8dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/view_line" />
+        android:layout_marginEnd="25dp"
+        android:ellipsize="end"
+        android:includeFontPadding="false"
+        android:lines="1"
+        android:paddingStart="6dp"
+        android:textColor="@color/color_1a1a1a"
+        android:textSize="@dimen/sp_16"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_tag"
+        app:layout_constraintLeft_toRightOf="@+id/tv_tag"
+        app:layout_constraintRight_toLeftOf="@+id/fl_status"
+        app:layout_constraintTop_toTopOf="@+id/tv_tag"
+        tools:text="维瓦尔第 E第一维瓦尔第维瓦尔第维瓦尔第E第一维瓦尔第维瓦尔第维瓦尔第E第一维瓦尔第维瓦尔第维瓦尔第" />
 
     <TextView
-        android:id="@+id/tv_nickname"
-        android:layout_width="wrap_content"
+        android:id="@+id/tv_author"
+        android:layout_width="68dp"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="25dp"
+        android:ellipsize="end"
         android:includeFontPadding="false"
+        android:lines="1"
         android:paddingStart="6dp"
-        android:textColor="@color/color_333333"
+        android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_12"
-        app:layout_constraintBottom_toBottomOf="@+id/cir_avatar"
-        app:layout_constraintLeft_toRightOf="@+id/cir_avatar"
-        app:layout_constraintTop_toTopOf="@+id/cir_avatar"
-        tools:text="李崴星" />
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_name"
+        app:layout_constraintLeft_toRightOf="@+id/tv_name"
+        app:layout_constraintTop_toTopOf="@+id/tv_name"
+        tools:text="-维瓦尔第…维瓦尔第维瓦尔第" />
 
     <LinearLayout
-        android:id="@+id/ll_subject_container"
-        android:layout_width="wrap_content"
+        android:id="@+id/ll_music_subject"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
         android:orientation="horizontal"
-        android:paddingStart="8dp"
-        app:layout_constraintBottom_toBottomOf="@+id/cir_avatar"
-        app:layout_constraintLeft_toRightOf="@+id/tv_nickname"
-        app:layout_constraintTop_toTopOf="@+id/cir_avatar" />
+        app:layout_constraintBottom_toBottomOf="@+id/tv_upload_author"
+        app:layout_constraintLeft_toRightOf="@+id/tv_upload_author"
+        app:layout_constraintRight_toLeftOf="@+id/fl_status"
+        app:layout_constraintTop_toTopOf="@+id/tv_upload_author" />
+
+    <FrameLayout
+        android:id="@+id/fl_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="14dp"
+        android:gravity="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <ImageView
+            android:id="@+id/iv_play"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/icon_music_sheet_play"
+            android:visibility="visible" />
+
+        <TextView
+            android:id="@+id/tv_status_tip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableRight="@drawable/icon_arrow_right_small_blue"
+            android:drawablePadding="5dp"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:text="下架"
+            android:textColor="@color/color_008ae0"
+            android:textSize="@dimen/sp_14"
+            android:visibility="gone"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </FrameLayout>
+
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="match_parent"
+        android:layout_height="0.5dp"
+        android:layout_marginStart="14dp"
+        android:layout_marginTop="15dp"
+        android:layout_marginEnd="14dp"
+        android:background="@color/color_e8e8e8"
+        app:layout_constraintTop_toBottomOf="@+id/tv_upload_author" />
 </androidx.constraintlayout.widget.ConstraintLayout>