解决bug

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

@@ -18,8 +18,8 @@ import com.cooleshow.student.constants.CourseConstants;
  */
 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
@@ -27,7 +27,7 @@ public class PianoRoomCourseListAdapter extends BaseQuickAdapter<PianoRoomCourse
         //时间
         holder.setText(R.id.tv_time, data.startTime);
         //title
-        holder.setText(R.id.tv_title, data.groupName);
+        holder.setText(R.id.tv_title, data.courseGroupName);
         //subjectName
         holder.setText(R.id.tv_course_name, data.subjectName);
         TextView tv_course_status = holder.getView(R.id.tv_course_status);

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

@@ -450,6 +450,6 @@ public interface APIService {
      * @param
      * @return
      */
-    @POST(STUDENT_GROUP + "courseSchedule/selectCourseList")
+    @POST(STUDENT_GROUP + "courseSchedule/queryPianoClass")
     Observable<BaseResponse<PianoRoomCourseListBean>> getPianoRoomCourseList(@Body RequestBody body);
 }

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

@@ -1,5 +1,9 @@
 package com.cooleshow.student.bean;
 
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -68,31 +72,37 @@ public class PianoRoomCourseListBean {
     }
 
     public static class RowsBean {
+        
+       /* "status": "COMPLETE",
+                "endTime": "2022-06-28 09:45:00",
+                "startTime": "2022-06-28 09:00:00",
+                "subjectName": "架子鼓",
+                "studentSign": 0,
+                "courseId": 1380,
+                "imGroupId": "f7c2edee-d79d-4897-98ec-468d93f0e7abCOURSE",
+                "subjectId": 19,
+                "avatar": "https://ks3-cn-beijing.ksyuncs.com/daya/1656388583679image.jpeg",
+                "courseGroupId": 469,
+                "teacherId": 562,
+                "teacherName": "hkd",
+                "courseGroupName": "云云云-第1课",
+                "teacherRealName": "李焕"*/
 
-        /**
-         * consumTime : 0
-         * courseId : 0
-         * endTime :
-         * groupName :
-         * imGroupId :
-         * singleCourseTime : 0
-         * startTime :
-         * status :
-         * studentCount : 0
-         * subjectId : 0
-         * subjectName :
-         */
-
-        public int consumTime;
-        public String courseId;
+        public String status;
         public String endTime;
-        public String groupName;
-        public String imGroupId;
-        public int singleCourseTime;
         public String startTime;
-        public String status;
-        public int studentCount;
-        public int subjectId;
         public String subjectName;
+        public int studentSign;
+        public String courseId;
+        public String imGroupId;
+        public int subjectId;
+        public String avatar;
+        public int courseGroupId;
+        public int teacherId;
+        public String teacherName;
+        public String courseGroupName;
+        public String teacherRealName;
+
+
     }
 }

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

@@ -128,7 +128,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
             viewBinding.tvHomeworkCommentContent.setText(bean.teacherReplied);
         } else {
             viewBinding.tvHomeworkCommentEmptyText.setVisibility(View.VISIBLE);
-            viewBinding.tvHomeworkSetComment.setVisibility(View.VISIBLE);
+            viewBinding.tvHomeworkSetComment.setVisibility(View.GONE);
             viewBinding.tvHomeworkCommentContent.setVisibility(View.GONE);
         }
     }
@@ -196,7 +196,7 @@ public class PianoRoomCourseDetailActivity extends BaseMVPActivity<ActivityPiano
             //未布置课后作业
             viewBinding.tvHomeworkEmptyText.setVisibility(View.VISIBLE);
             viewBinding.tvHomeworkContent.setVisibility(View.GONE);
-            viewBinding.tvSetHomework.setVisibility(View.VISIBLE);
+            viewBinding.tvSetHomework.setVisibility(View.GONE);
         }
     }
 

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

@@ -114,7 +114,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) {

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

@@ -201,7 +201,7 @@
                         android:drawableLeft="@drawable/icon_homework_empty"
                         android:drawablePadding="8dp"
                         android:gravity="center_vertical"
-                        android:text="课程结束之后记得布置作业哦！"
+                        android:text="老师尚未布置作业"
                         android:textColor="@color/color_999999"
                         android:textSize="@dimen/sp_13" />
 
@@ -267,7 +267,7 @@
                         android:drawableLeft="@drawable/icon_homework_video_empty"
                         android:drawablePadding="8dp"
                         android:gravity="center_vertical"
-                        android:text="学员尚未上传作业视频"
+                        android:text="您尚未上传作业视频"
                         android:textColor="@color/color_999999"
                         android:textSize="@dimen/sp_13" />
 
@@ -349,7 +349,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/item_piano_room_course_list_layout.xml

@@ -103,7 +103,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" />
@@ -115,7 +115,7 @@
         android:layout_marginStart="8dp"
         android:textColor="@color/color_6a6a6a"
         android:textSize="@dimen/sp_11"
-        android:visibility="visible"
+        android:visibility="gone"
         android:text="0人已购买"
         app:layout_constraintBottom_toBottomOf="@+id/view_line2"
         app:layout_constraintLeft_toRightOf="@+id/view_line2"

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

@@ -8,13 +8,16 @@ import android.widget.ImageView;
 import android.widget.PopupWindow;
 import android.widget.TextView;
 
+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.OnItemClickListener;
 import com.chad.library.adapter.base.listener.OnLoadMoreListener;
+import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
+import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.LogUtils;
 import com.cooleshow.base.utils.PopupUtil;
@@ -81,17 +84,19 @@ public class LiveCourseFragment extends BaseMVPFragment<FragmentLiveCourseLayout
     @Override
     public void refreshData() {
         super.refreshData();
-        reBuildFilter(currentSelectDate,currentCourseFilterStatus);
+        reBuildFilter(currentSelectDate, currentCourseFilterStatus);
         isFirstLoad = false;
     }
+
     @Override
     public void onResume() {
         super.onResume();
-        if(isFirstLoad){
+        if (isFirstLoad) {
             isFirstLoad = false;
             reBuildFilter(null, CourseConstants.COURSE_FILTER_ALL);
         }
     }
+
     private void buildDefaultCourseStatusFilterList() {
         mCourseFilterStatusBeans = new ArrayList<>();
         mCourseFilterStatusBeans.add(new CourseFilterStatusBean(CourseConstants.COURSE_FILTER_ALL, "全部"));
@@ -140,7 +145,13 @@ public class LiveCourseFragment extends BaseMVPFragment<FragmentLiveCourseLayout
         });
         mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
         mViewBinding.recyclerView.setAdapter(mAdapter);
-
+        mAdapter.setOnItemClickListener((adapter, view, position) -> {
+            LiveCourseListBean.RowsBean item = (LiveCourseListBean.RowsBean) adapter.getItem(position);
+            ARouter.getInstance()
+                    .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                    .withString(WebConstants.WEB_URL, WebConstants.TEACHER_LIVE_DETAIL + "?groupId=" + item.courseGroupId)
+                    .navigation();
+        });
         buildDefaultCourseStatusFilterList();
     }
 
@@ -256,6 +267,7 @@ public class LiveCourseFragment extends BaseMVPFragment<FragmentLiveCourseLayout
             pvTime.show();
         }
     }
+
     @Override
     public void onClick(View v) {
         if (v.getId() == R.id.tv_time) {

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

@@ -296,8 +296,8 @@ public class SparringCourseDetailActivity extends BaseMVPActivity<ActivitySparri
 
         if (v.getId() == R.id.tv_enter_room) {
             //进入教室
-            if (mInfoBean != null && TextUtils.equals(CourseConstants.COURSE_STATUS_ING, courseInfoBean.courseStatus)) {
-                CourseEnterHelper.start(this, mInfoBean.courseScheduleId, courseInfoBean.subjectName);
+            if (mInfoBean != null && TextUtils.equals(CourseConstants.COURSE_STATUS_ING, mInfoBean.courseStatus)) {
+                CourseEnterHelper.start(this, mInfoBean.courseScheduleId, mInfoBean.subjectName);
             }
             return;
         }

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

@@ -7,6 +7,8 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.common.WebConstants;
 import com.cooleshow.base.constanst.Constants;
@@ -67,6 +69,13 @@ public class LiveCoursePageFragment extends BaseMVPFragment<FragmentLiveCoursePa
         });
         mViewBinding.recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
         mViewBinding.recyclerView.setAdapter(mAdapter);
+        mAdapter.setOnItemClickListener((adapter, view, position) -> {
+            LiveCourseListBean.RowsBean item = (LiveCourseListBean.RowsBean) adapter.getItem(position);
+            ARouter.getInstance()
+                    .build(RouterPath.WebCenter.ACTIVITY_HTML)
+                    .withString(WebConstants.WEB_URL, WebConstants.TEACHER_LIVE_DETAIL + "?groupId=" + item.courseGroupId)
+                    .navigation();
+        });
 
     }
 
@@ -90,11 +99,11 @@ public class LiveCoursePageFragment extends BaseMVPFragment<FragmentLiveCoursePa
                         .navigation();
                 break;
             case R.id.tv_open:
-                if (mViewBinding.tvOpen.getText().toString().equals("去认证")){
+                if (mViewBinding.tvOpen.getText().toString().equals("去认证")) {
                     ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_HTML)
                             .withString(WebConstants.WEB_URL, WebConstants.TEACHER_CERT)
                             .navigation();
-                }else if (mViewBinding.tvOpen.getText().toString().equals("立即开通")){
+                } else if (mViewBinding.tvOpen.getText().toString().equals("立即开通")) {
                     ARouter.getInstance()
                             .build(RouterPath.WebCenter.ACTIVITY_HTML)
                             .withString(WebConstants.WEB_URL, WebConstants.TEACHER_OPEN_LIVE)

teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreActivity.java

@@ -124,13 +124,7 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
     }
 
     private void showScoreShareDialog(MusicSheetShareBean data) {
-        DialogUtils.showScoreShare(this,data, new DialogUtils.ActionShareCallback() {
-
-            @Override
-            public void onShareClick(Bitmap bitmap) {
-                share(bitmap);
-            }
-        });
+        DialogUtils.showScoreShare(this,data, bitmap -> share(bitmap));
     }
     private ShareAction mShareAction;
     private UMShareListener mShareListener;

teacher/src/main/java/com/cooleshow/teacher/ui/score/MineScoreFragment.java

@@ -12,10 +12,12 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.chad.library.adapter.base.listener.OnLoadMoreListener;
 import com.cooleshow.base.constanst.Constants;
+import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
 import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.teacher.R;
@@ -62,6 +64,12 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+        queryScore(true);
+    }
+
+    @Override
     protected FragmentMineScoreBinding getLayoutView() {
         return FragmentMineScoreBinding.inflate(getLayoutInflater());
     }
@@ -116,7 +124,15 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
             WebStartHelper.startMusicPersonCertPage();
         });
         mineScoreAdapter.setOnItemClickListener((adapter, view, position) -> {
-
+            List<MusicSheetListBean.RowsBean> data = mineScoreAdapter.getData();
+            MusicSheetListBean.RowsBean rowsBean = data.get(position);
+//            ARouter.getInstance().build(RouterPath.WebCenter.ACTIVITY_ACCOMPANY_HTML)
+//                    .withString("url", rowsBean.url)
+//                    .withBoolean("isHideTitle", true)
+//                    .withBoolean("statusBarTextColor", statusBarTextColor)
+//                    .withBoolean("isOpenLight", isOpenLight)
+//                    .withInt("orientation", orientation)
+//                    .navigation();
         });
 
     }
@@ -139,7 +155,6 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
             }
         });
         currentPage = 1;
-        queryScore(true);
     }
 
     private boolean hasNext = true;