增加首页公告UI逻辑

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

@@ -80,6 +80,8 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
         mViewBinding.rvHotTrack.addItemDecoration(itemDecoration);
         mViewBinding.rvHotTrack.setLayoutManager(musicSheetManager);
         mViewBinding.rvHotTrack.setAdapter(mHomeHotMusicSheetAdapter);
+        mViewBinding.rvHotTrack.setNestedScrollingEnabled(false);
+        mViewBinding.rvHotAlbum.setNestedScrollingEnabled(false);
         initListener();
         presenter.getHotAlbumList();
         presenter.getHotMusicSheetList();
@@ -102,6 +104,14 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
         mViewBinding.bgAnnouncement.setOnClickListener(this);
         mViewBinding.tvHotAlbumMore.setOnClickListener(this);
         mViewBinding.tvHotTrackMore.setOnClickListener(this);
+        mViewBinding.refreshLayout.setOnRefreshListener(refreshLayout -> {
+            mViewBinding.refreshLayout.finishRefresh();
+            presenter.getHotAlbumList();
+            presenter.getHotMusicSheetList();
+            presenter.queryCountOfUnread();
+            presenter.queryLiveAndVideo();
+            presenter.appHome();
+        });
         mAlbumAdapter.setOnItemClickListener(new OnItemClickListener() {
             @Override
             public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
@@ -120,7 +130,6 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
         super.onResume();
         if (presenter != null) {
             presenter.queryCountOfUnread();
-            presenter.helpCenterContentList();
             presenter.queryLiveAndVideo();
             presenter.appHome();
         }
@@ -134,13 +143,21 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
     @Override
     public void helpCenterContentListSuccess(HelpCenterContentBean data) {
         if (data != null && data.rows != null && data.rows.size() > 0) {
-            mViewBinding.bgAnnouncement.setVisibility(View.VISIBLE);
             mViewBinding.tvNoticeContent.setText(data.rows.get(0).title);
+            mViewBinding.tvNoticeContent2.setText(data.rows.get(0).title);
             noticeId = data.rows.get(0).id;
+            if (mRecentCourses != null) {
+                //有进入课程提示
+                mViewBinding.bgAnnouncement.setVisibility(View.VISIBLE);
+                mViewBinding.bgAnnouncement2.setVisibility(View.GONE);
+            } else {
+                mViewBinding.bgAnnouncement2.setVisibility(View.VISIBLE);
+                mViewBinding.bgAnnouncement.setVisibility(View.GONE);
+            }
         } else {
             mViewBinding.bgAnnouncement.setVisibility(View.GONE);
+            mViewBinding.bgAnnouncement2.setVisibility(View.GONE);
         }
-
     }
 
 
@@ -159,6 +176,7 @@ public class NewHomeFragment extends BaseMVPFragment<FragmentNewHomeLayoutBindin
             return;
         }
         mRecentCourses = bean.recentCourses;
+        presenter.helpCenterContentList();
         mViewBinding.flCourseEnter.setVisibility(mRecentCourses != null ? View.VISIBLE : View.GONE);
         if (mRecentCourses != null) {
             mViewBinding.tvLiveTitle.setText(mRecentCourses.courseGroupName + "即将开始");

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

@@ -21,12 +21,12 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:text="您好"
             android:id="@+id/tv_teacher_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="24dp"
             android:includeFontPadding="false"
+            android:text="您好"
             android:textColor="@color/color_1a1a1a"
             android:textSize="@dimen/sp_22"
             android:textStyle="bold"
@@ -79,434 +79,499 @@
             tools:visibility="visible" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <androidx.core.widget.NestedScrollView
+    <com.scwang.smart.refresh.layout.SmartRefreshLayout
+        android:id="@+id/refreshLayout"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cs_header"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:overScrollMode="never"
-        android:scrollbars="none"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/cs_header">
+        app:srlEnableLoadMore="false">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:paddingBottom="20dp"
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent"
+            android:overScrollMode="never"
+            android:scrollbars="none"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/cs_header">
 
-            <View
-                android:id="@+id/top_view_bg"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:background="@color/white"
-                app:layout_constraintBottom_toBottomOf="@+id/top_help_line"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/tv_score_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="25dp"
-                android:text="评分"
-                android:textColor="@color/color_666666"
-                android:textSize="@dimen/sp_12"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <RatingBar
-                android:id="@+id/rating_bar"
-                style="@style/HomeRatingBar"
-                android:layout_width="wrap_content"
-                android:layout_height="19dp"
-                android:layout_marginStart="4dp"
-                android:numStars="5"
-                android:rating="0"
-                android:stepSize="1"
-                android:visibility="visible"
-                app:layout_constraintBottom_toBottomOf="@+id/tv_score_name"
-                app:layout_constraintLeft_toRightOf="@+id/tv_score_name"
-                app:layout_constraintTop_toTopOf="@+id/tv_score_name" />
-
-
-            <ImageView
-                android:id="@+id/iv_style_badge"
-                android:layout_width="23dp"
-                android:layout_height="23dp"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="23dp"
-                android:background="@drawable/icon_style_badge_new_enable"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/rating_bar" />
-
-            <ImageView
-                android:id="@+id/iv_video_badge"
-                android:layout_width="23dp"
-                android:layout_height="23dp"
-                android:layout_marginStart="6dp"
-                android:background="@drawable/icon_video_badge_new_enable"
-                app:layout_constraintBottom_toBottomOf="@+id/iv_style_badge"
-                app:layout_constraintLeft_toRightOf="@+id/iv_style_badge"
-                app:layout_constraintTop_toTopOf="@+id/iv_style_badge" />
-
-
-            <ImageView
-                android:id="@+id/iv_live_badge"
-                android:layout_width="24dp"
-                android:layout_height="23dp"
-                android:layout_marginStart="6dp"
-                android:background="@drawable/icon_live_badge_new_enable"
-                app:layout_constraintBottom_toBottomOf="@+id/iv_video_badge"
-                app:layout_constraintLeft_toRightOf="@+id/iv_video_badge"
-                app:layout_constraintTop_toTopOf="@+id/iv_video_badge" />
-
-
-            <ImageView
-                android:id="@+id/iv_album_badge"
-                android:layout_width="23dp"
-                android:layout_height="23dp"
-                android:layout_marginStart="6dp"
-                android:background="@drawable/icon_album_badge_new_enable"
-                app:layout_constraintBottom_toBottomOf="@+id/iv_live_badge"
-                app:layout_constraintLeft_toRightOf="@+id/iv_live_badge"
-                app:layout_constraintTop_toTopOf="@+id/iv_live_badge" />
-
-
-            <TextView
-                android:id="@+id/tv_medal_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:includeFontPadding="false"
-                android:text="勋章"
-                android:textColor="@color/color_666666"
-                android:textSize="@dimen/sp_14"
-                app:layout_constraintBottom_toBottomOf="@+id/iv_album_badge"
-                app:layout_constraintLeft_toRightOf="@+id/iv_album_badge"
-                app:layout_constraintTop_toTopOf="@+id/iv_album_badge" />
-
-
-            <TextView
-                android:id="@+id/tv_medal_value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="6dp"
-                android:includeFontPadding="false"
-                android:text="0/4"
-                android:textColor="@color/color_666666"
-                android:textSize="@dimen/sp_14"
-                app:layout_constraintBottom_toBottomOf="@+id/tv_medal_name"
-                app:layout_constraintLeft_toRightOf="@+id/tv_medal_name"
-                app:layout_constraintTop_toTopOf="@+id/tv_medal_name" />
-
-            <ImageView
-                android:clickable="false"
-                android:id="@+id/iv_cert"
-                android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:layout_marginEnd="25dp"
-                android:adjustViewBounds="true"
-                android:src="@drawable/icon_home_un_certification"
-                app:layout_constraintBottom_toBottomOf="@+id/iv_style_badge"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/iv_style_badge" />
-
-            <View
-                android:id="@+id/top_help_line"
-                android:layout_width="1px"
-                android:layout_height="1px"
-                android:layout_marginTop="17dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/iv_cert" />
-
-
-            <androidx.cardview.widget.CardView
-                android:id="@+id/bg_announcement"
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="14dp"
-                android:layout_marginTop="@dimen/dp_12"
-                android:layout_marginEnd="14dp"
-                android:visibility="visible"
-                app:cardBackgroundColor="@color/white"
-                app:cardCornerRadius="10dp"
-                app:cardElevation="2dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/top_view_bg">
+                android:paddingBottom="20dp">
 
-                <androidx.constraintlayout.widget.ConstraintLayout
+                <View
+                    android:id="@+id/top_view_bg"
                     android:layout_width="match_parent"
+                    android:layout_height="0dp"
+                    android:background="@color/white"
+                    app:layout_constraintBottom_toBottomOf="@+id/top_help_line"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <TextView
+                    android:id="@+id/tv_score_name"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal">
+                    android:layout_marginStart="25dp"
+                    android:text="评分"
+                    android:textColor="@color/color_666666"
+                    android:textSize="@dimen/sp_12"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-                    <ImageView
-                        android:id="@+id/iv_bell"
-                        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"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
+                <RatingBar
+                    android:id="@+id/rating_bar"
+                    style="@style/HomeRatingBar"
+                    android:layout_width="wrap_content"
+                    android:layout_height="19dp"
+                    android:layout_marginStart="4dp"
+                    android:numStars="5"
+                    android:rating="0"
+                    android:stepSize="1"
+                    android:visibility="visible"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_score_name"
+                    app:layout_constraintLeft_toRightOf="@+id/tv_score_name"
+                    app:layout_constraintTop_toTopOf="@+id/tv_score_name" />
+
+
+                <ImageView
+                    android:id="@+id/iv_style_badge"
+                    android:layout_width="23dp"
+                    android:layout_height="23dp"
+                    android:layout_marginStart="25dp"
+                    android:layout_marginTop="23dp"
+                    android:background="@drawable/icon_style_badge_new_enable"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/rating_bar" />
+
+                <ImageView
+                    android:id="@+id/iv_video_badge"
+                    android:layout_width="23dp"
+                    android:layout_height="23dp"
+                    android:layout_marginStart="6dp"
+                    android:background="@drawable/icon_video_badge_new_enable"
+                    app:layout_constraintBottom_toBottomOf="@+id/iv_style_badge"
+                    app:layout_constraintLeft_toRightOf="@+id/iv_style_badge"
+                    app:layout_constraintTop_toTopOf="@+id/iv_style_badge" />
+
+
+                <ImageView
+                    android:id="@+id/iv_live_badge"
+                    android:layout_width="24dp"
+                    android:layout_height="23dp"
+                    android:layout_marginStart="6dp"
+                    android:background="@drawable/icon_live_badge_new_enable"
+                    app:layout_constraintBottom_toBottomOf="@+id/iv_video_badge"
+                    app:layout_constraintLeft_toRightOf="@+id/iv_video_badge"
+                    app:layout_constraintTop_toTopOf="@+id/iv_video_badge" />
+
+
+                <ImageView
+                    android:id="@+id/iv_album_badge"
+                    android:layout_width="23dp"
+                    android:layout_height="23dp"
+                    android:layout_marginStart="6dp"
+                    android:background="@drawable/icon_album_badge_new_enable"
+                    app:layout_constraintBottom_toBottomOf="@+id/iv_live_badge"
+                    app:layout_constraintLeft_toRightOf="@+id/iv_live_badge"
+                    app:layout_constraintTop_toTopOf="@+id/iv_live_badge" />
 
-                    <TextView
-                        android:id="@+id/tv_notice_content"
-                        android:layout_width="wrap_content"
-                        android:layout_height="44dp"
-                        android:layout_marginStart="2dp"
-                        android:gravity="center"
-                        android:includeFontPadding="false"
-                        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.cardview.widget.CardView>
 
-            <androidx.cardview.widget.CardView
-                android:id="@+id/fl_top_menu"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="14dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="14dp"
-                android:visibility="visible"
-                app:cardBackgroundColor="@color/white"
-                app:cardCornerRadius="10dp"
-                app:cardElevation="2dp"
-                app:cardPreventCornerOverlap="true"
-                app:cardUseCompatPadding="false"
-                app:layout_constraintTop_toBottomOf="@+id/bg_announcement">
-
-                <androidx.viewpager.widget.ViewPager
-                    android:id="@+id/viewpager_menu"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/dp_90"
-                    android:overScrollMode="never"
-                    android:scrollbars="none" />
-            </androidx.cardview.widget.CardView>
+                <TextView
+                    android:id="@+id/tv_medal_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:includeFontPadding="false"
+                    android:text="勋章"
+                    android:textColor="@color/color_666666"
+                    android:textSize="@dimen/sp_14"
+                    app:layout_constraintBottom_toBottomOf="@+id/iv_album_badge"
+                    app:layout_constraintLeft_toRightOf="@+id/iv_album_badge"
+                    app:layout_constraintTop_toTopOf="@+id/iv_album_badge" />
 
-            <androidx.cardview.widget.CardView
-                android:id="@+id/fl_course_enter"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="25dp"
-                android:visibility="gone"
-                app:cardBackgroundColor="@color/white"
-                app:cardCornerRadius="10dp"
-                app:cardElevation="2dp"
-                app:cardPreventCornerOverlap="true"
-                app:cardUseCompatPadding="false"
-                app:layout_constraintTop_toBottomOf="@+id/fl_top_menu">
 
-                <androidx.constraintlayout.widget.ConstraintLayout
+                <TextView
+                    android:id="@+id/tv_medal_value"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="6dp"
+                    android:includeFontPadding="false"
+                    android:text="0/4"
+                    android:textColor="@color/color_666666"
+                    android:textSize="@dimen/sp_14"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_medal_name"
+                    app:layout_constraintLeft_toRightOf="@+id/tv_medal_name"
+                    app:layout_constraintTop_toTopOf="@+id/tv_medal_name" />
+
+                <ImageView
+                    android:id="@+id/iv_cert"
+                    android:layout_width="wrap_content"
+                    android:layout_height="30dp"
+                    android:layout_marginEnd="25dp"
+                    android:adjustViewBounds="true"
+                    android:clickable="false"
+                    android:src="@drawable/icon_home_un_certification"
+                    app:layout_constraintBottom_toBottomOf="@+id/iv_style_badge"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/iv_style_badge" />
+
+                <View
+                    android:id="@+id/top_help_line"
+                    android:layout_width="1px"
+                    android:layout_height="1px"
+                    android:layout_marginTop="17dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/iv_cert" />
+
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/bg_announcement"
                     android:layout_width="match_parent"
-                    android:layout_height="70dp">
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="14dp"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginEnd="14dp"
+                    android:visibility="gone"
+                    app:cardBackgroundColor="@color/white"
+                    app:cardCornerRadius="10dp"
+                    app:cardElevation="2dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/top_view_bg">
 
-                    <TextView
-                        android:id="@+id/tv_live_title"
-                        android:layout_width="wrap_content"
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="120dp"
-                        android:includeFontPadding="false"
-                        android:text="您有新课程即将开始"
-                        android:textColor="@color/color_1a1a1a"
-                        android:textSize="@dimen/sp_16"
-                        app:layout_constraintBottom_toTopOf="@+id/alarm_icon"
-                        app:layout_constraintLeft_toLeftOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_chainStyle="packed" />
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/iv_bell"
+                            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"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <TextView
+                            android:id="@+id/tv_notice_content"
+                            android:layout_width="wrap_content"
+                            android:layout_height="44dp"
+                            android:layout_marginStart="2dp"
+                            android:gravity="center"
+                            android:includeFontPadding="false"
+                            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.cardview.widget.CardView>
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/fl_top_menu"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="14dp"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginEnd="14dp"
+                    android:visibility="visible"
+                    app:cardBackgroundColor="@color/white"
+                    app:cardCornerRadius="10dp"
+                    app:cardElevation="2dp"
+                    app:cardPreventCornerOverlap="true"
+                    app:cardUseCompatPadding="false"
+                    app:layout_constraintTop_toBottomOf="@+id/bg_announcement">
+
+                    <androidx.viewpager.widget.ViewPager
+                        android:id="@+id/viewpager_menu"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/dp_90"
+                        android:overScrollMode="never"
+                        android:scrollbars="none" />
+                </androidx.cardview.widget.CardView>
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/bg_announcement2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="14dp"
+                    android:layout_marginTop="@dimen/dp_12"
+                    android:layout_marginEnd="14dp"
+                    android:visibility="gone"
+                    app:cardBackgroundColor="@color/white"
+                    app:cardCornerRadius="10dp"
+                    app:cardElevation="2dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/fl_top_menu">
 
-                    <ImageView
-                        android:id="@+id/alarm_icon"
-                        android:layout_width="@dimen/dp_15"
-                        android:layout_height="@dimen/dp_15"
-                        android:layout_marginTop="10dp"
-                        android:src="@mipmap/small_alarm_clock"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintLeft_toLeftOf="@+id/tv_live_title"
-                        app:layout_constraintTop_toBottomOf="@+id/tv_live_title" />
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+
+                        <ImageView
+                            android:id="@+id/iv_bell2"
+                            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"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                        <TextView
+                            android:id="@+id/tv_notice_content2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="44dp"
+                            android:layout_marginStart="2dp"
+                            android:gravity="center"
+                            android:includeFontPadding="false"
+                            android:textColor="@color/color_1a1a1a"
+                            android:textSize="@dimen/sp_14"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintLeft_toRightOf="@+id/iv_bell2"
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:text="网络教室升级公告" />
+
+                        <ImageView
+                            android:id="@+id/im_notice_list2"
+                            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.cardview.widget.CardView>
+
+
+                <androidx.cardview.widget.CardView
+                    android:id="@+id/fl_course_enter"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="25dp"
+                    android:layout_marginTop="24dp"
+                    android:layout_marginEnd="25dp"
+                    android:visibility="gone"
+                    app:cardBackgroundColor="@color/white"
+                    app:cardCornerRadius="10dp"
+                    app:cardElevation="2dp"
+                    app:cardPreventCornerOverlap="true"
+                    app:cardUseCompatPadding="false"
+                    app:layout_constraintTop_toBottomOf="@+id/bg_announcement2">
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="70dp">
+
+                        <TextView
+                            android:id="@+id/tv_live_title"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginStart="120dp"
+                            android:includeFontPadding="false"
+                            android:text="您有新课程即将开始"
+                            android:textColor="@color/color_1a1a1a"
+                            android:textSize="@dimen/sp_16"
+                            app:layout_constraintBottom_toTopOf="@+id/alarm_icon"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:layout_constraintVertical_chainStyle="packed" />
+
+                        <ImageView
+                            android:id="@+id/alarm_icon"
+                            android:layout_width="@dimen/dp_15"
+                            android:layout_height="@dimen/dp_15"
+                            android:layout_marginTop="10dp"
+                            android:src="@mipmap/small_alarm_clock"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintLeft_toLeftOf="@+id/tv_live_title"
+                            app:layout_constraintTop_toBottomOf="@+id/tv_live_title" />
+
+
+                        <TextView
+                            android:id="@+id/tv_live_time"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginTop="@dimen/dp_1"
+                            android:layout_marginBottom="@dimen/dp_5"
+                            android:paddingStart="5dp"
+                            android:textColor="@color/color_FF806F"
+                            android:textSize="@dimen/sp_13"
+                            app:layout_constraintBottom_toBottomOf="@+id/alarm_icon"
+                            app:layout_constraintLeft_toRightOf="@+id/alarm_icon"
+                            app:layout_constraintTop_toTopOf="@+id/alarm_icon"
+                            tools:text="今日 16:30-17:05" />
+
+
+                        <ImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginEnd="11dp"
+                            android:src="@drawable/icon_arrow_right_bg_tran"
+                            app:layout_constraintBottom_toBottomOf="parent"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintTop_toTopOf="parent" />
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+                </androidx.cardview.widget.CardView>
+
+
+                <com.airbnb.lottie.LottieAnimationView
+                    android:id="@+id/iv_course_enter_anim"
+                    android:layout_width="105dp"
+                    android:layout_height="83dp"
+                    android:layout_marginStart="11dp"
+                    android:visibility="gone"
+                    app:layout_constraintBottom_toBottomOf="@+id/fl_course_enter"
+                    app:layout_constraintLeft_toLeftOf="@+id/fl_course_enter"
+                    app:lottie_autoPlay="true"
+                    app:lottie_loop="true" />
 
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_hot_album"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/dp_18"
+                    android:visibility="visible"
+                    app:layout_constraintTop_toBottomOf="@+id/fl_course_enter">
+
+                    <View
+                        android:id="@+id/tv_hot_album_line"
+                        android:layout_width="4dp"
+                        android:layout_height="17dp"
+                        android:layout_marginStart="14dp"
+                        android:background="@drawable/shape_course_title_tag_bg"
+                        app:layout_constraintBottom_toBottomOf="@+id/tv_hot_album"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toTopOf="@+id/tv_hot_album" />
 
                     <TextView
-                        android:id="@+id/tv_live_time"
+                        android:id="@+id/tv_hot_album"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="@dimen/dp_1"
-                        android:layout_marginBottom="@dimen/dp_5"
-                        android:paddingStart="5dp"
-                        android:textColor="@color/color_FF806F"
-                        android:textSize="@dimen/sp_13"
-                        app:layout_constraintBottom_toBottomOf="@+id/alarm_icon"
-                        app:layout_constraintLeft_toRightOf="@+id/alarm_icon"
-                        app:layout_constraintTop_toTopOf="@+id/alarm_icon"
-                        tools:text="今日 16:30-17:05" />
-
-
-                    <ImageView
+                        android:layout_marginLeft="@dimen/dp_6"
+                        android:gravity="center"
+                        android:text="热门专辑"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_18"
+                        android:textStyle="bold"
+                        app:layout_constraintLeft_toRightOf="@+id/tv_hot_album_line"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                    <TextView
+                        android:id="@+id/tv_hot_album_more"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="11dp"
-                        android:src="@drawable/icon_arrow_right_bg_tran"
-                        app:layout_constraintBottom_toBottomOf="parent"
+                        android:layout_marginRight="@dimen/dp_14"
+                        android:background="@drawable/shape_f2f2f2_9dp"
+                        android:drawableEnd="@drawable/icon_next_right"
+                        android:drawablePadding="1dp"
+                        android:gravity="center"
+                        android:paddingStart="7dp"
+                        android:paddingTop="2dp"
+                        android:paddingEnd="3dp"
+                        android:paddingBottom="2dp"
+                        android:text="更多"
+                        android:textColor="@color/color_999999"
+                        android:textSize="@dimen/sp_12"
+                        app:layout_constraintBottom_toBottomOf="@+id/tv_hot_album"
                         app:layout_constraintRight_toRightOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-            </androidx.cardview.widget.CardView>
+                        app:layout_constraintTop_toTopOf="@+id/tv_hot_album" />
 
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_hot_album"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
+                        android:overScrollMode="never"
+                        android:paddingLeft="@dimen/dp_7"
+                        android:paddingRight="@dimen/dp_7"
+                        android:scrollbars="none"
+                        app:layout_constraintTop_toBottomOf="@+id/tv_hot_album" />
 
-            <com.airbnb.lottie.LottieAnimationView
-                android:id="@+id/iv_course_enter_anim"
-                android:layout_width="105dp"
-                android:layout_height="83dp"
-                android:layout_marginStart="11dp"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="@+id/fl_course_enter"
-                app:layout_constraintLeft_toLeftOf="@+id/fl_course_enter"
-                app:lottie_autoPlay="true"
-                app:lottie_loop="true" />
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_hot_album"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_18"
-                android:visibility="visible"
-                app:layout_constraintTop_toBottomOf="@+id/fl_course_enter">
-
-                <View
-                    android:id="@+id/tv_hot_album_line"
-                    android:layout_width="4dp"
-                    android:layout_height="17dp"
-                    android:layout_marginStart="14dp"
-                    android:background="@drawable/shape_course_title_tag_bg"
-                    app:layout_constraintBottom_toBottomOf="@+id/tv_hot_album"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/tv_hot_album" />
-
-                <TextView
-                    android:id="@+id/tv_hot_album"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/dp_6"
-                    android:gravity="center"
-                    android:text="热门专辑"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_18"
-                    android:textStyle="bold"
-                    app:layout_constraintLeft_toRightOf="@+id/tv_hot_album_line"
-                    app:layout_constraintTop_toTopOf="parent" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
 
-                <TextView
-                    android:id="@+id/tv_hot_album_more"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="@dimen/dp_14"
-                    android:background="@drawable/shape_f2f2f2_9dp"
-                    android:drawableEnd="@drawable/icon_next_right"
-                    android:drawablePadding="1dp"
-                    android:gravity="center"
-                    android:paddingStart="7dp"
-                    android:paddingTop="2dp"
-                    android:paddingEnd="3dp"
-                    android:paddingBottom="2dp"
-                    android:text="更多"
-                    android:textColor="@color/color_999999"
-                    android:textSize="@dimen/sp_12"
-                    app:layout_constraintBottom_toBottomOf="@+id/tv_hot_album"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/tv_hot_album" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rv_hot_album"
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:id="@+id/cl_hot_track"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:overScrollMode="never"
-                    android:paddingLeft="@dimen/dp_7"
-                    android:paddingRight="@dimen/dp_7"
-                    android:scrollbars="none"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_hot_album" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cl_hot_track"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_25"
-                android:visibility="visible"
-                app:layout_constraintTop_toBottomOf="@+id/cl_hot_album">
-
-                <View
-                    android:id="@+id/tv_hot_track_line"
-                    android:layout_width="4dp"
-                    android:layout_height="17dp"
-                    android:layout_marginStart="14dp"
-                    android:background="@drawable/shape_course_title_tag_bg"
-                    app:layout_constraintBottom_toBottomOf="@+id/tv_hot_track"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/tv_hot_track" />
+                    android:layout_marginTop="@dimen/dp_25"
+                    android:visibility="visible"
+                    app:layout_constraintTop_toBottomOf="@+id/cl_hot_album">
+
+                    <View
+                        android:id="@+id/tv_hot_track_line"
+                        android:layout_width="4dp"
+                        android:layout_height="17dp"
+                        android:layout_marginStart="14dp"
+                        android:background="@drawable/shape_course_title_tag_bg"
+                        app:layout_constraintBottom_toBottomOf="@+id/tv_hot_track"
+                        app:layout_constraintLeft_toLeftOf="parent"
+                        app:layout_constraintTop_toTopOf="@+id/tv_hot_track" />
 
-                <TextView
-                    android:id="@+id/tv_hot_track"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/dp_6"
-                    android:gravity="center"
-                    android:text="热门曲目"
-                    android:textColor="@color/color_333333"
-                    android:textSize="@dimen/sp_18"
-                    android:textStyle="bold"
-                    app:layout_constraintLeft_toRightOf="@+id/tv_hot_track_line"
-                    app:layout_constraintTop_toTopOf="parent" />
+                    <TextView
+                        android:id="@+id/tv_hot_track"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/dp_6"
+                        android:gravity="center"
+                        android:text="热门曲目"
+                        android:textColor="@color/color_333333"
+                        android:textSize="@dimen/sp_18"
+                        android:textStyle="bold"
+                        app:layout_constraintLeft_toRightOf="@+id/tv_hot_track_line"
+                        app:layout_constraintTop_toTopOf="parent" />
 
-                <TextView
-                    android:id="@+id/tv_hot_track_more"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="@dimen/dp_14"
-                    android:background="@drawable/shape_f2f2f2_9dp"
-                    android:drawableEnd="@drawable/icon_next_right"
-                    android:drawablePadding="1dp"
-                    android:gravity="center"
-                    android:paddingStart="7dp"
-                    android:paddingTop="2dp"
-                    android:paddingEnd="3dp"
-                    android:paddingBottom="2dp"
-                    android:text="更多"
-                    android:textColor="@color/color_999999"
-                    android:textSize="@dimen/sp_12"
-                    app:layout_constraintBottom_toBottomOf="@+id/tv_hot_track"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/tv_hot_track" />
+                    <TextView
+                        android:id="@+id/tv_hot_track_more"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginRight="@dimen/dp_14"
+                        android:background="@drawable/shape_f2f2f2_9dp"
+                        android:drawableEnd="@drawable/icon_next_right"
+                        android:drawablePadding="1dp"
+                        android:gravity="center"
+                        android:paddingStart="7dp"
+                        android:paddingTop="2dp"
+                        android:paddingEnd="3dp"
+                        android:paddingBottom="2dp"
+                        android:text="更多"
+                        android:textColor="@color/color_999999"
+                        android:textSize="@dimen/sp_12"
+                        app:layout_constraintBottom_toBottomOf="@+id/tv_hot_track"
+                        app:layout_constraintRight_toRightOf="parent"
+                        app:layout_constraintTop_toTopOf="@+id/tv_hot_track" />
 
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rv_hot_track"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:overScrollMode="never"
-                    android:paddingLeft="@dimen/dp_14"
-                    android:scrollbars="none"
-                    app:layout_constraintTop_toBottomOf="@+id/tv_hot_track" />
+                    <androidx.recyclerview.widget.RecyclerView
+                        android:id="@+id/rv_hot_track"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="12dp"
+                        android:overScrollMode="never"
+                        android:paddingLeft="@dimen/dp_14"
+                        android:scrollbars="none"
+                        app:layout_constraintTop_toBottomOf="@+id/tv_hot_track" />
 
+                </androidx.constraintlayout.widget.ConstraintLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.core.widget.NestedScrollView>
+        </androidx.core.widget.NestedScrollView>
+    </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>