修改学生端我的课程字段显示

student/src/main/java/com/cooleshow/student/adapter/LiveCourseListAdapter.java

@@ -82,7 +82,7 @@ public class LiveCourseListAdapter extends BaseQuickAdapter<LiveCourseListBean.R
         ImageView iv_avatar=holder.getView(R.id.iv_avatar);
         GlideUtils.INSTANCE.loadImage(getContext(),data.getAvatar(),iv_avatar,R.drawable.icon_teacher_default_head);
         TextView tv_teacher_name = holder.getView(R.id.tv_teacher_name);
-        tv_teacher_name.setText(data.getTeacherName());
+        tv_teacher_name.setText(data.realName);
     }
 
     @NonNull

student/src/main/java/com/cooleshow/student/adapter/VideoCourseListAdapter.java

@@ -29,7 +29,7 @@ public class VideoCourseListAdapter extends BaseQuickAdapter<SelectMyGroupBean.R
 
     @Override
     protected void convert(@NonNull BaseViewHolder holder, SelectMyGroupBean.RowsBean data) {
-        ImageView iv_bg = holder.getView(R.id.iv_bg);
+        ImageView iv_bg = holder.getView(R.id.im_pic);
         //封面
         GlideUtils.INSTANCE.loadImage(getContext(), data.lessonCoverUrl, iv_bg, com.cooleshow.base.R.drawable.bg_video_placeholder);
         //title

student/src/main/java/com/cooleshow/student/ui/course/MineCourseActivity.java

@@ -50,6 +50,8 @@ public class MineCourseActivity extends BaseMVPActivity<ActivityMineCourseBindin
     private PianoCourseGroupFragment mPianoRoomCourseFragment;
     private ArrayList<CourseTipBean> courseTipList;
     private CourseTipDialog mCourseTipDialog;
+    private VIPCourseGroupFragment mVipCourseGroupFragment;
+    private InterestCourseGroupFragment mInterestCourseGroupFragment;
 
     @Override
     protected void initView() {
@@ -105,13 +107,13 @@ public class MineCourseActivity extends BaseMVPActivity<ActivityMineCourseBindin
     }
 
     private void initTabLayoutAndViewPager() {
-        VIPCourseGroupFragment vipCourseGroupFragment = new VIPCourseGroupFragment();
-        InterestCourseGroupFragment interestCourseGroupFragment = new InterestCourseGroupFragment();
+        mVipCourseGroupFragment = new VIPCourseGroupFragment();
+        mInterestCourseGroupFragment = new InterestCourseGroupFragment();
         mLiveCourseFragment = new LiveCourseGroupFragment();
         mVideoCourseFragment = new VideoCourseGroupFragment();
         mPianoRoomCourseFragment = new PianoCourseGroupFragment();
-        fragments.add(vipCourseGroupFragment);
-        fragments.add(interestCourseGroupFragment);
+        fragments.add(mVipCourseGroupFragment);
+        fragments.add(mInterestCourseGroupFragment);
         fragments.add(mLiveCourseFragment);
         fragments.add(mVideoCourseFragment);
         fragments.add(mPianoRoomCourseFragment);
@@ -171,8 +173,11 @@ public class MineCourseActivity extends BaseMVPActivity<ActivityMineCourseBindin
 
     @Override
     public void querySubjectItemSuccess(List<QuerySubjectBean> data) {
-        if (mMinePracticeCourseFragment != null) {
-            mMinePracticeCourseFragment.querySubjectItemSuccess(data);
+        if (mVipCourseGroupFragment != null) {
+            mVipCourseGroupFragment.querySubjectItemSuccess(data);
+        }
+        if (mInterestCourseGroupFragment != null) {
+            mInterestCourseGroupFragment.querySubjectItemSuccess(data);
         }
         if (mLiveCourseFragment != null) {
             mLiveCourseFragment.querySubjectItemSuccess(data);

student/src/main/res/layout/item_live_course_list_layout.xml

@@ -24,6 +24,17 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="开课时间：2024-11-16 09:30" />
+    <TextView
+        android:id="@+id/tv_course_status"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textColor="@color/color_999999"
+        android:textSize="@dimen/sp_14"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_time"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/tv_time"
+        tools:text="未开始" />
+
 
     <com.cooleshow.base.widgets.QMUIRadiusImageView
         android:id="@+id/iv_bg"
@@ -151,6 +162,7 @@
         tools:text="严老师" />
 
     <TextView
+        android:visibility="gone"
         android:id="@+id/tv_price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -164,6 +176,7 @@
         app:layout_constraintRight_toLeftOf="@+id/tv_price_unit" />
 
     <TextView
+        android:visibility="gone"
         android:id="@+id/tv_price_symbol"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -175,6 +188,7 @@
         app:layout_constraintRight_toLeftOf="@+id/tv_price" />
 
     <TextView
+        android:visibility="gone"
         android:includeFontPadding="false"
         android:id="@+id/tv_price_unit"
         android:layout_width="wrap_content"
@@ -185,6 +199,69 @@
         android:textSize="@dimen/sp_12"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintBaseline_toBaselineOf="@+id/tv_price" />
+    <ImageView
+        android:layout_marginEnd="4dp"
+        android:id="@+id/iv_course_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/icon_course_completed_tag"
+        app:layout_constraintRight_toLeftOf="@+id/tv_course_completed_title"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_course_completed_title"
+        app:layout_constraintTop_toTopOf="@+id/tv_course_completed_title" />
+
+    <TextView
+        android:id="@+id/tv_course_completed_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:text="已上课时"
+        android:textColor="@color/color_999999"
+        android:textSize="@dimen/sp_12"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_course_completed_value"
+        app:layout_constraintRight_toLeftOf="@+id/tv_course_completed_value" />
+
+
+    <TextView
+        android:id="@+id/tv_course_completed_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:paddingStart="3dp"
+        android:paddingEnd="3dp"
+        android:text="0"
+        android:textColor="@color/color_2dc7aa"
+        android:textSize="@dimen/sp_12"
+        android:textStyle="bold"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_course_total_title"
+        app:layout_constraintRight_toLeftOf="@+id/tv_course_total_title" />
+
+    <TextView
+        android:id="@+id/tv_course_total_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:text="/总课时"
+        android:textColor="@color/color_999999"
+        android:textSize="@dimen/sp_12"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_course_total_value"
+        app:layout_constraintRight_toLeftOf="@+id/tv_course_total_value" />
+
+
+    <TextView
+        android:id="@+id/tv_course_total_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:paddingStart="3dp"
+        android:paddingEnd="3dp"
+        android:text="0"
+        android:textColor="@color/color_333333"
+        android:textSize="@dimen/sp_12"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_teacher_name"
+        app:layout_constraintTop_toTopOf="@+id/tv_teacher_name"
+        app:layout_constraintRight_toRightOf="parent" />
+
 
     <ImageView
         android:id="@+id/iv_chat"

student/src/main/res/layout/item_video_course_list_layout.xml

@@ -73,6 +73,7 @@
             android:paddingTop="1dp"
             android:paddingEnd="6dp"
             android:paddingBottom="1dp"
+            android:layout_marginEnd="4dp"
             android:textColor="@color/color_777777"
             android:textSize="@dimen/sp_11"
             android:visibility="gone"
@@ -82,7 +83,6 @@
             android:id="@+id/tv_price_unit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
             android:background="@drawable/shape_f5f6fa_3dp"
             android:gravity="center"
             android:includeFontPadding="false"

student/src/main/res/layout/item_vip_course_layout.xml

@@ -101,7 +101,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="6dp"
         android:includeFontPadding="false"
         android:text="已上课时"
         android:textColor="@color/color_999999"

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

@@ -92,6 +92,7 @@
             android:paddingTop="1dp"
             android:paddingEnd="6dp"
             android:paddingBottom="1dp"
+            android:layout_marginEnd="4dp"
             android:textColor="@color/color_777777"
             android:textSize="@dimen/sp_11"
             tools:text="3首曲目" />
@@ -100,7 +101,6 @@
             android:id="@+id/tv_price_unit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
             android:background="@drawable/shape_f5f6fa_3dp"
             android:gravity="center"
             android:includeFontPadding="false"

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

@@ -101,7 +101,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="6dp"
         android:includeFontPadding="false"
         android:text="已上课时"
         android:textColor="@color/color_999999"

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

@@ -91,6 +91,7 @@
             android:paddingStart="6dp"
             android:paddingTop="1dp"
             android:paddingEnd="6dp"
+            android:layout_marginEnd="4dp"
             android:paddingBottom="1dp"
             android:textColor="@color/color_777777"
             android:textSize="@dimen/sp_11"
@@ -100,7 +101,6 @@
             android:id="@+id/tv_price_unit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
             android:background="@drawable/shape_f5f6fa_3dp"
             android:gravity="center"
             android:includeFontPadding="false"