Browse Source

修改跳转单聊使用imUserId字段

Pq 2 years ago
parent
commit
ae815c474c
19 changed files with 19 additions and 10 deletions
  1. 1 0
      student/src/main/java/com/cooleshow/student/bean/CourseTableDataBean.java
  2. 1 0
      student/src/main/java/com/cooleshow/student/bean/HomeworkDetailBean.java
  3. 1 0
      student/src/main/java/com/cooleshow/student/bean/HomeworkListBean.java
  4. 1 0
      student/src/main/java/com/cooleshow/student/bean/PracticeCourseListBean.java
  5. 1 0
      student/src/main/java/com/cooleshow/student/bean/SparringCourseHomeworkBean.java
  6. 1 1
      student/src/main/java/com/cooleshow/student/ui/course/MinePracticeCourseFragment.java
  7. 1 1
      student/src/main/java/com/cooleshow/student/ui/course/PracticeCourseDetailActivity.java
  8. 1 1
      student/src/main/java/com/cooleshow/student/ui/course/SparringCourseDetailActivity.java
  9. 1 1
      student/src/main/java/com/cooleshow/student/ui/main/CourseTableFragment.kt
  10. 1 1
      student/src/main/java/com/cooleshow/student/ui/work/HomeWorkDetailActivity.java
  11. 1 1
      student/src/main/java/com/cooleshow/student/ui/work/HomeWorkFragment.java
  12. 1 0
      teacher/src/main/java/com/cooleshow/teacher/bean/CourseTableDataBean.java
  13. 1 0
      teacher/src/main/java/com/cooleshow/teacher/bean/HomeworkListBean.java
  14. 1 0
      teacher/src/main/java/com/cooleshow/teacher/bean/SparringCourseHomeworkBean.java
  15. 1 0
      teacher/src/main/java/com/cooleshow/teacher/bean/SparringCourseListBean.java
  16. 1 1
      teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseDetailActivity.java
  17. 1 1
      teacher/src/main/java/com/cooleshow/teacher/ui/course/SparringCourseFragment.java
  18. 1 1
      teacher/src/main/java/com/cooleshow/teacher/ui/main/CourseTableFragment.kt
  19. 1 1
      teacher/src/main/java/com/cooleshow/teacher/ui/work/HomeWorkFragment.java

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

@@ -62,6 +62,7 @@ public class CourseTableDataBean {
         public String payCount;
         public String name;
         public String imGroupId;
+        public String imUserId;
         public int studentReplied;//0是未评价 1是已评价
         public int teacherReplied;//0是未评价 1是已评价
     }

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

@@ -67,6 +67,7 @@ public class HomeworkDetailBean {
     public String submitTime;
     public String teacherAvatar;
     public String teacherId;
+    public String imUserId;
     public String teacherName;
     public String teacherReplied;
     public String title;

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

@@ -48,5 +48,6 @@ public class HomeworkListBean {
         public String decorateTime;
         public int homeworkId;
         public String type;
+        public String imUserId;
     }
 }

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

@@ -48,6 +48,7 @@ public class PracticeCourseListBean {
         public int subjectId;
         public String subjectName;
         public String userId;//学生ID
+        public String imUserId;//学生IM ID
         public String userName;//学生名称
     }
 }

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

@@ -56,6 +56,7 @@ public class SparringCourseHomeworkBean {
     public Object submitTime;
     public String teacherAvatar;
     public String teacherId;
+    public String imUserId;
     public String teacherName;
     public String teacherReplied;
     public String title;

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

@@ -206,7 +206,7 @@ public class MinePracticeCourseFragment extends BaseMVPFragment<FragmentPractice
                 if (position < mAdapter.getData().size()) {
                     PracticeCourseListBean.RowsBean rowsBean = mAdapter.getData().get(position);
                     if (rowsBean != null) {
-                        OpenChatHelper.goChat(getContext(), rowsBean.userId, rowsBean.userName);
+                        OpenChatHelper.goChat(getContext(), rowsBean.imUserId, rowsBean.userName);
                     }
                 }
             }

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

@@ -106,7 +106,7 @@ public class PracticeCourseDetailActivity extends BaseMVPActivity<ActivityPracti
             case R.id.iv_go_chat:
                 //聊天
                 if (mInfoBean != null) {
-                    OpenChatHelper.goChat(PracticeCourseDetailActivity.this, mInfoBean.teacherId, mInfoBean.teacherName);
+                    OpenChatHelper.goChat(PracticeCourseDetailActivity.this, mInfoBean.imUserId, mInfoBean.teacherName);
                 }
                 break;
         }

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

@@ -314,7 +314,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         if (v.getId() == R.id.iv_go_chat) {
             //跳转聊天
             if (mInfoBean != null) {
-                OpenChatHelper.goChat(SparringCourseDetailActivity.this, mInfoBean.teacherId, mInfoBean.teacherName);
+                OpenChatHelper.goChat(SparringCourseDetailActivity.this, mInfoBean.imUserId, mInfoBean.teacherName);
             }
         }
 

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

@@ -156,7 +156,7 @@ class CourseTableFragment :
             if (view.id == R.id.iv_go_chat) {
                 if (TextUtils.equals(data.courseType, CourseTableListAdapter.OTHER_COURSE)) {
                     //陪练课
-                    OpenChatHelper.goChat(context, data.userId, data.name)
+                    OpenChatHelper.goChat(context, data.imUserId, data.name)
                 } else {
                     //琴房课或者直播课
                     OpenChatHelper.goGroupChat(context, data.imGroupId, data.name)

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

@@ -386,7 +386,7 @@ public class HomeWorkDetailActivity extends BaseMVPActivity<ActivityHomeworkDeta
             }
             if (TextUtils.equals(mInfoBean.courseType, CourseConstants.OTHER_COURSE)) {
                 //陪练课
-                OpenChatHelper.goChat(HomeWorkDetailActivity.this, mInfoBean.teacherId, mInfoBean.teacherName);
+                OpenChatHelper.goChat(HomeWorkDetailActivity.this, mInfoBean.imUserId, mInfoBean.teacherName);
             } else {
                 //琴房课或者直播课
                 OpenChatHelper.goGroupChat(HomeWorkDetailActivity.this, mInfoBean.imGroupId, "");

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

@@ -113,7 +113,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
                 if (view.getId() == R.id.iv_go_chat) {
                     if (TextUtils.equals(rowsBean.type, CourseConstants.OTHER_COURSE)) {
                         //陪练课
-                        OpenChatHelper.goChat(getContext(), rowsBean.teacherId, rowsBean.teacherName);
+                        OpenChatHelper.goChat(getContext(), rowsBean.imUserId, rowsBean.teacherName);
                     } else {
                         //琴房课或者直播课
                         OpenChatHelper.goGroupChat(getContext(), rowsBean.imGroupId, "");

+ 1 - 0
teacher/src/main/java/com/cooleshow/teacher/bean/CourseTableDataBean.java

@@ -63,5 +63,6 @@ public class CourseTableDataBean {
         public String imGroupId;
         public String name;
         public int teacherReplied;
+        public String imUserId;
     }
 }

+ 1 - 0
teacher/src/main/java/com/cooleshow/teacher/bean/HomeworkListBean.java

@@ -27,6 +27,7 @@ public class HomeworkListBean {
         public String startTime;
         public String endTime;
         public String studentId;
+        public String imUserId;
         public String imGroupId;
         public String courseId;
         public String backgroundPic;

+ 1 - 0
teacher/src/main/java/com/cooleshow/teacher/bean/SparringCourseHomeworkBean.java

@@ -42,6 +42,7 @@ public class SparringCourseHomeworkBean {
     public int studentNum;
     public int id;
     public String content;
+    public String imUserId;
 
     /**  {
         "endTime": "2022-07-01 23:59:00",

+ 1 - 0
teacher/src/main/java/com/cooleshow/teacher/bean/SparringCourseListBean.java

@@ -97,5 +97,6 @@ public class SparringCourseListBean {
         public String subjectName;
         public String userId;//学生ID
         public String userName;//学生名称
+        public String imUserId;//学生im id
     }
 }

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

@@ -323,7 +323,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
                 return;
             }
             if (mInfoBean != null) {
-                OpenChatHelper.goChat(SparringCourseDetailActivity.this, mInfoBean.studentId, mInfoBean.studentName);
+                OpenChatHelper.goChat(SparringCourseDetailActivity.this, mInfoBean.imUserId, mInfoBean.studentName);
             }
         }
     }

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

@@ -157,7 +157,7 @@ public class SparringCourseFragment extends BaseMVPFragment<FragmentSparringCour
             public void onItemChildClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
                 if (position < mAdapter.getData().size()) {
                     SparringCourseListBean.RowsBean rowsBean = mAdapter.getData().get(position);
-                    OpenChatHelper.goChat(getContext(), rowsBean.userId, rowsBean.userName);
+                    OpenChatHelper.goChat(getContext(), rowsBean.imUserId, rowsBean.userName);
                 }
             }
         });

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

@@ -119,7 +119,7 @@ class CourseTableFragment :
             if (view.id == R.id.iv_go_chat) {
                 if (TextUtils.equals(data.courseType, CourseTableListAdapter.OTHER_COURSE)) {
                     //陪练课
-                    OpenChatHelper.goChat(context, data.userId, data.name)
+                    OpenChatHelper.goChat(context, data.imUserId, data.name)
                 } else {
                     //琴房课或者直播课
                     OpenChatHelper.goGroupChat(context, data.imGroupId, data.name)

+ 1 - 1
teacher/src/main/java/com/cooleshow/teacher/ui/work/HomeWorkFragment.java

@@ -114,7 +114,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
                 HomeworkListBean.RowsBean rowsBean = homeworkAdapter.getData().get(position);
                 if (TextUtils.equals(rowsBean.type, CourseConstants.OTHER_COURSE)) {
                     //陪练课
-                    OpenChatHelper.goChat(getContext(), rowsBean.studentId, rowsBean.studentName);
+                    OpenChatHelper.goChat(getContext(), rowsBean.imUserId, rowsBean.studentName);
                 } else {
                     //琴房课或者直播课
                     OpenChatHelper.goGroupChat(getContext(), rowsBean.imGroupId, "");