Pq vor 3 Jahren
Ursprung
Commit
848b620a9f

+ 1 - 0
student/src/main/res/layout/activity_modify_phonenum.xml

@@ -27,6 +27,7 @@
             android:hint="请输手机号"
             android:inputType="phone"
             android:paddingLeft="14dp"
+            android:maxLength="11"
             android:paddingRight="14dp"
             android:textColor="@color/color_1a1a1a"
             android:textColorHint="@color/color_999999"

+ 8 - 5
teacher/src/main/java/com/cooleshow/teacher/adapter/HomeworkAdapter.java

@@ -36,25 +36,28 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
 
     public HomeworkAdapter(List<HomeworkListBean.RowsBean> data) {
         super(R.layout.layout_item_homework, data);
+        addChildClickViewIds(R.id.iv_go_chat);
     }
 
 
     @Override
     protected void convert(BaseViewHolder helper, HomeworkListBean.RowsBean item) {
-        if(item == null){
+        if (item == null) {
             return;
         }
         TextView tv_state = helper.getView(R.id.tv_state);
         ImageView im_header = helper.getView(R.id.im_header);
         TextView tv_name = helper.getView(R.id.tv_name);
         RecyclerView rv_mark = helper.getView(R.id.rv_mark);
-        if(TextUtils.equals(item.type, CourseConstants.PIANO_ROOM_COURSE)){
+        if (TextUtils.equals(item.type, CourseConstants.PIANO_ROOM_COURSE)) {
             im_header.setImageResource(R.drawable.icon_piano_room_course);
-        }else {
+            String tvname = item.classNum > 0 ? "第" + item.classNum + "课" : "";
+            tv_name.setText(item.courseGroupName + tvname);
+        } else {
             GlideUtils.INSTANCE.loadImage(getContext(), item.studentAvatar, im_header, R.drawable.icon_teacher_default_head);
+            tv_name.setText(item.courseGroupName);
         }
-        String tvname = item.classNum > 0 ? "第" + item.classNum + "课" : "";
-        tv_name.setText(item.courseGroupName + tvname);
+
         if (TextUtils.equals(mDecorate, "YES")) {
             tv_state.setVisibility(View.VISIBLE);
             if (TextUtils.equals(item.homeworkStatus, "NOTCOMMIT")) {

+ 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 imGroupId;
         public String courseId;
         public String backgroundPic;
         public String subjectName;

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

@@ -99,7 +99,7 @@ public class PianoRoomCourseHomeWorkActivity extends BaseMVPActivity<ActivityPia
             return;
         }
         //学生头像
-        GlideUtils.INSTANCE.loadImage(this, infoBean.studentAvatar, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
+        viewBinding.ivAvatar.setImageResource(R.drawable.icon_piano_room_course);
         //title
         viewBinding.tvTitle.setText(UserHelper.getStudentName(infoBean.studentName, studentId));
         //subjectName

+ 4 - 5
teacher/src/main/java/com/cooleshow/teacher/ui/work/AssignHomeworkActivity.java

@@ -29,7 +29,7 @@ import com.cooleshow.usercenter.helper.UserHelper;
  * 创建日期:2022/5/31 15:26
  *
  * @author Ryan
- * 类说明:布置作业
+ * 类说明:老师端陪练课布置作业
  */
 @Route(path = RouterPath.WorkCenter.TEACHER_WORK_ASSIGN_HOMEWORK)
 public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomeworkBinding, AssignHomeworkPresenter> implements AssignHomeworkContract.AssignHomeworkView {
@@ -99,12 +99,11 @@ public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomewo
             return;
         }
         //subjectName
+        GlideUtils.INSTANCE.loadImage(this, bean.studentAvatar, viewBinding.imHeader, R.drawable.icon_teacher_default_head);
         viewBinding.tvCourseName.setText(bean.subjectName);
-        viewBinding.tvName.setText(bean.studentName);
-        String tvname = bean.classNum > 0 ? "第" + bean.classNum + "课" : "";
-        viewBinding.tvName.setText(bean.courseGroupName + tvname);
+        viewBinding.tvName.setText(bean.courseGroupName);
 
-        viewBinding.tvDate.setText(UiUtils.getCourseTimeString(bean.startTime,bean.endTime));
+        viewBinding.tvDate.setText(UiUtils.getCourseTimeString(bean.startTime, bean.endTime));
 
         String status = bean.courseStatus;
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_NOT_START, status)) {

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

@@ -9,12 +9,14 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import io.rong.imkit.utils.helper.OpenChatHelper;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.bigkoo.pickerview.builder.TimePickerBuilder;
 import com.bigkoo.pickerview.listener.CustomListener;
 import com.bigkoo.pickerview.view.TimePickerView;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.listener.OnItemChildClickListener;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.constanst.Constants;
@@ -109,6 +111,23 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
                         .navigation();
             }
         });
+
+        homeworkAdapter.setOnItemChildClickListener(new OnItemChildClickListener() {
+            @Override
+            public void onItemChildClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
+                if (position >= homeworkAdapter.getData().size()) {
+                    return;
+                }
+                HomeworkListBean.RowsBean rowsBean = homeworkAdapter.getData().get(position);
+                if (TextUtils.equals(rowsBean.type, CourseConstants.OTHER_COURSE)) {
+                    //陪练课
+                    OpenChatHelper.goChat(getContext(), rowsBean.studentId, rowsBean.studentName);
+                } else {
+                    //琴房课或者直播课
+                    OpenChatHelper.goGroupChat(getContext(), rowsBean.imGroupId, "");
+                }
+            }
+        });
     }
 
     @Override

+ 0 - 1
teacher/src/main/res/layout/activity_assign_homework.xml

@@ -72,7 +72,6 @@
             android:layout_marginLeft="11dp"
             android:layout_marginTop="17dp"
             android:layout_marginBottom="20dp"
-            android:src="@drawable/icon_piano_room_course"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/view_line"

+ 1 - 0
teacher/src/main/res/layout/activity_piano_course_homework_layout.xml

@@ -38,6 +38,7 @@
                     android:layout_height="51dp"
                     android:layout_marginStart="11dp"
                     android:layout_marginTop="20dp"
+                    android:src="@drawable/icon_piano_room_course"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toTopOf="parent"

+ 1 - 0
teacher/src/main/res/layout/layout_item_homework.xml

@@ -79,6 +79,7 @@
             app:layout_constraintTop_toTopOf="@+id/im_header" />
 
         <ImageView
+            android:id="@+id/iv_go_chat"
             android:layout_width="@dimen/dp_19"
             android:layout_height="@dimen/dp_18"
             android:layout_marginLeft="5dp"