Merge branch 'dev' of http://git.dayaedu.com/yonge/cooleshow_android into dev

BaseLibrary/src/main/java/com/cooleshow/base/ui/activity/set/EditAddressActivity.java

@@ -50,7 +50,7 @@ public class EditAddressActivity extends BaseMVPActivity<ActivityEditAddressBind
     private String province;//省
     private String city;//市
     private String region;//区
-    private boolean isDefaultAddress;
+    private boolean isDefaultAddress = true;
     private int id;
 
     @Override

BaseLibrary/src/main/res/layout/activity_edit_address.xml

@@ -210,7 +210,7 @@
             android:layout_marginRight="14dp"
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
-            android:src="@drawable/icon_switch_off"
+            android:src="@drawable/icon_switch_open"
             app:layout_constraintBottom_toBottomOf="@+id/tv_default_set"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="@+id/tv_default_set" />

student/src/main/java/com/cooleshow/student/adapter/HomeLiveCourseAdapter.java

@@ -1,11 +1,13 @@
 package com.cooleshow.student.adapter;
 
+import android.text.TextUtils;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.cooleshow.base.utils.GlideUtils;
+import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.HomeLiveAndVideoBean;
 import com.cooleshow.student.bean.HotAlbumBean;
@@ -28,17 +30,17 @@ public class HomeLiveCourseAdapter extends BaseQuickAdapter<HomeLiveAndVideoBean
     protected void convert(BaseViewHolder helper, HomeLiveAndVideoBean.CourseBean item) {
         ImageView im_pic = helper.getView(R.id.im_pic);
         GlideUtils.INSTANCE.loadImage(getContext(), item.backgroundPic, im_pic);
+        GlideUtils.INSTANCE.loadImage(getContext(), item.avatar, helper.getView(R.id.teacher_header),R.drawable.icon_student_default_head);
         TextView tv_title = helper.getView(R.id.tv_title);
         tv_title.setText(item.courseGroupName);
+        helper.setText(R.id.subject_name,item.subjectName);
         TextView tv_teacher_name = helper.getView(R.id.tv_teacher_name);
-        tv_teacher_name.setText("老师：" + item.teacherName);
+        tv_teacher_name.setText(item.teacherName);
         TextView tv_start_time = helper.getView(R.id.tv_start_time);
-        tv_start_time.setText("开课时间：" + item.courseStartTime);
+        tv_start_time.setText(TextUtils.isEmpty(item.courseStartTime) ? "" : TimeUtils.date2String(TimeUtils.string2Date(item.courseStartTime), "MM月dd日 HH:mm"));
         TextView tv_price = helper.getView(R.id.tv_price);
         tv_price.setText(item.courseGroupPrice + "");
         TextView tv_course_num = helper.getView(R.id.tv_course_num);
         tv_course_num.setText(item.courseNum + "课时");
-        TextView tv_buy_num = helper.getView(R.id.tv_buy_num);
-        tv_buy_num.setText(item.buyCount + "人已购买");
     }
 }

student/src/main/java/com/cooleshow/student/adapter/HomeTeacherStyleAdapter.java

@@ -1,16 +1,20 @@
 package com.cooleshow.student.adapter;
 
+import android.os.Build;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.cooleshow.base.utils.GlideUtils;
+import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.HomeStyleBean;
 
 import java.util.List;
 
+import io.rong.imkit.picture.tools.MediaUtils;
+
 /**
  * 创建日期：2022/5/27 16:13
  *
@@ -36,5 +40,14 @@ public class HomeTeacherStyleAdapter extends BaseQuickAdapter<HomeStyleBean.Rows
         tv_teacher_name.setText(item.username);
         tv_watch_count.setText(item.browse + "人观看");
 
+        if (item.liveing != null) {
+            helper.setVisible(R.id.liveing_text, true);
+            helper.setGone(R.id.video_length, true);
+        } else {
+            helper.setVisible(R.id.video_length, true);
+//            helper.setGone(R.id.liveing_text, true);
+//            long time = MediaUtils.extractDuration(getContext(), Build.VERSION.SDK_INT == Build.VERSION_CODES.Q, item.videoUrl);
+//            helper.setText(R.id.liveing_text,String.valueOf(time));
+        }
     }
 }

student/src/main/java/com/cooleshow/student/adapter/HomeVideoCourseAdapter.java

@@ -27,15 +27,15 @@ public class HomeVideoCourseAdapter extends BaseQuickAdapter<HomeLiveAndVideoBea
     protected void convert(BaseViewHolder helper, HomeLiveAndVideoBean.VideoCourseBean item) {
         ImageView im_pic = helper.getView(R.id.im_pic);
         GlideUtils.INSTANCE.loadImage(getContext(), item.lessonCoverUrl, im_pic);
+        GlideUtils.INSTANCE.loadImage(getContext(), item.avatar, helper.getView(R.id.teacher_header),R.drawable.icon_student_default_head);
+        helper.setText(R.id.subject_name,item.subjectName);
         TextView tv_title = helper.getView(R.id.tv_title);
         tv_title.setText(item.videoGroupName);
         TextView tv_teacher_name = helper.getView(R.id.tv_teacher_name);
-        tv_teacher_name.setText("老师：" + item.teacherName);
+        tv_teacher_name.setText(item.teacherName);
         TextView tv_price = helper.getView(R.id.tv_price);
         tv_price.setText(item.lessonPrice + "");
         TextView tv_course_num = helper.getView(R.id.tv_course_num);
         tv_course_num.setText(item.lessonCount + "课时");
-        TextView tv_buy_num = helper.getView(R.id.tv_buy_num);
-        tv_buy_num.setText(item.buyCount + "人已购买");
     }
 }

student/src/main/java/com/cooleshow/student/adapter/PianoRoomCourseListAdapter.java

@@ -9,6 +9,7 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.module.BaseLoadMoreModule;
 import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
+import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.PianoRoomCourseListBean;
 import com.cooleshow.student.constants.CourseConstants;
@@ -25,7 +26,7 @@ public class PianoRoomCourseListAdapter extends BaseQuickAdapter<PianoRoomCourse
     @Override
     protected void convert(@NonNull BaseViewHolder holder, PianoRoomCourseListBean.RowsBean data) {
         //时间
-        holder.setText(R.id.tv_time, data.startTime);
+        holder.setText(R.id.tv_time, UiUtils.getCourseTimeString(data.startTime,data.endTime));
         //title
         holder.setText(R.id.tv_title, data.courseGroupName);
         //subjectName

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

@@ -11,6 +11,7 @@ import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.SizeUtils;
+import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.PianoRoomCourseHomeworkBean;
@@ -100,7 +101,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
         }
         this.mInfoBean = infoBean;
         //时间
-        viewBinding.tvCourseTime.setText(infoBean.classDate);
+        viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime,infoBean.endTime));
         //title
         viewBinding.tvTitle.setText(infoBean.courseGroupName);
         //subjectName

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

@@ -17,6 +17,7 @@ import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.SizeUtils;
 
 import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.SparringCourseCommentBean;
@@ -111,7 +112,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         }
         this.mInfoBean = infoBean;
         //时间
-        viewBinding.tvCourseTime.setText(infoBean.classDate);
+        viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime,infoBean.endTime));
         //学生头像
         GlideUtils.INSTANCE.loadImage(this, infoBean.teacherAvatar, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);
         //title
@@ -125,18 +126,21 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
             viewBinding.tvCourseStatus.setText(getString(R.string.course_not_start_str));
             viewBinding.tvCourseStatus.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_ff802c));
             viewBinding.tvEnterRoom.setVisibility(View.GONE);
+            viewBinding.bottomView.setVisibility(View.GONE);
         }
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_ING, status)) {
             //课程进行中
             viewBinding.tvCourseStatus.setText(R.string.course_ing_str);
             viewBinding.tvCourseStatus.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_2dc7aa));
             viewBinding.tvEnterRoom.setVisibility(View.VISIBLE);
+            viewBinding.bottomView.setVisibility(View.VISIBLE);
         }
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_COMPLETE, status)) {
             //课程已结束
             viewBinding.tvCourseStatus.setText(R.string.course_is_completed);
             viewBinding.tvCourseStatus.setTextColor(getResources().getColor(com.cooleshow.base.R.color.color_999999));
             viewBinding.tvEnterRoom.setVisibility(View.GONE);
+            viewBinding.bottomView.setVisibility(View.GONE);
         }
         //课后作业
         handleHomeworkData(infoBean);

student/src/main/java/com/cooleshow/student/ui/main/HomeFragment.java

@@ -317,16 +317,13 @@ public class HomeFragment extends BaseMVPFragment<FragmentHomeLayoutBinding, Hom
         mViewBinding.rvTeacherStyle.setLayoutManager(gridLayoutManager);
         HomeTeacherStyleAdapter homeTeacherStyleAdapter = new HomeTeacherStyleAdapter(data.rows);
         mViewBinding.rvTeacherStyle.setAdapter(homeTeacherStyleAdapter);
-        homeTeacherStyleAdapter.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
-                HomeStyleBean.RowsBean item = (HomeStyleBean.RowsBean) adapter.getItem(position);
-                ARouter.getInstance()
-                        .build(RouterPath.WebCenter.ACTIVITY_HTML)
-                        .withString(WebConstants.WEB_URL, WebConstants.STUDENT_TEACHER_HOME + item.userId)
-                        .navigation();
+        homeTeacherStyleAdapter.setOnItemClickListener((adapter, view, position) -> {
+            HomeStyleBean.RowsBean item = (HomeStyleBean.RowsBean) adapter.getItem(position);
+            ARouter.getInstance()
+                    .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                    .withString(WebConstants.WEB_URL, WebConstants.STUDENT_TEACHER_HOME + item.userId)
+                    .navigation();
 
-            }
         });
 
     }

student/src/main/res/drawable/gray_5_radius_bg.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <corners android:radius="@dimen/dp_5"/>
+    <solid android:color="#99666666"/>
+</shape>

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

@@ -261,7 +261,7 @@
                     android:paddingTop="5dp"
                     android:paddingEnd="11dp"
                     android:paddingBottom="5dp"
-                    android:text="编辑"
+                    android:text="提交作业"
                     android:textColor="@color/color_2dc7aa"
                     android:textSize="@dimen/sp_14"
                     android:visibility="gone"
@@ -372,7 +372,7 @@
                         android:drawableLeft="@drawable/icon_homework_comment"
                         android:drawablePadding="8dp"
                         android:gravity="center_vertical"
-                        android:text="老师尚未点评作业"
+                        android:text="课程结束后上传视频会得到老师点评哦～"
                         android:textColor="@color/color_999999"
                         android:textSize="@dimen/sp_13" />
 

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

@@ -546,6 +546,11 @@
                         tools:text="每个音的指法比较熟练，但是遇到指法变换比较频繁的小节熟练度不足，建议平时可以选择指法变换较大的曲目多加练习！" />
                 </FrameLayout>
             </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <View
+                android:id="@+id/bottom_view"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/dp_100"/>
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 

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

@@ -21,6 +21,21 @@
         app:qmui_corner_radius="@dimen/dp_10" />
 
     <TextView
+        android:id="@+id/subject_name"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_13"
+        android:layout_marginLeft="@dimen/dp_8"
+        android:layout_marginTop="@dimen/dp_8"
+        android:background="@drawable/gray_1_radius_bg"
+        android:gravity="center"
+        android:paddingLeft="@dimen/dp_4"
+        android:paddingRight="@dimen/dp_4"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_9"
+        app:layout_constraintLeft_toLeftOf="@+id/im_pic"
+        app:layout_constraintTop_toTopOf="@+id/im_pic" />
+
+    <TextView
         android:id="@+id/tv_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -40,35 +55,52 @@
         android:id="@+id/tv_teacher_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_8"
-        android:layout_marginTop="@dimen/dp_3"
+        android:layout_marginLeft="@dimen/dp_4"
         android:textColor="@color/color_6a6a6a"
         android:textSize="@dimen/sp_12"
-        app:layout_constraintLeft_toRightOf="@+id/im_pic"
-        app:layout_constraintTop_toBottomOf="@+id/tv_title"
+        app:layout_constraintBottom_toBottomOf="@+id/teacher_header"
+        app:layout_constraintLeft_toRightOf="@+id/teacher_header"
+        app:layout_constraintTop_toTopOf="@+id/teacher_header"
         tools:text="老师：李云磊" />
 
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/teacher_header"
+        android:layout_width="@dimen/dp_18"
+        android:layout_height="@dimen/dp_18"
+        android:layout_marginTop="@dimen/dp_4"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_title"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title" />
+
+    <ImageView
+        android:id="@+id/start_img"
+        android:layout_width="@dimen/dp_18"
+        android:layout_height="@dimen/dp_18"
+        android:layout_marginTop="@dimen/dp_6"
+        android:src="@mipmap/start_icon"
+        app:layout_constraintLeft_toLeftOf="@+id/teacher_header"
+        app:layout_constraintTop_toBottomOf="@+id/teacher_header" />
+
     <TextView
         android:id="@+id/tv_start_time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_8"
-        android:layout_marginTop="@dimen/dp_3"
+        android:layout_marginLeft="@dimen/dp_4"
         android:textColor="@color/color_6a6a6a"
-        android:textSize="@dimen/sp_11"
-        app:layout_constraintLeft_toRightOf="@+id/im_pic"
-        app:layout_constraintTop_toBottomOf="@+id/tv_teacher_name"
-        tools:text="开课时间：2月28日 19:30" />
+        android:textSize="@dimen/sp_12"
+        app:layout_constraintBottom_toBottomOf="@+id/start_img"
+        app:layout_constraintLeft_toRightOf="@+id/start_img"
+        app:layout_constraintTop_toTopOf="@+id/start_img"
+        tools:text="2月28日 19:30" />
 
     <TextView
         android:id="@+id/tv_money_unit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_8"
-        android:layout_marginBottom="@dimen/dp_5"
         android:text="￥"
         android:textColor="@color/color_fa6400"
-        android:textSize="@dimen/sp_10"
+        android:textSize="@dimen/sp_12"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_price"
         app:layout_constraintBottom_toBottomOf="@+id/im_pic"
         app:layout_constraintLeft_toRightOf="@+id/im_pic" />
 
@@ -76,9 +108,8 @@
         android:id="@+id/tv_price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_5"
         android:textColor="@color/color_fa6400"
-        android:textSize="@dimen/sp_14"
+        android:textSize="@dimen/sp_16"
         app:layout_constraintBottom_toBottomOf="@+id/im_pic"
         app:layout_constraintLeft_toRightOf="@+id/tv_money_unit"
         tools:text="299" />
@@ -87,29 +118,12 @@
         android:id="@+id/tv_course_num"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="@drawable/shape_couse_type_text_bg"
-        android:paddingLeft="@dimen/dp_4"
-        android:paddingTop="@dimen/dp_2"
-        android:paddingRight="@dimen/dp_4"
-        android:layout_marginLeft="@dimen/dp_4"
-        android:paddingBottom="@dimen/dp_2"
-        android:textColor="@color/color_ff9300"
-        android:textSize="@dimen/sp_12"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_price"
-        app:layout_constraintLeft_toRightOf="@+id/tv_price"
-        app:layout_constraintTop_toTopOf="@+id/tv_price"
-        tools:text="12课时" />
-
-
-    <TextView
-        android:id="@+id/tv_buy_num"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/dp_10"
-        android:layout_marginBottom="@dimen/dp_16"
-        android:textColor="@color/color_ff802c"
-        android:textSize="@dimen/sp_12"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:textColor="@color/color_999999"
+        android:textSize="@dimen/sp_14"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        tools:text="6人已购买" />
+        tools:text="12课时" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/dp_164"
     android:layout_marginLeft="@dimen/dp_6"
-    android:layout_marginRight="@dimen/dp_6"
     android:layout_marginTop="@dimen/dp_6"
+    android:layout_marginRight="@dimen/dp_6"
     android:layout_marginBottom="@dimen/dp_6"
     android:background="@drawable/bg_white_10dp">
 
@@ -19,6 +20,38 @@
         app:riv_corner_radius_top_right="@dimen/dp_10" />
 
     <TextView
+        android:id="@+id/liveing_text"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawableLeft="@mipmap/liveing_icon"
+        android:drawablePadding="@dimen/dp_8"
+        android:text="直播中"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_14"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/im_pic"
+        app:layout_constraintLeft_toLeftOf="@+id/im_pic"
+        app:layout_constraintRight_toRightOf="@+id/im_pic"
+        app:layout_constraintTop_toTopOf="@+id/im_pic" />
+
+    <TextView
+        android:id="@+id/video_length"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_20"
+        android:layout_marginRight="@dimen/dp_7"
+        android:layout_marginBottom="@dimen/dp_7"
+        android:background="@drawable/gray_5_radius_bg"
+        android:drawableLeft="@mipmap/start_video_icon"
+        android:drawablePadding="@dimen/dp_3"
+        android:paddingLeft="@dimen/dp_6"
+        android:paddingRight="@dimen/dp_8"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_11"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/im_pic"
+        app:layout_constraintRight_toRightOf="@+id/im_pic" />
+
+    <TextView
         android:id="@+id/tv_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

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

@@ -21,6 +21,21 @@
         app:qmui_corner_radius="@dimen/dp_10" />
 
     <TextView
+        android:id="@+id/subject_name"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/dp_13"
+        android:layout_marginLeft="@dimen/dp_8"
+        android:layout_marginTop="@dimen/dp_8"
+        android:background="@drawable/gray_1_radius_bg"
+        android:gravity="center"
+        android:paddingLeft="@dimen/dp_4"
+        android:paddingRight="@dimen/dp_4"
+        android:textColor="@color/white"
+        android:textSize="@dimen/sp_9"
+        app:layout_constraintLeft_toLeftOf="@+id/im_pic"
+        app:layout_constraintTop_toTopOf="@+id/im_pic" />
+
+    <TextView
         android:id="@+id/tv_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -36,16 +51,24 @@
         app:layout_constraintTop_toTopOf="@+id/im_pic"
         tools:text="竖笛基础入门练习" />
 
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:id="@+id/teacher_header"
+        android:layout_width="@dimen/dp_18"
+        android:layout_height="@dimen/dp_18"
+        android:layout_marginTop="@dimen/dp_4"
+        app:layout_constraintLeft_toLeftOf="@+id/tv_title"
+        app:layout_constraintTop_toBottomOf="@+id/tv_title" />
+
     <TextView
         android:id="@+id/tv_teacher_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_8"
-        android:layout_marginTop="@dimen/dp_3"
+        android:layout_marginLeft="@dimen/dp_4"
         android:textColor="@color/color_6a6a6a"
         android:textSize="@dimen/sp_12"
-        app:layout_constraintLeft_toRightOf="@+id/im_pic"
-        app:layout_constraintTop_toBottomOf="@+id/tv_title"
+        app:layout_constraintBottom_toBottomOf="@+id/teacher_header"
+        app:layout_constraintLeft_toRightOf="@+id/teacher_header"
+        app:layout_constraintTop_toTopOf="@+id/teacher_header"
         tools:text="老师：李云磊" />
 
     <TextView
@@ -53,51 +76,34 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/dp_8"
-        android:layout_marginBottom="@dimen/dp_5"
         android:text="￥"
         android:textColor="@color/color_fa6400"
-        android:textSize="@dimen/sp_10"
-        app:layout_constraintBottom_toBottomOf="@+id/im_pic"
+        android:textSize="@dimen/sp_12"
+        app:layout_constraintBaseline_toBaselineOf="@+id/tv_price"
+        app:layout_constraintBottom_toBottomOf="@+id/tv_price"
         app:layout_constraintLeft_toRightOf="@+id/im_pic" />
 
     <TextView
         android:id="@+id/tv_price"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/dp_5"
+        android:layout_marginTop="@dimen/dp_5"
         android:textColor="@color/color_fa6400"
-        android:textSize="@dimen/sp_14"
-        app:layout_constraintBottom_toBottomOf="@+id/im_pic"
+        android:textSize="@dimen/sp_16"
         app:layout_constraintLeft_toRightOf="@+id/tv_money_unit"
+        app:layout_constraintBottom_toBottomOf="@+id/im_pic"
         tools:text="299" />
 
     <TextView
         android:id="@+id/tv_course_num"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_4"
-        android:background="@drawable/shape_couse_type_text_bg"
-        android:paddingLeft="@dimen/dp_4"
-        android:paddingTop="@dimen/dp_2"
-        android:paddingRight="@dimen/dp_4"
-        android:paddingBottom="@dimen/dp_2"
-        android:textColor="@color/color_ff9300"
-        android:textSize="@dimen/sp_12"
-        app:layout_constraintBottom_toBottomOf="@+id/tv_price"
-        app:layout_constraintLeft_toRightOf="@+id/tv_price"
-        app:layout_constraintTop_toTopOf="@+id/tv_price"
-        tools:text="12课时" />
-
-
-    <TextView
-        android:id="@+id/tv_buy_num"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/dp_10"
-        android:layout_marginBottom="@dimen/dp_16"
-        android:textColor="@color/color_ff802c"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:textColor="@color/color_999999"
         android:textSize="@dimen/sp_12"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintRight_toRightOf="parent"
-        tools:text="6人已购买" />
+        tools:text="12课时" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

teacher/src/main/AndroidManifest.xml

@@ -266,7 +266,7 @@
         </activity>
         <activity
             android:name=".ui.work.AssignHomeworkActivity"
-            android:configChanges="orientation|screenSize|keyboardHidden"
+            android:configChanges="orientation|screenSize"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.mine.NetworkMonitoringActivity"

teacher/src/main/java/com/cooleshow/teacher/adapter/ReceivedCommentListAdapter.java

@@ -9,6 +9,9 @@ import com.chad.library.adapter.base.module.BaseLoadMoreModule;
 import com.chad.library.adapter.base.module.LoadMoreModule;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.cooleshow.base.utils.GlideUtils;
+import com.cooleshow.base.utils.TimeUtils;
+import com.cooleshow.base.utils.UiMessageUtils;
+import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.ReceivedCommentListBean;
 
@@ -33,7 +36,7 @@ public class ReceivedCommentListAdapter extends BaseQuickAdapter<ReceivedComment
         //声部名称
         holder.setText(R.id.tv_course_name, bean.subjectName);
         //时间
-        holder.setText(R.id.tv_time, bean.startTime);
+        holder.setText(R.id.tv_time, UiUtils.getCourseTimeString(bean.startTime,bean.endTime));
         //评价内容
         holder.setText(R.id.tv_comment_content, bean.studentReplied);
         //评分

teacher/src/main/java/com/cooleshow/teacher/constants/CourseConstants.java

@@ -22,6 +22,10 @@ public class CourseConstants {
     public static final int COURSE_HOMEWORK_STU_SUBMIT = 1;//学员已提交课后作业
     public static final int COURSE_HOMEWORK_STU_NO_SUBMIT = 0;//学员未提交课后作业
 
+    public static final int COURSE_HOMEWORK_OVERDUE = 1;//作业过期
+    public static final int COURSE_HOMEWORK_NOT_OVERDUE = 0;//作业过期
+
+
     public static final String LIVE_COURSE = "LIVE";//直播课PRACTICE
     public static final String OTHER_COURSE = "PRACTICE";//陪练课
     public static final String PIANO_ROOM_COURSE = "PIANO_ROOM_CLASS";//琴房课

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

@@ -143,20 +143,25 @@ public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomewo
             viewBinding.tvSetHomework.setVisibility(View.VISIBLE);
         }
         //tv_homework_video_empty_text
-        if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT) {
+        if (bean.submitHomework == CourseConstants.COURSE_HOMEWORK_STU_SUBMIT && bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_NOT_OVERDUE) {
             //学员已提交课后作业
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.GONE);
             viewBinding.llHomeworkVideoContent.removeAllViews();
             viewBinding.homeWordVideoView.setVisibility(View.VISIBLE);
             addVideoThumbnailView(bean.studentAttachments);
         } else {
-            //学员未提交课后作业
+            //学员未提交课后作业 || 作业过期
             if (bean.decorateHomework == CourseConstants.COURSE_HOMEWORK_SET) {
                 viewBinding.homeWordVideoView.setVisibility(View.VISIBLE);
             } else {
                 viewBinding.homeWordVideoView.setVisibility(View.GONE);
             }
             viewBinding.tvHomeworkVideoEmptyText.setVisibility(View.VISIBLE);
+            if(bean.homeworkExpire == CourseConstants.COURSE_HOMEWORK_OVERDUE){
+                viewBinding.tvHomeworkVideoEmptyText.setText("作业已过期无法查看");
+            }else {
+                viewBinding.tvHomeworkVideoEmptyText.setText("学员尚未上传作业视频");
+            }
         }
         //作业点评
         if (!TextUtils.isEmpty(bean.teacherReplied)) {