修改部分样式问题

BaseLibrary/src/main/java/com/cooleshow/base/widgets/dialog/CommonFilterDialog.java → BaseLibrary/src/main/java/com/cooleshow/base/widgets/dialog/CommonFilterDialogV2.java

@@ -26,21 +26,21 @@ import androidx.recyclerview.widget.RecyclerView;
 /**
  * Author by pq, Date on 2023/2/20.
  */
-public class CommonFilterDialog<T> extends Dialog implements View.OnClickListener {
+public class CommonFilterDialogV2<T> extends Dialog implements View.OnClickListener {
 
     private RecyclerView mRecyclerView;
     private BaseQuickAdapter<T, BaseViewHolder> mAdapter;
     private OnEventListener mEventListener;
     private int selectPos = -1;
 
-    public CommonFilterDialog(@NonNull Context context) {
+    public CommonFilterDialogV2(@NonNull Context context) {
         super(context, R.style.BottomDialogStyle);
     }
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.dialog_common_filter_layout);
+        setContentView(R.layout.dialog_common_filter_v2_layout);
         Window window = getWindow();
         //设置dialog在屏幕底部
         window.setGravity(Gravity.BOTTOM);
@@ -59,7 +59,7 @@ public class CommonFilterDialog<T> extends Dialog implements View.OnClickListene
         window.setAttributes(lp);
 
         mRecyclerView = findViewById(R.id.recyclerView);
-        mAdapter = new BaseQuickAdapter<T, BaseViewHolder>(R.layout.item_common_filter_layout) {
+        mAdapter = new BaseQuickAdapter<T, BaseViewHolder>(R.layout.item_dialog_common_filter_layout) {
             @Override
             protected void convert(@NonNull BaseViewHolder holder, T t) {
                 String text = "";

musicMerge/src/main/java/com/cooleshow/musicmerge/ui/MusicHandleActivity_.java

@@ -1697,7 +1697,7 @@ public class MusicHandleActivity_ extends BaseMVPActivity<AcMusicHandleLayoutBin
         commonConfirmDialog.setIsCanCel(false);
         commonConfirmDialog.setTitle("温馨提示");
         commonConfirmDialog.setContent("已成功保存到草稿，草稿7天未发布将自动删除。");
-        commonConfirmDialog.setCancelText("确认");
+        commonConfirmDialog.setCancelText("我知道了");
         commonConfirmDialog.setConfirmText("查看草稿");
         commonConfirmDialog.setOnCancelClickListener(new View.OnClickListener() {
             @Override

musicMerge/src/main/java/com/cooleshow/musicmerge/ui/work/MyWorkDraftFragment.java

@@ -13,19 +13,15 @@ import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.router.RouterPath;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
-import com.cooleshow.base.utils.PermissionUtils;
 import com.cooleshow.base.utils.SizeUtils;
-import com.cooleshow.base.utils.SoftKeyboardUtil;
 import com.cooleshow.base.utils.SoftKeyboardUtils;
 import com.cooleshow.base.utils.ToastUtil;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.Utils;
 import com.cooleshow.base.utils.helper.PermissionTipHelper;
-import com.cooleshow.base.widgets.DialogUtil;
 import com.cooleshow.base.widgets.EmptyViewLayout;
-import com.cooleshow.base.widgets.dialog.CommonConfirmDialog;
 import com.cooleshow.base.widgets.dialog.CommonConfirmDialog2;
-import com.cooleshow.base.widgets.dialog.CommonFilterDialog;
+import com.cooleshow.base.widgets.dialog.CommonFilterDialogV2;
 import com.cooleshow.musicmerge.R;
 import com.cooleshow.musicmerge.adapter.MyDraftWorkListAdapter;
 import com.cooleshow.musicmerge.bean.MyWorkListBean;
@@ -55,7 +51,7 @@ public class MyWorkDraftFragment extends BaseMVPFragment<FgMyWorkDraftLayoutBind
     private MyDraftWorkListAdapter mListAdapter;
 
     private boolean isEditMode = false;
-    private CommonFilterDialog<WorksType> mCommonFilterDialog;
+    private CommonFilterDialogV2<WorksType> mCommonFilterDialog;
     private String fileType;
     private String searchStr;
     private int filterSelectPos = 0;
@@ -325,8 +321,8 @@ public class MyWorkDraftFragment extends BaseMVPFragment<FgMyWorkDraftLayoutBind
 
     private void selectFilter(TextView targetView) {
         if (mCommonFilterDialog == null) {
-            mCommonFilterDialog = new CommonFilterDialog<WorksType>(getContext());
-            mCommonFilterDialog.setOnEventListener(new CommonFilterDialog.OnEventListener() {
+            mCommonFilterDialog = new CommonFilterDialogV2<WorksType>(getContext());
+            mCommonFilterDialog.setOnEventListener(new CommonFilterDialogV2.OnEventListener() {
                 @Override
                 public void onItemClickListener(BaseQuickAdapter baseQuickAdapter, int pos) {
                     if (mWorksTypes != null && pos < mWorksTypes.size()) {

musicMerge/src/main/java/com/cooleshow/musicmerge/ui/work/MyWorkPublishFragment.java

@@ -9,12 +9,11 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.listener.OnItemClickListener;
 import com.cooleshow.base.constanst.Constants;
 import com.cooleshow.base.ui.fragment.BaseMVPFragment;
-import com.cooleshow.base.utils.SoftKeyboardUtil;
 import com.cooleshow.base.utils.SoftKeyboardUtils;
 import com.cooleshow.base.utils.UiUtils;
 import com.cooleshow.base.utils.helper.WebStartHelper;
 import com.cooleshow.base.widgets.EmptyViewLayout;
-import com.cooleshow.base.widgets.dialog.CommonFilterDialog;
+import com.cooleshow.base.widgets.dialog.CommonFilterDialogV2;
 import com.cooleshow.musicmerge.R;
 import com.cooleshow.musicmerge.adapter.MyWorkListAdapter;
 import com.cooleshow.musicmerge.bean.MyWorkListBean;
@@ -42,7 +41,7 @@ public class MyWorkPublishFragment extends BaseMVPFragment<FgMyWorkPublishLayout
 
     private int currentPage = 1;
     private boolean hasNext = true;
-    private CommonFilterDialog<WorksType> mCommonFilterDialog;
+    private CommonFilterDialogV2<WorksType> mCommonFilterDialog;
     private String fileType;
     private String searchStr;
     private int filterSelectPos = 0;
@@ -201,8 +200,8 @@ public class MyWorkPublishFragment extends BaseMVPFragment<FgMyWorkPublishLayout
 
     private void selectFilter(TextView targetView) {
         if (mCommonFilterDialog == null) {
-            mCommonFilterDialog = new CommonFilterDialog<WorksType>(getContext());
-            mCommonFilterDialog.setOnEventListener(new CommonFilterDialog.OnEventListener() {
+            mCommonFilterDialog = new CommonFilterDialogV2<WorksType>(getContext());
+            mCommonFilterDialog.setOnEventListener(new CommonFilterDialogV2.OnEventListener() {
                 @Override
                 public void onItemClickListener(BaseQuickAdapter baseQuickAdapter, int pos) {
                     if (mWorksTypes != null && pos < mWorksTypes.size()) {