diff --git a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/YuchuFragment.java b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/YuchuFragment.java index a411a85..8194026 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/YuchuFragment.java +++ b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/YuchuFragment.java @@ -20,6 +20,7 @@ import org.forks.jsonrpc.RpcFacade; import org.forks.jsonrpc.RpcObject; import org.json.JSONArray; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.List; @@ -83,9 +84,9 @@ public class YuchuFragment extends BaseFragment { TextView item4 = view2.findViewById(R.id.item4); item1.setText(detailsList.get(j).getString("Batch_Name")); - item2.setText("周龄:"+i+2); - item3.setText("死淘:"+detailsList.get(j).getInt("SiTaoNumber")); - item4.setText("成活率:"+detailsList.get(j).getDecimal("SurvivalRate")); + item2.setText("周龄:"+detailsList.get(j).getString("Week")); + item3.setText("死淘:"+detailsList.get(j).getInt("SiTaoNumber")); + item4.setText("成活率:"+detailsList.get(j).getDecimal("SurvivalRate").multiply(new BigDecimal("100")).stripTrailingZeros().toPlainString()+"%"); secondContent.addView(view2); } firstContent.addView(view); diff --git a/app/src/main/res/layout/view_second.xml b/app/src/main/res/layout/view_second.xml index 9dc2fa2..21b9b3e 100644 --- a/app/src/main/res/layout/view_second.xml +++ b/app/src/main/res/layout/view_second.xml @@ -11,7 +11,7 @@ android:id="@+id/item1" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_weight="1" + android:layout_weight="5" android:textColor="@color/black303030" android:textSize="@dimen/text_size_14" /> @@ -19,7 +19,7 @@ android:id="@+id/item2" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_weight="1" + android:layout_weight="5" android:textColor="@color/black303030" android:textSize="@dimen/text_size_14" /> @@ -27,7 +27,7 @@ android:id="@+id/item3" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_weight="1" + android:layout_weight="5" android:textColor="@color/black303030" android:textSize="@dimen/text_size_14" /> @@ -35,7 +35,7 @@ android:id="@+id/item4" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_weight="1" + android:layout_weight="6" android:textColor="@color/black303030" android:textSize="@dimen/text_size_14" />