bug 修改

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

@@ -174,6 +174,7 @@ public class UiUtils {
 
     /**
      * 保留2位小数
+     *
      * @param targetValue
      * @return
      */
@@ -182,4 +183,18 @@ public class UiUtils {
         double result = bd.setScale(2, BigDecimal.ROUND_DOWN).doubleValue(); // 保留两位小数，不四舍五入(可选舍入模式)
         return String.valueOf(result);
     }
+
+    public static String getCourseTimeString(String start, String end) {
+        String time = "";
+        String startTime = TimeUtils.date2String(TimeUtils.getDate(start), "yyyy-MM-dd");
+        String endTime = TimeUtils.date2String(TimeUtils.getDate(end), "yyyy-MM-dd");
+        String startTimeText = TimeUtils.date2String(TimeUtils.getDate(start), "HH:mm");
+        String endTimeText = TimeUtils.date2String(TimeUtils.getDate(end), "HH:mm");
+        if (TextUtils.equals(startTime, endTime)) {
+            time = startTime + " " + startTimeText + "-" + endTimeText;
+        } else {
+            time = startTime + " " + startTimeText + "-" + endTime + " " + endTimeText;
+        }
+        return time;
+    }
 }

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

@@ -12,6 +12,7 @@ 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.UiUtils;
 import com.cooleshow.student.R;
 import com.cooleshow.student.bean.LiveCourseListBean;
 import com.cooleshow.student.constants.CourseConstants;
@@ -33,15 +34,7 @@ public class LiveCourseListAdapter extends BaseQuickAdapter<LiveCourseListBean.R
             return;
         }
         //时间
-        String endTime = TimeUtils.date2String(TimeUtils.getDate(data.endTime), "yyyy-MM-dd");
-        String startTime = TimeUtils.date2String(TimeUtils.getDate(data.startTime), "yyyy-MM-dd");
-        String startTimeText = TimeUtils.date2String(TimeUtils.getDate(data.startTime), "HH:mm");
-        String endTimeText = TimeUtils.date2String(TimeUtils.getDate(data.endTime), "HH:mm");
-        if (TextUtils.equals(endTime, startTime)) {
-            holder.setText(R.id.tv_time, startTime + " " + startTimeText + "-" + endTimeText);
-        } else {
-            holder.setText(R.id.tv_time, startTime + " " + startTimeText + "-" + endTime + " " + endTimeText);
-        }
+        holder.setText(R.id.tv_time, UiUtils.getCourseTimeString(data.startTime,data.endTime));
 
         //title
         holder.setText(R.id.tv_title, data.name);

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

@@ -22,6 +22,7 @@ import com.cooleshow.base.utils.ActivityUtils;
 import com.cooleshow.base.utils.FileUtils;
 import com.cooleshow.base.utils.GlideUtils;
 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.adapter.ItemMarkAdapter;
@@ -153,15 +154,8 @@ public class PracticeCourseDetailActivity extends BaseMVPActivity<ActivityPracti
             return;
         }
         mInfoBean = infoBean;
-        String startTime = TimeUtils.date2String(TimeUtils.getDate(infoBean.startTime), "yyyy-MM-dd");
-        String endTime = TimeUtils.date2String(TimeUtils.getDate(infoBean.endTime), "yyyy-MM-dd");
-        if (TextUtils.equals(startTime, endTime)) {
-            String startTimeText = TimeUtils.date2String(TimeUtils.getDate(infoBean.startTime), "HH:mm");
-            String endTimeText = TimeUtils.date2String(TimeUtils.getDate(infoBean.endTime), "HH:mm");
-            viewBinding.tvCourseTime.setText(startTime + " " + startTimeText + "-" + endTimeText);
-        } else {
-            viewBinding.tvCourseTime.setText(infoBean.startTime + "-" + infoBean.endTime);
-        }
+        viewBinding.tvCourseTime.setText(UiUtils.getCourseTimeString(infoBean.startTime,infoBean.endTime));
+
         //时间
         //老师头像
         GlideUtils.INSTANCE.loadImage(this, infoBean.teacherAvatar, viewBinding.ivAvatar, R.drawable.icon_teacher_default_head);

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

@@ -70,7 +70,7 @@
         android:layout_height="11dp"
         android:layout_marginStart="8dp"
         android:background="@color/color_d3d3d3"
-        android:visibility="visible"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@+id/tv_course_name"
         app:layout_constraintLeft_toRightOf="@+id/tv_course_name"
         app:layout_constraintTop_toTopOf="@+id/tv_course_name" />

teacher/src/main/AndroidManifest.xml

@@ -78,6 +78,7 @@
         <activity
             android:name=".ui.web.HtmlActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
+            android:windowSoftInputMode="adjustResize"
             android:screenOrientation="portrait" />
         <activity
             android:name=".ui.web.HtmlHorizontalScreenActivity"

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

@@ -15,6 +15,7 @@ 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.UiUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.HomeworkListBean;
 import com.cooleshow.teacher.bean.MusicSheetListBean;
@@ -44,7 +45,7 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
         TextView tv_name = helper.getView(R.id.tv_name);
         RecyclerView rv_mark = helper.getView(R.id.rv_mark);
         GlideUtils.INSTANCE.loadImage(getContext(), item.studentAvatar, im_header, R.drawable.icon_teacher_default_head);
-        tv_name.setText(item.studentName);
+        tv_name.setText(item.courseGroupName);
         if (TextUtils.equals(mDecorate, "YES")) {
             tv_state.setVisibility(View.VISIBLE);
             if (TextUtils.equals(item.homeworkStatus, "NOTCOMMIT")) {
@@ -80,15 +81,8 @@ public class HomeworkAdapter extends BaseQuickAdapter<HomeworkListBean.RowsBean,
             rv_mark.setVisibility(View.GONE);
         }
 
-        String endTime = TimeUtils.date2String(TimeUtils.getDate(item.endTime), "yyyy-MM-dd");
-        String startTime = TimeUtils.date2String(TimeUtils.getDate(item.startTime), "yyyy-MM-dd");
-        String startTimeText = TimeUtils.date2String(TimeUtils.getDate(item.startTime), "HH:mm");
-        String endTimeText = TimeUtils.date2String(TimeUtils.getDate(item.endTime), "HH:mm");
-        if (TextUtils.equals(endTime, startTime)) {
-            helper.setText(R.id.tv_date, startTime + " " + startTimeText + "-" + endTimeText);
-        } else {
-            helper.setText(R.id.tv_date, startTime + " " + startTimeText + "-" + endTime + " " + endTimeText);
-        }
+        helper.setText(R.id.tv_date, UiUtils.getCourseTimeString(item.startTime,item.endTime));
+
     }
 
     @NonNull

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

@@ -9,6 +9,7 @@ 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.UiUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.LiveCourseListBean;
 import com.cooleshow.teacher.constants.CourseConstants;
@@ -20,14 +21,14 @@ import androidx.annotation.NonNull;
  */
 public class LiveCourseListAdapter extends BaseQuickAdapter<LiveCourseListBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
-    public LiveCourseListAdapter(int layoutResId) {
-        super(layoutResId);
+    public LiveCourseListAdapter() {
+        super(R.layout.item_live_course_list_layout);
     }
 
     @Override
     protected void convert(@NonNull BaseViewHolder holder, LiveCourseListBean.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

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

@@ -12,6 +12,7 @@ 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.TimeUtils;
+import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.MusicSheetListBean;
 import com.cooleshow.teacher.bean.UserAccountBean;
@@ -69,15 +70,8 @@ public class MineIncomeAdapter extends BaseQuickAdapter<UserAccountBean.RowsBean
         tv_price.setText(item.transAmount + "");
         tv_date.setText(item.endTime);
 
-        String startTime = TimeUtils.date2String(TimeUtils.getDate(item.startTime), "yyyy-MM-dd");
-        String endTime = TimeUtils.date2String(TimeUtils.getDate(item.endTime), "yyyy-MM-dd");
-        String startTimeText = TimeUtils.date2String(TimeUtils.getDate(item.startTime), "HH:mm");
-        String endTimeText = TimeUtils.date2String(TimeUtils.getDate(item.endTime), "HH:mm");
-        if (TextUtils.equals(startTime, endTime)) {
-            tv_date.setText(startTime + " " + startTimeText + "-" + endTimeText);
-        } else {
-            tv_date.setText(startTime + " " + startTimeText + "-" + endTime + " " + endTimeText);
-        }
+        tv_date.setText(UiUtils.getCourseTimeString(item.startTime,item.endTime));
+
     }
 
     @NonNull

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

@@ -9,6 +9,7 @@ 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.UiUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.PianoRoomCourseListBean;
 import com.cooleshow.teacher.bean.SparringCourseListBean;
@@ -21,18 +22,22 @@ import androidx.annotation.NonNull;
  */
 public class PianoRoomCourseListAdapter extends BaseQuickAdapter<PianoRoomCourseListBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
-    public PianoRoomCourseListAdapter(int layoutResId) {
-        super(layoutResId);
+    public PianoRoomCourseListAdapter() {
+        super(R.layout.item_piano_room_course_list_layout);
     }
 
     @Override
     protected void convert(@NonNull BaseViewHolder holder, PianoRoomCourseListBean.RowsBean data) {
+        if (data == null) {
+            return;
+        }
         //时间
-        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.groupName);
         //subjectName
         holder.setText(R.id.tv_course_name, data.subjectName);
+        holder.setText(R.id.tv_buy_num, data.studentCount + "人参与");
         TextView tv_course_status = holder.getView(R.id.tv_course_status);
 
         if (TextUtils.equals(CourseConstants.COURSE_STATUS_NOT_START, data.status)) {

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

@@ -9,6 +9,7 @@ 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.UiUtils;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.SparringCourseListBean;
 import com.cooleshow.teacher.constants.CourseConstants;
@@ -26,8 +27,11 @@ public class SparringCourseListAdapter extends BaseQuickAdapter<SparringCourseLi
 
     @Override
     protected void convert(@NonNull BaseViewHolder holder, SparringCourseListBean.RowsBean data) {
+        if(data == null){
+            return;
+        }
         //时间
-        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.userName);
         //subjectName

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

@@ -17,8 +17,8 @@ import androidx.annotation.NonNull;
  */
 public class VideoCourseListAdapter extends BaseQuickAdapter<VideoCourseListBean.RowsBean, BaseViewHolder> implements LoadMoreModule {
 
-    public VideoCourseListAdapter(int layoutResId) {
-        super(layoutResId);
+    public VideoCourseListAdapter() {
+        super(R.layout.item_video_course_list_layout);
     }
 
     @Override

teacher/src/main/java/com/cooleshow/teacher/api/APIService.java

@@ -45,6 +45,7 @@ import com.cooleshow.teacher.bean.WithdrawalInfoBean;
 import com.cooleshow.teacher.bean.WithdrawalRecordBean;
 import com.cooleshow.teacher.bean.request.QueryGroupListEntry;
 import com.cooleshow.teacher.bean.request.SheetMusicEntry;
+import com.cooleshow.teacher.bean.request.SysSuggestionEntry;
 import com.cooleshow.teacher.bean.request.UnBindCardEntry;
 import com.cooleshow.usercenter.bean.SetDetailBean;
 import com.cooleshow.usercenter.bean.UserInfo;
@@ -438,7 +439,7 @@ public interface APIService {
      * @return
      */
     @POST(TEACHER_GROUP + "sysSuggestion/add")
-    Observable<BaseResponse<Object>> addSuggestion(@Body RequestBody body);
+    Observable<BaseResponse<Object>> addSuggestion(@Body SysSuggestionEntry body);
 
     /**
      * 银行卡查询

teacher/src/main/java/com/cooleshow/teacher/bean/request/SysSuggestionEntry.java

@@ -0,0 +1,12 @@
+package com.cooleshow.teacher.bean.request;
+
+/**
+ * @author dengqw
+ * @time 2022/7/1 22:28
+ * @describe：意见反馈entry
+ **/
+public class SysSuggestionEntry {
+    public String clientType = "Android";
+    public String type = "APP";
+    public String content = "APP";
+}

teacher/src/main/java/com/cooleshow/teacher/presenter/mine/FeedBackPresenter.java

@@ -7,6 +7,7 @@ import com.cooleshow.base.utils.RequestBodyUtil;
 import com.cooleshow.base.utils.ToastUtils;
 import com.cooleshow.base.utils.ErrorParse;
 import com.cooleshow.teacher.api.APIService;
+import com.cooleshow.teacher.bean.request.SysSuggestionEntry;
 import com.cooleshow.teacher.contract.FeedBackContract;
 
 /**
@@ -18,7 +19,9 @@ import com.cooleshow.teacher.contract.FeedBackContract;
 public class FeedBackPresenter extends BasePresenter<FeedBackContract.FeedBackView> implements FeedBackContract.Presenter {
     public void addSuggestion(String jsonStr) {
         getView().showLoading();
-        addSubscribe(create(APIService.class).addSuggestion(RequestBodyUtil.convertToRequestBodyJson(jsonStr)), new BaseObserver<Object>(getView()) {
+        SysSuggestionEntry entry = new SysSuggestionEntry();
+        entry.content = jsonStr;
+        addSubscribe(create(APIService.class).addSuggestion(entry), new BaseObserver<Object>(getView()) {
             @Override
             protected void onSuccess(Object data) {
                 if (getView() != null) {

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

@@ -129,7 +129,7 @@ public class LiveCourseFragment extends BaseMVPFragment<FragmentLiveCourseLayout
             }
         });
 
-        mAdapter = new LiveCourseListAdapter(R.layout.item_live_course_list_layout);
+        mAdapter = new LiveCourseListAdapter();
 //        mAdapter.getLoadMoreModule().setEnableLoadMoreIfNotFullPage(false);
         mAdapter.getLoadMoreModule().setOnLoadMoreListener(new OnLoadMoreListener() {
             @Override

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

@@ -99,15 +99,12 @@ public class MineVideoCourseFragment extends BaseMVPFragment<FragmentMineVideoCo
         mineVideoCourseAdapter.setEmptyView(emptyLayout);
         rvAddress.setAdapter(mineVideoCourseAdapter);
         mViewBinding.tvOpen.setOnClickListener(this);
-        mineVideoCourseAdapter.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(@NonNull BaseQuickAdapter<?, ?> adapter, @NonNull View view, int position) {
-                VideoCourseListBean.RowsBean item = (VideoCourseListBean.RowsBean) adapter.getItem(position);
-                ARouter.getInstance()
-                        .build(RouterPath.WebCenter.ACTIVITY_HTML)
-                        .withString(WebConstants.WEB_URL, WebConstants.TEACHER_VIDEO_DETAIL + "?groupId=" + item.id)
-                        .navigation();
-            }
+        mineVideoCourseAdapter.setOnItemClickListener((adapter, view, position) -> {
+            VideoCourseListBean.RowsBean item = (VideoCourseListBean.RowsBean) adapter.getItem(position);
+            ARouter.getInstance()
+                    .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                    .withString(WebConstants.WEB_URL, WebConstants.TEACHER_VIDEO_DETAIL + "?groupId=" + item.id)
+                    .navigation();
         });
     }
 
@@ -115,23 +112,17 @@ public class MineVideoCourseFragment extends BaseMVPFragment<FragmentMineVideoCo
 
     @Override
     protected void initData() {
-        mViewBinding.refreshLayout.setOnRefreshListener(new OnRefreshListener() {
-            @Override
-            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-                currentPage = 1;
-                queryCourse(true);
-            }
+        mViewBinding.refreshLayout.setOnRefreshListener(refreshLayout -> {
+            currentPage = 1;
+            queryCourse(true);
         });
-        mineVideoCourseAdapter.getLoadMoreModule().setOnLoadMoreListener(new OnLoadMoreListener() {
-            @Override
-            public void onLoadMore() {
-                //上拉加载
-                if (hasNext) {
-                    currentPage++;
-                    queryCourse(false);
-                } else {
-                    mineVideoCourseAdapter.getLoadMoreModule().loadMoreEnd();
-                }
+        mineVideoCourseAdapter.getLoadMoreModule().setOnLoadMoreListener(() -> {
+            //上拉加载
+            if (hasNext) {
+                currentPage++;
+                queryCourse(false);
+            } else {
+                mineVideoCourseAdapter.getLoadMoreModule().loadMoreEnd();
             }
         });
         currentPage = 1;

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

@@ -132,7 +132,7 @@ public class PianoRoomCourseFragment extends BaseMVPFragment<FragmentPianoRoomCo
             queryCourse(true);
         });
 
-        mAdapter = new PianoRoomCourseListAdapter(R.layout.item_piano_room_course_list_layout);
+        mAdapter = new PianoRoomCourseListAdapter();
         mAdapter.getLoadMoreModule().setOnLoadMoreListener(() -> {
             //上拉加载
             if (hasNext) {

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

@@ -11,6 +11,7 @@ import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.TimeUtils;
 import com.cooleshow.base.utils.ToastUtil;
+import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.widgets.VideoThumbnailView;
 import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.bean.SparringCourseCommentBean;
@@ -31,9 +32,6 @@ import androidx.annotation.NonNull;
  */
 @Route(path = RouterPath.CourseCenter.SPARRING_COURSE_DETAIL)
 public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparringCourseDetailLayoutBinding, SparringCourseDetailPresenter> implements SparringCourseDetailContract.SparringCourseDetailView, View.OnClickListener {
-    public static final String COURSE_ID = "course_id";
-    public static final String COURSE_GROUP_ID = "course_group_id";
-    public static final String STUDENT_ID = "studentId";
     private String mCourseId;
     private String mCourseGroupId;
     private String studentId;
@@ -49,9 +47,9 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
     @Override
     protected void initView() {
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "课程详情");
-        mCourseId = getIntent().getStringExtra(COURSE_ID);
-        mCourseGroupId = getIntent().getStringExtra(COURSE_GROUP_ID);
-        studentId = getIntent().getStringExtra(STUDENT_ID);
+        mCourseId = getIntent().getStringExtra(CourseConstants.COURSE_ID);
+        mCourseGroupId = getIntent().getStringExtra(CourseConstants.COURSE_GROUP_ID);
+        studentId = getIntent().getStringExtra(CourseConstants.STUDENT_ID);
         if (TextUtils.isEmpty(mCourseId)
                 || TextUtils.isEmpty(mCourseGroupId)
                 || TextUtils.isEmpty(studentId)) {
@@ -102,16 +100,7 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
         viewBinding.tvTitle.setText(UserHelper.getStudentName(infoBean.studentName, studentId));
         //subjectName
         viewBinding.tvCourseName.setText(infoBean.subjectName);
-
-        String startTime = TimeUtils.date2String(TimeUtils.getDate(infoBean.startTime), "yyyy-MM-dd");
-        String endTime = TimeUtils.date2String(TimeUtils.getDate(infoBean.endTime), "yyyy-MM-dd");
-        if (TextUtils.equals(startTime, endTime)) {
-            String startTimeText = TimeUtils.date2String(TimeUtils.getDate(infoBean.startTime), "HH:mm");
-            String endTimeText = TimeUtils.date2String(TimeUtils.getDate(infoBean.endTime), "HH:mm");
-            viewBinding.tvCourseTime.setText(startTime + " " + startTimeText + "-" + endTimeText);
-        } else {
-            viewBinding.tvCourseTime.setText(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)) {

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

@@ -142,9 +142,9 @@ public class SparringCourseFragment extends BaseMVPFragment<FragmentSparringCour
                 if (rowsBean != null) {
                     ARouter.getInstance()
                             .build(RouterPath.CourseCenter.SPARRING_COURSE_DETAIL)
-                            .withString(SparringCourseDetailActivity.COURSE_ID, rowsBean.courseId)
-                            .withString(SparringCourseDetailActivity.COURSE_GROUP_ID, rowsBean.courseGoupId)
-                            .withString(SparringCourseDetailActivity.STUDENT_ID, rowsBean.userId)
+                            .withString(CourseConstants.COURSE_ID, rowsBean.courseId)
+                            .withString(CourseConstants.COURSE_GROUP_ID, rowsBean.courseGoupId)
+                            .withString(CourseConstants.STUDENT_ID, rowsBean.userId)
                             .navigation();
                 }
             }

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

@@ -109,7 +109,7 @@ public class VideoCourseFragment extends BaseMVPFragment<FragmentVideoCourseLayo
             }
         });
 
-        mAdapter = new VideoCourseListAdapter(R.layout.item_video_course_list_layout);
+        mAdapter = new VideoCourseListAdapter();
         mAdapter.getLoadMoreModule().setOnLoadMoreListener(new OnLoadMoreListener() {
             @Override
             public void onLoadMore() {

teacher/src/main/java/com/cooleshow/teacher/ui/homepage/SparringCoursePageFragment.java

@@ -18,6 +18,7 @@ import com.cooleshow.teacher.R;
 import com.cooleshow.teacher.adapter.SparringCourseListAdapter;
 import com.cooleshow.teacher.bean.SparringCourseListBean;
 import com.cooleshow.teacher.bean.TeacherUserInfo;
+import com.cooleshow.teacher.constants.CourseConstants;
 import com.cooleshow.teacher.constants.TeacherInfoConstants;
 import com.cooleshow.teacher.contract.SparringCoursePageContract;
 import com.cooleshow.teacher.databinding.FragmentSparringCoursePageLayoutBinding;
@@ -72,9 +73,9 @@ public class SparringCoursePageFragment extends BaseMVPFragment<FragmentSparring
                     if (rowsBean != null) {
                         ARouter.getInstance()
                                 .build(RouterPath.CourseCenter.SPARRING_COURSE_DETAIL)
-                                .withString(SparringCourseDetailActivity.COURSE_ID, rowsBean.courseId)
-                                .withString(SparringCourseDetailActivity.COURSE_GROUP_ID, rowsBean.courseGoupId)
-                                .withString(SparringCourseDetailActivity.STUDENT_ID, rowsBean.userId)
+                                .withString(CourseConstants.COURSE_ID, rowsBean.courseId)
+                                .withString(CourseConstants.COURSE_GROUP_ID, rowsBean.courseGoupId)
+                                .withString(CourseConstants.STUDENT_ID, rowsBean.userId)
                                 .navigation();
                     }
                 }

teacher/src/main/java/com/cooleshow/teacher/ui/main/CourseTableFragment.kt

@@ -26,6 +26,7 @@ import com.cooleshow.teacher.CourseHelper
 import com.cooleshow.teacher.R
 import com.cooleshow.teacher.adapter.CourseTableListAdapter
 import com.cooleshow.teacher.bean.CourseTableDataBean
+import com.cooleshow.teacher.constants.CourseConstants
 import com.cooleshow.teacher.contract.CourseTableContract
 import com.cooleshow.teacher.databinding.FragmentCourseTableLayoutBinding
 import com.cooleshow.teacher.presenter.main.CourseTablePresenter
@@ -136,12 +137,12 @@ class CourseTableFragment :
             //陪练课 跳转详情页
             ARouter.getInstance()
                 .build(RouterPath.CourseCenter.SPARRING_COURSE_DETAIL)
-                .withString(SparringCourseDetailActivity.COURSE_ID, data.courseId)
+                .withString(CourseConstants.COURSE_ID, data.courseId)
                 .withString(
-                    SparringCourseDetailActivity.COURSE_GROUP_ID,
+                    CourseConstants.COURSE_GROUP_ID,
                     data.courseGoupId
                 )
-                .withString(SparringCourseDetailActivity.STUDENT_ID, data.userId)
+                .withString(CourseConstants.STUDENT_ID, data.userId)
                 .navigation()
         } else if (TextUtils.equals(
                 CourseTableListAdapter.PIANO_ROOM_COURSE,

teacher/src/main/java/com/cooleshow/teacher/ui/mine/FeedBackActivity.java

@@ -42,14 +42,7 @@ public class FeedBackActivity extends BaseMVPActivity<ActivityFeedbackBinding, F
 //                    ToastUtils.showShort("请输入您的邮箱或手机号");
 //                    break;
 //                }
-                JSONObject jsonObject = new JSONObject();
-                try {
-                    jsonObject.putOpt("content", content);
-//                    jsonObject.putOpt("mobileNo", mobileNo);
-                } catch (JSONException e) {
-                    e.printStackTrace();
-                }
-                presenter.addSuggestion(jsonObject.toString());
+                presenter.addSuggestion(content);
                 break;
         }
     }

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

@@ -10,6 +10,7 @@ import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.GlideUtils;
 import com.cooleshow.base.utils.SizeUtils;
 import com.cooleshow.base.utils.TimeUtils;
+import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.VibrateUtils;
 import com.cooleshow.base.utils.helper.QMUIStatusBarHelper;
 import com.cooleshow.base.widgets.VideoThumbnailView;
@@ -103,15 +104,7 @@ public class AssignHomeworkActivity extends BaseMVPActivity<ActivityAssignHomewo
         viewBinding.tvCourseName.setText(bean.subjectName);
         viewBinding.tvName.setText(bean.studentName);
 
-        String startTime = TimeUtils.date2String(TimeUtils.getDate(bean.startTime), "yyyy-MM-dd");
-        String endTime = TimeUtils.date2String(TimeUtils.getDate(bean.endTime), "yyyy-MM-dd");
-        if (TextUtils.equals(startTime, endTime)) {
-            String startTimeText = TimeUtils.date2String(TimeUtils.getDate(bean.startTime), "HH:mm");
-            String endTimeText = TimeUtils.date2String(TimeUtils.getDate(bean.endTime), "HH:mm");
-            viewBinding.tvDate.setText(startTime + " " + startTimeText + "-" + endTimeText);
-        } else {
-            viewBinding.tvDate.setText(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)) {

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

@@ -30,17 +30,15 @@ import io.rong.imkit.utils.StatusBarUtil;
  */
 @Route(path = RouterPath.WorkCenter.TEACHER_WORK_HOMEWORK)
 public class HomeWorkActivity extends BaseMVPActivity<ActivityHomeworkBinding, HomeWorkActPresenter> implements HomeWorkActContract.HomeWorkActView, View.OnClickListener {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StatusBarUtil.setStatusBarDarkTheme(this, true);
-    }
-
+    private List<String> titles = new ArrayList<String>(Arrays.asList("未布置", "已布置"));
+    private List<String> auditStatusList = new ArrayList<String>(Arrays.asList("NO", "YES"));
+    private List<Fragment> fragments = new ArrayList<>();
     private TabLayout tabLayout;
     private ViewPager viewPager;
 
     @Override
     protected void initView() {
+        StatusBarUtil.setStatusBarDarkTheme(this, true);
         initMidTitleToolBar(viewBinding.toolbarInclude.toolbar, "课后作业");
         tabLayout = viewBinding.tablayout;
         viewPager = viewBinding.viewpager;
@@ -61,14 +59,12 @@ public class HomeWorkActivity extends BaseMVPActivity<ActivityHomeworkBinding, H
     protected HomeWorkActPresenter createPresenter() {
         return new HomeWorkActPresenter();
     }
+
     @Override
     public void initData() {
         super.initData();
         initTabLayoutAndViewPager();
     }
-    private List<String> titles = new ArrayList<String>(Arrays.asList("未布置", "已布置"));
-    private List<String> auditStatusList = new ArrayList<String>(Arrays.asList("NO", "YES"));
-    private List<Fragment> fragments = new ArrayList<>();
 
     private void initTabLayoutAndViewPager() {
         tabLayout.removeAllTabs();
@@ -80,6 +76,26 @@ public class HomeWorkActivity extends BaseMVPActivity<ActivityHomeworkBinding, H
         }
         viewPager.setAdapter(new HomeWorkPagerAdapter(getSupportFragmentManager(), fragments, titles));
         tabLayout.setupWithViewPager(viewPager);
+
+        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+                HomeWorkFragment fragment = (HomeWorkFragment) fragments.get(position);
+                if (fragment != null) {
+                    fragment.queryCourse(false);
+                }
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
     }
 
 }

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

@@ -43,6 +43,14 @@ import java.util.List;
  * 类说明：
  */
 public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, HomeWorkPresenter> implements HomeWorkContract.HomeWorkView, View.OnClickListener {
+    private int currentPage;
+    private String decorate = "";
+    private HomeworkAdapter homeworkAdapter;
+    private List<HomeworkListBean.RowsBean> dataList = new ArrayList<>();
+    private boolean hasNext = true;
+    private TimePickerView pvTime;
+    private Date currentSelectDate;
+    private String currentFilterDate;
 
     public static HomeWorkFragment newInstance(String decorate) {
         Bundle args = new Bundle();
@@ -54,7 +62,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
 
     @Override
     public void onClick(View view) {
-        switch (view.getId()){
+        switch (view.getId()) {
             case R.id.tv_date:
                 showTimeSelectPicker();
                 break;
@@ -71,10 +79,6 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         return new HomeWorkPresenter();
     }
 
-    private String decorate = "";
-    private HomeworkAdapter homeworkAdapter;
-    List<HomeworkListBean.RowsBean> dataList = new ArrayList<>();
-
     @Override
     protected void initView(View rootView) {
         decorate = getArguments().getString("decorate");
@@ -92,14 +96,12 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
             List<HomeworkListBean.RowsBean> data = (List<HomeworkListBean.RowsBean>) adapter.getData();
             HomeworkListBean.RowsBean rowsBean = data.get(position);
             ARouter.getInstance().build(RouterPath.WorkCenter.TEACHER_WORK_ASSIGN_HOMEWORK)
-                    .withString(TeacherConfig.COURSE_ID,rowsBean.courseId)
-                    .withString(TeacherConfig.STUDENT_ID,rowsBean.studentId)
+                    .withString(TeacherConfig.COURSE_ID, rowsBean.courseId)
+                    .withString(TeacherConfig.STUDENT_ID, rowsBean.studentId)
                     .navigation();
         });
     }
 
-    private int currentPage;
-
     @Override
     protected void initData() {
         mViewBinding.refreshLayout.setOnRefreshListener(refreshLayout -> {
@@ -117,11 +119,14 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         });
         currentPage = 1;
         reBuildFilter(null);
-        queryCourse(true);
     }
 
 
-    private boolean hasNext = true;
+    @Override
+    public void onResume() {
+        super.onResume();
+        queryCourse(true);
+    }
 
     /**
      * 检查是否还有下一页
@@ -132,7 +137,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         hasNext = dataSize >= Constants.DEFAULT_DATA_SIZE;
     }
 
-    private void queryCourse(boolean isLoading) {
+    public void queryCourse(boolean isLoading) {
         presenter.queryHomeworkList(isLoading, currentPage, decorate, currentFilterDate);
     }
 
@@ -177,34 +182,23 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         }
     }
 
-    private TimePickerView pvTime;
 
     private void showTimeSelectPicker() {
         if (pvTime == null) {
             pvTime = new TimePickerBuilder(requireContext(), (date, v) -> {//选中事件回调
                 reBuildFilter(date);
-            }).setLayoutRes(com.cooleshow.base.R.layout.pickerview_default_layout, new CustomListener() {
-                        @Override
-                        public void customLayout(View v) {
-                            //自定义布局中的控件初始化及事件处理
-                            final TextView tvSubmit = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_finish);
-                            TextView ivCancel = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_cancel);
-                            tvSubmit.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    pvTime.returnData();
-                                    pvTime.dismiss();
-                                }
-                            });
-                            ivCancel.setOnClickListener(new View.OnClickListener() {
-                                @Override
-                                public void onClick(View v) {
-                                    pvTime.dismiss();
-                                }
-                            });
-
-                        }
-                    })
+                queryCourse(true);
+            }).setLayoutRes(com.cooleshow.base.R.layout.pickerview_default_layout, v -> {
+                //自定义布局中的控件初始化及事件处理
+                final TextView tvSubmit = v.findViewById(com.cooleshow.base.R.id.tv_finish);
+                TextView ivCancel = v.findViewById(com.cooleshow.base.R.id.tv_cancel);
+                tvSubmit.setOnClickListener(v1 -> {
+                    pvTime.returnData();
+                    pvTime.dismiss();
+                });
+                ivCancel.setOnClickListener(v12 -> pvTime.dismiss());
+
+            })
                     .setLineSpacingMultiplier(2.5f)
                     .setType(new boolean[]{true, true, false, false, false, false})// 默认全部显示
                     .setTextColorCenter(getResources().getColor(com.cooleshow.base.R.color.color_1a1a1a))//设置选中项的颜色
@@ -219,8 +213,7 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
             pvTime.show();
         }
     }
-    private Date currentSelectDate;
-    private String currentFilterDate;
+
     private void reBuildFilter(Date date) {
         currentSelectDate = date != null ? date : TimeUtils.getNowDate();
         String targetDateTimeStr = TimeUtils.date2String(currentSelectDate, TimeUtils.getSafeDateFormat("yyyy-MM"));
@@ -231,6 +224,5 @@ public class HomeWorkFragment extends BaseMVPFragment<FragmentHomeworkBinding, H
         currentFilterDate = targetDateTimeStr;
         currentPage = 1;
         mViewBinding.tvDate.setText(currentFilterDate);
-        queryCourse(true);
     }
 }

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

@@ -11,6 +11,7 @@
         android:layout_marginLeft="14dp"
         android:drawableRight="@drawable/icon_arrow_down"
         android:gravity="center"
+        android:drawablePadding="@dimen/dp_6"
         android:text="2021年9月"
         android:textColor="@color/black_333"
         android:textSize="@dimen/sp_14" />

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

@@ -477,7 +477,7 @@
                 android:drawableLeft="@drawable/icon_mine_feedback"
                 android:text="意见反馈"
                 android:textSize="@dimen/sp_14"
-                android:visibility="visible"
+                android:visibility="gone"
                 app:layout_constraintLeft_toLeftOf="@+id/tv_help"
                 app:layout_constraintTop_toBottomOf="@+id/tv_help" />
         </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -116,7 +116,6 @@
         android:textColor="@color/color_6a6a6a"
         android:textSize="@dimen/sp_11"
         android:visibility="visible"
-        android:text="0人已购买"
         app:layout_constraintBottom_toBottomOf="@+id/view_line2"
         app:layout_constraintLeft_toRightOf="@+id/view_line2"
         app:layout_constraintTop_toTopOf="@+id/view_line2"