修改老师端我的页面

BaseLibrary/src/main/java/com/cooleshow/base/common/WebConstants.java

@@ -45,6 +45,7 @@ public abstract class WebConstants {
     public static final String STUDENT_MEMBER_RECORD = getBaseUrlH5() + "/#/memberRecord";
     //会员中心
     public static final String STUDENT_MEMBER_CENTER = getBaseUrlH5() + "/#/memberCenter";
+    public static final String TEACHER_MEMBER_CENTER = getBaseUrlH5() + "/#/memberCenter";
     //老师主页
     public static final String STUDENT_TEACHER_HOME = getBaseUrlH5() + "/#/teacherHome?teacherId=";
     //老师风采

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

@@ -54,6 +54,7 @@ public class TeacherUserInfo implements Serializable {
     public String fansNum;
     public String expTime;
     public String unExpTime;
+    public String membershipDays;
     public int starGrade;
     public String idCardNo;
     public String gender;

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

@@ -52,6 +52,7 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
         mViewBinding.llCourseNumCompleted.setOnClickListener(this);
         mViewBinding.llCourseNumNotStart.setOnClickListener(this);
         mViewBinding.ivGoodsOrder.setOnClickListener(this);
+        mViewBinding.viewVipBg.setOnClickListener(this);
     }
 
     @Override
@@ -81,47 +82,51 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
             mViewBinding.tvNoScore.setVisibility(View.VISIBLE);
         }
 
+        if (!TextUtils.isEmpty(teacherUserInfo.tag)) {
+            mViewBinding.llBadge.setVisibility(View.VISIBLE);
+            mViewBinding.llBadge.setVipIcon(teacherUserInfo.isVip == 1);
+            mViewBinding.llBadge.setData(teacherUserInfo.tag);
+        } else {
+            if (teacherUserInfo.isVip == 1) {
+                mViewBinding.llBadge.setVipIcon(true);
+                mViewBinding.llBadge.setVisibility(View.VISIBLE);
+            } else {
+                mViewBinding.llBadge.setVisibility(View.GONE);
+            }
+        }
+
         //粉丝数
         mViewBinding.tvFansNum.setText(teacherUserInfo.fansNum);
         //已上课时数
         mViewBinding.tvCourseNumCompleted.setText(teacherUserInfo.expTime);
         //未上课时数
         mViewBinding.tvCourseNumNotStart.setText(teacherUserInfo.unExpTime);
-
+        //会员天数
+        mViewBinding.tvValidity.setText(teacherUserInfo.membershipDays);
         if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_DOING)) {
             //入驻审核中
             mViewBinding.ivCertificationStatus.setImageResource(R.drawable.icon_home_entry_doing);
             mViewBinding.ivCertificationStatus.setVisibility(View.VISIBLE);
-            mViewBinding.ivUnCertificationTip.setVisibility(View.GONE);
-            mViewBinding.ivTeacherEntryTag.setVisibility(View.GONE);
             hintCertificationOtherView();
         } else if (TextUtils.equals(teacherUserInfo.entryStatus, TeacherInfoConstants.ENTRY_STATUS_PASS)) {
             //入驻审核通过
             mViewBinding.ivCertificationStatus.setVisibility(View.GONE);
-            mViewBinding.ivUnCertificationTip.setVisibility(View.GONE);
-            mViewBinding.ivTeacherEntryTag.setVisibility(View.VISIBLE);
             showCertificationOtherView();
         } else {
             //未通过或者未申请
             mViewBinding.ivCertificationStatus.setImageResource(R.drawable.icon_home_un_certification);
             mViewBinding.ivCertificationStatus.setVisibility(View.VISIBLE);
-            mViewBinding.ivUnCertificationTip.setVisibility(View.VISIBLE);
-            mViewBinding.ivTeacherEntryTag.setVisibility(View.GONE);
             hintCertificationOtherView();
         }
 
         //音乐人认证状态
         if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_PASS)) {
-            mViewBinding.ivTeacherMusicPersonTag.setVisibility(View.VISIBLE);
             mViewBinding.tvMusicStatusTip.setText(getString(R.string.cert_completed_str));
         } else if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_DOING)) {
-            mViewBinding.ivTeacherMusicPersonTag.setVisibility(View.GONE);
             mViewBinding.tvMusicStatusTip.setText("审核中");
         } else if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_UNPAALY)) {
-            mViewBinding.ivTeacherMusicPersonTag.setVisibility(View.GONE);
             mViewBinding.tvMusicStatusTip.setText("未认证");
         } else if (TextUtils.equals(teacherUserInfo.musicianAuthStatus, TeacherInfoConstants.MUSICIAN_STATUS_UNPASS)) {
-            mViewBinding.ivTeacherMusicPersonTag.setVisibility(View.GONE);
             mViewBinding.tvMusicStatusTip.setText("审核未通过");
         }
         //银行卡绑定状态
@@ -291,7 +296,16 @@ public class MineFragment extends BaseMVPFragment<FragmentMineLayoutBinding, Min
                         .withString(WebConstants.WEB_URL, WebConstants.MALL_GOODS_ORDER)
                         .navigation();
                 break;
-
+            case R.id.view_vip_bg:
+                if (UiUtils.isFastClick()) {
+                    return;
+                }
+                //会员中心
+                ARouter.getInstance()
+                        .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                        .withString(WebConstants.WEB_URL, WebConstants.TEACHER_MEMBER_CENTER)
+                        .navigation();
+                break;
 
         }
     }

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

@@ -128,27 +128,27 @@
             app:layout_constraintRight_toLeftOf="@+id/iv_scan"
             app:layout_constraintTop_toTopOf="@+id/tv_nickname" />
 
-<!--        <ImageView-->
-<!--            android:id="@+id/iv_teacher_entry_tag"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginStart="6dp"-->
-<!--            android:src="@drawable/icon_teahcer_entry_tag"-->
-<!--            android:visibility="gone"-->
-<!--            app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"-->
-<!--            app:layout_constraintLeft_toRightOf="@+id/tv_nickname"-->
-<!--            app:layout_constraintTop_toTopOf="@+id/tv_nickname" />-->
-
-<!--        <ImageView-->
-<!--            android:id="@+id/iv_teacher_music_person_tag"-->
-<!--            android:layout_width="wrap_content"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginStart="3dp"-->
-<!--            android:src="@drawable/icon_teacher_music_person_tag"-->
-<!--            android:visibility="gone"-->
-<!--            app:layout_constraintBottom_toBottomOf="@+id/iv_teacher_entry_tag"-->
-<!--            app:layout_constraintLeft_toRightOf="@+id/iv_teacher_entry_tag"-->
-<!--            app:layout_constraintTop_toTopOf="@+id/iv_teacher_entry_tag" />-->
+        <!--        <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"
@@ -289,15 +289,19 @@
             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" />
 
 
-        <FrameLayout
+        <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="20dp"
             android:layout_marginEnd="14dp"
-            android:background="@drawable/bg_white_10dp"
-            android:visibility="gone"
+            android:visibility="visible"
+            app:cardBackgroundColor="@color/white"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="2dp"
+            app:cardPreventCornerOverlap="true"
+            app:cardUseCompatPadding="false"
             app:layout_constraintTop_toBottomOf="@+id/tv_fans_num">
 
             <androidx.viewpager.widget.ViewPager
@@ -306,58 +310,66 @@
                 android:layout_height="@dimen/dp_90"
                 android:overScrollMode="never"
                 android:scrollbars="none" />
-        </FrameLayout>
+        </androidx.cardview.widget.CardView>
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <androidx.cardview.widget.CardView
             android:id="@+id/bg_announcement"
             android:layout_width="match_parent"
-            android:layout_height="44dp"
+            android:layout_height="wrap_content"
             android:layout_marginStart="14dp"
             android:layout_marginTop="@dimen/dp_10"
             android:layout_marginEnd="14dp"
-            android:background="@drawable/bg_white_10dp"
-            android:elevation="2dp"
-            android:orientation="horizontal"
+            app:cardBackgroundColor="@color/white"
+            app:cardCornerRadius="10dp"
+            app:cardElevation="2dp"
             android:visibility="visible"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/fl_top_menu"
             app:layout_goneMarginTop="@dimen/dp_20">
 
-            <ImageView
-                android:id="@+id/iv_bell"
-                android:layout_width="wrap_content"
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
                 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" />
+                android:orientation="horizontal"
+                >
 
-            <TextView
-                android:id="@+id/tv_notice_content"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                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/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>
 
-            <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"

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

@@ -77,27 +77,38 @@
             app:layout_constraintVertical_chainStyle="packed"
             tools:text="游客12e32td" />
 
-        <ImageView
-            android:id="@+id/iv_teacher_entry_tag"
-            android:layout_width="wrap_content"
+        <com.cooleshow.base.widgets.BadgeIconListView
+            android:id="@+id/ll_badge"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:src="@drawable/icon_teahcer_entry_tag"
+            android:layout_marginStart="5dp"
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="@+id/tv_nickname"
             app:layout_constraintLeft_toRightOf="@+id/tv_nickname"
+            app:layout_constraintRight_toLeftOf="@+id/iv_scan"
             app:layout_constraintTop_toTopOf="@+id/tv_nickname" />
 
-        <ImageView
-            android:id="@+id/iv_teacher_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" />
+<!--        <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"
@@ -154,7 +165,7 @@
             android:visibility="gone"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/certification_tip_help_view"
-            tools:visibility="visible" />
+            tools:visibility="gone" />
 
         <LinearLayout
             android:id="@+id/ll_fans"
@@ -279,17 +290,87 @@
         </LinearLayout>
 
         <View
+            android:id="@+id/view_vip_bg"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_82"
+            android:layout_marginLeft="21dp"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="21dp"
+            app:layout_goneMarginTop="30dp"
+            android:background="@drawable/icon_mine_vip_bg"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/ll_fans" />
+
+
+        <View
+            android:id="@+id/view_vip_star"
+            android:layout_width="@dimen/dp_19"
+            android:layout_height="@dimen/dp_16"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="14dp"
+            android:background="@drawable/icon_mine_vip_star"
+            app:layout_constraintLeft_toLeftOf="@+id/view_vip_bg"
+            app:layout_constraintTop_toTopOf="@+id/view_vip_bg" />
+
+
+        <TextView
+            android:id="@+id/tv_validity_start"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dp"
+            android:text="会员有效期剩余"
+            android:textColor="@color/color_fed271"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="@+id/view_vip_star"
+            app:layout_constraintLeft_toRightOf="@+id/view_vip_star"
+            app:layout_constraintTop_toTopOf="@+id/view_vip_star" />
+
+        <TextView
+            android:id="@+id/tv_validity"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/color_fed271"
+            android:textSize="@dimen/sp_14"
+            android:textStyle="bold"
+            android:text="0"
+            app:layout_constraintBottom_toBottomOf="@+id/view_vip_star"
+            app:layout_constraintLeft_toRightOf="@+id/tv_validity_start"
+            app:layout_constraintTop_toTopOf="@+id/view_vip_star"
+            tools:text="321" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="天"
+            android:textColor="@color/color_fed271"
+            android:textSize="@dimen/sp_14"
+            app:layout_constraintBottom_toBottomOf="@+id/view_vip_star"
+            app:layout_constraintLeft_toRightOf="@+id/tv_validity"
+            app:layout_constraintTop_toTopOf="@+id/view_vip_star" />
+
+        <ImageView
+            android:id="@+id/im_vip"
+            android:layout_width="@dimen/dp_75"
+            android:layout_height="@dimen/dp_20"
+            android:layout_marginRight="16dp"
+            app:layout_constraintBottom_toBottomOf="@+id/view_vip_star"
+            android:background="@drawable/icon_mine_vip_center"
+            app:layout_constraintRight_toRightOf="@+id/view_vip_bg"
+            app:layout_constraintTop_toTopOf="@+id/view_vip_star" />
+
+
+        <View
             android:id="@+id/view_top_bg"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginStart="14dp"
-            android:layout_marginTop="19dp"
+            android:layout_marginTop="42dp"
             android:layout_marginEnd="14dp"
             android:background="@drawable/bg_white_10dp"
             app:layout_constraintBottom_toTopOf="@+id/top_bottom_view"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ll_fans"
+            app:layout_constraintTop_toTopOf="@+id/view_vip_bg"
             app:layout_goneMarginTop="@dimen/dp_26" />
 
         <TextView