diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt index 74cbd0b..1556c7c 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/MainActivity.kt @@ -152,7 +152,12 @@ class MainActivity : BaseActivityOaToolbarViewBinding() { binding.rbContact.isChecked = true binding.toolbarView.topLl.visibility = View.VISIBLE if(contactFragment.datas.size==0){ - contactFragment.getData() + if (contactFragment.isAdded && contactFragment.isVisible) { + // Fragment存在且可见,可以安全访问 + contactFragment.getData() + } else { + // Fragment不可用或不可见 + } } } diff --git a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqylsActivity.java b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqylsActivity.java index 377b057..66a67ee 100644 --- a/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqylsActivity.java +++ b/app/src/main/java/com/rehome/zhdcoa/ui/activity/ZdqylsActivity.java @@ -79,10 +79,17 @@ public class ZdqylsActivity extends BaseActivity { public void initData() { datas = new ArrayList<>(); initdatas = new ArrayList<>(); - getdata(); + adapter = new CwlsAdapter(context, datas); + lv.setAdapter(adapter); + lv.setOnItemClickListener((parent, view, position, id) -> { + Intent intent = new Intent(ZdqylsActivity.this, LrqylsryinfoActivity.class);//临时 + intent.putExtra("id", datas.get(position).getId()); + startActivity(intent); + }); + getData(); } - public void getdata() { + public void getData() { HttpUtils.getApi().Getlsry((String) SPUtils.get(context, Contans.BZBH, "")).enqueue(new BaseCallBack(context) { @Override @@ -91,9 +98,12 @@ public class ZdqylsActivity extends BaseActivity { if (bean != null) { if (bean.getTotal().equals("0")) { showToast("无数据"); + datas.clear(); + adapter.notifyDataSetChanged(); } else { - datas = bean.getRows(); - setAdapter(); +// datas = bean.getRows(); + datas.addAll(bean.getRows()); + adapter.notifyDataSetChanged(); } } } @@ -107,26 +117,8 @@ public class ZdqylsActivity extends BaseActivity { } - private void setAdapter() { - - initdatas.addAll(datas); - if (adapter == null) { - adapter = new CwlsAdapter(context, datas); - lv.setAdapter(adapter); - lv.setOnItemClickListener((parent, view, position, id) -> { - Intent intent = new Intent(ZdqylsActivity.this, LrqylsryinfoActivity.class);//临时 - intent.putExtra("id", datas.get(position).getId()); - startActivity(intent); - }); - - } else { - adapter.setNewData(datas); - } - } - /** * 过滤数据 - * * @param txt */ public void filterData(String txt) {