Pq %!s(int64=3) %!d(string=hai) anos
pai
achega
7fd0549af7

+ 8 - 0
BaseLibrary/src/main/java/com/cooleshow/base/utils/UiUtils.java

@@ -206,4 +206,12 @@ public class UiUtils {
         }
         }
         return time;
         return time;
     }
     }
+
+    public static String getPianoCourseName(String courseTitle, int classNum) {
+        if (classNum != 0) {
+            return courseTitle + "第" + classNum + "课";
+        } else {
+            return courseTitle;
+        }
+    }
 }
 }

+ 1 - 0
BaseLibrary/src/main/res/values/colors.xml

@@ -97,6 +97,7 @@
     <color name="color_ff4444">#FF4444</color>
     <color name="color_ff4444">#FF4444</color>
     <color name="color_808080">#808080</color>
     <color name="color_808080">#808080</color>
     <color name="color_416fff">#416FFF</color>
     <color name="color_416fff">#416FFF</color>
+    <color name="color_02c1ac">#02C1AC</color>
 
 
     <color name="color_25292e">#25292E</color>
     <color name="color_25292e">#25292E</color>
     <color name="color_F8F8F8">#F8F8F8</color>
     <color name="color_F8F8F8">#F8F8F8</color>

+ 1 - 1
rong_im/kit/src/main/res/layout/rc_conversationlist_empty_view.xml

@@ -9,7 +9,7 @@
     <ImageView
     <ImageView
         android:layout_width="match_parent"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_height="match_parent"
-        android:src="@drawable/rc_conversation_list_empty"/>
+        android:src="@drawable/icon_empty_content"/>
 
 
     <TextView
     <TextView
         android:id="@+id/rc_empty_tv"
         android:id="@+id/rc_empty_tv"

+ 1 - 0
student/src/main/java/com/cooleshow/student/bean/PianoRoomCourseHomeworkBean.java

@@ -45,6 +45,7 @@ public class PianoRoomCourseHomeworkBean {
     public String endTime;
     public String endTime;
     public int id;
     public int id;
     public int reviewHomework;
     public int reviewHomework;
+    public int classNum;
     public String startTime;
     public String startTime;
     public String studentAttachments;
     public String studentAttachments;
     public String studentAvatar;
     public String studentAvatar;

+ 2 - 1
student/src/main/java/com/cooleshow/student/ui/course/PianoRoomCourseDetailActivity.java

@@ -20,6 +20,7 @@ import com.cooleshow.student.contract.PianoRoomCourseDetailContract;
 import com.cooleshow.student.databinding.ActivityPianoRoomCourseDetailLayoutBinding;
 import com.cooleshow.student.databinding.ActivityPianoRoomCourseDetailLayoutBinding;
 import com.cooleshow.student.presenter.course.PianoRoomCourseDetailPresenter;
 import com.cooleshow.student.presenter.course.PianoRoomCourseDetailPresenter;
 import com.cooleshow.base.widgets.VideoThumbnailView;
 import com.cooleshow.base.widgets.VideoThumbnailView;
+import com.cooleshow.student.widgets.helper.CourseHelper;
 import com.daya.live_teaching.utils.helper.CourseEnterHelper;
 import com.daya.live_teaching.utils.helper.CourseEnterHelper;
 
 
 import androidx.annotation.NonNull;
 import androidx.annotation.NonNull;
@@ -103,7 +104,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         //时间
         //时间
         viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime, infoBean.endTime));
         viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime, infoBean.endTime));
         //title
         //title
-        viewBinding.tvTitle.setText(infoBean.courseGroupName);
+        viewBinding.tvTitle.setText(UiUtils.getPianoCourseName(infoBean.courseGroupName, infoBean.classNum));
         //subjectName
         //subjectName
         viewBinding.tvCourseName.setText(infoBean.subjectName);
         viewBinding.tvCourseName.setText(infoBean.subjectName);
 
 

+ 1 - 1
student/src/main/java/com/cooleshow/student/ui/main/HomeFragment.java

@@ -364,7 +364,7 @@ public class HomeFragment extends BaseMVPFragment<FragmentHomeLayoutBinding, Hom
         }
         }
         mViewBinding.clLive.setVisibility(View.VISIBLE);
         mViewBinding.clLive.setVisibility(View.VISIBLE);
         GlideUtils.INSTANCE.loadImage(getContext(), recentCourses.avatar, mViewBinding.imLiveHeader, R.drawable.icon_student_default_head);
         GlideUtils.INSTANCE.loadImage(getContext(), recentCourses.avatar, mViewBinding.imLiveHeader, R.drawable.icon_student_default_head);
-        mViewBinding.tvLiveTitle.setText(recentCourses.courseGroupName);
+        mViewBinding.tvLiveTitle.setText(recentCourses.courseGroupName+"即将开始");
         String currentTime = TimeUtils.date2String(new Date(System.currentTimeMillis()), "yyyy-MM-dd");
         String currentTime = TimeUtils.date2String(new Date(System.currentTimeMillis()), "yyyy-MM-dd");
         String startTime = TimeUtils.date2String(TimeUtils.getDate(recentCourses.courseStartTime), "yyyy-MM-dd");
         String startTime = TimeUtils.date2String(TimeUtils.getDate(recentCourses.courseStartTime), "yyyy-MM-dd");
         if (!TextUtils.isEmpty(recentCourses.courseStartTime) && TextUtils.equals(currentTime, startTime)) {
         if (!TextUtils.isEmpty(recentCourses.courseStartTime) && TextUtils.equals(currentTime, startTime)) {

+ 2 - 0
student/src/main/res/layout/fragment_home_layout.xml

@@ -175,6 +175,8 @@
                         android:layout_width="@dimen/dp_48"
                         android:layout_width="@dimen/dp_48"
                         android:layout_height="@dimen/dp_48"
                         android:layout_height="@dimen/dp_48"
                         android:layout_marginLeft="@dimen/dp_7"
                         android:layout_marginLeft="@dimen/dp_7"
+                        app:civ_border_color="@color/color_02c1ac"
+                        app:civ_border_width="1dp"
                         android:src="@drawable/icon_student_default_head"
                         android:src="@drawable/icon_student_default_head"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintLeft_toLeftOf="parent"
                         app:layout_constraintLeft_toLeftOf="parent"

+ 2 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseDetailActivity.java

@@ -15,6 +15,7 @@ import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.EmptyViewLayout;
 import com.cooleshow.base.widgets.EmptyViewLayout;
+import com.cooleshow.teacher.CourseHelper;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.PianoRoomCourseStudentListAdapter;
 import com.cooleshow.teacher.adapter.PianoRoomCourseStudentListAdapter;
 import com.cooleshow.teacher.bean.PianoRoomCourseInfoBean;
 import com.cooleshow.teacher.bean.PianoRoomCourseInfoBean;
@@ -133,7 +134,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         //时间
         //时间
         viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime, infoBean.endTime));
         viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime, infoBean.endTime));
         //title
         //title
-        viewBinding.tvTitle.setText(infoBean.courseGroupName);
+        viewBinding.tvTitle.setText(UiUtils.getPianoCourseName(infoBean.courseGroupName, infoBean.classNum));
         //subjectName
         //subjectName
         viewBinding.tvCourseName.setText(infoBean.subjectName);
         viewBinding.tvCourseName.setText(infoBean.subjectName);
         //学生人数
         //学生人数

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/main/HomeFragment.kt

@@ -337,7 +337,7 @@ class HomeFragment : BaseMVPFragment<FragmentHomeLayoutBinding, HomePresenter>()
         val recentCourses = bean?.recentCourses
         val recentCourses = bean?.recentCourses
         mViewBinding.clLive.setVisible(recentCourses != null)
         mViewBinding.clLive.setVisible(recentCourses != null)
         if (recentCourses != null) {
         if (recentCourses != null) {
-            mViewBinding.tvLiveTitle.setText(recentCourses.courseGroupName)
+            mViewBinding.tvLiveTitle.setText(recentCourses.courseGroupName + "即将开始")
             mViewBinding.tvLiveTime.setText(recentCourses.courseStartTime)
             mViewBinding.tvLiveTime.setText(recentCourses.courseStartTime)
             val currentTime = TimeUtils.date2String(Date(System.currentTimeMillis()), "yyyy-MM-dd")
             val currentTime = TimeUtils.date2String(Date(System.currentTimeMillis()), "yyyy-MM-dd")
             val startTime = TimeUtils.date2String(
             val startTime = TimeUtils.date2String(