Browse Source

Fix: user info data column to correct type

liweihao 6 years ago
parent
commit
569dc964a8

+ 5 - 34
src/main/java/com/example/kdan_data_center/datacenter/user/data/UserInfoData.kt

@@ -13,37 +13,20 @@ data class UserInfoData(
             @SerializedName("account") val account: String,
             @SerializedName("folder_name_hash") val folderNameHash: String,
             @SerializedName("full_storage") val fullStorage: Long,
-            @SerializedName("used_storage") val usedStorage: Int,
+            @SerializedName("used_storage") val usedStorage: Long,
             @SerializedName("active") val active: Boolean,
             @SerializedName("created_at") val createdAt: String,
             @SerializedName("updated_at") val updatedAt: String,
-            @SerializedName("projects_count") val projectsCount: ProjectsCount,
-            @SerializedName("content_category_count") val contentCategoryCount: ContentCategoryCount,
-            @SerializedName("bucket_category_count") val bucketCategoryCount: BucketCategoryCount,
+            @SerializedName("projects_count") val projectsCount: HashMap<String,Int>,
+            @SerializedName("content_category_count") val contentCategoryCount: HashMap<String,Int>,
+            @SerializedName("bucket_category_count") val bucketCategoryCount: HashMap<String,Int>,
             @SerializedName("storage_expired_at") val storageExpiredAt: String,
             @SerializedName("email") val email: String,
-            @SerializedName("using_version") val usingVersion: Any,
+            @SerializedName("using_version") val usingVersion: String?,
             @SerializedName("project_count") val projectCount: Int,
             @SerializedName("source_location") val sourceLocation: SourceLocation
     ) {
 
-        data class ContentCategoryCount(
-                @SerializedName("txt") val txt: Int,
-                @SerializedName("other") val other: Int,
-                @SerializedName("pdf") val pdf: Int,
-                @SerializedName("image") val image: Int,
-                @SerializedName("iwork") val iwork: Int,
-                @SerializedName("doc") val doc: Int,
-                @SerializedName("audio") val audio: Int,
-                @SerializedName("video") val video: Int
-        )
-
-
-        data class ProjectsCount(
-                @SerializedName("cloud-demo") val cloudDemo: Int
-        )
-
-
         data class SourceLocation(
                 @SerializedName("data_source") val dataSource: DataSource
         ) {
@@ -79,17 +62,5 @@ data class UserInfoData(
                 )
             }
         }
-
-
-        data class BucketCategoryCount(
-                @SerializedName("cloud-demo,txt") val cloudDemoTxt: Int,
-                @SerializedName("cloud-demo,other") val cloudDemoOther: Int,
-                @SerializedName("cloud-demo,pdf") val cloudDemoPdf: Int,
-                @SerializedName("cloud-demo,image") val cloudDemoImage: Int,
-                @SerializedName("cloud-demo,iwork") val cloudDemoIwork: Int,
-                @SerializedName("cloud-demo,doc") val cloudDemoDoc: Int,
-                @SerializedName("cloud-demo,audio") val cloudDemoAudio: Int,
-                @SerializedName("cloud-demo,video") val cloudDemoVideo: Int
-        )
     }
 }