解决bug

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

@@ -114,5 +114,6 @@
     <color name="color_ff4e1a">#FF4E1A</color>
     <color name="color_e4f8f7">#E4F8F7</color>
     <color name="color_01c1b5">#01C1B5</color>
+    <color name="color_FF806F">#FF806F</color>
 
 </resources>

rong_im/common_im_ui/src/main/java/com/common/im/ui/MessageFragment.java

@@ -73,6 +73,12 @@ public class MessageFragment extends BaseMVPFragment<FragmentMessageLayoutBindin
                     tv_text.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_333333));
                     tv_text.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD));
                 }
+                if(tab != null && tab.getPosition() == 1){
+                    ContactListTabFragment fragment = (ContactListTabFragment) fragments.get(tab.getPosition());
+                    if(fragment!=null){
+                        fragment.refreshContactList();
+                    }
+                }
             }
 
             @Override

rong_im/common_im_ui/src/main/java/com/common/im/ui/contact/ContactListTabFragment.java

@@ -81,9 +81,6 @@ public class ContactListTabFragment  extends BaseMVPFragment<FragmentContactList
         initTabLayoutAndViewPager();
     }
 
-
-
-
     private List<Fragment> fragments = new ArrayList<>();
     private List<String> titles = new ArrayList<String>(Arrays.asList("联系人", "群聊"));
 
@@ -109,4 +106,13 @@ public class ContactListTabFragment  extends BaseMVPFragment<FragmentContactList
             viewPager.setCurrentItem(1);
         }
     }
+
+    public void refreshContactList(){
+        if(fragments.size()>0) {
+            ContactPersonListFragment fragment = (ContactPersonListFragment) fragments.get(0);
+            if (fragment != null) {
+                fragment.initData();
+            }
+        }
+    }
 }

rong_im/kit/src/main/res/layout/rc_text_message_item.xml

@@ -5,6 +5,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:paddingStart="8dp"
+    android:paddingEnd="@dimen/dp_8"
     android:paddingTop="6dp"
     android:paddingBottom="6dp"
     android:textColor="@color/rc_text_main_color"

student/src/main/java/com/cooleshow/student/ui/web/AccompanyFragment.java

@@ -290,7 +290,7 @@ public class AccompanyFragment extends BaseMVPFragment<FragmentAccompanyBinding,
                 .subscribe(permission -> {
                     if (permission) {
 //                        startWebSocketClient(message);
-                        if (webSocketClient != null) {
+                        if (webSocketClient != null && !webSocketClient.isOpen()) {
                             if (webSocketClient.getReadyState() == ReadyState.NOT_YET_CONNECTED) {
                                 if (webSocketClient.isClosed()) {
                                     webSocketClient.reconnectBlocking();

student/src/main/java/com/cooleshow/student/ui/web/HtmlActivity.java

@@ -1116,6 +1116,9 @@ public class HtmlActivity extends BaseActivity<ActivityHtml1Binding> implements
 //            clearUploadMessage();
             return;
         } else if (requestCode == 1011) {
+            if (data == null) {
+                return;
+            }
             String selectAddress = data.getStringExtra("selectAddress");
             selectAddress(selectAddress);
         }

student/src/main/java/com/cooleshow/student/widgets/helper/JsInterfaceAccomPanyUtils.java

@@ -9,6 +9,7 @@ import android.view.WindowManager;
 import android.webkit.JavascriptInterface;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.usercenter.constants.UserConstants;
 import com.cooleshow.usercenter.helper.UserHelper;
@@ -111,7 +112,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
                         path = RouterPath.WebCenter.ACTIVITY_HORIZONTAL_SCREEN_HTML;
                     }
                     ARouter.getInstance().build(path)
-                            .withString("url", content.getString("url"))
+                            .withString(WebConstants.WEB_URL, content.optString("url"))
                             .withBoolean("isHideTitle", isHideTitle)
                             .withBoolean("statusBarTextColor", statusBarTextColor)
                             .withBoolean("isOpenLight", isOpenLight)

teacher/src/main/java/com/cooleshow/teacher/api/APIService.java

@@ -1,6 +1,7 @@
 package com.cooleshow.teacher.api;
 
 import com.cooleshow.base.data.net.BaseResponse;
+import com.cooleshow.teacher.bean.HomeLiveAndVideoBean;
 import com.cooleshow.teacher.bean.request.LiveCourseEntry;
 import com.cooleshow.teacher.bean.AccountDetailBean;
 import com.cooleshow.teacher.bean.AccountTotalBean;
@@ -123,6 +124,13 @@ public interface APIService {
     Observable<BaseResponse<PianoRoomCourseListBean>> getPianoRoomCourseList(@Body RequestBody body);
 
     /**
+     * 获取直播课信息
+     * @return
+     */
+    @GET(TEACHER_GROUP + "courseSchedule/queryLiveAndVideo")
+    Observable<BaseResponse<HomeLiveAndVideoBean>> queryLiveAndVideo();
+
+    /**
      * 查询陪练课作业信息
      *
      * @param

teacher/src/main/java/com/cooleshow/teacher/bean/HomeLiveAndVideoBean.java

@@ -0,0 +1,105 @@
+package com.cooleshow.teacher.bean;
+
+import java.util.List;
+
+/**
+ * @author dengqw
+ * @time 2022/6/29 22:25
+ * @describe：
+ **/
+public class HomeLiveAndVideoBean {
+
+    public List<CourseBean> liveList;
+    public List<VideoCourseBean> videoList;
+    public RecentCoursesBean recentCourses;
+
+    public static class CourseBean {
+        /*
+        	"avatar": "",
+				"backgroundPic": "",
+				"buyCount": 0,
+				"courseGroupId": 0,
+				"courseGroupName": "",
+				"courseGroupPrice": 0,
+				"courseNum": 0,
+				"courseStartTime": "",
+				"realName": "",
+				"subjectId": 0,
+				"subjectName": "",
+				"teacherId": 0,
+				"teacherName": ""
+         */
+        public String avatar;
+        public String backgroundPic;
+        public int buyCount;
+        public long courseGroupId;
+        public String courseGroupName;
+        public String courseGroupPrice;
+        public int courseNum;
+        public String courseStartTime;
+        public String realName;
+        public int subjectId;
+        public String subjectName;
+        public long teacherId;
+        public String teacherName;
+
+    }
+
+    public static class VideoCourseBean{
+        /*
+        "avatar": "",
+				"buyCount": 0,
+				"createTime": "",
+				"lessonCount": 0,
+				"lessonCoverUrl": "",
+				"lessonPrice": 0,
+				"realName": "",
+				"subjectId": 0,
+				"subjectName": "",
+				"teacherId": 0,
+				"teacherName": "",
+				"videoGroupId": 0,
+				"videoGroupName": ""
+         */
+        public String avatar;
+        public int buyCount;
+        public String createTime;
+        public int lessonCount;
+        public String lessonCoverUrl;
+        public String lessonPrice;
+        public String realName;
+        public int subjectId;
+        public String subjectName;
+        public long teacherId;
+        public String teacherName;
+        public long videoGroupId;
+        public String videoGroupName;
+
+    }
+
+    public static class RecentCoursesBean {
+        /*
+        	"avatar": "",
+			"courseGroupId": 0,
+			"courseGroupName": "",
+			"courseId": 0,
+			"courseStartTime": "",
+			"courseType": "",
+			"realName": "",
+			"status": "",
+			"teacherId": 0,
+			"teacherName": ""
+         */
+        public String avatar;
+        public long courseGroupId;
+        public String courseGroupName;
+        public long courseId;
+        public String courseStartTime;
+        public String courseType;
+        public String realName;
+        public String status;
+        public long teacherId;
+        public String teacherName;
+
+    }
+}

teacher/src/main/java/com/cooleshow/teacher/contract/HomeContract.java

@@ -4,6 +4,7 @@ import com.cooleshow.base.presenter.view.BaseView;
 import com.cooleshow.teacher.bean.CountOfUnreadBean;
 import com.cooleshow.teacher.bean.HelpCenterContentBean;
 import com.cooleshow.teacher.bean.HomeCountBean;
+import com.cooleshow.teacher.bean.HomeLiveAndVideoBean;
 import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.usercenter.bean.UserInfo;
 
@@ -18,6 +19,7 @@ public interface HomeContract {
         void getHomeCountSuccess(HomeCountBean data);
         void helpCenterContentListSuccess(HelpCenterContentBean data);
         void queryCountOfUnreadSuccess(List<CountOfUnreadBean> data);
+        void queryLiveAndVideoSuccess(HomeLiveAndVideoBean bean);
     }
 
     interface Presenter {

teacher/src/main/java/com/cooleshow/teacher/presenter/main/HomePresenter.java

@@ -8,6 +8,7 @@ import com.cooleshow.teacher.api.APIService;
 import com.cooleshow.teacher.bean.CountOfUnreadBean;
 import com.cooleshow.teacher.bean.HelpCenterContentBean;
 import com.cooleshow.teacher.bean.HomeCountBean;
+import com.cooleshow.teacher.bean.HomeLiveAndVideoBean;
 import com.cooleshow.teacher.bean.TeacherUserInfo;
 import com.cooleshow.teacher.contract.HomeContract;
 import com.cooleshow.usercenter.bean.UserInfo;
@@ -125,4 +126,26 @@ public class HomePresenter extends BasePresenter<HomeContract.HomeView> implemen
             }
         });
     }
+
+    public void queryLiveAndVideo() {
+        addSubscribe(create(APIService.class).queryLiveAndVideo(), new BaseObserver<HomeLiveAndVideoBean>(getView()) {
+            @Override
+            protected void onSuccess(HomeLiveAndVideoBean data) {
+                if (getView() != null) {
+                    getView().queryLiveAndVideoSuccess(data);
+                }
+            }
+
+            @Override
+            public void onComplete() {
+                super.onComplete();
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                super.onError(e);
+
+            }
+        });
+    }
 }

teacher/src/main/java/com/cooleshow/teacher/ui/main/HomeFragment.kt

@@ -10,14 +10,12 @@ import com.cooleshow.base.ui.fragment.BaseMVPFragment
 import com.cooleshow.base.utils.GlideUtils.loadImage
 import com.cooleshow.base.utils.Utils
 import com.cooleshow.teacher.R
-import com.cooleshow.teacher.bean.CountOfUnreadBean
-import com.cooleshow.teacher.bean.HelpCenterContentBean
-import com.cooleshow.teacher.bean.HomeCountBean
-import com.cooleshow.teacher.bean.TeacherUserInfo
+import com.cooleshow.teacher.bean.*
 import com.cooleshow.teacher.constants.TeacherInfoConstants
 import com.cooleshow.teacher.contract.HomeContract
 import com.cooleshow.teacher.databinding.FragmentHomeLayoutBinding
 import com.cooleshow.teacher.presenter.main.HomePresenter
+import com.cooleshow.teacher.ui.course.SparringCourseDetailActivity
 import com.cooleshow.usercenter.helper.UserHelper
 
 
@@ -189,7 +187,7 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
                     .withString(WebConstants.WEB_URL, WebConstants.HELP_CENTER_CATALOGTYPE_2)
                     .navigation()
             }
-            R.id.card_Kotofusa->{
+            R.id.card_Kotofusa -> {
                 //云库琴房
                 ARouter.getInstance()
                     .build(RouterPath.WebCenter.ACTIVITY_HTML)
@@ -205,6 +203,7 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
         presenter.getHomeCount();
         presenter.queryCountOfUnread()
         presenter.helpCenterContentList()
+        presenter.queryLiveAndVideo()
     }
 
     override fun getHomeCountSuccess(data: HomeCountBean?) {
@@ -216,7 +215,7 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
             mViewBinding.tvMineMusicSheetCount.text = "共" + data.musicSheet + "支\n乐谱"
             mViewBinding.tvMineAssessCount.text = "本周收到\n" + data.studentReplied + "个评价"
             mViewBinding.tvMineIncomeCount.text = "本月收入\n" + data.decimal + "元"
-            mViewBinding.tvMineKotofusaCount.text="剩余\n"+data.pianoTime + "分钟"
+            mViewBinding.tvMineKotofusaCount.text = "剩余\n" + data.pianoTime + "分钟"
         }
     }
 
@@ -246,4 +245,21 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
         }
     }
 
+    override fun queryLiveAndVideoSuccess(bean: HomeLiveAndVideoBean?) {
+        val recentCourses = bean?.recentCourses
+        mViewBinding.clLive.setVisible(recentCourses != null)
+        if(recentCourses != null){
+            mViewBinding.tvLiveTitle.setText(recentCourses.courseGroupName)
+            mViewBinding.tvLiveTime.setText(recentCourses.courseStartTime)
+            mViewBinding.tvGoLive.setOnClickListener { v ->
+                //进入直播
+                ARouter.getInstance().build(RouterPath.CourseCenter.SPARRING_COURSE_DETAIL)
+                    .withString(SparringCourseDetailActivity.COURSE_ID, recentCourses.courseId.toString())
+                    .withString(SparringCourseDetailActivity.COURSE_GROUP_ID, recentCourses.courseGroupId.toString())
+                    .withString(SparringCourseDetailActivity.STUDENT_ID, UserHelper.getUserId())
+                    .navigation()
+            }
+        }
+    }
+
 }

teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreFragment.java

@@ -102,7 +102,7 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
             case TeacherInfoConstants.MUSICIAN_STATUS_UNPAALY:
                 mViewBinding.llContent.setVisibility(View.GONE);
                 mViewBinding.clEmpty.setVisibility(View.VISIBLE);
-                mViewBinding.tvEmptyHint.setText("您还未提交认证申请");
+                mViewBinding.tvEmptyHint.setText(getString(R.string.go_cert_music_person_tip));
                 mViewBinding.gotoVerifyBtn.setVisibility(View.VISIBLE);
                 break;
             case TeacherInfoConstants.MUSICIAN_STATUS_UNPASS:

teacher/src/main/java/com/cooleshow/teacher/widgets/helper/JsInterfaceAccomPanyUtils.java

@@ -9,6 +9,7 @@ import android.view.WindowManager;
 import android.webkit.JavascriptInterface;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.usercenter.constants.UserConstants;
 import com.cooleshow.usercenter.helper.UserHelper;
@@ -111,7 +112,7 @@ public class JsInterfaceAccomPanyUtils extends Object {
                         path = RouterPath.WebCenter.ACTIVITY_HORIZONTAL_SCREEN_HTML;
                     }
                     ARouter.getInstance().build(path)
-                            .withString("url", content.getString("url"))
+                            .withString(WebConstants.WEB_URL, content.getString("url"))
                             .withBoolean("isHideTitle", isHideTitle)
                             .withBoolean("statusBarTextColor", statusBarTextColor)
                             .withBoolean("isOpenLight", isOpenLight)

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

@@ -4,657 +4,727 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
+
     <androidx.constraintlayout.widget.ConstraintLayout
 
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
 
-    <ImageView
-        android:id="@+id/iv_header_bg"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:scaleType="fitXY"
-        android:src="@drawable/bg_login_header"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <ImageView
+            android:id="@+id/iv_header_bg"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:adjustViewBounds="true"
+            android:scaleType="fitXY"
+            android:src="@drawable/bg_login_header"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
 
-    <View
-        android:id="@+id/view_status_bar"
-        android:layout_width="match_parent"
-        android:layout_height="1px"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="74dp"
-        android:src="@drawable/bg_home_header2"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/view_status_bar" />
-
-    <ImageView
-        android:id="@+id/iv_app_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="14dp"
-        android:layout_marginTop="25dp"
-        android:src="@drawable/icon_app_name_word"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/view_status_bar" />
-
-    <ImageView
-        android:id="@+id/iv_chat"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="34dp"
-        android:layout_marginEnd="20dp"
-        android:src="@drawable/icon_home_chat"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/view_status_bar" />
-    <View
-        android:id="@+id/view_unread_message"
-        android:layout_width="@dimen/dp_7"
-        android:layout_height="@dimen/dp_7"
-        android:background="@drawable/bg_red_ovil"
-        android:visibility="gone"
-        app:layout_constraintRight_toRightOf="@+id/iv_chat"
-        app:layout_constraintTop_toTopOf="@+id/iv_chat"
-        tools:visibility="visible" />
-    <View
-        android:id="@+id/view_chat_red_point"
-        android:layout_width="6dp"
-        android:layout_height="6dp"
-        android:background="@drawable/shape_red_point"
-        android:visibility="gone"
-        app:layout_constraintRight_toRightOf="@+id/iv_chat"
-        app:layout_constraintTop_toTopOf="@+id/iv_chat" />
-
-    <de.hdodenhof.circleimageview.CircleImageView
-        android:id="@+id/iv_avatar"
-        android:layout_width="52dp"
-        android:layout_height="52dp"
-        android:layout_marginTop="37dp"
-        android:src="@drawable/icon_teacher_default_head"
-        app:layout_constraintLeft_toLeftOf="@+id/iv_app_name"
-        app:layout_constraintTop_toBottomOf="@+id/iv_app_name" />
-
-    <TextView
-        android:id="@+id/tv_nickname"
-        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_constraintLeft_toRightOf="@+id/iv_avatar"
-        app:layout_constraintTop_toTopOf="@+id/iv_avatar"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="游客12e32td" />
-
-    <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" />
-
-    <RatingBar
-        android:id="@+id/rating_bar"
-        style="@style/HomeRatingBar"
-        android:layout_width="wrap_content"
-        android:layout_height="19dp"
-        android:numStars="5"
-        android:rating="0"
-        android:stepSize="1"
-        app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
-        app:layout_constraintLeft_toLeftOf="@+id/tv_nickname"
-        app:layout_constraintTop_toBottomOf="@+id/tv_nickname" />
-
-    <TextView
-        android:id="@+id/tv_no_score"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        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"
-        android:text="暂无评分"/>
-
-    <ImageView
-        android:id="@+id/iv_certification_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:src="@drawable/icon_home_un_certification"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rating_bar" />
-
-    <View
-        android:id="@+id/certification_tip_help_view"
-        android:layout_width="1px"
-        android:layout_height="1px"
-        android:layout_marginBottom="15dp"
-        app:layout_constraintBottom_toBottomOf="@+id/iv_certification_status"
-        app:layout_constraintLeft_toLeftOf="@+id/iv_certification_status" />
-
-    <ImageView
-        android:id="@+id/iv_un_certification_tip"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:src="@drawable/icon_home_certification_tip"
-        android:visibility="gone"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/certification_tip_help_view" />
-
-    <TextView
-        android:id="@+id/tv_fans_title"
-        android:layout_width="wrap_content"
-        android:layout_height="28dp"
-        android:layout_marginTop="16dp"
-        android:gravity="center"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:text="粉丝"
-        android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp_12"
-        app:layout_constraintLeft_toLeftOf="@+id/iv_avatar"
-        app:layout_constraintTop_toBottomOf="@+id/iv_avatar" />
-
-    <TextView
-        android:id="@+id/tv_course_num_complete_title"
-        android:layout_width="wrap_content"
-        android:layout_height="28dp"
-        android:gravity="center"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:text="已上课时"
-        android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp_12"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_fans_title"
-        app:layout_constraintLeft_toRightOf="@+id/tv_fans_title"
-        app:layout_constraintTop_toTopOf="@+id/tv_fans_title" />
-
-    <TextView
-        android:id="@+id/tv_course_num_no_start_title"
-        android:layout_width="wrap_content"
-        android:layout_height="28dp"
-        android:gravity="center"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:text="未上课时"
-        android:textColor="@color/color_333333"
-        android:textSize="@dimen/sp_12"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_fans_title"
-        app:layout_constraintLeft_toRightOf="@+id/tv_course_num_complete_title"
-        app:layout_constraintTop_toTopOf="@+id/tv_fans_title" />
-
-
-    <TextView
-        android:id="@+id/tv_fans_num"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="0"
-        android:textColor="@color/black"
-        android:textSize="@dimen/sp_17"
-        app:layout_constraintLeft_toLeftOf="@+id/tv_fans_title"
-        app:layout_constraintRight_toRightOf="@+id/tv_fans_title"
-        app:layout_constraintTop_toBottomOf="@+id/tv_fans_title"
-        tools:text="1344" />
-
-    <TextView
-        android:id="@+id/tv_course_num_completed"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="0"
-        android:textColor="@color/black"
-        android:textSize="@dimen/sp_17"
-        app:layout_constraintLeft_toLeftOf="@+id/tv_course_num_complete_title"
-        app:layout_constraintRight_toRightOf="@+id/tv_course_num_complete_title"
-        app:layout_constraintTop_toBottomOf="@+id/tv_course_num_complete_title"
-        tools:text="34" />
-
-    <TextView
-        android:id="@+id/tv_course_num_not_start"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="0"
-        android:textColor="@color/black"
-        android:textSize="@dimen/sp_17"
-        app:layout_constraintLeft_toLeftOf="@+id/tv_course_num_no_start_title"
-        app:layout_constraintRight_toRightOf="@+id/tv_course_num_no_start_title"
-        app:layout_constraintTop_toBottomOf="@+id/tv_course_num_no_start_title"
-        tools:text="34" />
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/group_teacher_extra"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:constraint_referenced_ids="tv_course_num_not_start,tv_course_num_completed,tv_fans_num,tv_fans_title,tv_course_num_complete_title,tv_course_num_no_start_title" />
+        <View
+            android:id="@+id/view_status_bar"
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/bg_announcement"
-        android:layout_width="match_parent"
-        android:layout_height="44dp"
-        android:layout_marginStart="14dp"
-        android:layout_marginTop="91dp"
-        android:layout_marginEnd="14dp"
-        android:background="@drawable/bg_white_10dp"
-        android:elevation="2dp"
-        android:orientation="horizontal"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iv_avatar">
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="74dp"
+            android:src="@drawable/bg_home_header2"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/view_status_bar" />
 
         <ImageView
-            android:id="@+id/iv_bell"
+            android:id="@+id/iv_app_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="10dp"
-            android:src="@drawable/icon_home_bell"
-            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="25dp"
+            android:src="@drawable/icon_app_name_word"
             app:layout_constraintLeft_toLeftOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toBottomOf="@+id/view_status_bar" />
+
+        <ImageView
+            android:id="@+id/iv_chat"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="34dp"
+            android:layout_marginEnd="20dp"
+            android:src="@drawable/icon_home_chat"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/view_status_bar" />
+
+        <View
+            android:id="@+id/view_unread_message"
+            android:layout_width="@dimen/dp_7"
+            android:layout_height="@dimen/dp_7"
+            android:background="@drawable/bg_red_ovil"
+            android:visibility="gone"
+            app:layout_constraintRight_toRightOf="@+id/iv_chat"
+            app:layout_constraintTop_toTopOf="@+id/iv_chat"
+            tools:visibility="visible" />
+
+        <View
+            android:id="@+id/view_chat_red_point"
+            android:layout_width="6dp"
+            android:layout_height="6dp"
+            android:background="@drawable/shape_red_point"
+            android:visibility="gone"
+            app:layout_constraintRight_toRightOf="@+id/iv_chat"
+            app:layout_constraintTop_toTopOf="@+id/iv_chat" />
+
+        <de.hdodenhof.circleimageview.CircleImageView
+            android:id="@+id/iv_avatar"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_marginTop="37dp"
+            android:src="@drawable/icon_teacher_default_head"
+            app:layout_constraintLeft_toLeftOf="@+id/iv_app_name"
+            app:layout_constraintTop_toBottomOf="@+id/iv_app_name" />
 
         <TextView
-            android:id="@+id/tv_notice_content"
+            android:id="@+id/tv_nickname"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginStart="2dp"
-            android:gravity="center"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
+            android:layout_marginBottom="10dp"
             android:includeFontPadding="false"
-            tools:text="网络教室升级公告"
             android:textColor="@color/color_1a1a1a"
-            android:textSize="@dimen/sp_14"
-            app:layout_constraintLeft_toRightOf="@+id/iv_bell"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            android:textSize="@dimen/sp_18"
+            app:layout_constraintBottom_toTopOf="@+id/rating_bar"
+            app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
+            app:layout_constraintTop_toTopOf="@+id/iv_avatar"
+            app:layout_constraintVertical_chainStyle="packed"
+            tools:text="游客12e32td" />
 
         <ImageView
-            android:id="@+id/im_notice_list"
-            android:layout_width="@dimen/dp_38"
-            android:layout_height="@dimen/dp_38"
-            android:padding="@dimen/dp_10"
-            android:layout_marginRight="@dimen/dp_1"
-            app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            android:src="@drawable/icon_calendar_next_month" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/card_mine_course"
-        android:layout_width="0dp"
-        android:layout_height="105dp"
-        android:layout_marginStart="14dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="5dp"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="10dp"
-        app:cardElevation="2dp"
-        app:cardPreventCornerOverlap="true"
-        app:cardUseCompatPadding="false"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toLeftOf="@+id/card_after_class_homework"
-        app:layout_constraintTop_toBottomOf="@+id/bg_announcement">
+            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_gravity="center_vertical|end"
-            android:src="@drawable/icon_home_mine_course" />
+            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" />
+
+        <RatingBar
+            android:id="@+id/rating_bar"
+            style="@style/HomeRatingBar"
+            android:layout_width="wrap_content"
+            android:layout_height="19dp"
+            android:numStars="5"
+            android:rating="0"
+            android:stepSize="1"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
+            app:layout_constraintLeft_toLeftOf="@+id/tv_nickname"
+            app:layout_constraintTop_toBottomOf="@+id/tv_nickname" />
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/tv_no_score"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
-            android:layout_marginTop="18dp"
-            android:orientation="vertical"
-            android:paddingEnd="18dp">
+            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" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:includeFontPadding="false"
-                android:text="@string/home_mine_course_str"
-                android:textColor="@color/color_1a1a1a"
-                android:textSize="@dimen/sp_16"
-                android:textStyle="bold" />
+        <ImageView
+            android:id="@+id/iv_certification_status"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:src="@drawable/icon_home_un_certification"
+            android:visibility="gone"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/rating_bar" />
 
-            <TextView
-                android:id="@+id/tv_mine_course_count"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:includeFontPadding="false"
-                android:text="本周剩余\n0课时"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/sp_12" />
-
-
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/card_after_class_homework"
-        android:layout_width="0dp"
-        android:layout_height="105dp"
-        android:layout_marginStart="5dp"
-        android:layout_marginEnd="14dp"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="10dp"
-        app:cardElevation="2dp"
-        app:cardPreventCornerOverlap="true"
-        app:cardUseCompatPadding="false"
-        app:layout_constraintLeft_toRightOf="@+id/card_mine_course"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/card_mine_course">
+        <View
+            android:id="@+id/certification_tip_help_view"
+            android:layout_width="1px"
+            android:layout_height="1px"
+            android:layout_marginBottom="15dp"
+            app:layout_constraintBottom_toBottomOf="@+id/iv_certification_status"
+            app:layout_constraintLeft_toLeftOf="@+id/iv_certification_status" />
 
         <ImageView
+            android:id="@+id/iv_un_certification_tip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:src="@drawable/icon_home_homework" />
+            android:layout_marginStart="6dp"
+            android:src="@drawable/icon_home_certification_tip"
+            android:visibility="gone"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/certification_tip_help_view" />
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/tv_fans_title"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
-            android:layout_marginTop="18dp"
-            android:orientation="vertical"
-            android:paddingEnd="18dp">
+            android:layout_height="28dp"
+            android:layout_marginTop="16dp"
+            android:gravity="center"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:text="粉丝"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_12"
+            app:layout_constraintLeft_toLeftOf="@+id/iv_avatar"
+            app:layout_constraintTop_toBottomOf="@+id/iv_avatar" />
 
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:includeFontPadding="false"
-                android:text="课后作业"
-                android:textColor="@color/color_1a1a1a"
-                android:textSize="@dimen/sp_16"
-                android:textStyle="bold" />
+        <TextView
+            android:id="@+id/tv_course_num_complete_title"
+            android:layout_width="wrap_content"
+            android:layout_height="28dp"
+            android:gravity="center"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:text="已上课时"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_12"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_fans_title"
+            app:layout_constraintLeft_toRightOf="@+id/tv_fans_title"
+            app:layout_constraintTop_toTopOf="@+id/tv_fans_title" />
 
-            <TextView
-                android:id="@+id/tv_after_class_homework_count"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:includeFontPadding="false"
-                android:text="本周共0节课\n未布置作业"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/sp_12" />
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/card_after_class_assess"
-        android:layout_width="0dp"
-        android:layout_height="105dp"
-        android:layout_marginTop="12dp"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="10dp"
-        app:cardElevation="2dp"
-        app:cardPreventCornerOverlap="true"
-        app:cardUseCompatPadding="false"
-        app:layout_constraintLeft_toLeftOf="@+id/card_mine_course"
-        app:layout_constraintRight_toRightOf="@+id/card_mine_course"
-        app:layout_constraintTop_toBottomOf="@+id/card_mine_course">
+        <TextView
+            android:id="@+id/tv_course_num_no_start_title"
+            android:layout_width="wrap_content"
+            android:layout_height="28dp"
+            android:gravity="center"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:text="未上课时"
+            android:textColor="@color/color_333333"
+            android:textSize="@dimen/sp_12"
+            app:layout_constraintBottom_toBottomOf="@+id/tv_fans_title"
+            app:layout_constraintLeft_toRightOf="@+id/tv_course_num_complete_title"
+            app:layout_constraintTop_toTopOf="@+id/tv_fans_title" />
 
-        <ImageView
+
+        <TextView
+            android:id="@+id/tv_fans_num"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:src="@drawable/icon_home_appraisal" />
+            android:text="0"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_17"
+            app:layout_constraintLeft_toLeftOf="@+id/tv_fans_title"
+            app:layout_constraintRight_toRightOf="@+id/tv_fans_title"
+            app:layout_constraintTop_toBottomOf="@+id/tv_fans_title"
+            tools:text="1344" />
 
-        <LinearLayout
+        <TextView
+            android:id="@+id/tv_course_num_completed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
-            android:layout_marginTop="18dp"
-            android:orientation="vertical"
-            android:paddingEnd="18dp">
+            android:text="0"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_17"
+            app:layout_constraintLeft_toLeftOf="@+id/tv_course_num_complete_title"
+            app:layout_constraintRight_toRightOf="@+id/tv_course_num_complete_title"
+            app:layout_constraintTop_toBottomOf="@+id/tv_course_num_complete_title"
+            tools:text="34" />
 
-            <TextView
+        <TextView
+            android:id="@+id/tv_course_num_not_start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="0"
+            android:textColor="@color/black"
+            android:textSize="@dimen/sp_17"
+            app:layout_constraintLeft_toLeftOf="@+id/tv_course_num_no_start_title"
+            app:layout_constraintRight_toRightOf="@+id/tv_course_num_no_start_title"
+            app:layout_constraintTop_toBottomOf="@+id/tv_course_num_no_start_title"
+            tools:text="34" />
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/group_teacher_extra"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:constraint_referenced_ids="tv_course_num_not_start,tv_course_num_completed,tv_fans_num,tv_fans_title,tv_course_num_complete_title,tv_course_num_no_start_title" />
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/bg_announcement"
+            android:layout_width="match_parent"
+            android:layout_height="44dp"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="91dp"
+            android:layout_marginEnd="14dp"
+            android:background="@drawable/bg_white_10dp"
+            android:elevation="2dp"
+            android:orientation="horizontal"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/iv_avatar">
+
+            <ImageView
+                android:id="@+id/iv_bell"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:includeFontPadding="false"
-                android:text="课后评价"
-                android:textColor="@color/color_1a1a1a"
-                android:textSize="@dimen/sp_16"
-                android:textStyle="bold" />
+                android:layout_marginLeft="10dp"
+                android:src="@drawable/icon_home_bell"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
-                android:id="@+id/tv_after_class_assess_count"
+                android:id="@+id/tv_notice_content"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
+                android:layout_height="match_parent"
+                android:layout_marginStart="2dp"
+                android:gravity="center"
                 android:includeFontPadding="false"
-                android:text="剩余0节\n尚未评价"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/sp_12" />
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/card_mine_music_sheet"
-        android:layout_width="0dp"
-        android:layout_height="105dp"
-        android:layout_marginTop="12dp"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="10dp"
-        app:cardElevation="2dp"
-        app:cardPreventCornerOverlap="true"
-        app:cardUseCompatPadding="false"
-        app:layout_constraintLeft_toLeftOf="@+id/card_after_class_homework"
-        app:layout_constraintRight_toRightOf="@+id/card_after_class_homework"
-        app:layout_constraintTop_toBottomOf="@+id/card_after_class_homework">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:src="@drawable/icon_home_sheet_music" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
-            android:layout_marginTop="18dp"
-            android:orientation="vertical"
-            android:paddingEnd="18dp">
+                android:textColor="@color/color_1a1a1a"
+                android:textSize="@dimen/sp_14"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintLeft_toRightOf="@+id/iv_bell"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="网络教室升级公告" />
+
+            <ImageView
+                android:id="@+id/im_notice_list"
+                android:layout_width="@dimen/dp_38"
+                android:layout_height="@dimen/dp_38"
+                android:layout_marginRight="@dimen/dp_1"
+                android:padding="@dimen/dp_10"
+                android:src="@drawable/icon_calendar_next_month"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/cl_live"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_70"
+            android:layout_marginLeft="@dimen/dp_14"
+            android:layout_marginTop="@dimen/dp_12"
+            android:layout_marginRight="@dimen/dp_14"
+            android:background="@drawable/bg_white_10dp"
+            android:visibility="gone"
+            tools:visibility="visible"
+            app:layout_constraintTop_toBottomOf="@+id/bg_announcement">
+
+            <ImageView
+                android:id="@+id/alarm_icon"
+                android:layout_width="@dimen/dp_15"
+                android:layout_height="@dimen/dp_15"
+                android:layout_marginLeft="@dimen/dp_19"
+                android:src="@mipmap/small_alarm_clock"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_live_title" />
 
             <TextView
-                android:layout_width="wrap_content"
+                android:id="@+id/tv_live_title"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:includeFontPadding="false"
-                android:text="我的乐谱"
+                android:layout_marginLeft="@dimen/dp_18"
+                android:layout_marginTop="@dimen/dp_12"
+                android:layout_marginRight="@dimen/dp_120"
+                android:ellipsize="end"
+                android:lineHeight="@dimen/dp_28"
+                android:lines="1"
                 android:textColor="@color/color_1a1a1a"
                 android:textSize="@dimen/sp_16"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:text="竖笛直播课即将开始" />
 
             <TextView
-                android:id="@+id/tv_mine_music_sheet_count"
+                android:id="@+id/tv_live_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:includeFontPadding="false"
-                android:text="共 0 支\n乐谱"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/sp_12" />
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/card_mine_assess"
-        android:layout_width="0dp"
-        android:layout_height="105dp"
-        android:layout_marginTop="12dp"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="10dp"
-        app:cardElevation="2dp"
-        app:cardPreventCornerOverlap="true"
-        app:cardUseCompatPadding="false"
-        app:layout_constraintLeft_toLeftOf="@+id/card_mine_course"
-        app:layout_constraintRight_toRightOf="@+id/card_mine_course"
-        app:layout_constraintTop_toBottomOf="@+id/card_after_class_assess">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:src="@drawable/icon_home_receive_appraisal" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
-            android:layout_marginTop="18dp"
-            android:orientation="vertical"
-            android:paddingEnd="18dp">
+                android:layout_marginLeft="@dimen/dp_5"
+                android:layout_marginTop="@dimen/dp_1"
+                android:layout_marginBottom="@dimen/dp_5"
+                android:textColor="@color/color_FF806F"
+                android:textSize="@dimen/sp_13"
+                app:layout_constraintLeft_toLeftOf="@+id/alarm_icon"
+                app:layout_constraintTop_toBottomOf="@+id/tv_live_title"
+                tools:text="今日 16:30-17:05" />
 
             <TextView
+                android:id="@+id/tv_go_live"
+                android:layout_width="@dimen/dp_72"
+                android:layout_height="@dimen/dp_28"
+                android:layout_marginRight="@dimen/dp_19"
+                android:background="@drawable/shape_course_status_ing"
+                android:gravity="center"
+                android:text="进入课堂"
+                android:textColor="@color/white"
+                android:textSize="@dimen/sp_13"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/card_mine_course"
+            android:layout_width="0dp"
+            android:layout_height="105dp"
+            android:layout_marginStart="14dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginEnd="5dp"
+            app:cardBackgroundColor="@color/white"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="2dp"
+            app:cardPreventCornerOverlap="true"
+            app:cardUseCompatPadding="false"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toLeftOf="@+id/card_after_class_homework"
+            app:layout_constraintTop_toBottomOf="@+id/cl_live">
+
+            <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:includeFontPadding="false"
-                android:text="我收到的评价"
-                android:textColor="@color/color_1a1a1a"
-                android:textSize="@dimen/sp_16"
-                android:textStyle="bold" />
+                android:layout_gravity="center_vertical|end"
+                android:src="@drawable/icon_home_mine_course" />
 
-            <TextView
-                android:id="@+id/tv_mine_assess_count"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:includeFontPadding="false"
-                android:text="本周收到\n0 个评价"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/sp_12" />
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/card_Kotofusa"
-        android:layout_width="0dp"
-        android:layout_height="105dp"
-        android:layout_marginTop="12dp"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="10dp"
-        app:cardElevation="2dp"
-        app:cardPreventCornerOverlap="true"
-        app:cardUseCompatPadding="false"
-        app:layout_constraintLeft_toLeftOf="@+id/card_after_class_homework"
-        app:layout_constraintRight_toRightOf="@+id/card_after_class_homework"
-        app:layout_constraintTop_toBottomOf="@+id/card_mine_music_sheet">
+                android:layout_marginStart="18dp"
+                android:layout_marginTop="18dp"
+                android:orientation="vertical"
+                android:paddingEnd="18dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="@string/home_mine_course_str"
+                    android:textColor="@color/color_1a1a1a"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tv_mine_course_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="3dp"
+                    android:includeFontPadding="false"
+                    android:text="本周剩余\n0课时"
+                    android:textColor="@color/color_999999"
+                    android:textSize="@dimen/sp_12" />
+
+
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/card_after_class_homework"
+            android:layout_width="0dp"
+            android:layout_height="105dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="14dp"
+            app:cardBackgroundColor="@color/white"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="2dp"
+            app:cardPreventCornerOverlap="true"
+            app:cardUseCompatPadding="false"
+            app:layout_constraintLeft_toRightOf="@+id/card_mine_course"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/card_mine_course">
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:src="@drawable/icon_home_mine_income" />
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                android:src="@drawable/icon_home_homework" />
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
-            android:layout_marginTop="18dp"
-            android:orientation="vertical"
-            android:paddingEnd="18dp">
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="18dp"
+                android:layout_marginTop="18dp"
+                android:orientation="vertical"
+                android:paddingEnd="18dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="课后作业"
+                    android:textColor="@color/color_1a1a1a"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tv_after_class_homework_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="3dp"
+                    android:includeFontPadding="false"
+                    android:text="本周共0节课\n未布置作业"
+                    android:textColor="@color/color_999999"
+                    android:textSize="@dimen/sp_12" />
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/card_after_class_assess"
+            android:layout_width="0dp"
+            android:layout_height="105dp"
+            android:layout_marginTop="12dp"
+            app:cardBackgroundColor="@color/white"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="2dp"
+            app:cardPreventCornerOverlap="true"
+            app:cardUseCompatPadding="false"
+            app:layout_constraintLeft_toLeftOf="@+id/card_mine_course"
+            app:layout_constraintRight_toRightOf="@+id/card_mine_course"
+            app:layout_constraintTop_toBottomOf="@+id/card_mine_course">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                android:src="@drawable/icon_home_appraisal" />
 
-            <TextView
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:includeFontPadding="false"
-                android:text="云库琴房"
-                android:textColor="@color/color_1a1a1a"
-                android:textSize="@dimen/sp_16"
-                android:textStyle="bold" />
+                android:layout_marginStart="18dp"
+                android:layout_marginTop="18dp"
+                android:orientation="vertical"
+                android:paddingEnd="18dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="课后评价"
+                    android:textColor="@color/color_1a1a1a"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tv_after_class_assess_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="3dp"
+                    android:includeFontPadding="false"
+                    android:text="剩余0节\n尚未评价"
+                    android:textColor="@color/color_999999"
+                    android:textSize="@dimen/sp_12" />
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/card_mine_music_sheet"
+            android:layout_width="0dp"
+            android:layout_height="105dp"
+            android:layout_marginTop="12dp"
+            app:cardBackgroundColor="@color/white"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="2dp"
+            app:cardPreventCornerOverlap="true"
+            app:cardUseCompatPadding="false"
+            app:layout_constraintLeft_toLeftOf="@+id/card_after_class_homework"
+            app:layout_constraintRight_toRightOf="@+id/card_after_class_homework"
+            app:layout_constraintTop_toBottomOf="@+id/card_after_class_homework">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                android:src="@drawable/icon_home_sheet_music" />
 
-            <TextView
-                android:id="@+id/tv_mine_Kotofusa_count"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:includeFontPadding="false"
-                android:text="剩余\n0 分钟"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/sp_12" />
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
-
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/card_mine_income"
-        android:layout_width="0dp"
-        android:layout_height="105dp"
-        android:layout_marginTop="12dp"
-        app:cardBackgroundColor="@color/white"
-        app:cardCornerRadius="10dp"
-        app:cardElevation="2dp"
-        app:cardPreventCornerOverlap="true"
-        android:layout_marginBottom="@dimen/dp_20"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:cardUseCompatPadding="false"
-        app:layout_constraintLeft_toLeftOf="@+id/card_mine_course"
-        app:layout_constraintRight_toRightOf="@+id/card_mine_course"
-        app:layout_constraintTop_toBottomOf="@+id/card_mine_assess">
+                android:layout_marginStart="18dp"
+                android:layout_marginTop="18dp"
+                android:orientation="vertical"
+                android:paddingEnd="18dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="我的乐谱"
+                    android:textColor="@color/color_1a1a1a"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tv_mine_music_sheet_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="3dp"
+                    android:includeFontPadding="false"
+                    android:text="共 0 支\n乐谱"
+                    android:textColor="@color/color_999999"
+                    android:textSize="@dimen/sp_12" />
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/card_mine_assess"
+            android:layout_width="0dp"
+            android:layout_height="105dp"
+            android:layout_marginTop="12dp"
+            app:cardBackgroundColor="@color/white"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="2dp"
+            app:cardPreventCornerOverlap="true"
+            app:cardUseCompatPadding="false"
+            app:layout_constraintLeft_toLeftOf="@+id/card_mine_course"
+            app:layout_constraintRight_toRightOf="@+id/card_mine_course"
+            app:layout_constraintTop_toBottomOf="@+id/card_after_class_assess">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                android:src="@drawable/icon_home_receive_appraisal" />
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:src="@drawable/icon_home_mine_income" />
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="18dp"
+                android:layout_marginTop="18dp"
+                android:orientation="vertical"
+                android:paddingEnd="18dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="我收到的评价"
+                    android:textColor="@color/color_1a1a1a"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tv_mine_assess_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="3dp"
+                    android:includeFontPadding="false"
+                    android:text="本周收到\n0 个评价"
+                    android:textColor="@color/color_999999"
+                    android:textSize="@dimen/sp_12" />
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/card_Kotofusa"
+            android:layout_width="0dp"
+            android:layout_height="105dp"
+            android:layout_marginTop="12dp"
+            app:cardBackgroundColor="@color/white"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="2dp"
+            app:cardPreventCornerOverlap="true"
+            app:cardUseCompatPadding="false"
+            app:layout_constraintLeft_toLeftOf="@+id/card_after_class_homework"
+            app:layout_constraintRight_toRightOf="@+id/card_after_class_homework"
+            app:layout_constraintTop_toBottomOf="@+id/card_mine_music_sheet">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical|end"
+                android:src="@drawable/icon_home_mine_income" />
 
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="18dp"
-            android:layout_marginTop="18dp"
-            android:orientation="vertical"
-            android:paddingEnd="18dp">
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="18dp"
+                android:layout_marginTop="18dp"
+                android:orientation="vertical"
+                android:paddingEnd="18dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="云库琴房"
+                    android:textColor="@color/color_1a1a1a"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tv_mine_Kotofusa_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="3dp"
+                    android:includeFontPadding="false"
+                    android:text="剩余\n0 分钟"
+                    android:textColor="@color/color_999999"
+                    android:textSize="@dimen/sp_12" />
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
+
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/card_mine_income"
+            android:layout_width="0dp"
+            android:layout_height="105dp"
+            android:layout_marginTop="12dp"
+            android:layout_marginBottom="@dimen/dp_20"
+            app:cardBackgroundColor="@color/white"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="2dp"
+            app:cardPreventCornerOverlap="true"
+            app:cardUseCompatPadding="false"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="@+id/card_mine_course"
+            app:layout_constraintRight_toRightOf="@+id/card_mine_course"
+            app:layout_constraintTop_toBottomOf="@+id/card_mine_assess">
 
-            <TextView
+            <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:includeFontPadding="false"
-                android:text="我的收入"
-                android:textColor="@color/color_1a1a1a"
-                android:textSize="@dimen/sp_16"
-                android:textStyle="bold" />
+                android:layout_gravity="center_vertical|end"
+                android:src="@drawable/icon_home_mine_income" />
 
-            <TextView
-                android:id="@+id/tv_mine_income_count"
+            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:includeFontPadding="false"
-                android:text="本月收入\n0.00 元"
-                android:textColor="@color/color_999999"
-                android:textSize="@dimen/sp_12" />
-        </LinearLayout>
-    </androidx.cardview.widget.CardView>
+                android:layout_marginStart="18dp"
+                android:layout_marginTop="18dp"
+                android:orientation="vertical"
+                android:paddingEnd="18dp">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:includeFontPadding="false"
+                    android:text="我的收入"
+                    android:textColor="@color/color_1a1a1a"
+                    android:textSize="@dimen/sp_16"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/tv_mine_income_count"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="3dp"
+                    android:includeFontPadding="false"
+                    android:text="本月收入\n0.00 元"
+                    android:textColor="@color/color_999999"
+                    android:textSize="@dimen/sp_12" />
+            </LinearLayout>
+        </androidx.cardview.widget.CardView>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>

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

@@ -74,7 +74,7 @@
             android:layout_width="@dimen/dp_260"
             android:layout_height="@dimen/dp_230"
             android:layout_marginTop="8dp"
-            android:background="@drawable/icon_empty_content"
+            android:background="@drawable/bg_go_music_cert_tip"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -86,7 +86,7 @@
             android:layout_marginTop="14dp"
             android:gravity="center"
             android:lineSpacingExtra="4dp"
-            android:text="暂无内容~"
+            android:text="@string/go_cert_music_person_tip"
             android:textColor="@color/color_999999"
             android:textSize="@dimen/sp_16"
             app:layout_constraintLeft_toLeftOf="parent"