修改走查问题

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

@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:background="@drawable/bg_white_top_10dp"
     android:orientation="vertical"
-    android:paddingTop="15dp"
+    android:paddingTop="8dp"
     android:paddingBottom="15dp">
 
     <androidx.recyclerview.widget.RecyclerView
@@ -16,7 +16,7 @@
         android:scrollbars="none" />
 
     <View
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="2dp"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="@color/color_f2f2f2" />

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

@@ -2,7 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="44dp"
+    android:layout_height="46dp"
+    android:layout_marginBottom="6dp"
     android:paddingStart="13dp"
     android:paddingEnd="13dp"
     xmlns:tools="http://schemas.android.com/tools">

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

@@ -44,7 +44,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="6dp"
-                    android:text="课程状态"
+                    android:text="课程组状态"
                     android:textColor="@color/color_333333"
                     android:textSize="@dimen/sp_16"
                     android:textStyle="bold"
@@ -155,7 +155,7 @@
             android:layout_marginEnd="13dp"
             android:background="@drawable/shape_2dc7aa_22dp"
             android:gravity="center"
-            android:text="查询"
+            android:text="@string/confirm_str"
             android:textColor="@color/white"
             android:textSize="@dimen/sp_16"
             android:textStyle="bold"

BaseLibrary/src/main/res/values/styles.xml

@@ -142,8 +142,8 @@
 
     <style name="line_style">
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">1dp</item>
-        <item name="android:background">@color/divide_color</item>
+        <item name="android:layout_height">0.5dp</item>
+        <item name="android:background">@color/divide_color2</item>
     </style>
 
     <declare-styleable name="verify_EditText">

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

@@ -251,26 +251,6 @@ public class MineLiveCourseFragment extends BaseMVPFragment<FragmentMineLiveCour
 
 
     private String getEmptyText() {
-        if (TextUtils.equals(type, "ING")) {
-            //进行中
-            return "暂无进行中直播课程";
-        }
-        if (TextUtils.equals(type, "NOT_SALE")) {
-            //未开始
-            return "暂无未上架直播课程";
-        }
-        if (TextUtils.equals(type, "APPLY")) {
-            //申请中
-            return "暂无销售中直播课程";
-        }
-        if (TextUtils.equals(type, "COMPLETE")) {
-            //已完成
-            return "暂无已完成直播课程";
-        }
-        if (TextUtils.equals(type, "CANCEL")) {
-            //已取消
-            return "暂无已取消直播课程";
-        }
         return "暂无内容";
     }
 }

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

@@ -95,13 +95,7 @@ public class MineVideoCourseFragment extends BaseMVPFragment<FragmentMineVideoCo
         View emptyLayout = inflater.inflate(R.layout.empty_mine_video_course, null);
         TextView tv_create = emptyLayout.findViewById(R.id.tv_create);
         TextView tvEmptyHint = emptyLayout.findViewById(R.id.tv_empty_hint);
-        if (TextUtils.equals(auditStatus, "PASS")) {
-            tvEmptyHint.setText("您尚未创建视频课");
-        } else if (TextUtils.equals(auditStatus, "DOING")) {
-            tvEmptyHint.setText("暂无审核中视频课程");
-        } else if (TextUtils.equals(auditStatus, "UNPASS")) {
-            tvEmptyHint.setText("暂无审核失败视频课程");
-        }
+        tvEmptyHint.setText("暂无内容");
         tv_create.setOnClickListener(this);
         mineVideoCourseAdapter.setEmptyView(emptyLayout);
         rvAddress.setAdapter(mineVideoCourseAdapter);

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

@@ -72,6 +72,7 @@ public class LiveCoursePageFragment extends BaseMVPFragment<FragmentLiveCoursePa
                 LiveCoursePageFragment.this.goCreate();
             }
         });
+        mViewBinding.commonHeader.handleCreateBt(false);
 
 
         Date currentSelectDate = TimeUtils.getNowDate();

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

@@ -18,6 +18,9 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
+import com.bigkoo.pickerview.listener.OnDismissListener;
+import com.bigkoo.pickerview.view.OptionsPickerView;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.activity.BaseMVPActivity;
 import com.cooleshow.base.utils.FileUtils;
@@ -100,6 +103,8 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
     private ShareAction mShareAction;
     private UMShareListener mShareListener;
     private Bitmap targetBitmap;
+    private OptionsPickerView pvOptions;
+    private int currentSelectSubjectPosition = 0;
 
     @Override
     public void onClick(View view) {
@@ -171,21 +176,50 @@ public class MineScoreActivity extends BaseMVPActivity<ActivityMineScoreBinding,
         if (subjectBeanList.size() == 0) {
             subjectBeanList.add(new QuerySubjectBean("全部声部", ""));
         }
-        List<PopMenuBean> popList = new ArrayList<>();
-        for (QuerySubjectBean bean : subjectBeanList) {
-            PopMenuBean popMenuBean = new PopMenuBean();
-            popMenuBean.setActionName(bean.name);
-            popList.add(popMenuBean);
-        }
-        initCoursePop(viewBinding.viewSubjectFilterPoint, popList, position -> {
-            QuerySubjectBean bean = subjectBeanList.get(position);
+        selectSubject();
+    }
+
+    private void selectSubject() {
+        pvOptions = new OptionsPickerBuilder(this, (options1, options2, options3, v) -> {
+            this.currentSelectSubjectPosition = options1;
+            QuerySubjectBean bean = subjectBeanList.get(options1);
             currentSubjectId = String.valueOf(bean.id);
             viewBinding.searchView.getLeftText().setText(bean.name);
             updateByFilter();
+        }).setLayoutRes(com.cooleshow.base.R.layout.pickerview_address_layout, v -> {
+                    //自定义布局中的控件初始化及事件处理
+                    final TextView tvSubmit = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_finish);
+                    tvSubmit.setText(getString(com.cooleshow.base.R.string.confirm_str));
+                    TextView ivCancel = (TextView) v.findViewById(com.cooleshow.base.R.id.tv_cancel);
+                    tvSubmit.setOnClickListener(v12 -> {
+                        pvOptions.returnData();
+                        pvOptions.dismiss();
+                    });
+                    ivCancel.setOnClickListener(v1 -> pvOptions.dismiss());
+
+                }).setTextColorOut(getResources().getColor(com.cooleshow.base.R.color.color_aaaaaa))
+                .setDividerColor(Color.TRANSPARENT)
+                .setBgColor(Color.TRANSPARENT).isDialog(false).build();
+        pvOptions.setPicker(subjectBeanList);
+        if (currentSelectSubjectPosition < subjectBeanList.size()) {
+            pvOptions.setSelectOptions(currentSelectSubjectPosition);
+        }
+        pvOptions.setOnDismissListener(new OnDismissListener() {
+            @Override
+            public void onDismiss(Object o) {
+                UiUtils.refreshFilterTextStyle2(false, viewBinding.searchView.getLeftText());
+            }
+
+            @Override
+            public void onShow() {
+                UiUtils.refreshFilterTextStyle2(true, viewBinding.searchView.getLeftText());
+            }
         });
+        pvOptions.show();
     }
 
     private void updateByFilter() {
+        viewBinding.searchView.clearEditFocus();
         int currentItem = viewPager.getCurrentItem();
         for (int i = 0; i < fragments.size(); i++) {
             MineScoreFragment mineScoreFragment = (MineScoreFragment) fragments.get(i);

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

@@ -103,7 +103,7 @@ public class MineScoreFragment extends BaseMVPFragment<FragmentMineScoreBinding,
         ImageView im_empty_logo = emptyLayout.findViewById(R.id.im_empty_logo);
         im_empty_logo.setBackgroundResource(R.drawable.icon_empty_content);
         TextView tv_empty_hint = emptyLayout.findViewById(R.id.tv_empty_hint);
-        tv_empty_hint.setText("暂无曲谱~");
+        tv_empty_hint.setText("暂无内容");
         mineScoreAdapter.setEmptyView(emptyLayout);
         rvAddress.setAdapter(mineScoreAdapter);
         if (TextUtils.equals(auditStatus, MineScoreActivity.TYPE_BUY)) {

teacher/src/main/java/com/cooleshow/teacher/widgets/CourseSearchView.java

@@ -12,6 +12,7 @@ import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.cooleshow.base.utils.LOG;
 import com.cooleshow.base.utils.SoftKeyboardUtils;
 import com.cooleshow.base.utils.helper.QMUIDeviceHelper;
 import com.cooleshow.teacher.R;

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

@@ -99,7 +99,6 @@
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="10dp"
-                            android:layout_marginEnd="5dp"
                             android:ellipsize="end"
                             android:includeFontPadding="false"
                             android:maxLines="1"

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

@@ -3,6 +3,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
     android:layout_height="wrap_content">
 
     <View

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

@@ -15,6 +15,7 @@
         android:text="添加课程规划"
         android:textColor="@color/color_333333"
         android:textSize="@dimen/sp_18"
+        android:textStyle="bold"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />