1.0.9

kongzue · Nov 3, 2022 · 6c54aaa · 6c54aaa
1 parent 49ef0c9
commit 6c54aaa
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 9 deletions.
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.bin b/.gradle/6.7.1/fileHashes/fileHashes.bin
diff --git a/.gradle/6.7.1/fileHashes/fileHashes.lock b/.gradle/6.7.1/fileHashes/fileHashes.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin
diff --git a/basejson/build.gradle b/basejson/build.gradle
@@ -5,8 +5,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 30
-        versionCode 8
-        versionName "1.0.8"
+        versionCode 9
+        versionName "1.0.9"
     }
 
     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
@@ -272,4 +272,12 @@ private boolean isNull(String s) {
     public boolean equals(Object o) {
         return toString().equals(o.toString());
     }
+
+    @Override
+    public Object get(int index) {
+        if (index < 0 || index >= size()) {
+            return null;
+        }
+        return super.get(index);
+    }
 }
diff --git a/basejson/src/main/java/com/kongzue/baseokhttp/util/JsonMap.java b/basejson/src/main/java/com/kongzue/baseokhttp/util/JsonMap.java
@@ -167,7 +167,7 @@ public int getInt(String key, int emptyValue) {
             result = Integer.parseInt(get(key) + "");
         } catch (Exception e) {
         }
-        return result;
+        return result == 0 ? emptyValue : result;
     }
 
     public boolean getBoolean(String key) {
@@ -180,7 +180,7 @@ public boolean getBoolean(String key, boolean emptyValue) {
             result = Boolean.parseBoolean(get(key) + "");
         } catch (Exception e) {
         }
-        return result;
+        return result == false ? emptyValue : result;
     }
 
     public long getLong(String key) {
@@ -193,7 +193,7 @@ public long getLong(String key, long emptyValue) {
             result = Long.parseLong(get(key) + "");
         } catch (Exception e) {
         }
-        return result;
+        return result == 0 ? emptyValue : result;
     }
 
     public short getShort(String key) {
@@ -206,7 +206,7 @@ public short getShort(String key, short emptyValue) {
             result = Short.parseShort(get(key) + "");
         } catch (Exception e) {
         }
-        return result;
+        return result == 0?emptyValue:result;
     }
 
     public double getDouble(String key) {
@@ -219,7 +219,7 @@ public double getDouble(String key, double emptyValue) {
             result = Double.parseDouble(get(key) + "");
         } catch (Exception e) {
         }
-        return result;
+        return result==0?emptyValue:result;
     }
 
     public float getFloat(String key) {
@@ -232,7 +232,7 @@ public float getFloat(String key, float emptyValue) {
             result = Float.parseFloat(get(key) + "");
         } catch (Exception e) {
         }
-        return result;
+        return result==0?emptyValue:result;
     }
 
     public JsonList getList(String key) {

diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:4.2.0'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files