修改老师端个人中心

BaseLibrary/src/main/java/com/cooleshow/base/widgets/BadgeIconListView.java

@@ -50,6 +50,12 @@ public class BadgeIconListView extends LinearLayout {
         mIvLiveIcon = findViewById(R.id.iv_live_icon);
     }
 
+    public void hideVip() {
+        if (mIvVipIcon != null) {
+            mIvVipIcon.setVisibility(View.GONE);
+        }
+    }
+
     public void setVipIcon(boolean isVip) {
         if (mIvVipIcon != null) {
             mIvVipIcon.setImageResource(isVip ? R.drawable.icon_vip_able : R.drawable.icon_vip_enable);

BaseLibrary/src/main/res/values/colors.xml

@@ -111,6 +111,7 @@
     <color name="color_01b84f">#01B84F</color>
     <color name="color_cd863e">#CD863E</color>
     <color name="color_3591ce">#3591ce</color>
+    <color name="color_7f6b3f">#7F6B3F</color>
 
     <color name="color_25292e">#25292E</color>
     <color name="color_F8F8F8">#F8F8F8</color>

BaseLibrary/src/main/res/values/styles.xml

@@ -332,7 +332,7 @@
     <style name="me_btn_style">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:drawableRight">@drawable/icon_arrow_right</item>
+        <item name="android:drawableRight">@drawable/icon_arrow_right2</item>
         <item name="android:drawablePadding">5dp</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:paddingLeft">10dp</item>
@@ -340,7 +340,7 @@
         <item name="android:paddingRight">12dp</item>
         <item name="android:paddingBottom">10dp</item>
         <item name="android:textColor">@color/color_1a1a1a</item>
-        <item name="android:textSize">@dimen/sp_15</item>
+        <item name="android:textSize">@dimen/sp_16</item>
     </style>
 
     <style name="InputBar_Dialog_Style" parent="android:Theme.Dialog">

teacher/src/main/java/com/cooleshow/teacher/ui/comment/CourseCommentActivity.java

@@ -2,8 +2,10 @@ package com.cooleshow.teacher.ui.comment;
 
 import android.graphics.Typeface;
 import android.os.Bundle;
+import android.view.View;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseActivity;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
@@ -21,7 +23,7 @@ import androidx.viewpager2.widget.ViewPager2;
  * Author by pq, Date on 2022/5/5.
  */
 @Route(path = RouterPath.CommentCenter.TEACHER_COURSE_COMMENT)
-public class CourseCommentActivity extends BaseActivity<ActivityCourseCommentLayoutBinding> {
+public class CourseCommentActivity extends BaseActivity<ActivityCourseCommentLayoutBinding> implements View.OnClickListener {
     private ArrayList<Fragment> mFragments = new ArrayList<>();
 
     @Override
@@ -32,7 +34,10 @@ public class CourseCommentActivity extends BaseActivity<ActivityCourseCommentLay
 
     @Override
     protected void initView() {
-        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "陪练课评价");
+        initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "我的评价");
+        viewBinding.toolbarInclude.tvRightText.setVisibility(View.VISIBLE);
+        viewBinding.toolbarInclude.tvRightText.setText("收到评价");
+        viewBinding.toolbarInclude.tvRightText.setOnClickListener(this);
         viewBinding.radioGroup.setOnCheckedChangeListener((radioGroup, i) -> {
             if (i == R.id.rb_not_reply) {
                 viewBinding.viewPager.setCurrentItem(0);
@@ -79,4 +84,15 @@ public class CourseCommentActivity extends BaseActivity<ActivityCourseCommentLay
     protected ActivityCourseCommentLayoutBinding getLayoutView() {
         return ActivityCourseCommentLayoutBinding.inflate(getLayoutInflater());
     }
+
+    @Override
+    public void onClick(View v) {
+        int id = v.getId();
+        if (id == com.cooleshow.base.R.id.tv_right_text) {
+            //收到评价
+            ARouter.getInstance().build(RouterPath.CommentCenter.TEACHER_RECEIVED_COMMENT)
+                    .navigation();
+            return;
+        }
+    }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/main/MineFragment.java

@@ -57,11 +57,18 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         mViewBinding.viewVipBg.setOnClickListener(this);
         mViewBinding.tvTradeRecord.setOnClickListener(this);
         mViewBinding.ivScan.setOnClickListener(this);
+
+        mViewBinding.tvMineIncome.setOnClickListener(this);
+        mViewBinding.tvSheetMusic.setOnClickListener(this);
+        mViewBinding.tvPianoCourse.setOnClickListener(this);
+        mViewBinding.tvHomework.setOnClickListener(this);
+        mViewBinding.tvCourseComment.setOnClickListener(this);
+
     }
 
     @Override
     protected void initData() {
-
+        mViewBinding.llBadge.hideVip();
     }
 
     //是否有直播权限 0 否 1 是
@@ -85,7 +92,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
             mViewBinding.ratingBar.setVisibility(View.GONE);
             mViewBinding.tvNoScore.setVisibility(View.VISIBLE);
         }
-        mViewBinding.llBadge.setVipIcon(teacherUserInfo.isVip == 1);
+        mViewBinding.ivVip.setImageResource(teacherUserInfo.isVip == 1 ? com.cooleshow.base.R.drawable.icon_vip_able : com.cooleshow.base.R.drawable.icon_vip_enable);
         mViewBinding.llBadge.setData(teacherUserInfo.tag);
         //粉丝数
         mViewBinding.tvFansNum.setText(teacherUserInfo.fansNum);
@@ -101,16 +108,13 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
             //入驻审核中
             mViewBinding.ivCertificationStatus.setImageResource(R.drawable.icon_home_entry_doing);
             mViewBinding.ivCertificationStatus.setVisibility(View.GONE);
-            hintCertificationOtherView();
         } else if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
             //入驻审核通过
             mViewBinding.ivCertificationStatus.setVisibility(View.GONE);
-            showCertificationOtherView();
         } else {
             //未通过或者未申请
             mViewBinding.ivCertificationStatus.setImageResource(R.drawable.icon_home_un_certification);
             mViewBinding.ivCertificationStatus.setVisibility(View.GONE);
-            hintCertificationOtherView();
         }
 
         //银行卡绑定状态
@@ -121,22 +125,6 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         }
     }
 
-    private void hintCertificationOtherView() {
-        mViewBinding.llFans.setVisibility(View.GONE);
-        mViewBinding.viewLine1.setVisibility(View.GONE);
-        mViewBinding.llCourseNumCompleted.setVisibility(View.GONE);
-        mViewBinding.viewLine2.setVisibility(View.GONE);
-        mViewBinding.llCourseNumNotStart.setVisibility(View.GONE);
-    }
-
-    private void showCertificationOtherView() {
-        mViewBinding.llFans.setVisibility(View.VISIBLE);
-        mViewBinding.viewLine1.setVisibility(View.VISIBLE);
-        mViewBinding.llCourseNumCompleted.setVisibility(View.VISIBLE);
-        mViewBinding.viewLine2.setVisibility(View.VISIBLE);
-        mViewBinding.llCourseNumNotStart.setVisibility(View.VISIBLE);
-    }
-
     @Override
     protected FragmentMineLayoutBinding getLayoutView() {
         return FragmentMineLayoutBinding.inflate(getLayoutInflater());
@@ -149,6 +137,9 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
 
     @Override
     public void onClick(View v) {
+        if (UiUtils.isFastClick()) {
+            return;
+        }
         switch (v.getId()) {
             case R.id.iv_certification_status:
                 //达人认证
@@ -159,9 +150,6 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 mViewBinding.ivUnCertificationTip.setVisibility(View.GONE);
                 break;
             case R.id.tv_mine_page:
-                if (UiUtils.isFastClick()) {
-                    return;
-                }
                 if (TextUtils.equals(teacherCertStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
                     //个人主页
                     ARouter.getInstance().build(RouterPath.MineCenter.HOME_PAGE)
@@ -171,9 +159,6 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 }
                 break;
             case R.id.tv_mine_style:
-                if (UiUtils.isFastClick()) {
-                    return;
-                }
                 if (TextUtils.equals(teacherCertStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
                     //个人风采
                     ARouter.getInstance().build(RouterPath.MineCenter.MINE_STYLE_PAGE)
@@ -193,9 +178,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                         .navigation();
                 break;
             case R.id.tv_sparing_course_set:
-                if (UiUtils.isFastClick()) {
-                    return;
-                }
+
                 if (TextUtils.equals(teacherCertStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
                     //陪练课设置
                     ARouter.getInstance()
@@ -207,17 +190,11 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 }
                 break;
             case R.id.tv_live_course:
-                if (UiUtils.isFastClick()) {
-                    return;
-                }
                 //直播课
                 ARouter.getInstance().build(RouterPath.CourseCenter.TEACHER_MINE_LIVE_COURSE)
                         .navigation();
                 break;
             case R.id.tv_video_course:
-                if (UiUtils.isFastClick()) {
-                    return;
-                }
                 //视频课
                 ARouter.getInstance().build(RouterPath.CourseCenter.TEACHER_MINE_VIDEO_COURSE)
                         .navigation();
@@ -241,9 +218,6 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 break;
             case R.id.tv_open_live:
                 //开启直播
-                if (UiUtils.isFastClick()) {
-                    return;
-                }
                 if (liveFlag == 0) {
                     ARouter.getInstance()
                             .build(RouterPath.WebCenter.ACTIVITY_HTML)
@@ -280,9 +254,6 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                         .navigation();
                 break;
             case R.id.iv_goods_order:
-                if (UiUtils.isFastClick()) {
-                    return;
-                }
                 //商品订单
                 ARouter.getInstance()
                         .build(RouterPath.WebCenter.ACTIVITY_HTML)
@@ -290,9 +261,6 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                         .navigation();
                 break;
             case R.id.view_vip_bg:
-                if (UiUtils.isFastClick()) {
-                    return;
-                }
                 //会员中心
                 ARouter.getInstance()
                         .build(RouterPath.WebCenter.ACTIVITY_HTML)
@@ -303,14 +271,38 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                 WebStartHelper.startTradeRecord();
                 break;
             case R.id.iv_scan:
-                if (UiUtils.isFastClick()) {
-                    return;
-                }
                 //二维码扫描
                 ARouter.getInstance()
                         .build(RouterPath.BaseCenter.SCAN_QR_CODE)
                         .navigation();
                 break;
+            case R.id.tv_mine_income:
+                //我的收入
+                ARouter.getInstance().build(RouterPath.IncomeCenter.TEACHER_MINE_INCOME)
+                        .navigation();
+                break;
+            case R.id.tv_sheet_music:
+                //我的曲谱
+                ARouter.getInstance().build(RouterPath.ScoreCenter.TEACHER_MINE_SCORE)
+                        .navigation();
+                break;
+            case R.id.tv_piano_course:
+                //云库琴房
+                ARouter.getInstance()
+                        .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                        .withString(WebConstants.WEB_URL, WebConstants.PIANO_ROOM)
+                        .navigation();
+                break;
+            case R.id.tv_homework:
+                //课后作业
+                ARouter.getInstance().build(RouterPath.WorkCenter.TEACHER_WORK_HOMEWORK)
+                        .navigation();
+                break;
+            case R.id.tv_course_comment:
+                //课后评价
+                ARouter.getInstance().build(RouterPath.CommentCenter.TEACHER_COURSE_COMMENT)
+                        .navigation();
+                break;
         }
     }
 

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

@@ -10,17 +10,17 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="15dp">
+        android:paddingBottom="23dp">
 
 
         <ImageView
             android:id="@+id/iv_header_bg"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:adjustViewBounds="true"
             android:scaleType="fitXY"
-            android:src="@drawable/bg_login_header"
-            app:layout_constraintLeft_toLeftOf="parent"
+            android:src="@drawable/bg_mine_header"
+            app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <View
@@ -35,7 +35,7 @@
             android:layout_height="wrap_content"
             android:padding="6dp"
             android:src="@drawable/icon_scan_for_teacher"
-            android:visibility="visible"
+            android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/iv_setting"
             app:layout_constraintRight_toLeftOf="@+id/iv_setting"
             app:layout_constraintTop_toTopOf="@+id/iv_setting" />
@@ -44,7 +44,7 @@
             android:id="@+id/iv_setting"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="16dp"
             android:layout_marginEnd="12dp"
             android:padding="6dp"
             android:src="@drawable/icon_setting_teacher"
@@ -53,10 +53,10 @@
 
         <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/iv_avatar"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
             android:layout_marginStart="14dp"
-            android:layout_marginTop="74dp"
+            android:layout_marginTop="48dp"
             android:src="@drawable/icon_teacher_default_head"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/view_status_bar" />
@@ -66,48 +66,60 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="10dp"
-            android:layout_marginBottom="10dp"
             android:includeFontPadding="false"
             android:textColor="@color/color_1a1a1a"
             android:textSize="@dimen/sp_18"
-            app:layout_constraintBottom_toTopOf="@+id/rating_bar"
+            app:layout_constraintBottom_toTopOf="@+id/tv_badge_title"
             app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
             app:layout_constraintTop_toTopOf="@+id/iv_avatar"
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="游客12e32td" />
 
-        <com.cooleshow.base.widgets.BadgeIconListView
-            android:id="@+id/ll_badge"
-            android:layout_width="0dp"
+        <ImageView
+            android:id="@+id/iv_vip"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
-            android:visibility="visible"
+            android:layout_marginStart="6dp"
+            android:src="@drawable/icon_vip_enable"
             app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"
             app:layout_constraintLeft_toRightOf="@+id/tv_nickname"
-            app:layout_constraintRight_toLeftOf="@+id/iv_scan"
             app:layout_constraintTop_toTopOf="@+id/tv_nickname" />
 
-        <!--        <ImageView-->
-        <!--            android:id="@+id/iv_teacher_entry_tag"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginStart="6dp"-->
-        <!--            android:src="@drawable/icon_teahcer_entry_tag"-->
-        <!--            android:visibility="gone"-->
-        <!--            app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"-->
-        <!--            app:layout_constraintLeft_toRightOf="@+id/tv_nickname"-->
-        <!--            app:layout_constraintTop_toTopOf="@+id/tv_nickname" />-->
-
-        <!--        <ImageView-->
-        <!--            android:id="@+id/iv_teacher_music_person_tag"-->
-        <!--            android:layout_width="wrap_content"-->
-        <!--            android:layout_height="wrap_content"-->
-        <!--            android:layout_marginStart="3dp"-->
-        <!--            android:src="@drawable/icon_teacher_music_person_tag"-->
-        <!--            android:visibility="gone"-->
-        <!--            app:layout_constraintBottom_toBottomOf="@+id/iv_teacher_entry_tag"-->
-        <!--            app:layout_constraintLeft_toRightOf="@+id/iv_teacher_entry_tag"-->
-        <!--            app:layout_constraintTop_toTopOf="@+id/iv_teacher_entry_tag" />-->
+        <TextView
+            android:id="@+id/tv_badge_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:includeFontPadding="false"
+            android:text="勋章:"
+            android:textColor="@color/color_666666"
+            android:textSize="@dimen/sp_12"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
+            app:layout_constraintLeft_toLeftOf="@+id/tv_nickname"
+            app:layout_constraintTop_toBottomOf="@+id/tv_nickname" />
+
+        <com.cooleshow.base.widgets.BadgeIconListView
+            android:id="@+id/ll_badge"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_badge_title"
+            app:layout_constraintLeft_toRightOf="@+id/tv_badge_title"
+            app:layout_constraintTop_toTopOf="@+id/tv_badge_title" />
+
+        <TextView
+            android:layout_marginStart="15dp"
+            android:id="@+id/tv_score_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:includeFontPadding="false"
+            android:text="评分:"
+            android:textColor="@color/color_666666"
+            android:textSize="@dimen/sp_12"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_badge_title"
+            app:layout_constraintLeft_toRightOf="@+id/ll_badge"
+            app:layout_constraintTop_toTopOf="@+id/tv_badge_title" />
+
 
         <RatingBar
             android:id="@+id/rating_bar"
@@ -119,9 +131,9 @@
             android:rating="0"
             android:stepSize="1"
             android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
-            app:layout_constraintLeft_toLeftOf="@+id/tv_nickname"
-            app:layout_constraintTop_toBottomOf="@+id/tv_nickname" />
+            app:layout_constraintBottom_toBottomOf="@+id/tv_score_title"
+            app:layout_constraintLeft_toRightOf="@+id/tv_score_title"
+            app:layout_constraintTop_toTopOf="@+id/tv_score_title" />
 
         <TextView
             android:id="@+id/tv_no_score"
@@ -130,9 +142,9 @@
             android:text="暂无评分"
             android:textSize="@dimen/sp_13"
             android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
-            app:layout_constraintLeft_toLeftOf="@+id/tv_nickname"
-            app:layout_constraintTop_toBottomOf="@+id/tv_nickname" />
+            app:layout_constraintBottom_toBottomOf="@+id/tv_score_title"
+            app:layout_constraintLeft_toRightOf="@+id/tv_score_title"
+            app:layout_constraintTop_toTopOf="@+id/tv_score_title" />
 
         <ImageView
             android:id="@+id/iv_certification_status"
@@ -166,26 +178,38 @@
             app:layout_constraintTop_toBottomOf="@+id/certification_tip_help_view"
             tools:visibility="gone" />
 
+        <View
+            android:id="@+id/view_vip_bg"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_82"
+            android:layout_marginLeft="21dp"
+            android:layout_marginTop="17dp"
+            android:layout_marginRight="21dp"
+            android:background="@drawable/icon_mine_vip_bg"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/iv_avatar"
+            app:layout_goneMarginTop="30dp" />
+
+        <View
+            android:id="@+id/view_other_info_bg"
+            android:layout_width="match_parent"
+            android:layout_height="80dp"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="62dp"
+            android:layout_marginEnd="14dp"
+            android:background="@drawable/shape_8dp_white"
+            app:layout_constraintTop_toBottomOf="@+id/iv_avatar" />
+
         <LinearLayout
             android:id="@+id/ll_fans"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_22"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            app:layout_constraintLeft_toLeftOf="parent"
+            android:gravity="center"
+            android:orientation="vertical"
+            app:layout_constraintBottom_toBottomOf="@+id/view_other_info_bg"
+            app:layout_constraintLeft_toLeftOf="@+id/view_other_info_bg"
             app:layout_constraintRight_toLeftOf="@+id/ll_course_num_completed"
-            app:layout_constraintTop_toBottomOf="@+id/iv_avatar">
-
-            <TextView
-                android:id="@+id/tv_fans_title"
-                android:layout_width="wrap_content"
-                android:layout_height="28dp"
-                android:gravity="center"
-                android:includeFontPadding="false"
-                android:text="粉丝"
-                android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_14" />
+            app:layout_constraintTop_toTopOf="@+id/view_other_info_bg">
 
             <TextView
                 android:id="@+id/tv_fans_num"
@@ -195,42 +219,34 @@
                 android:paddingStart="3dp"
                 android:text="0"
                 android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_17"
+                android:textSize="@dimen/sp_22"
                 android:textStyle="bold"
                 tools:text="1181" />
+
+            <TextView
+                android:id="@+id/tv_fans_title"
+                android:layout_width="wrap_content"
+                android:layout_height="28dp"
+                android:layout_marginTop="5dp"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:text="粉丝"
+                android:textColor="@color/color_999999"
+                android:textSize="@dimen/sp_14" />
+
         </LinearLayout>
 
-        <View
-            android:id="@+id/view_line1"
-            android:layout_width="1dp"
-            android:layout_height="12dp"
-            android:background="@color/color_d3d3d3"
-            app:layout_constraintBottom_toBottomOf="@+id/ll_fans"
-            app:layout_constraintLeft_toRightOf="@+id/ll_fans"
-            app:layout_constraintRight_toLeftOf="@+id/ll_course_num_completed"
-            app:layout_constraintTop_toTopOf="@+id/ll_fans" />
 
         <LinearLayout
             android:id="@+id/ll_course_num_completed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
+            android:gravity="center"
+            android:orientation="vertical"
             app:layout_constraintLeft_toRightOf="@+id/ll_fans"
             app:layout_constraintRight_toLeftOf="@+id/ll_course_num_not_start"
             app:layout_constraintTop_toTopOf="@+id/ll_fans">
 
-
-            <TextView
-                android:id="@+id/tv_course_num_completed_title"
-                android:layout_width="wrap_content"
-                android:layout_height="28dp"
-                android:gravity="center"
-                android:includeFontPadding="false"
-                android:text="已上课时"
-                android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_14" />
-
             <TextView
                 android:id="@+id/tv_course_num_completed"
                 android:layout_width="wrap_content"
@@ -239,42 +255,34 @@
                 android:paddingStart="3dp"
                 android:text="0"
                 android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_17"
+                android:textSize="@dimen/sp_22"
                 android:textStyle="bold"
                 tools:text="118" />
-        </LinearLayout>
 
-        <View
-            android:id="@+id/view_line2"
-            android:layout_width="1dp"
-            android:layout_height="12dp"
-            android:background="@color/color_d3d3d3"
-            app:layout_constraintBottom_toBottomOf="@+id/ll_fans"
-            app:layout_constraintLeft_toRightOf="@+id/ll_course_num_completed"
-            app:layout_constraintRight_toLeftOf="@+id/ll_course_num_not_start"
-            app:layout_constraintTop_toTopOf="@+id/ll_fans" />
+            <TextView
+                android:id="@+id/tv_course_num_completed_title"
+                android:layout_width="wrap_content"
+                android:layout_height="28dp"
+                android:layout_marginTop="5dp"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:text="已上课时"
+                android:textColor="@color/color_999999"
+                android:textSize="@dimen/sp_14" />
+
+
+        </LinearLayout>
 
         <LinearLayout
             android:id="@+id/ll_course_num_not_start"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
+            android:gravity="center"
+            android:orientation="vertical"
             app:layout_constraintLeft_toRightOf="@+id/ll_course_num_completed"
-            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintRight_toRightOf="@+id/view_other_info_bg"
             app:layout_constraintTop_toTopOf="@+id/ll_fans">
 
-
-            <TextView
-                android:id="@+id/tv_course_num_not_start_title"
-                android:layout_width="wrap_content"
-                android:layout_height="28dp"
-                android:gravity="center"
-                android:includeFontPadding="false"
-                android:text="未上课时"
-                android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_14" />
-
             <TextView
                 android:id="@+id/tv_course_num_not_start"
                 android:layout_width="wrap_content"
@@ -283,31 +291,31 @@
                 android:paddingStart="3dp"
                 android:text="0"
                 android:textColor="@color/color_333333"
-                android:textSize="@dimen/sp_17"
+                android:textSize="@dimen/sp_22"
                 android:textStyle="bold"
                 tools:text="118" />
-        </LinearLayout>
 
-        <View
-            android:id="@+id/view_vip_bg"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/dp_82"
-            android:layout_marginLeft="21dp"
-            android:layout_marginTop="20dp"
-            android:layout_marginRight="21dp"
-            android:background="@drawable/icon_mine_vip_bg"
-            app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ll_fans"
-            app:layout_goneMarginTop="30dp" />
+            <TextView
+                android:id="@+id/tv_course_num_not_start_title"
+                android:layout_width="wrap_content"
+                android:layout_height="28dp"
+                android:layout_marginTop="5dp"
+                android:gravity="center"
+                android:includeFontPadding="false"
+                android:text="未上课时"
+                android:textColor="@color/color_999999"
+                android:textSize="@dimen/sp_14" />
 
+        </LinearLayout>
 
-        <View
+
+        <ImageView
             android:id="@+id/view_vip_star"
             android:layout_width="@dimen/dp_19"
-            android:layout_height="@dimen/dp_16"
+            android:layout_height="@dimen/dp_18"
             android:layout_marginLeft="20dp"
             android:layout_marginTop="14dp"
-            android:background="@drawable/icon_mine_vip_star"
+            android:src="@drawable/icon_mine_vip_star"
             app:layout_constraintLeft_toLeftOf="@+id/view_vip_bg"
             app:layout_constraintTop_toTopOf="@+id/view_vip_bg" />
 
@@ -318,7 +326,7 @@
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dp"
             android:text="会员有效期剩余"
-            android:textColor="@color/color_fed271"
+            android:textColor="@color/color_7f6b3f"
             android:textSize="@dimen/sp_14"
             app:layout_constraintBottom_toBottomOf="@+id/view_vip_star"
             app:layout_constraintLeft_toRightOf="@+id/view_vip_star"
@@ -329,7 +337,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="0"
-            android:textColor="@color/color_fed271"
+            android:textColor="@color/color_7f6b3f"
             android:textSize="@dimen/sp_14"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="@+id/view_vip_star"
@@ -341,7 +349,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="天"
-            android:textColor="@color/color_fed271"
+            android:textColor="@color/color_7f6b3f"
             android:textSize="@dimen/sp_14"
             app:layout_constraintBottom_toBottomOf="@+id/view_vip_star"
             app:layout_constraintLeft_toRightOf="@+id/tv_validity"
@@ -349,8 +357,8 @@
 
         <ImageView
             android:id="@+id/im_vip"
-            android:layout_width="@dimen/dp_75"
-            android:layout_height="@dimen/dp_20"
+            android:layout_width="@dimen/dp_74"
+            android:layout_height="@dimen/dp_26"
             android:layout_marginRight="16dp"
             android:background="@drawable/icon_mine_vip_center"
             app:layout_constraintBottom_toBottomOf="@+id/view_vip_star"
@@ -363,149 +371,280 @@
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginStart="14dp"
-            android:layout_marginTop="42dp"
+            android:layout_marginTop="12dp"
             android:layout_marginEnd="14dp"
             android:background="@drawable/bg_white_10dp"
             app:layout_constraintBottom_toTopOf="@+id/top_bottom_view"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/view_vip_bg"
+            app:layout_constraintTop_toBottomOf="@+id/view_other_info_bg"
             app:layout_goneMarginTop="@dimen/dp_26" />
 
         <TextView
+            android:id="@+id/tv_tools_use"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="15dp"
+            android:includeFontPadding="false"
+            android:text="常用工具"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_16"
+            android:textStyle="bold"
+            app:layout_constraintLeft_toLeftOf="@+id/view_top_bg"
+            app:layout_constraintTop_toTopOf="@+id/view_top_bg" />
+
+        <TextView
             android:id="@+id/tv_mine_page"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="19dp"
+            android:layout_marginTop="12dp"
             android:drawableTop="@drawable/icon_mine_page"
-            android:drawablePadding="@dimen/dp_7"
+            android:drawablePadding="@dimen/dp_3"
+            android:gravity="center"
             android:includeFontPadding="false"
             android:text="@string/mine_page_str"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/sp_13"
             app:layout_constraintLeft_toLeftOf="@+id/view_top_bg"
-            app:layout_constraintRight_toLeftOf="@+id/tv_mine_style"
-            app:layout_constraintTop_toTopOf="@+id/view_top_bg" />
+            app:layout_constraintRight_toLeftOf="@+id/tv_mine_income"
+            app:layout_constraintTop_toBottomOf="@+id/tv_tools_use" />
 
         <TextView
-            android:id="@+id/tv_mine_style"
+            android:id="@+id/tv_mine_income"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableTop="@drawable/icon_mine_style"
-            android:drawablePadding="@dimen/dp_7"
+            android:drawableTop="@drawable/icon_mine_income"
+            android:drawablePadding="@dimen/dp_3"
             android:includeFontPadding="false"
-            android:text="个人风采"
+            android:text="我的收入"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/sp_13"
             app:layout_constraintLeft_toRightOf="@+id/tv_mine_page"
-            app:layout_constraintRight_toLeftOf="@+id/tv_open_live"
+            app:layout_constraintRight_toLeftOf="@+id/tv_mine_style"
             app:layout_constraintTop_toTopOf="@+id/tv_mine_page" />
 
+
         <TextView
-            android:id="@+id/tv_open_live"
+            android:id="@+id/tv_mine_style"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableTop="@drawable/icon_open_live"
-            android:drawablePadding="@dimen/dp_7"
+            android:drawableTop="@drawable/icon_mine_style"
+            android:drawablePadding="@dimen/dp_3"
             android:includeFontPadding="false"
-            android:text="开启直播"
+            android:text="个人风采"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_12"
-            app:layout_constraintLeft_toRightOf="@+id/tv_mine_style"
+            android:textSize="@dimen/sp_13"
+            app:layout_constraintLeft_toRightOf="@+id/tv_mine_income"
             app:layout_constraintRight_toLeftOf="@+id/iv_goods_order"
-            app:layout_constraintTop_toTopOf="@+id/tv_mine_style" />
+            app:layout_constraintTop_toTopOf="@+id/tv_mine_page" />
+
 
         <TextView
             android:id="@+id/iv_goods_order"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/icon_goods_order"
-            android:drawablePadding="@dimen/dp_7"
+            android:drawablePadding="@dimen/dp_3"
             android:includeFontPadding="false"
             android:text="商品订单"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_12"
-            app:layout_constraintLeft_toRightOf="@+id/tv_open_live"
+            android:textSize="@dimen/sp_13"
+            app:layout_constraintLeft_toRightOf="@+id/tv_mine_style"
             app:layout_constraintRight_toRightOf="@+id/view_top_bg"
             app:layout_constraintTop_toTopOf="@+id/tv_mine_style" />
 
+        <View
+            android:id="@+id/top_bottom_view"
+            android:layout_width="1px"
+            android:layout_height="1px"
+            android:layout_marginTop="24dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_mine_page" />
+
+        <View
+            android:id="@+id/view_bottom_bg"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="14dp"
+            android:background="@drawable/shape_8dp_white"
+            app:layout_constraintBottom_toTopOf="@+id/bottom_view_line"
+            app:layout_constraintTop_toBottomOf="@+id/top_bottom_view" />
+
+
         <TextView
-            android:id="@+id/tv_sparing_course_set"
+            android:id="@+id/tv_tools_teaching"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/dp_27"
-            android:drawableTop="@drawable/icon_sparing_course_set"
-            android:drawablePadding="@dimen/dp_7"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="15dp"
             android:includeFontPadding="false"
-            android:text="陪练课设置"
+            android:text="教学工具"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_12"
-            app:layout_constraintLeft_toLeftOf="@+id/tv_mine_page"
-            app:layout_constraintRight_toRightOf="@+id/tv_mine_page"
-            app:layout_constraintTop_toBottomOf="@+id/tv_mine_page" />
+            android:textSize="@dimen/sp_16"
+            android:textStyle="bold"
+            app:layout_constraintLeft_toLeftOf="@+id/view_bottom_bg"
+            app:layout_constraintTop_toTopOf="@+id/view_bottom_bg" />
+
+
+        <TextView
+            android:id="@+id/tv_open_live"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/icon_open_live"
+            android:drawablePadding="@dimen/dp_3"
+            android:includeFontPadding="false"
+            android:text="我的直播"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_13"
+            android:layout_marginTop="13dp"
+            app:layout_constraintLeft_toLeftOf="@+id/view_bottom_bg"
+            app:layout_constraintRight_toLeftOf="@+id/tv_live_course"
+            app:layout_constraintTop_toBottomOf="@+id/tv_tools_teaching" />
+
 
         <TextView
             android:id="@+id/tv_live_course"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/icon_live_course"
-            android:drawablePadding="@dimen/dp_7"
+            android:drawablePadding="@dimen/dp_3"
             android:gravity="center"
             android:includeFontPadding="false"
             android:minWidth="@dimen/dp_48"
             android:text="直播课"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_12"
-            app:layout_constraintLeft_toLeftOf="@+id/tv_mine_style"
-            app:layout_constraintRight_toRightOf="@+id/tv_mine_style"
-            app:layout_constraintTop_toTopOf="@+id/tv_sparing_course_set" />
-
+            android:textSize="@dimen/sp_13"
+            app:layout_constraintLeft_toRightOf="@+id/tv_open_live"
+            app:layout_constraintRight_toLeftOf="@+id/tv_video_course"
+            app:layout_constraintTop_toTopOf="@+id/tv_open_live" />
 
         <TextView
             android:id="@+id/tv_video_course"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/icon_video_course"
-            android:drawablePadding="@dimen/dp_7"
+            android:drawablePadding="@dimen/dp_3"
             android:gravity="center"
             android:includeFontPadding="false"
             android:minWidth="@dimen/dp_48"
             android:text="视频课"
             android:textColor="@color/color_333333"
-            android:textSize="@dimen/sp_12"
+            android:textSize="@dimen/sp_13"
+            app:layout_constraintLeft_toRightOf="@+id/tv_live_course"
+            app:layout_constraintRight_toLeftOf="@+id/tv_sheet_music"
+            app:layout_constraintTop_toTopOf="@+id/tv_open_live" />
+
+        <TextView
+            android:id="@+id/tv_sheet_music"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/icon_mine_sheet_music"
+            android:drawablePadding="@dimen/dp_3"
+            android:gravity="center"
+            android:includeFontPadding="false"
+            android:minWidth="@dimen/dp_48"
+            android:text="我的乐谱"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_13"
+            app:layout_constraintLeft_toRightOf="@+id/tv_video_course"
+            app:layout_constraintRight_toRightOf="@+id/view_bottom_bg"
+            app:layout_constraintTop_toTopOf="@+id/tv_open_live" />
+
+        <TextView
+            android:id="@+id/tv_sparing_course_set"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/dp_17"
+            android:drawableTop="@drawable/icon_sparing_course_set"
+            android:drawablePadding="@dimen/dp_3"
+            android:includeFontPadding="false"
+            android:text="陪练课设置"
+            android:gravity="center"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_13"
             app:layout_constraintLeft_toLeftOf="@+id/tv_open_live"
             app:layout_constraintRight_toRightOf="@+id/tv_open_live"
+            app:layout_constraintTop_toBottomOf="@+id/tv_open_live" />
+
+        <TextView
+            android:id="@+id/tv_piano_course"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/icon_mine_piano_course"
+            android:drawablePadding="@dimen/dp_3"
+            android:includeFontPadding="false"
+            android:minWidth="48dp"
+            android:text="琴房课"
+            android:gravity="center"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_13"
+            app:layout_constraintLeft_toLeftOf="@+id/tv_live_course"
+            app:layout_constraintRight_toRightOf="@+id/tv_live_course"
             app:layout_constraintTop_toTopOf="@+id/tv_sparing_course_set" />
 
+        <TextView
+            android:id="@+id/tv_homework"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/icon_mine_homework"
+            android:drawablePadding="@dimen/dp_3"
+            android:includeFontPadding="false"
+            android:minWidth="48dp"
+            android:text="课后作业"
+            android:gravity="center"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_13"
+            app:layout_constraintLeft_toLeftOf="@+id/tv_video_course"
+            app:layout_constraintRight_toRightOf="@+id/tv_video_course"
+            app:layout_constraintTop_toTopOf="@+id/tv_sparing_course_set" />
+
+        <TextView
+            android:id="@+id/tv_course_comment"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/icon_mine_course_comment"
+            android:drawablePadding="@dimen/dp_3"
+            android:includeFontPadding="false"
+            android:minWidth="48dp"
+            android:gravity="center"
+            android:text="课后评价"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_13"
+            app:layout_constraintLeft_toLeftOf="@+id/tv_sheet_music"
+            app:layout_constraintRight_toRightOf="@+id/tv_sheet_music"
+            app:layout_constraintTop_toTopOf="@+id/tv_sparing_course_set" />
 
         <View
-            android:id="@+id/top_bottom_view"
+            android:id="@+id/bottom_view_line"
             android:layout_width="1px"
             android:layout_height="1px"
-            android:layout_marginTop="28dp"
+            android:layout_marginTop="24dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/tv_sparing_course_set" />
 
-
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cs_menu_usually"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="14dp"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="12dp"
             android:layout_marginEnd="14dp"
+            android:paddingTop="12dp"
+            android:paddingBottom="12dp"
             android:background="@drawable/bg_white_10dp"
             android:orientation="vertical"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/view_top_bg">
+            app:layout_constraintTop_toBottomOf="@+id/view_bottom_bg">
 
             <TextView
                 android:id="@+id/tv_my_account"
                 style="@style/me_btn_style"
-                android:layout_marginTop="@dimen/dp_12"
-                android:drawableLeft="@drawable/icon_invite_plan"
                 android:text="酷乐秀推广计划"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/sp_16"
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
@@ -525,9 +664,8 @@
             <TextView
                 android:id="@+id/tv_authentication"
                 style="@style/me_btn_style"
-                android:drawableLeft="@drawable/icon_bank_card"
                 android:text="银行卡"
-                android:textSize="@dimen/sp_14"
+                android:textSize="@dimen/sp_16"
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_my_account" />
@@ -548,9 +686,7 @@
             <TextView
                 android:id="@+id/tv_trade_record"
                 style="@style/me_btn_style"
-                android:drawableLeft="@drawable/icon_trade_record"
                 android:text="交易记录"
-                android:textSize="@dimen/sp_14"
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="@+id/tv_authentication"
                 app:layout_constraintTop_toBottomOf="@+id/tv_authentication" />
@@ -558,9 +694,7 @@
             <TextView
                 android:id="@+id/tv_network_monitoring"
                 style="@style/me_btn_style"
-                android:drawableLeft="@drawable/icon_net_check"
                 android:text="网络检测"
-                android:textSize="@dimen/sp_14"
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="@+id/tv_authentication"
                 app:layout_constraintTop_toBottomOf="@+id/tv_trade_record" />
@@ -569,19 +703,29 @@
             <TextView
                 android:id="@+id/tv_equipment_testing"
                 style="@style/me_btn_style"
-                android:drawableLeft="@drawable/icon_equipment_testing"
                 android:text="设备检测"
-                android:textSize="@dimen/sp_14"
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/tv_network_monitoring" />
 
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <LinearLayout
+            android:background="@drawable/shape_8dp_white"
+            android:paddingBottom="10dp"
+            android:paddingTop="10dp"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="14dp"
+            app:layout_constraintTop_toBottomOf="@+id/cs_menu_usually">
+
             <TextView
                 android:id="@+id/tv_help"
                 style="@style/me_btn_style"
-                android:drawableLeft="@drawable/icon_help_center"
                 android:text="帮助中心"
-                android:textSize="@dimen/sp_14"
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="@+id/tv_equipment_testing"
                 app:layout_constraintTop_toBottomOf="@+id/tv_equipment_testing" />
@@ -589,13 +733,10 @@
             <TextView
                 android:id="@+id/tv_feedback"
                 style="@style/me_btn_style"
-                android:drawableLeft="@drawable/icon_mine_feedback"
                 android:text="意见反馈"
-                android:textSize="@dimen/sp_14"
                 android:visibility="visible"
                 app:layout_constraintLeft_toLeftOf="@+id/tv_help"
                 app:layout_constraintTop_toBottomOf="@+id/tv_help" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
+        </LinearLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>