1.2.3

kongzue · Jan 3, 2024 · 90eee49 · 90eee49
1 parent 1b673f7
commit 90eee49
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 5 deletions.
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/basejson/build.gradle b/basejson/build.gradle
@@ -7,8 +7,8 @@ android {
         minSdkVersion 14
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 30
-        versionCode 15
-        versionName "1.2.2"
+        versionCode 16
+        versionName "1.2.3"
     }
 
     buildTypes {

diff --git a/basejson/src/main/java/com/kongzue/baseokhttp/util/JsonList.java b/basejson/src/main/java/com/kongzue/baseokhttp/util/JsonList.java
@@ -59,8 +59,13 @@ public JsonList(String jsonStr) {
                     set(o);
                 }
             }
+            if (isEmpty()) {
+                onEmpty(this, null);
+            } else {
+                onSuccess(this);
+            }
         } catch (Exception e) {
-
+            onEmpty(this, e);
         }
     }
 
@@ -85,7 +90,13 @@ public JsonList(String jsonStr, boolean preParsing) {
                     set(o);
                 }
             }
+            if (isEmpty()) {
+                onEmpty(this, null);
+            } else {
+                onSuccess(this);
+            }
         } catch (Exception e) {
+            onEmpty(this, e);
         }
     }
 
@@ -365,4 +376,14 @@ public JsonList preBuild(int preBuildIndex, JsonList parentJsonList) {
         this.parentJsonList = parentJsonList;
         return this;
     }
+
+    // 构建中用于复写的成功状态
+    public void onSuccess(JsonList thisJson) {
+
+    }
+
+    // 构建中用于复写的空/异常内容状态
+    public void onEmpty(JsonList thisJson, Exception e) {
+
+    }
 }
diff --git a/basejson/src/main/java/com/kongzue/baseokhttp/util/JsonMap.java b/basejson/src/main/java/com/kongzue/baseokhttp/util/JsonMap.java
@@ -76,8 +76,13 @@ public JsonMap(String jsonStr) {
                     put(key, value);
                 }
             }
+            if (isEmpty()) {
+                onEmpty(this, null);
+            } else {
+                onSuccess(this);
+            }
         } catch (Exception e) {
-
+            onEmpty(this, e);
         }
     }
 
@@ -103,8 +108,13 @@ public JsonMap(String jsonStr, boolean preParsing) {
                     put(key, value);
                 }
             }
+            if (isEmpty()) {
+                onEmpty(this, null);
+            } else {
+                onSuccess(this);
+            }
         } catch (Exception e) {
-
+            onEmpty(this, e);
         }
     }
 
@@ -367,4 +377,14 @@ public JsonMap preBuild(int preBuildIndex, JsonList parentJsonList) {
         this.parentJsonList = parentJsonList;
         return this;
     }
+
+    // 构建中用于复写的成功状态
+    public void onSuccess(JsonMap thisJson) {
+
+    }
+
+    // 构建中用于复写的空/异常内容状态
+    public void onEmpty(JsonMap thisJson, Exception e) {
+
+    }
 }