diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index d58c9bf..36a1a79 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -45,6 +45,40 @@ viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + viewBinding.titleBarLayout.rightTextView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + new AlertControlDialog.Builder() + .setContext(context) + .setTitle("重置") + .setMessage("确定要重置填写的资料吗?") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { + @Override + public void onConfirmClick() { + //将搜索条件置空 + eorc = ""; + typeCode = ""; + typeDetailCode = ""; + caseState = ""; + + //将界面显示置空 + viewBinding.caseClassView.setText(""); + viewBinding.caseLargeClassView.setText(""); + viewBinding.caseSmallClassView.setText(""); + viewBinding.caseStatusView.setText(""); + viewBinding.startTimeView.setText(""); + viewBinding.endTimeView.setText(""); + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + } + }); } @Override @@ -55,6 +89,47 @@ @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); + commonDataViewModel.largeTypeModel.observe(this, new Observer() { + @Override + public void onChanged(CaseLargeTypeBean typeBean) { + if (typeBean.getCode() == 200) { + //设置大类数据 + largeTypeBeans = typeBean.getData(); + } + } + }); + commonDataViewModel.smallTypeModel.observe(this, new Observer() { + @Override + public void onChanged(CaseSmallTypeBean typeBean) { + if (typeBean.getCode() == 200) { + //设置大类数据 + smallTypeBeans = typeBean.getData(); + } + } + }); + commonDataViewModel.caseStatusModel.observe(this, new Observer() { + @Override + public void onChanged(CaseStatusBean resultBean) { + if (resultBean.getCode() == 200) { + List beans = resultBean.getData(); + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(context); + sheetBuilder.setTitle("处理状态"); + for (CaseStatusBean.DataBean dataBean : beans) { + sheetBuilder.addItem(dataBean.getName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + + caseState = beans.get(position).getValue(); + viewBinding.caseStatusView.setText(tag); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); + } + }).build().show(); + } + } + }); } @Override @@ -81,21 +156,6 @@ }).build().show(); } }); - commonDataViewModel.largeTypeModel.observe(this, new Observer() { - @Override - public void onChanged(CaseLargeTypeBean typeBean) { - if (typeBean.getCode() == 200) { - //设置大类数据 - largeTypeBeans = typeBean.getData(); - if (largeTypeBeans.size() == 0) { - viewBinding.caseLargeClassView.setText("无小类"); - } else { - viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 - } - viewBinding.caseSmallClassView.setText("请选择"); - } - } - }); viewBinding.caseLargeClassLayout.setOnClickListener(new View.OnClickListener() { @Override @@ -124,20 +184,6 @@ } } }); - commonDataViewModel.smallTypeModel.observe(this, new Observer() { - @Override - public void onChanged(CaseSmallTypeBean typeBean) { - if (typeBean.getCode() == 200) { - //设置大类数据 - smallTypeBeans = typeBean.getData(); - if (smallTypeBeans.size() == 0) { - viewBinding.caseSmallClassView.setText("无小类"); - } else { - viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 - } - } - } - }); viewBinding.caseSmallClassLayout.setOnClickListener(new View.OnClickListener() { @Override @@ -168,29 +214,7 @@ commonDataViewModel.obtainCaseStatus(); } }); - commonDataViewModel.caseStatusModel.observe(this, new Observer() { - @Override - public void onChanged(CaseStatusBean resultBean) { - if (resultBean.getCode() == 200) { - List beans = resultBean.getData(); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(context); - sheetBuilder.setTitle("处理状态"); - for (CaseStatusBean.DataBean dataBean : beans) { - sheetBuilder.addItem(dataBean.getName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - caseState = beans.get(position).getValue(); - viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); - } - }).build().show(); - } - } - }); viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override @@ -230,41 +254,6 @@ } }); - viewBinding.resetButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - new AlertControlDialog.Builder() - .setContext(context) - .setTitle("重置") - .setMessage("确定要重置填写的资料吗?") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { - @Override - public void onConfirmClick() { - //将搜索条件置空 - eorc = ""; - typeCode = ""; - typeDetailCode = ""; - caseState = ""; - - //将界面显示置空 - viewBinding.caseClassView.setText(""); - viewBinding.caseLargeClassView.setText(""); - viewBinding.caseSmallClassView.setText(""); - viewBinding.caseStatusView.setText(""); - viewBinding.startTimeView.setText(""); - viewBinding.endTimeView.setText(""); - } - - @Override - public void onCancelClick() { - - } - }).build().show(); - } - }); - viewBinding.searchButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java index d58c9bf..36a1a79 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -45,6 +45,40 @@ viewBinding.titleBarLayout.titleView.setText("案卷查询"); viewBinding.titleBarLayout.leftBackView.setOnClickListener(v -> finish()); + viewBinding.titleBarLayout.rightTextView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + new AlertControlDialog.Builder() + .setContext(context) + .setTitle("重置") + .setMessage("确定要重置填写的资料吗?") + .setNegativeButton("取消") + .setPositiveButton("确定") + .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { + @Override + public void onConfirmClick() { + //将搜索条件置空 + eorc = ""; + typeCode = ""; + typeDetailCode = ""; + caseState = ""; + + //将界面显示置空 + viewBinding.caseClassView.setText(""); + viewBinding.caseLargeClassView.setText(""); + viewBinding.caseSmallClassView.setText(""); + viewBinding.caseStatusView.setText(""); + viewBinding.startTimeView.setText(""); + viewBinding.endTimeView.setText(""); + } + + @Override + public void onCancelClick() { + + } + }).build().show(); + } + }); } @Override @@ -55,6 +89,47 @@ @Override public void initData() { commonDataViewModel = new ViewModelProvider(this).get(CommonDataViewModel.class); + commonDataViewModel.largeTypeModel.observe(this, new Observer() { + @Override + public void onChanged(CaseLargeTypeBean typeBean) { + if (typeBean.getCode() == 200) { + //设置大类数据 + largeTypeBeans = typeBean.getData(); + } + } + }); + commonDataViewModel.smallTypeModel.observe(this, new Observer() { + @Override + public void onChanged(CaseSmallTypeBean typeBean) { + if (typeBean.getCode() == 200) { + //设置大类数据 + smallTypeBeans = typeBean.getData(); + } + } + }); + commonDataViewModel.caseStatusModel.observe(this, new Observer() { + @Override + public void onChanged(CaseStatusBean resultBean) { + if (resultBean.getCode() == 200) { + List beans = resultBean.getData(); + QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(context); + sheetBuilder.setTitle("处理状态"); + for (CaseStatusBean.DataBean dataBean : beans) { + sheetBuilder.addItem(dataBean.getName()); + } + sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { + dialog.dismiss(); + + caseState = beans.get(position).getValue(); + viewBinding.caseStatusView.setText(tag); + viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); + } + }).build().show(); + } + } + }); } @Override @@ -81,21 +156,6 @@ }).build().show(); } }); - commonDataViewModel.largeTypeModel.observe(this, new Observer() { - @Override - public void onChanged(CaseLargeTypeBean typeBean) { - if (typeBean.getCode() == 200) { - //设置大类数据 - largeTypeBeans = typeBean.getData(); - if (largeTypeBeans.size() == 0) { - viewBinding.caseLargeClassView.setText("无小类"); - } else { - viewBinding.caseLargeClassView.setText(largeTypeBeans.get(0).getTypeName());//默认选择第一个 - } - viewBinding.caseSmallClassView.setText("请选择"); - } - } - }); viewBinding.caseLargeClassLayout.setOnClickListener(new View.OnClickListener() { @Override @@ -124,20 +184,6 @@ } } }); - commonDataViewModel.smallTypeModel.observe(this, new Observer() { - @Override - public void onChanged(CaseSmallTypeBean typeBean) { - if (typeBean.getCode() == 200) { - //设置大类数据 - smallTypeBeans = typeBean.getData(); - if (smallTypeBeans.size() == 0) { - viewBinding.caseSmallClassView.setText("无小类"); - } else { - viewBinding.caseSmallClassView.setText(smallTypeBeans.get(0).getTypeDetailName());//默认选择第一个 - } - } - } - }); viewBinding.caseSmallClassLayout.setOnClickListener(new View.OnClickListener() { @Override @@ -168,29 +214,7 @@ commonDataViewModel.obtainCaseStatus(); } }); - commonDataViewModel.caseStatusModel.observe(this, new Observer() { - @Override - public void onChanged(CaseStatusBean resultBean) { - if (resultBean.getCode() == 200) { - List beans = resultBean.getData(); - QMUIBottomSheet.BottomListSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomListSheetBuilder(context); - sheetBuilder.setTitle("处理状态"); - for (CaseStatusBean.DataBean dataBean : beans) { - sheetBuilder.addItem(dataBean.getName()); - } - sheetBuilder.setGravityCenter(true).setOnSheetItemClickListener(new QMUIBottomSheet.BottomListSheetBuilder.OnSheetItemClickListener() { - @Override - public void onClick(QMUIBottomSheet dialog, View itemView, int position, String tag) { - dialog.dismiss(); - caseState = beans.get(position).getValue(); - viewBinding.caseStatusView.setText(tag); - viewBinding.caseStatusView.setTextColor(IntHub.convertColor(context, R.color.mainTextColor)); - } - }).build().show(); - } - } - }); viewBinding.selectStartDateView.setOnClickListener(new View.OnClickListener() { @Override @@ -230,41 +254,6 @@ } }); - viewBinding.resetButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - new AlertControlDialog.Builder() - .setContext(context) - .setTitle("重置") - .setMessage("确定要重置填写的资料吗?") - .setNegativeButton("取消") - .setPositiveButton("确定") - .setOnDialogButtonClickListener(new AlertControlDialog.OnDialogButtonClickListener() { - @Override - public void onConfirmClick() { - //将搜索条件置空 - eorc = ""; - typeCode = ""; - typeDetailCode = ""; - caseState = ""; - - //将界面显示置空 - viewBinding.caseClassView.setText(""); - viewBinding.caseLargeClassView.setText(""); - viewBinding.caseSmallClassView.setText(""); - viewBinding.caseStatusView.setText(""); - viewBinding.startTimeView.setText(""); - viewBinding.endTimeView.setText(""); - } - - @Override - public void onCancelClick() { - - } - }).build().show(); - } - }); - viewBinding.searchButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/res/layout/activity_case_search.xml b/app/src/main/res/layout/activity_case_search.xml index 222d360..729330c 100644 --- a/app/src/main/res/layout/activity_case_search.xml +++ b/app/src/main/res/layout/activity_case_search.xml @@ -7,7 +7,7 @@ + layout="@layout/include_sub_option_text_title" /> @@ -162,30 +162,12 @@ android:layout_height="0dp" android:layout_weight="1"> - - -