From c5bf501d8b507d1e3e79541e7ac9b45910860b4d Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Wed, 29 May 2019 16:17:07 +0800
Subject: [PATCH] 添加新功能
---
app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java b/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
index 6602109..3990582 100644
--- a/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
+++ b/app/src/main/java/com/moral/yunfushao/activity/ChartActivity.java
@@ -308,7 +308,7 @@
private ArrayList<UserData> dataList = new ArrayList<>();
- private void getData(String startTime, String endTime) {
+ private void getData(final String startTime, String endTime) {
HashMap<String, String> params = new HashMap<>();
params.put("user_id", MainApp.userId);
params.put("start_time", startTime);
@@ -324,13 +324,15 @@
String data = jsonObject.optString("data");
ArrayList<UserData> temp = (ArrayList<UserData>) FastJsonTools.getArrayJson(data, UserData.class);
dataList.clear();
-
dataList.addAll(resetData(temp));
-
//������
reshowChart(dataList);
tv_value.setText(NumberUtils.getBigDecimalValue(jsonObject.optDouble("avg"), 3) + "uSv");
- tv_status.setText(jsonObject.optString("status"));
+ String status = jsonObject.optString("status");
+ if (status.equals("������������")) {
+ status = "������������";
+ }
+ tv_status.setText(status);
} catch (JSONException e) {
e.printStackTrace();
}
@@ -449,8 +451,6 @@
} catch (JSONException e) {
e.printStackTrace();
}
-
-
}
@Override
--
Gitblit v1.8.0