增加老师端课表列表,增加VIP课程类型

BaseLibrary/src/main/java/com/cooleshow/base/utils/UiUtils.java

@@ -247,9 +247,9 @@ public class UiUtils {
         String startTimeText = TimeUtils.date2String(TimeUtils.getDate(start), "HH:mm");
         String endTimeText = TimeUtils.date2String(TimeUtils.getDate(end), "HH:mm");
         if (TextUtils.equals(startTime, endTime)) {
-            time = startTime + " " + startTimeText + "-" + endTimeText;
+            time = startTime + " " + startTimeText + "~" + endTimeText;
         } else {
-            time = startTime + " " + startTimeText + "-" + endTime + " " + endTimeText;
+            time = startTime + " " + startTimeText + "~" + endTime + " " + endTimeText;
         }
         return time;
     }

BaseLibrary/src/main/res/drawable/shape_couse_type_text_bg.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/color_fff1de"/>
-    <corners android:radius="4dp"/>
+    <solid android:color="@color/color_fff4e6"/>
+    <corners android:radius="3dp"/>
 </shape>

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

@@ -227,4 +227,5 @@
     <color name="color_18b99a">#18B99A</color>
     <color name="color_80000000">#80000000</color>
     <color name="color_dfdfdf">#DFDFDF</color>
+    <color name="color_fff4e6">#FFF4E6</color>
 </resources>

teacher/src/main/java/com/cooleshow/teacher/adapter/CourseTableListAdapter.kt

@@ -24,6 +24,7 @@ class CourseTableListAdapter(layoutResId: Int) :
         const val LIVE_COURSE = "LIVE"//直播课
         const val OTHER_COURSE = "PRACTICE"//陪练课
         const val PIANO_ROOM_COURSE = "PIANO_ROOM_CLASS"//琴房课
+        const val VIP_COURSE = "VIP"//VIP课
         const val NOT_START = "NOT_START"
         const val ING = "ING"
         const val COMPLETE = "COMPLETE"
@@ -46,6 +47,7 @@ class CourseTableListAdapter(layoutResId: Int) :
         val ivAvatar = baseViewHolder.getView<ImageView>(R.id.iv_avatar)
         val viewLine2 = baseViewHolder.getView<View>(R.id.view_line2)
         val tvBuyNum = baseViewHolder.getView<TextView>(R.id.tv_buy_num)
+        val tv_vip_course_tag = baseViewHolder.getView<TextView>(R.id.tv_vip_course_tag)
         val tvCourseStatusBt = baseViewHolder.getView<TextView>(R.id.tv_course_status_bt)
         //开始时间
         tvTime.text = UiUtils.getCourseTimeString(data?.startTime, data?.endTime);
@@ -63,12 +65,26 @@ class CourseTableListAdapter(layoutResId: Int) :
             )
             viewLine2.setVisible(false)
             tvBuyNum.setVisible(false)
+            tv_vip_course_tag.setVisible(false)
         } else if (TextUtils.equals(PIANO_ROOM_COURSE, data?.courseType)) {
             //琴房课
             ivAvatar.setImageResource(R.drawable.icon_piano_room_course)
             tvBuyNum.text = data?.payCount + "人"
             viewLine2.setVisible(true)
             tvBuyNum.setVisible(true)
+            tv_vip_course_tag.setVisible(false)
+        } else if (TextUtils.equals(VIP_COURSE, data?.courseType)) {
+            //VIP课
+            GlideUtils.loadImage(
+                context,
+                data!!.cover,
+                ivAvatar,
+                R.drawable.icon_teacher_default_head
+            )
+            tv_vip_course_tag.text = "VIP定制课-" + data?.name
+            viewLine2.setVisible(false)
+            tvBuyNum.setVisible(false)
+            tv_vip_course_tag.setVisible(true)
         } else {
             //直播课
             ivAvatar.setImageResource(R.drawable.icon_live_bg)
@@ -77,6 +93,7 @@ class CourseTableListAdapter(layoutResId: Int) :
             tvBuyNum.text = context.getString(R.string.pay_count_str, payCount)
             viewLine2.setVisible(true)
             tvBuyNum.setVisible(true)
+            tv_vip_course_tag.setVisible(false)
         }
         when (data?.status) {
             NOT_START -> {

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

@@ -159,7 +159,14 @@ class CourseTableFragment :
             ARouter.getInstance().build(RouterPath.CourseCenter.PIANO_ROOM_COURSE_DETAIL)
                 .withString("course_id", data.courseId)
                 .navigation()
-        } else {
+        } else if(TextUtils.equals(
+                CourseTableListAdapter.VIP_COURSE,
+                data?.courseType)){
+            //VIP课
+
+
+
+        }else {
             //直播课
             ARouter.getInstance()
                 .build(RouterPath.WebCenter.ACTIVITY_HTML)

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

@@ -46,8 +46,8 @@
 
     <com.cooleshow.base.widgets.QMUIRadiusImageView
         android:id="@+id/iv_avatar"
-        android:layout_width="47dp"
-        android:layout_height="51dp"
+        android:layout_width="54dp"
+        android:layout_height="54dp"
         android:layout_marginTop="17dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/view_line"
@@ -79,6 +79,26 @@
         app:layout_constraintTop_toTopOf="@+id/tv_title" />
 
     <TextView
+        android:id="@+id/tv_vip_course_tag"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shape_couse_type_text_bg"
+        android:gravity="center"
+        android:includeFontPadding="false"
+        android:paddingStart="6dp"
+        android:paddingTop="2dp"
+        android:paddingEnd="6dp"
+        android:paddingBottom="2dp"
+        android:textColor="@color/color_ff8c00"
+        android:textSize="@dimen/sp_11"
+        android:visibility="gone"
+        app:layout_constraintTop_toTopOf="@+id/tv_course_name"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_title"
+        tools:text="单簧管" />
+
+    <TextView
+        app:layout_goneMarginStart="0dp"
+        android:layout_marginStart="4dp"
         android:id="@+id/tv_course_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -86,14 +106,14 @@
         android:background="@drawable/shape_couse_type_text_bg"
         android:gravity="center"
         android:includeFontPadding="false"
-        android:paddingStart="4dp"
+        android:paddingStart="6dp"
         android:paddingTop="2dp"
-        android:paddingEnd="4dp"
+        android:paddingEnd="6dp"
         android:paddingBottom="2dp"
         android:textColor="@color/color_ff8c00"
         android:textSize="@dimen/sp_11"
+        app:layout_constraintLeft_toRightOf="@+id/tv_vip_course_tag"
         app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
-        app:layout_constraintLeft_toLeftOf="@+id/tv_title"
         app:layout_constraintTop_toBottomOf="@+id/tv_title"
         tools:text="单簧管" />
 
@@ -139,8 +159,8 @@
         android:background="@drawable/shape_course_status_normal"
         android:gravity="center"
         android:textColor="@color/color_2dc7aa"
-        android:textSize="@dimen/sp_14"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:textSize="@dimen/sp_13"
+        app:layout_constraintBottom_toBottomOf="@+id/iv_avatar"
         app:layout_constraintRight_toRightOf="parent"
         tools:text="调课" />