From 15f5680b532238290d0adf095a93e5af1c5f1203 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 07 二月 2025 17:14:57 +0800
Subject: [PATCH] 1.添加显示隐藏取水口、分水房功能 2.完善图例自定义控件功能和显示 3.处理工单添加选择时间功能

---
 app/src/main/java/com/dayu/pipirrapp/tool/InspectionUtils.java |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/dayu/pipirrapp/tool/InspectionUtils.java b/app/src/main/java/com/dayu/pipirrapp/tool/InspectionUtils.java
index 6679193..645aff0 100644
--- a/app/src/main/java/com/dayu/pipirrapp/tool/InspectionUtils.java
+++ b/app/src/main/java/com/dayu/pipirrapp/tool/InspectionUtils.java
@@ -55,16 +55,20 @@
      * @param fragment
      * @return
      */
-    public static String getInspectionId(MapFragment fragment) {
+    public static void getInspectionId(MapFragment fragment) {
         DaoSingleton.getAsynchInstance(fragment.getContext()).inspectionDao().getMostRecentInspectionWithNoStopTime()
                 .subscribeOn(Schedulers.io())
                 .observeOn(Schedulers.io()).subscribe(inspectionBean -> {
 
                 });
-        return "";
     }
 
 
+    /**
+     * 缁х画鏄剧ず寮傚父鍏抽棴涔嬪墠鐨勫贰妫�鍧愭爣
+     *
+     * @param fragment
+     */
     public static void aginShowLocation(MapFragment fragment) {
         //鏌ヨ褰撳墠鏈叧闂殑宸℃璁板綍
         DaoSingleton.getAsynchInstance(fragment.getContext()).inspectionDao().getMostRecentInspectionWithNoStopTime()
@@ -138,19 +142,21 @@
                 .subscribe(strings -> {
                     //寰幆鏌ヨ鎵�鏈塱d
                     for (String data : strings) {
-                        DaoSingleton.getAsynchInstance(context).inspectionDao().findBymInspectId(data)
-                                .subscribeOn(Schedulers.io())
-                                .observeOn(Schedulers.io())
-                                .subscribe(inspectionBeans -> {
-                                    DaoSingleton.getAsynchInstance(context).inspectionLocationDao().findByNoPostAndInspectId(data)
-                                            .subscribeOn(Schedulers.io())
-                                            .observeOn(Schedulers.io())
-                                            .subscribe(inspectionLocationBeans -> {
-                                                if (inspectionLocationBeans != null && inspectionLocationBeans.size() > 0) {
-                                                    postInspectionData(context, inspectionBeans, inspectionLocationBeans);
-                                                }
-                                            });
-                                });
+                        if (!TextUtils.isEmpty(data)) {
+                            DaoSingleton.getAsynchInstance(context).inspectionDao().findBymInspectId(data)
+                                    .subscribeOn(Schedulers.io())
+                                    .observeOn(Schedulers.io())
+                                    .subscribe(inspectionBeans -> {
+                                        DaoSingleton.getAsynchInstance(context).inspectionLocationDao().findByNoPostAndInspectId(data)
+                                                .subscribeOn(Schedulers.io())
+                                                .observeOn(Schedulers.io())
+                                                .subscribe(inspectionLocationBeans -> {
+                                                    if (inspectionLocationBeans != null && inspectionLocationBeans.size() > 0) {
+                                                        postInspectionData(context, inspectionBeans, inspectionLocationBeans);
+                                                    }
+                                                });
+                                    });
+                        }
                     }
 
                 });

--
Gitblit v1.8.0