增加陪练课详情页聊天跳转

student/src/main/java/com/cooleshow/student/bean/SparringCourseHomeworkBean.java

@@ -49,13 +49,13 @@ public class SparringCourseHomeworkBean {
     public String studentAttachments;
     public String studentAvatar;
     public int studentHomeworkId;
-    public int studentId;
+    public String studentId;
     public String studentName;
     public String subjectName;
     public int submitHomework;
     public Object submitTime;
     public String teacherAvatar;
-    public int teacherId;
+    public String teacherId;
     public String teacherName;
     public String teacherReplied;
     public String title;

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

@@ -11,6 +11,7 @@ import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import io.rong.imkit.utils.helper.OpenChatHelper;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -97,6 +98,12 @@ public class PracticeCourseDetailActivity extends BaseMVPActivity<ActivityPracti
                         .withString("course_group_id", mCourseGroupId)
                         .navigation();
                 break;
+            case R.id.iv_go_chat:
+                //聊天
+                if (mInfoBean != null) {
+                    OpenChatHelper.goChat(PracticeCourseDetailActivity.this, mInfoBean.teacherId, mInfoBean.teacherName);
+                }
+                break;
         }
     }
 
@@ -109,6 +116,7 @@ public class PracticeCourseDetailActivity extends BaseMVPActivity<ActivityPracti
         mCourseGroupId = getIntent().getStringExtra(COURSE_GROUP_ID);
         viewBinding.tvDo.setOnClickListener(this);
         viewBinding.tvEvaluate.setOnClickListener(this);
+        viewBinding.ivGoChat.setOnClickListener(this);
 
         rvVideo = viewBinding.rvVideo;
         GridLayoutManager manager = new GridLayoutManager(this, 3);
@@ -154,7 +162,7 @@ public class PracticeCourseDetailActivity extends BaseMVPActivity<ActivityPracti
             return;
         }
         mInfoBean = infoBean;
-        viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime,infoBean.endTime));
+        viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime, infoBean.endTime));
 
         //时间
         //老师头像

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

@@ -5,6 +5,7 @@ import android.view.View;
 import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
+import io.rong.imkit.utils.helper.OpenChatHelper;
 
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GlideUtils;
@@ -32,6 +33,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
     private String mCourseGroupId;
     private String studentId;
     private CourseSetCommentDialog mSetCommentDialog;
+    private SparringCourseHomeworkBean mInfoBean;
 
     @NonNull
     @Override
@@ -87,6 +89,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         if (infoBean == null) {
             return;
         }
+        this.mInfoBean = infoBean;
         //时间
         viewBinding.tvCourseTime.setText(infoBean.classDate);
         //学生头像
@@ -266,6 +269,12 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             showSetCommentDialog(CourseSetCommentDialog.TYPE_SET_TEACHER_COMMENT);
             return;
         }
+
+        if (v.getId() == R.id.iv_go_chat) {
+            if (mInfoBean != null) {
+                OpenChatHelper.goChat(SparringCourseDetailActivity.this, mInfoBean.teacherId, mInfoBean.teacherName);
+            }
+        }
     }
 
     private void showSetCommentDialog(int typeSetTeacherComment) {
@@ -273,19 +282,19 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             mSetCommentDialog = new CourseSetCommentDialog(this);
             mSetCommentDialog.setOnSubmitClickListener(new CourseSetCommentDialog.OnSubmitClickListener() {
                 @Override
-                public void onSubmit(String content,int type) {
+                public void onSubmit(String content, int type) {
                     //提交
                     if (type == CourseSetCommentDialog.TYPE_SET_TEACHER_COMMENT) {
                         //提交老师点评
-                        presenter.submitSparringCourseComment(content,mCourseId,mCourseGroupId,studentId);
+                        presenter.submitSparringCourseComment(content, mCourseId, mCourseGroupId, studentId);
                     }
                     if (type == CourseSetCommentDialog.TYPE_SET_HOMEWORK) {
                         //提交布置作业
-                        presenter.submitSparringCourseHomework(content,mCourseId);
+                        presenter.submitSparringCourseHomework(content, mCourseId);
                     }
                     if (type == CourseSetCommentDialog.TYPE_SET_HOMEWORK_COMMENT) {
                         //提交作业点评
-                        presenter.submitSparringCourseHomeworkComment(content,mCourseId);
+                        presenter.submitSparringCourseHomeworkComment(content, mCourseId);
                     }
                 }
             });

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

@@ -88,7 +88,7 @@
 
                 <TextView
                     android:id="@+id/tv_title"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
@@ -99,11 +99,22 @@
                     android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
                     app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
-                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintRight_toLeftOf="@+id/iv_go_chat"
                     app:layout_constraintTop_toTopOf="@+id/iv_avatar"
                     app:layout_constraintVertical_chainStyle="packed"
                     tools:text="张豆豆张豆豆张豆豆张豆" />
 
+                <ImageView
+                    android:paddingStart="5dp"
+                    android:id="@+id/iv_go_chat"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:src="@drawable/icon_chat_small"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+                    app:layout_constraintLeft_toRightOf="@+id/tv_title"
+                    app:layout_constraintTop_toTopOf="@+id/tv_title" />
+
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/rv_course_name"
                     android:layout_width="wrap_content"

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

@@ -96,7 +96,7 @@
 
                 <TextView
                     android:id="@+id/tv_title"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
@@ -108,11 +108,23 @@
                     android:textStyle="bold"
                     app:layout_constraintBottom_toTopOf="@+id/tv_course_name"
                     app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
-                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintRight_toLeftOf="@+id/iv_go_chat"
                     app:layout_constraintTop_toTopOf="@+id/iv_avatar"
                     app:layout_constraintVertical_chainStyle="packed"
                     tools:text="张豆豆张豆豆张豆豆张豆" />
 
+
+                <ImageView
+                    android:paddingStart="5dp"
+                    android:id="@+id/iv_go_chat"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:src="@drawable/icon_chat_small"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+                    app:layout_constraintLeft_toRightOf="@+id/tv_title"
+                    app:layout_constraintTop_toTopOf="@+id/tv_title" />
+
                 <TextView
                     android:id="@+id/tv_course_name"
                     android:layout_width="wrap_content"

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

@@ -67,7 +67,7 @@
             android:background="@color/color_f2f2f2"
             app:layout_constraintTop_toBottomOf="@+id/im_clock" />
 
-        <com.cooleshow.base.widgets.QMUIRadiusImageView
+        <de.hdodenhof.circleimageview.CircleImageView
             android:id="@+id/im_header"
             android:layout_width="@dimen/dp_47"
             android:layout_height="@dimen/dp_51"

teacher/src/main/java/com/cooleshow/teacher/bean/SparringCourseHomeworkBean.java

@@ -43,8 +43,8 @@ public class SparringCourseHomeworkBean {
     public int courseGroupId;
     public String courseType;
     public String subjectName;
-    public int studentId;
-    public int teacherId;
+    public String studentId;
+    public String teacherId;
     public String title;
     public String studentAvatar;
     public String studentName;

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

@@ -26,6 +26,7 @@ import com.cooleshow.usercenter.helper.UserHelper;
 import com.daya.live_teaching.utils.helper.CourseEnterHelper;
 
 import androidx.annotation.NonNull;
+import io.rong.imkit.utils.helper.OpenChatHelper;
 
 /**
  * Author by pq, Date on 2022/4/27.
@@ -61,6 +62,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         viewBinding.tvHomeworkSetComment.setOnClickListener(this);
         viewBinding.tvSetTeacherComment.setOnClickListener(this);
         viewBinding.tvEnterRoom.setOnClickListener(this);
+        viewBinding.ivGoChat.setOnClickListener(this);
     }
 
     @Override
@@ -101,7 +103,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         viewBinding.tvTitle.setText(UserHelper.getStudentName(infoBean.studentName, studentId));
         //subjectName
         viewBinding.tvCourseName.setText(infoBean.subjectName);
-        viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime,infoBean.endTime));
+        viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime, infoBean.endTime));
 
         String status = infoBean.courseStatus;
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_NOT_START, status)) {
@@ -301,6 +303,12 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             }
             return;
         }
+
+        if (v.getId() == R.id.iv_go_chat) {
+            if (mInfoBean != null) {
+                OpenChatHelper.goChat(SparringCourseDetailActivity.this, mInfoBean.studentId, mInfoBean.studentName);
+            }
+        }
     }
 
     private void showSetCommentDialog(int typeSetTeacherComment) {

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

@@ -97,7 +97,7 @@
 
                 <TextView
                     android:id="@+id/tv_title"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="10dp"
                     android:layout_marginEnd="10dp"
@@ -109,10 +109,21 @@
                     android:textStyle="bold"
                     app:layout_constraintBottom_toTopOf="@+id/tv_course_name"
                     app:layout_constraintLeft_toRightOf="@+id/iv_avatar"
-                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintRight_toLeftOf="@+id/iv_go_chat"
                     app:layout_constraintTop_toTopOf="@+id/iv_avatar"
                     app:layout_constraintVertical_chainStyle="packed"
-                    tools:text="张豆豆张豆豆张豆豆张豆" />
+                    tools:text="张豆豆张豆豆张豆张张" />
+
+                <ImageView
+                    android:paddingStart="5dp"
+                    android:id="@+id/iv_go_chat"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="5dp"
+                    android:src="@drawable/icon_chat_small"
+                    app:layout_constraintBottom_toBottomOf="@+id/tv_title"
+                    app:layout_constraintLeft_toRightOf="@+id/tv_title"
+                    app:layout_constraintTop_toTopOf="@+id/tv_title" />
 
                 <TextView
                     android:id="@+id/tv_course_name"