v8 — fix bug field_include depth 2+

xfrocks · Feb 24, 2017 · 1989448 · 1989448
1 parent 65260a5
commit 1989448
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,7 +11,7 @@ android {
 
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 7
+        versionCode 8
         versionName "1.0.0"
 
         // oops, too many dependencies apparently?

diff --git a/app/src/main/java/com/xfrocks/api/androiddemo/common/Api.java b/app/src/main/java/com/xfrocks/api/androiddemo/common/Api.java
@@ -515,8 +515,13 @@ Params andFieldsInclude(Class<? extends ApiModel> clazz, StringBuilder valueBuil
                     }
 
                     if (ApiModel.class.isAssignableFrom(fieldType)) {
+                        String fieldPrefix = serializedName;
+                        if (!TextUtils.isEmpty(prefix)) {
+                            fieldPrefix = String.format("%s.%s", prefix, fieldPrefix);
+                        }
+
                         //noinspection unchecked
-                        andFieldsInclude((Class<? extends ApiModel>) fieldType, valueBuilder, serializedName);
+                        andFieldsInclude((Class<? extends ApiModel>) fieldType, valueBuilder, fieldPrefix);
                         continue;
                     }