修改部分问题

BaseLibrary/src/main/java/com/cooleshow/base/adapter/CourseGroupFilterAdapter.java

@@ -13,7 +13,7 @@ import androidx.annotation.NonNull;
  * Author by pq, Date on 2023/4/12.
  */
 public class CourseGroupFilterAdapter extends BaseQuickAdapter<IFilterViewData, BaseViewHolder> {
-    private int selectPos = -1;
+    private int selectPos = 0;
 
     public CourseGroupFilterAdapter() {
         super(R.layout.item_filter_text_layout);

BaseLibrary/src/main/java/com/cooleshow/base/widgets/SolveEditTextScrollClash.java

@@ -0,0 +1,48 @@
+package com.cooleshow.base.widgets;
+
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.EditText;
+
+/**
+ * Author by pq, Date on 2023/11/10.
+ */
+public class SolveEditTextScrollClash implements View.OnTouchListener{
+    private EditText editText;
+
+    public SolveEditTextScrollClash(EditText editText) {
+        this.editText = editText;
+    }
+
+    @Override
+    public boolean onTouch(View view, MotionEvent event) {
+        //触摸的是EditText而且当前EditText能够滚动则将事件交给EditText处理。否则将事件交由其父类处理
+        if ((view.getId() == editText.getId() && canVerticalScroll(editText))) {
+            view.getParent().requestDisallowInterceptTouchEvent(true);
+            if (event.getAction() == MotionEvent.ACTION_UP) {
+                view.getParent().requestDisallowInterceptTouchEvent(false);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * EditText竖直方向能否够滚动
+     * @param editText  须要推断的EditText
+     * @return  true：能够滚动   false：不能够滚动
+     */
+    private boolean canVerticalScroll(EditText editText) {
+        //滚动的距离
+        int scrollY = editText.getScrollY();
+        //控件内容的总高度
+        int scrollRange = editText.getLayout().getHeight();
+        //控件实际显示的高度
+        int scrollExtent = editText.getHeight() - editText.getCompoundPaddingTop() -editText.getCompoundPaddingBottom();
+        //控件内容总高度与实际显示高度的差值
+        int scrollDifference = scrollRange - scrollExtent;
+        if(scrollDifference == 0) {
+            return false;
+        }
+        return (scrollY > 0) || (scrollY < scrollDifference - 1);
+    }
+}

student/src/main/java/com/cooleshow/student/adapter/CourseTableListAdapter.kt

@@ -66,6 +66,7 @@ class CourseTableListAdapter(layoutResId: Int) :
             viewLine2.setVisible(false)
             tvBuyNum.setVisible(false)
             tv_vip_course_tag.setVisible(true)
+            baseViewHolder.setText(R.id.tv_title, data?.name);
         } else if (TextUtils.equals(PIANO_ROOM_COURSE, data?.courseType)) {
             //琴房课
             ivAvatar.setImageResource(R.drawable.icon_piano_room_course)
@@ -86,6 +87,7 @@ class CourseTableListAdapter(layoutResId: Int) :
             viewLine2.setVisible(false)
             tvBuyNum.setVisible(false)
             tv_vip_course_tag.setVisible(true)
+            baseViewHolder.setText(R.id.tv_title, data?.name);
         }else {
             //直播课
             ivAvatar.setImageResource(R.drawable.icon_live_bg)

teacher/src/main/java/com/cooleshow/teacher/adapter/CourseTableListAdapter.kt

@@ -68,6 +68,7 @@ class CourseTableListAdapter(layoutResId: Int) :
             viewLine2.setVisible(false)
             tvBuyNum.setVisible(false)
             tv_vip_course_tag.setVisible(true)
+            baseViewHolder.setText(R.id.tv_title, data?.name);
         } else if (TextUtils.equals(PIANO_ROOM_COURSE, data?.courseType)) {
             //琴房课
             ivAvatar.setImageResource(R.drawable.icon_piano_room_course)
@@ -87,6 +88,7 @@ class CourseTableListAdapter(layoutResId: Int) :
             viewLine2.setVisible(false)
             tvBuyNum.setVisible(false)
             tv_vip_course_tag.setVisible(true)
+            baseViewHolder.setText(R.id.tv_title, data?.name);
         } else {
             //直播课
             ivAvatar.setImageResource(R.drawable.icon_live_bg)

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

@@ -273,20 +273,26 @@
                             app:layout_constraintRight_toRightOf="parent"
                             app:layout_constraintTop_toTopOf="@+id/tv_plan_title" />
 
-                        <TextView
-                            android:id="@+id/tv_plan_content"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
+                        <androidx.core.widget.NestedScrollView
                             android:layout_marginTop="12dp"
-                            android:ellipsize="end"
-                            android:includeFontPadding="false"
-                            android:maxLines="4"
-                            android:textColor="@color/color_777777"
-                            android:textSize="@dimen/sp_13"
                             app:layout_constraintLeft_toLeftOf="parent"
                             app:layout_constraintRight_toRightOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tv_plan_title"
-                            tools:text="中国院长笛四级考级曲目教学中国院长笛四级考级曲目" />
+                            app:layout_constraintHeight_max="88dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:id="@+id/tv_plan_content"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:includeFontPadding="false"
+                                android:textColor="@color/color_777777"
+                                android:textSize="@dimen/sp_13"
+                                app:layout_constraintLeft_toLeftOf="parent"
+                                app:layout_constraintRight_toRightOf="parent"
+                                app:layout_constraintTop_toBottomOf="@+id/tv_plan_title"
+                                tools:text="中国院长笛四级考级曲目教学中国院长笛四级考级曲目" />
+                        </androidx.core.widget.NestedScrollView>
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
                 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -236,6 +236,7 @@
 
                     <androidx.constraintlayout.widget.ConstraintLayout
                         android:visibility="gone"
+                        tools:visibility="visible"
                         android:layout_width="match_parent"
                         android:id="@+id/cs_course_plan"
                         android:layout_height="wrap_content"
@@ -258,7 +259,6 @@
                             android:textSize="@dimen/sp_15"
                             app:layout_constraintLeft_toLeftOf="parent"
                             app:layout_constraintTop_toTopOf="parent" />
-
                         <TextView
                             android:id="@+id/tv_edit_plan"
                             android:layout_width="wrap_content"
@@ -273,21 +273,26 @@
                             app:layout_constraintRight_toRightOf="parent"
                             app:layout_constraintTop_toTopOf="@+id/tv_plan_title" />
 
-                        <TextView
-                            android:id="@+id/tv_plan_content"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
+                        <androidx.core.widget.NestedScrollView
                             android:layout_marginTop="12dp"
-                            android:ellipsize="end"
-                            android:includeFontPadding="false"
-                            android:maxLines="4"
-                            android:textColor="@color/color_777777"
-                            android:textSize="@dimen/sp_13"
                             app:layout_constraintLeft_toLeftOf="parent"
                             app:layout_constraintRight_toRightOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/tv_plan_title"
-                            tools:text="中国院长笛四级考级曲目教学中国院长笛四级考级曲目" />
-
+                            app:layout_constraintHeight_max="88dp"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:id="@+id/tv_plan_content"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:includeFontPadding="false"
+                                android:textColor="@color/color_777777"
+                                android:textSize="@dimen/sp_13"
+                                app:layout_constraintLeft_toLeftOf="parent"
+                                app:layout_constraintRight_toRightOf="parent"
+                                app:layout_constraintTop_toBottomOf="@+id/tv_plan_title"
+                                tools:text="中国院长笛四级考级曲目教学中国院长笛四级考级曲目" />
+                        </androidx.core.widget.NestedScrollView>
                     </androidx.constraintlayout.widget.ConstraintLayout>
                 </androidx.constraintlayout.widget.ConstraintLayout>
             </com.google.android.material.appbar.CollapsingToolbarLayout>