From 3b3c57694e652964e007fc35283c0791b4c31a44 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Sat, 24 Feb 2018 15:06:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../work/breedpoultry/DatanalysisActivity.java | 18 ++++++++++++++----
 app/src/main/res/drawable/shape_blue.xml       |  2 +-
 app/src/main/res/drawable/shape_green.xml      |  2 +-
 app/src/main/res/drawable/shape_perpo.xml      |  2 +-
 app/src/main/res/values/colors.xml             |  4 ++++
 5 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java
index b207bfa..9be9987 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java
@@ -17,6 +17,8 @@ import org.forks.jsonrpc.JsonRpcResult;
 import org.forks.jsonrpc.RpcFacade;
 import org.forks.jsonrpc.RpcObject;
 import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -91,12 +93,20 @@ public class DatanalysisActivity extends BaseActivity {
             List<String> rpobj;
             @Override
             protected void successUI() {
-                System.out.println("aaa++++++++rpo+++"+rpobj);
-                for (int i=1;i<rpobj.size();i++){
-                    hengzuobiaolist.add("第"+i+"日龄");
-                    listshuju.add(i+1.111f);
+                String js = rpobj.toString();
+                try {
+                    JSONArray jsonArray = new JSONArray(js);
+                    for (int i=0;i<jsonArray.length();i++){
+                        JSONArray jsArray = jsonArray.getJSONArray(i);
+                        hengzuobiaolist.add("第"+jsArray.get(0)+"日龄");
+                        listshuju.add(Float.parseFloat(jsArray.get(1).toString()));
+                    }
+
+                } catch (JSONException e) {
+                    e.printStackTrace();
                 }
 
+
                 ///< 横坐标数据
                 int lenth = hengzuobiaolist.size();
                 date = hengzuobiaolist.toArray(new String[lenth]);
diff --git a/app/src/main/res/drawable/shape_blue.xml b/app/src/main/res/drawable/shape_blue.xml
index 3aaf085..a4310b4 100644
--- a/app/src/main/res/drawable/shape_blue.xml
+++ b/app/src/main/res/drawable/shape_blue.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="@color/blue48dac7" />
+    <solid android:color="@color/reddada" />
 
     <!--<stroke-->
         <!--android:width="@dimen/dp_1"-->
diff --git a/app/src/main/res/drawable/shape_green.xml b/app/src/main/res/drawable/shape_green.xml
index e1b3c6c..b71a1e2 100644
--- a/app/src/main/res/drawable/shape_green.xml
+++ b/app/src/main/res/drawable/shape_green.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="@color/grenn48da59" />
+    <solid android:color="@color/perpoaa" />
 
     <!--<stroke-->
         <!--android:width="@dimen/dp_1"-->
diff --git a/app/src/main/res/drawable/shape_perpo.xml b/app/src/main/res/drawable/shape_perpo.xml
index 073996d..f14fd7e 100644
--- a/app/src/main/res/drawable/shape_perpo.xml
+++ b/app/src/main/res/drawable/shape_perpo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="@color/perpod26ee4" />
+    <solid android:color="@color/yellowe" />
 
     <!--<stroke-->
         <!--android:width="@dimen/dp_1"-->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a6b525d..a433ba9 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -33,6 +33,7 @@
     <color name="transp">#00000000</color>
     <color name="green02aa3e">#02aa3e</color>
 
+    <color name="reddada">#da4848</color>
     <color name="redda4848">#da4848</color>
     <color name="blue48dac7">#48dac7</color>
     <color name="grenn48da59">#48da59</color>
@@ -41,4 +42,7 @@
 
     <color name="blue05b0f9">#05b0f9</color>
     <color name="green_2eab71_90">#E62eab71</color>
+    <color name="perpoaa">#d16ee3</color>
+    <color name="yellowe">#e6d621</color>
+
 </resources>