修改学生端琴房课课程组详情,去掉时间筛选条件

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

@@ -132,9 +132,9 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
     }
 
     private void initListener() {
-        viewBinding.tvTime.setOnClickListener(this);
-        viewBinding.tvCourseStatus.setOnClickListener(this);
-        viewBinding.tvAgency.setOnClickListener(this);
+        viewBinding.flTime.setOnClickListener(this);
+        viewBinding.flStatus.setOnClickListener(this);
+        viewBinding.flAttendance.setOnClickListener(this);
         viewBinding.appBarLayout.addOnOffsetChangedListener(new AppBarLayoutStateChangeListener() {
 
             @Override
@@ -217,13 +217,11 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
             viewBinding.collapsingToolbarLayout.setContentScrimColor(Color.TRANSPARENT);
             viewBinding.collapsingToolbarLayout.setStatusBarScrimColor(Color.TRANSPARENT);
             viewBinding.toolbarInclude.toolbar.setBackgroundColor(Color.TRANSPARENT);
-            viewBinding.csFilter.setBackgroundColor(Color.TRANSPARENT);
             viewBinding.ivTopBg.setVisibility(View.VISIBLE);
         } else {
             viewBinding.collapsingToolbarLayout.setContentScrimColor(Color.WHITE);
             viewBinding.collapsingToolbarLayout.setStatusBarScrimColor(Color.WHITE);
             viewBinding.toolbarInclude.toolbar.setBackgroundColor(Color.WHITE);
-            viewBinding.csFilter.setBackgroundColor(Color.WHITE);
             viewBinding.ivTopBg.setVisibility(View.GONE);
         }
     }
@@ -251,7 +249,7 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
     }
 
     private void refreshCourseList(boolean isShowLoading) {
-        presenter.queryCourseList(isShowLoading, courseGroupId, classMonth, courseStatus, currentAttendanceStatus);
+        presenter.queryCourseList(isShowLoading, courseGroupId, "", courseStatus, currentAttendanceStatus);
     }
 
 
@@ -320,16 +318,16 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        if (id == R.id.tv_time) {
+        if (id == R.id.fl_time) {
             showTimeSelectPicker();
             return;
         }
-        if (id == R.id.tv_course_status) {
+        if (id == R.id.fl_status) {
             selectCourseStatus();
             return;
         }
 
-        if (id == R.id.tv_agency) {
+        if (id == R.id.fl_attendance) {
             selectAttendanceStatus();
             return;
         }
@@ -438,7 +436,7 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
                         PianoCourseGroupDetailActivity.this.currentSelectAttendancePosition = pos;
                         IFilterViewData iFilterViewData = attendanceStatusList.get(pos);
                         currentAttendanceStatus = iFilterViewData.getDataId();
-                        viewBinding.tvAgency.setText(iFilterViewData.getShowName());
+                        viewBinding.tvAttendanceStatus.setText(iFilterViewData.getShowName());
                         reBuildFilter(currentSelectDate, courseStatus, currentAttendanceStatus);
                     }
                 }
@@ -447,13 +445,13 @@ public class PianoCourseGroupDetailActivity extends BaseMVPActivity<AcPianoCours
             mAttendanceStatusFilterDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
                 @Override
                 public void onDismiss(DialogInterface dialog) {
-                    UiUtils.refreshFilterTextStyle(false, viewBinding.tvAgency);
+                    UiUtils.refreshFilterTextStyle(false, viewBinding.tvAttendanceStatus);
                 }
             });
         }
         if (!mAttendanceStatusFilterDialog.isShowing()) {
             mAttendanceStatusFilterDialog.show();
-            UiUtils.refreshFilterTextStyle(true, viewBinding.tvAgency);
+            UiUtils.refreshFilterTextStyle(true, viewBinding.tvAttendanceStatus);
         }
         mAttendanceStatusFilterDialog.setSelectPos(currentSelectAttendancePosition);
         mAttendanceStatusFilterDialog.setData(attendanceStatusList);

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

@@ -26,6 +26,7 @@
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar_layout"
+            android:paddingBottom="12dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/transparent"
@@ -256,98 +257,95 @@
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/cs_filter"
+            <LinearLayout
+                android:id="@+id/ll_filter"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="14dp"
-                android:paddingEnd="14dp">
-
-                <androidx.constraintlayout.widget.Guideline
-                    android:id="@+id/guide_line1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    app:layout_constraintGuide_percent="0.33" />
-
-                <androidx.constraintlayout.widget.Guideline
-                    android:id="@+id/guide_line2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    app:layout_constraintGuide_percent="0.66" />
-
-                <TextView
-                    android:id="@+id/tv_time"
+                android:layout_marginStart="14dp"
+                android:layout_marginTop="12dp"
+                android:layout_marginEnd="14dp"
+                android:orientation="horizontal"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <FrameLayout
+                    android:id="@+id/fl_time"
                     android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:drawableRight="@drawable/icon_arrow_down"
-                    android:drawablePadding="6dp"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:includeFontPadding="false"
-                    android:maxLines="1"
-                    android:paddingEnd="5dp"
-                    android:paddingStart="5dp"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
-                    android:textColor="@color/color_131415"
-                    android:textSize="@dimen/sp_14"
-                    app:layout_constraintHorizontal_chainStyle="spread_inside"
-                    app:layout_constraintLeft_toLeftOf="parent"
-                    app:layout_constraintRight_toLeftOf="@+id/guide_line1"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintWidth_default="wrap"
-                    tools:text="2021年9月" />
-
-                <TextView
-                    android:id="@+id/tv_course_status"
+                    android:layout_height="26dp"
+                    android:layout_marginEnd="11dp"
+                    android:layout_weight="0.4"
+                    android:background="@drawable/bg_white_4dp"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/tv_time"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center"
+                        android:drawableRight="@drawable/icon_arrow_down"
+                        android:drawablePadding="4dp"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:includeFontPadding="false"
+                        android:maxLines="1"
+                        android:text="@string/all_attendance_str"
+                        android:textColor="@color/color_131415"
+                        android:textSize="@dimen/sp_14"
+                        tools:text="2024年10月" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:id="@+id/fl_status"
                     android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:drawableRight="@drawable/icon_arrow_down"
-                    android:drawablePadding="6dp"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:includeFontPadding="false"
-                    android:maxLines="1"
-                    android:paddingEnd="5dp"
-                    android:paddingStart="5dp"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
-                    android:text="全部状态"
-                    android:textColor="@color/color_131415"
-                    android:textSize="@dimen/sp_14"
-                    app:layout_constraintBottom_toBottomOf="@+id/tv_time"
-                    app:layout_constraintLeft_toRightOf="@+id/guide_line1"
-                    app:layout_constraintRight_toLeftOf="@+id/guide_line2"
-                    app:layout_constraintTop_toTopOf="@+id/tv_time"
-                    app:layout_constraintWidth_default="wrap"
-                    tools:text="课程状态" />
-
-                <TextView
-                    android:id="@+id/tv_agency"
+                    android:layout_height="26dp"
+                    android:layout_marginEnd="11dp"
+                    android:layout_weight="0.3"
+                    android:background="@drawable/bg_white_4dp">
+
+                    <TextView
+                        android:id="@+id/tv_course_status"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center"
+                        android:background="@drawable/bg_white_10dp"
+                        android:drawableRight="@drawable/icon_arrow_down"
+                        android:drawablePadding="4dp"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:includeFontPadding="false"
+                        android:maxLines="1"
+                        android:text="@string/all_course_status_str"
+                        android:textColor="@color/color_131415"
+                        android:textSize="@dimen/sp_14"
+                        tools:text="全部状态" />
+
+                </FrameLayout>
+
+                <FrameLayout
+                    android:id="@+id/fl_attendance"
                     android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    android:drawableRight="@drawable/icon_arrow_down"
-                    android:drawablePadding="6dp"
-                    android:ellipsize="end"
-                    android:gravity="center"
-                    android:includeFontPadding="false"
-                    android:maxLines="1"
-                    android:paddingEnd="5dp"
-                    android:paddingStart="5dp"
-                    android:paddingTop="12dp"
-                    android:paddingBottom="12dp"
-                    android:text="全部考勤"
-                    android:textColor="@color/color_131415"
-                    android:textSize="@dimen/sp_14"
-                    app:layout_constraintBottom_toBottomOf="@+id/tv_time"
-                    app:layout_constraintLeft_toRightOf="@+id/guide_line2"
-                    app:layout_constraintRight_toRightOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/tv_time"
-                    app:layout_constraintWidth_default="wrap"
-                    tools:text="全部考勤" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
+                    android:layout_height="26dp"
+                    android:layout_weight="0.3"
+                    android:background="@drawable/bg_white_4dp">
+
+                    <TextView
+                        android:id="@+id/tv_attendance_status"
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:layout_gravity="center"
+                        android:background="@drawable/bg_white_10dp"
+                        android:drawableRight="@drawable/icon_arrow_down"
+                        android:drawablePadding="4dp"
+                        android:ellipsize="end"
+                        android:gravity="center"
+                        android:includeFontPadding="false"
+                        android:maxLines="1"
+                        android:text="@string/all_attendance_str"
+                        android:textColor="@color/color_131415"
+                        android:textSize="@dimen/sp_14"
+                        tools:text="全部考勤" />
+                </FrameLayout>
+            </LinearLayout>
         </com.google.android.material.appbar.AppBarLayout>
 
         <androidx.recyclerview.widget.RecyclerView

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

@@ -26,6 +26,7 @@
 
         <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar_layout"
+            android:paddingBottom="12dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/transparent"