From f41f0f2820a3f450d8ad9c367f572583122cfca0 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Wed, 24 Jan 2018 14:37:29 +0800
Subject: [PATCH] =?UTF-8?q?5=E5=A4=A7=E7=89=87=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  2 +-
 .../ytzh/index/shangpin/ShangpinFragment.java | 45 ++++++++++++-------
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7d2128b..fab3482 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdkVersion 15
         targetSdkVersion 26
         versionCode 1
-        versionName "1.2.0"
+        versionName "1.2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         ndk {
diff --git a/app/src/main/java/com/qhclh/ytzh/index/shangpin/ShangpinFragment.java b/app/src/main/java/com/qhclh/ytzh/index/shangpin/ShangpinFragment.java
index 0f4fd64..7985a3a 100644
--- a/app/src/main/java/com/qhclh/ytzh/index/shangpin/ShangpinFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/index/shangpin/ShangpinFragment.java
@@ -72,21 +72,6 @@ public class ShangpinFragment extends BaseFragment {
     @Override
     protected void initData() {
         list = new ArrayList<>();
-        for (int i =0;i<5;i++){
-            ShangpinPianquBean shangpinPianquBean = new ShangpinPianquBean();
-            shangpinPianquBean.setId(i+10);
-            shangpinPianquBean.setPianqu("片区:"+i);
-            shangpinPianquBean.setZonglan("总栏:"+i+"10");
-            shangpinPianquBean.setCunlan("存栏:"+i+"5");
-            shangpinPianquBean.setKonglan("空栏:"+i+"1");
-
-            list.add(shangpinPianquBean);
-        }
-
-        shangpinPianquAdapter = new ShangpinPianquAdapter(getActivity(),list);
-        mLayoutManager=new GridLayoutManager(getActivity(),2,GridLayoutManager.VERTICAL,false);//设置为一个2列的纵向网格布局
-        rv_shangpinpianqu.setLayoutManager(mLayoutManager);
-        rv_shangpinpianqu.setAdapter(shangpinPianquAdapter);
     }
 
     @Override
@@ -125,6 +110,36 @@ public class ShangpinFragment extends BaseFragment {
     }
 
     private void BreedFactoryAreaCountInfo() {
+        ViewOnClickTask areaTask = new ViewOnClickTask(getActivity(),"加载中...") {
+            List<RpcObject> rpcList;
+            @Override
+            protected void successUI() {
+                list.clear();
+                for (int i =0;i<rpcList.size();i++){
+                    ShangpinPianquBean shangpinPianquBean = new ShangpinPianquBean();
+                    shangpinPianquBean.setId(rpcList.get(i).getLong("WeatherArea_ID"));
+                    shangpinPianquBean.setPianqu("片区:"+rpcList.get(i).getString("WeatherArea_Name"));
+                    shangpinPianquBean.setZonglan("总栏:"+rpcList.get(i).getInt("ZongLan"));
+                    shangpinPianquBean.setCunlan("存栏:"+rpcList.get(i).getInt("CunLan"));
+                    shangpinPianquBean.setKonglan("空栏:"+rpcList.get(i).getInt("KongLan"));
+
+                    list.add(shangpinPianquBean);
+                }
+
+                shangpinPianquAdapter = new ShangpinPianquAdapter(getActivity(),list);
+                mLayoutManager=new GridLayoutManager(getActivity(),2,GridLayoutManager.VERTICAL,false);//设置为一个2列的纵向网格布局
+                rv_shangpinpianqu.setLayoutManager(mLayoutManager);
+                rv_shangpinpianqu.setAdapter(shangpinPianquAdapter);
+            }
+
+            @Override
+            public Object call() throws Exception {
+                JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.BreedReportRpcAreaCountInfo);
+                rpcList = result.getRpcObjectList(RpcUrl.BreedReportRpcAreaCountInfo_fanhui);
+                return null;
+            }
+        };
+        areaTask.execute();
     }
 
     private void BreedFactoryCountInfo() {