From 5d691a8381543a99f23104dd27e36c8f5cdd7c15 Mon Sep 17 00:00:00 2001
From: hwf452 <hwf452@163.com>
Date: Fri, 14 Feb 2025 18:36:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=9A=E8=AE=AF=E5=BD=95?=
 =?UTF-8?q?=E9=97=AA=E9=80=80=EF=BC=8C=E5=BD=93=E9=80=9A=E8=AE=AF=E5=BD=95?=
 =?UTF-8?q?=E5=B7=B2=E5=8A=A0=E5=8A=9F=E5=B9=B6=E5=8F=AF=E8=A7=81=E6=89=8D?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=81=9A=E7=BD=91?=
 =?UTF-8?q?=E7=BB=9C=E8=AF=B7=E6=B1=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rehome/zhdcoa/ui/activity/MainActivity.kt |  7 +++-
 .../zhdcoa/ui/activity/ZdqylsActivity.java    | 36 ++++++++-----------
 2 files changed, 20 insertions(+), 23 deletions(-)

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<ActivityMainBinding>() {
                         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<ZdqylsBean>(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) {