Merge remote-tracking branch 'origin/dev' into dev

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

@@ -51,10 +51,11 @@ class CourseTableListAdapter(layoutResId: Int) :
             )
             viewLine2.setVisible(false)
             tvBuyNum.setVisible(false)
-        }  else if (TextUtils.equals(PIANO_ROOM_COURSE, data?.courseType)) {
+        } else if (TextUtils.equals(PIANO_ROOM_COURSE, data?.courseType)) {
             //琴房课
             ivAvatar.setImageResource(R.drawable.icon_piano_room_course)
-            tvBuyNum.text = data?.payCount + "人"
+            val count: String = if (!TextUtils.isEmpty(data?.payCount)) data!!.payCount else "0"
+            tvBuyNum.text = count + "人"
             viewLine2.setVisible(true)
             tvBuyNum.setVisible(true)
         } else {
@@ -71,9 +72,6 @@ class CourseTableListAdapter(layoutResId: Int) :
                 //未开始
                 tvCourseStatusBt.setVisible(false)
                 baseViewHolder.setText(R.id.tv_course_status, "未开始")
-                tvCourseStatusBt.text = "调课"
-                tvCourseStatusBt.setBackgroundResource(R.drawable.shape_course_status_normal);
-                tvCourseStatusBt.setTextColor(context.resources.getColor(com.cooleshow.base.R.color.color_2dc7aa))
             }
             ING -> {
                 //进行中