From 7c4bfcaec18e0f40e03c9e90edf8a15f21cbc639 Mon Sep 17 00:00:00 2001
From: sujinwen <sujinwen@454eff88-639b-444f-9e54-f578c98de674>
Date: 星期三, 26 七月 2017 15:57:23 +0800
Subject: [PATCH] Failed commit: Default
---
VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java
index 1f2a40d..aec9e40 100644
--- a/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java
+++ b/VisitFace/DemoForBsk/app/src/main/java/cn/com/basic/face/discern/common/ResultBean.java
@@ -1,11 +1,14 @@
package cn.com.basic.face.discern.common;
+import java.util.ArrayList;
import java.util.List;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import org.xutils.http.annotation.HttpResponse;
+
+import cn.com.basic.face.base.BaseApplication;
@HttpResponse(parser = JsonResponseParser.class)
public class ResultBean {
@@ -16,6 +19,7 @@
private Object data;
private int totalPages;
private int pageNum;
+ private Object extraData;
public String getCode() {
@@ -31,6 +35,9 @@
this.message = message;
}
public Object getData() {
+ if (data == null) {
+ data = new ArrayList<>();
+ }
return data;
}
public void setData(Object data) {
@@ -48,13 +55,21 @@
}
public <T> List<T> getList(Class<T> requiredType) {
- if (data != null) {
- if (data instanceof JSONArray) {
- JSONArray jsonArray = (JSONArray) data;
- return JSON.parseArray(jsonArray.toJSONString(), requiredType);
+ if (BaseApplication.getInstance().networkAvailable()) {
+ if (data != null) {
+ if (data instanceof JSONArray) {
+ JSONArray jsonArray = (JSONArray) data;
+ return JSON.parseArray(jsonArray.toJSONString(), requiredType);
+ }
}
+ } else {
+ List<T> list = (List<T>)getData();
+ if (list == null) {
+ list = new ArrayList<>();
+ }
+ return list;
}
- return null;
+ return new ArrayList<>();
}
public boolean isSuccess() {
@@ -87,4 +102,12 @@
public boolean hasMorePages() {
return getPageNum() < getTotalPages();
}
+
+ public Object getExtraData() {
+ return extraData;
+ }
+
+ public void setExtraData(Object extraData) {
+ this.extraData = extraData;
+ }
}
--
Gitblit v1.8.0