diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 939d7e1..cd68bdc 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -2,7 +2,6 @@ import android.content.Context; import android.os.Handler; -import android.view.View; import androidx.annotation.NonNull; import androidx.lifecycle.Observer; @@ -143,13 +142,7 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉,没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); + viewBinding.emptyView.show(false, "抱歉,没有查到符合您规定条件的案卷", null, null, null); } else { viewBinding.emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { diff --git a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java index 939d7e1..cd68bdc 100644 --- a/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java +++ b/app/src/main/java/com/casic/dcms/view/CaseSearchResultActivity.java @@ -2,7 +2,6 @@ import android.content.Context; import android.os.Handler; -import android.view.View; import androidx.annotation.NonNull; import androidx.lifecycle.Observer; @@ -143,13 +142,7 @@ private final Handler.Callback callback = msg -> { if (msg.what == 20210425) { if (dataBeans.size() == 0) { - viewBinding.emptyView.show(false, "抱歉,没有查到符合您规定条件的案卷", null, "", new View.OnClickListener() { - @Override - public void onClick(View v) { - pageIndex = 1; - obtainSearchResult(); - } - }); + viewBinding.emptyView.show(false, "抱歉,没有查到符合您规定条件的案卷", null, null, null); } else { viewBinding.emptyView.hide(); adapter = new NormalRecyclerAdapter(R.layout.item_case_rv_l, dataBeans) { 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 36a1a79..bb0ba02 100644 --- a/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java +++ b/app/src/main/java/com/casic/dcms/view/SearchCaseActivity.java @@ -20,18 +20,20 @@ import com.pengxh.androidx.lite.base.AndroidxBaseActivity; import com.pengxh.androidx.lite.hub.IntHub; import com.pengxh.androidx.lite.hub.LongHub; +import com.pengxh.androidx.lite.hub.StringHub; import com.pengxh.androidx.lite.utils.ImmerseStatusBarManager; import com.pengxh.androidx.lite.widget.dialog.AlertControlDialog; import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; +import java.util.ArrayList; import java.util.List; public class SearchCaseActivity extends AndroidxBaseActivity { private static final String TAG = "CaseSearchActivity"; private final Context context = this; - private List largeTypeBeans; - private List smallTypeBeans; + private List largeTypeBeans = new ArrayList<>(); + private List smallTypeBeans = new ArrayList<>(); private CommonDataViewModel commonDataViewModel; private String eorc = ""; private String typeCode = ""; @@ -181,6 +183,8 @@ typeCode = dataBean.getTypeCode(); } }).build().show(); + } else { + StringHub.show(context, "请先选择案卷类型"); } } }); @@ -204,6 +208,8 @@ typeDetailCode = smallTypeBeans.get(position).getTypeDetailCode(); } }).build().show(); + } else { + StringHub.show(context, "请先选择案卷大类"); } } });