修复部分bug

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

@@ -50,18 +50,17 @@ public class JumpUtils {
                         //原生跳作业详情页面
                         if (BaseApplication.Companion.isTeacherClient()) {
                             //老师端 区分琴房课和陪练课
-//                        if (rowsBean != null && TextUtils.equals(CourseConstants.PIANO_ROOM_COURSE, rowsBean.type)) {
-//                            //琴房课
-//                            ARouter.getInstance().build(RouterPath.CourseCenter.PIANO_ROOM_COURSE_DETAIL)
-//                                    .withString("course_id", rowsBean.courseId)
-//                                    .navigation();
-//                        } else {
-//                            //陪练课
-//                            ARouter.getInstance().build(RouterPath.WorkCenter.TEACHER_WORK_ASSIGN_HOMEWORK)
-//                                    .withString(TeacherConfig.COURSE_ID, rowsBean.courseId)
-//                                    .withString(TeacherConfig.STUDENT_ID, rowsBean.studentId)
-//                                    .navigation();
-//                        }
+                            String params = routeBean.params;
+                            if (!TextUtils.isEmpty(params)) {
+                                String courseId = getParams(params, "courseId");
+                                String studentId = getParams(params, "studentId");
+                                if (TextUtils.isEmpty(courseId) && TextUtils.isEmpty(studentId)) {
+                                    ARouter.getInstance().build(RouterPath.WorkCenter.TEACHER_WORK_ASSIGN_HOMEWORK)
+                                            .withString("course_id", courseId)
+                                            .withString("student_id", studentId)
+                                            .navigation();
+                                }
+                            }
                         } else {
                             //学生端直接跳作业详情页面
                             String params = routeBean.params;

rong_im/kit/src/main/java/io/rong/imkit/conversationlist/ConversationListFragment.java

@@ -1,5 +1,6 @@
 package io.rong.imkit.conversationlist;
 
+import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -11,6 +12,9 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.cooleshow.base.router.RouterPath;
+
 import androidx.annotation.LayoutRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -21,7 +25,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -96,8 +99,14 @@ public class ConversationListFragment extends Fragment implements BaseAdapter.On
         mNoticeContainerView = view.findViewById(R.id.rc_conversationlist_notice_container);
         mNoticeContentTv = view.findViewById(R.id.rc_conversationlist_notice_tv);
         mNoticeIconIv = view.findViewById(R.id.rc_conversationlist_notice_icon_iv);
-
-
+        View view_search_bg = view.findViewById(R.id.view_search_bg);
+        view_search_bg.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                ARouter.getInstance().build(RouterPath.ChatCenter.CHAT_GROUP_SEARCH_HISTORY)
+                        .navigation();
+            }
+        });
         initRefreshView();
         subscribeUi();
     }
@@ -131,8 +140,6 @@ public class ConversationListFragment extends Fragment implements BaseAdapter.On
         });
 
 
-
-
     }
 
 

rong_im/kit/src/main/res/layout/rc_conversationlist_fragment.xml

@@ -38,7 +38,7 @@
         android:layout_marginEnd="5dp"
         android:background="@null"
         android:ellipsize="end"
-        android:text="请输入学员名称"
+        android:text="查找聊天记录"
         android:maxLines="1"
         android:paddingStart="8dp"
         android:textColor="@color/color_999999"

teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseDetailActivity.java

@@ -35,6 +35,7 @@ import io.rong.imkit.utils.helper.OpenChatHelper;
 /**
  * Author by pq, Date on 2022/6/24.
  * 琴房课详情页面
+ *
  */
 @Route(path = RouterPath.CourseCenter.PIANO_ROOM_COURSE_DETAIL)
 public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPianoRoomDetailLayoutBinding, PianoRoomDetailPresenter> implements PianoRoomCourseDetailContract.PianoRoomCourseDetailView, View.OnClickListener {
@@ -90,7 +91,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
             }
             if (position < mAdapter.getData().size()) {
                 PianoRoomCourseInfoBean.StudentHomeworkListBean.RecordsBean recordsBean = mAdapter.getData().get(position);
-                ARouter.getInstance().build(RouterPath.CourseCenter.PIANO_ROOM_COURSE_HOMEWORK)
+                ARouter.getInstance().build(RouterPath.WorkCenter.TEACHER_WORK_ASSIGN_HOMEWORK)
                         .withString("studentId", recordsBean.studentId)
                         .withString("course_id", mCourseId)
                         .navigation();

teacher/src/main/java/com/cooleshow/teacher/ui/course/PianoRoomCourseHomeWorkActivity.java

@@ -28,6 +28,8 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 /**
  * Author by pq, Date on 2022/6/24.
  * 琴房课作业详情页面
+ *
+ * 暂时不需要@AssignHomeworkActivity
  */
 @Route(path = RouterPath.CourseCenter.PIANO_ROOM_COURSE_HOMEWORK)
 public class PianoRoomCourseHomeWorkActivity extends BaseMVPActivity<ActivityPianoCourseHomeworkLayoutBinding, PianoRoomCourseHomeWorkPresenter> implements PianoRoomCourseHomeworkContract.PianoRoomCourseHomeworkView, View.OnClickListener {

teacher/src/main/java/com/cooleshow/teacher/ui/work/AssignHomeworkActivity.java

@@ -99,11 +99,18 @@ public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomewo
             return;
         }
         //subjectName
-        GlideUtils.INSTANCE.loadImage(this, bean.studentAvatar, viewBinding.imHeader, R.drawable.icon_teacher_default_head);
+        if(TextUtils.equals(bean.courseType,CourseConstants.OTHER_COURSE)){
+            //陪练课
+            GlideUtils.INSTANCE.loadImage(this, bean.studentAvatar, viewBinding.imHeader, R.drawable.icon_teacher_default_head);
+            viewBinding.tvName.setText(bean.studentName);
+        }else{
+            //琴房课
+            viewBinding.imHeader.setImageResource(R.drawable.icon_piano_room_course);
+            String tvname = bean.classNum > 0 ? "第" + bean.classNum + "课" : "";
+            viewBinding.tvName.setText(bean.courseGroupName + tvname);
+        }
         viewBinding.tvCourseName.setText(bean.subjectName);
 
-        viewBinding.tvName.setText(bean.studentName);
-
         viewBinding.tvDate.setText(UiUtils.getCourseTimeString(bean.startTime, bean.endTime));
 
         String status = bean.courseStatus;