1.2.5

kongzue · Jan 22, 2024 · 17d7bcf · 17d7bcf
1 parent 82e4e16
commit 17d7bcf
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 0 deletions.
diff --git a/basejson/src/main/java/com/kongzue/baseokhttp/util/JsonList.java b/basejson/src/main/java/com/kongzue/baseokhttp/util/JsonList.java
@@ -311,6 +311,9 @@ public Object get(int index) {
     }
 
     public JsonMap findJsonMap(String key, Object value) {
+        if (isNull(key)){
+            return new JsonMap().preBuild(-1, this);
+        }
         for (int i = 0; i < size(); i++) {
             Object child = get(i);
             if (child instanceof JsonMap) {
@@ -322,6 +325,51 @@ public JsonMap findJsonMap(String key, Object value) {
         return new JsonMap().preBuild(-1, this);
     }
 
+    public int findJsonMapIndex(String key, Object value) {
+        if (isNull(key)){
+            return -1;
+        }
+        for (int i = 0; i < size(); i++) {
+            Object child = get(i);
+            if (child instanceof JsonMap) {
+                if (((JsonMap) child).getString(key).equals(String.valueOf(value))) {
+                    return i;
+                }
+            }
+        }
+        return -1;
+    }
+
+    public JsonList findRemove(String key, Object value) {
+        if (isNull(key)){
+            return this;
+        }
+        for (int i = 0; i < size(); i++) {
+            Object child = get(i);
+            if (child instanceof JsonMap) {
+                if (((JsonMap) child).getString(key).equals(String.valueOf(value))) {
+                    remove(i);
+                    return this;
+                }
+            }
+        }
+        return this;
+    }
+
+    public JsonList remove(JsonMap data) {
+        if (data == null || data.isEmpty()) {
+            return this;
+        }
+        for (int i = 0; i < size(); i++) {
+            Object child = get(i);
+            if (data.toString().equals(child.toString())) {
+                remove(i);
+                return this;
+            }
+        }
+        return this;
+    }
+
     public JsonListAdapter createAdapter(Context context, int layoutResId) {
         return new JsonListAdapter(context, layoutResId, this);
     }

diff --git a/basejson/src/main/java/com/kongzue/baseokhttp/util/JsonMap.java b/basejson/src/main/java/com/kongzue/baseokhttp/util/JsonMap.java
@@ -337,6 +337,10 @@ public boolean equals(Object o) {
         return toString().equals(o.toString());
     }
 
+    public boolean equals(String key, Object value) {
+        return get(key) == value;
+    }
+
     private void callParentRelease() {
         if (parentJsonMap != null) {
             parentJsonMap.set(preBuildKey, this);