From 34535e7036f409ae5c34f2e0526ba09ed32c6527 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Wed, 11 Apr 2018 15:49:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=8D=E7=A6=BD=E6=97=A5=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Poultrydailyreport/PoultryReportActvity.java    |  2 +-
 app/src/main/res/layout/act_poultry_report.xml      | 13 +++++++------
 app/src/main/res/layout/item_lv_poultry_info.xml    |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportActvity.java b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportActvity.java
index 1d3ecdd..1a24af9 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportActvity.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportActvity.java
@@ -122,7 +122,6 @@ public class PoultryReportActvity extends BaseActivity {
                 buildhouseList.clear();
                 reportBeanList.clear();
                 for (int i = 0;i<rpcList.size();i++){
-                    buildhouseList.add(new ReportString(rpcList.get(i).getLong("House_ID"),""+(i+1)));
                     String House_Name="",Week="",FemaleSiTaoNumber="",MaleSiTaoNumber=""
                             ,FemaleSurvivalRate="",MaleSurvivalRate="",FemalePerFeedNumber="",FemaleEatTime="";
                     if (rpcList.get(i).getString("House_Name")!=null){
@@ -149,6 +148,7 @@ public class PoultryReportActvity extends BaseActivity {
                     if (rpcList.get(i).getDecimal("FemaleEatTime")!=null && rpcList.get(i).getDecimal("FemaleEatTime").compareTo(BigDecimal.ZERO)!=0){
                         FemaleEatTime = rpcList.get(i).getDecimal("FemaleEatTime")+"";
                     }
+                    buildhouseList.add(new ReportString(rpcList.get(i).getLong("House_ID"),House_Name));
                     reportBeanList.add(new PoultryReportBean(rpcList.get(i).getLong("House_ID"),House_Name,Week,FemaleSiTaoNumber
                             ,MaleSiTaoNumber,FemaleSurvivalRate,MaleSurvivalRate,FemalePerFeedNumber,FemaleEatTime));
 
diff --git a/app/src/main/res/layout/act_poultry_report.xml b/app/src/main/res/layout/act_poultry_report.xml
index 846afe6..b327bae 100644
--- a/app/src/main/res/layout/act_poultry_report.xml
+++ b/app/src/main/res/layout/act_poultry_report.xml
@@ -17,7 +17,7 @@
 
         <TextView
             android:id="@+id/tv_name"
-            android:layout_width="40dp"
+            android:layout_width="120dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:background="@color/white"
@@ -25,7 +25,7 @@
             android:paddingBottom="@dimen/dp_10"
             android:paddingTop="@dimen/dp_10"
             android:paddingLeft="@dimen/dp_5"
-            android:text="序号"
+            android:text="栋舍"
             android:textColor="@color/grey666666"
             android:textSize="16sp" />
 
@@ -50,6 +50,7 @@
                     android:layout_gravity="center_horizontal"
                     android:gravity="center"
                     android:text="栋舍"
+                    android:visibility="gone"
                     android:textColor="@color/grey666666"
                     android:textSize="16sp" />
 
@@ -127,8 +128,8 @@
 
         <ListView
             android:id="@+id/lv_buildhousename"
-            android:layout_width="40dp"
-            android:layout_height="match_parent"
+            android:layout_width="120dp"
+            android:layout_height="wrap_content"
             android:layout_below="@id/tv_name"
             android:paddingLeft="@dimen/dp_5"
             android:scrollbars="none"></ListView>
@@ -136,7 +137,7 @@
         <com.qhclh.ytzh.ui.LinkedHorizontalScrollView
             android:id="@+id/sv_report_detail"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_below="@id/tv_name"
             android:layout_toRightOf="@id/lv_buildhousename"
             android:scrollbars="none">
@@ -144,7 +145,7 @@
             <ListView
                 android:id="@+id/lv_report_info"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"></ListView>
+                android:layout_height="wrap_content"></ListView>
         </com.qhclh.ytzh.ui.LinkedHorizontalScrollView>
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/item_lv_poultry_info.xml b/app/src/main/res/layout/item_lv_poultry_info.xml
index f054f85..720e415 100644
--- a/app/src/main/res/layout/item_lv_poultry_info.xml
+++ b/app/src/main/res/layout/item_lv_poultry_info.xml
@@ -13,6 +13,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:gravity="center"
+        android:visibility="gone"
         android:textColor="@color/black303030"
         android:textSize="@dimen/text_size_14" />