diff --git a/app/src/main/java/com/qhclh/ytzh/bean/TablePBean.java b/app/src/main/java/com/qhclh/ytzh/bean/TablePBean.java
index d14427e..5d6754e 100644
--- a/app/src/main/java/com/qhclh/ytzh/bean/TablePBean.java
+++ b/app/src/main/java/com/qhclh/ytzh/bean/TablePBean.java
@@ -23,30 +23,37 @@ public class TablePBean {
public static class Details{
private String Days1;
+ private String chenghuolv1;
private String dienumber1;
private String obs1;
private String cunhuo1;
private String Days2;
+ private String chenghuolv2;
private String dienumber2;
private String obs2;
private String cunhuo2;
private String Days3;
+ private String chenghuolv3;
private String dienumber3;
private String obs3;
private String cunhuo3;
private String Days4;
+ private String chenghuolv4;
private String dienumber4;
private String obs4;
private String cunhuo4;
private String Days5;
+ private String chenghuolv5;
private String dienumber5;
private String obs5;
private String cunhuo5;
private String Days6;
+ private String chenghuolv6;
private String dienumber6;
private String obs6;
private String cunhuo6;
private String Days7;
+ private String chenghuolv7;
private String dienumber7;
private String obs7;
private String cunhuo7;
@@ -78,6 +85,62 @@ public class TablePBean {
'}';
}
+ public String getChenghuolv1() {
+ return chenghuolv1;
+ }
+
+ public void setChenghuolv1(String chenghuolv1) {
+ this.chenghuolv1 = chenghuolv1;
+ }
+
+ public String getChenghuolv2() {
+ return chenghuolv2;
+ }
+
+ public void setChenghuolv2(String chenghuolv2) {
+ this.chenghuolv2 = chenghuolv2;
+ }
+
+ public String getChenghuolv3() {
+ return chenghuolv3;
+ }
+
+ public void setChenghuolv3(String chenghuolv3) {
+ this.chenghuolv3 = chenghuolv3;
+ }
+
+ public String getChenghuolv4() {
+ return chenghuolv4;
+ }
+
+ public void setChenghuolv4(String chenghuolv4) {
+ this.chenghuolv4 = chenghuolv4;
+ }
+
+ public String getChenghuolv5() {
+ return chenghuolv5;
+ }
+
+ public void setChenghuolv5(String chenghuolv5) {
+ this.chenghuolv5 = chenghuolv5;
+ }
+
+ public String getChenghuolv6() {
+ return chenghuolv6;
+ }
+
+ public void setChenghuolv6(String chenghuolv6) {
+ this.chenghuolv6 = chenghuolv6;
+ }
+
+ public String getChenghuolv7() {
+ return chenghuolv7;
+ }
+
+ public void setChenghuolv7(String chenghuolv7) {
+ this.chenghuolv7 = chenghuolv7;
+ }
+
public String getDays3() {
return Days3;
}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/XFactryAdapter.java b/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/XFactryAdapter.java
index 1442fa0..97f6a7c 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/XFactryAdapter.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/XFactryAdapter.java
@@ -94,6 +94,14 @@ public class XFactryAdapter extends BaseAdapter{
viewHolder.view_v6 = view.findViewById(R.id.view_v6);
viewHolder.view_v7 = view.findViewById(R.id.view_v7);
+ viewHolder.tab_chenghuolv1 = view.findViewById(R.id.tab_chenghuolv1);
+ viewHolder.tab_chenghuolv2 = view.findViewById(R.id.tab_chenghuolv2);
+ viewHolder.tab_chenghuolv3 = view.findViewById(R.id.tab_chenghuolv3);
+ viewHolder.tab_chenghuolv4 = view.findViewById(R.id.tab_chenghuolv4);
+ viewHolder.tab_chenghuolv5 = view.findViewById(R.id.tab_chenghuolv5);
+ viewHolder.tab_chenghuolv6 = view.findViewById(R.id.tab_chenghuolv6);
+ viewHolder.tab_chenghuolv7 = view.findViewById(R.id.tab_chenghuolv7);
+
view.setTag(viewHolder);
}else {
viewHolder = (ViewHolder) view.getTag();
@@ -103,56 +111,63 @@ public class XFactryAdapter extends BaseAdapter{
if (message.getDetailses().getDays1()!=null) {
viewHolder.ll_tb1.setVisibility(View.VISIBLE);
viewHolder.view_v1.setVisibility(View.VISIBLE);
- viewHolder.tab_days1.setText("日龄1: " + message.getDetailses().getDays1());
- viewHolder.tab_dienub1.setText("死亡: " + message.getDetailses().getDienumber1());
- viewHolder.tab_obs1.setText("淘汰: " + message.getDetailses().getObs1());
+ viewHolder.tab_days1.setText("日龄1:" + message.getDetailses().getDays1());
+ viewHolder.tab_chenghuolv1.setText("成活率:"+message.getDetailses().getChenghuolv1());
+ viewHolder.tab_dienub1.setText("死亡:" + message.getDetailses().getDienumber1());
+ viewHolder.tab_obs1.setText("淘汰:" + message.getDetailses().getObs1());
}
if (message.getDetailses().getDays2()!=null) {
viewHolder.ll_tb2.setVisibility(View.VISIBLE);
viewHolder.view_v2.setVisibility(View.VISIBLE);
- viewHolder.tab_days2.setText("日龄2: " + message.getDetailses().getDays2());
- viewHolder.tab_dienub2.setText("死亡: " + message.getDetailses().getDienumber2());
- viewHolder.tab_obs2.setText("淘汰: " + message.getDetailses().getObs2());
+ viewHolder.tab_days2.setText("日龄2:" + message.getDetailses().getDays2());
+ viewHolder.tab_chenghuolv2.setText("成活率:"+message.getDetailses().getChenghuolv2());
+ viewHolder.tab_dienub2.setText("死亡:" + message.getDetailses().getDienumber2());
+ viewHolder.tab_obs2.setText("淘汰:" + message.getDetailses().getObs2());
}
if (message.getDetailses().getDays3()!=null) {
viewHolder.ll_tb3.setVisibility(View.VISIBLE);
viewHolder.view_v3.setVisibility(View.VISIBLE);
- viewHolder.tab_days3.setText("日龄3: " + message.getDetailses().getDays3());
- viewHolder.tab_dienub3.setText("死亡: " + message.getDetailses().getDienumber3());
- viewHolder.tab_obs3.setText("淘汰: " + message.getDetailses().getObs3());
+ viewHolder.tab_days3.setText("日龄3:" + message.getDetailses().getDays3());
+ viewHolder.tab_chenghuolv3.setText("成活率:"+message.getDetailses().getChenghuolv3());
+ viewHolder.tab_dienub3.setText("死亡:" + message.getDetailses().getDienumber3());
+ viewHolder.tab_obs3.setText("淘汰:" + message.getDetailses().getObs3());
}
if (message.getDetailses().getDays4()!=null) {
viewHolder.ll_tb4.setVisibility(View.VISIBLE);
viewHolder.view_v4.setVisibility(View.VISIBLE);
- viewHolder.tab_days4.setText("日龄4: " + message.getDetailses().getDays4());
- viewHolder.tab_dienub4.setText("死亡: " + message.getDetailses().getDienumber4());
- viewHolder.tab_obs4.setText("淘汰: " + message.getDetailses().getObs4());
+ viewHolder.tab_days4.setText("日龄4:" + message.getDetailses().getDays4());
+ viewHolder.tab_chenghuolv4.setText("成活率:"+message.getDetailses().getChenghuolv4());
+ viewHolder.tab_dienub4.setText("死亡:" + message.getDetailses().getDienumber4());
+ viewHolder.tab_obs4.setText("淘汰:" + message.getDetailses().getObs4());
}
if (message.getDetailses().getDays5()!=null) {
viewHolder.ll_tb5.setVisibility(View.VISIBLE);
viewHolder.view_v5.setVisibility(View.VISIBLE);
- viewHolder.tab_days5.setText("日龄5: " + message.getDetailses().getDays5());
- viewHolder.tab_dienub5.setText("死亡: " + message.getDetailses().getDienumber5());
- viewHolder.tab_obs5.setText("淘汰: " + message.getDetailses().getObs5());
+ viewHolder.tab_days5.setText("日龄5:" + message.getDetailses().getDays5());
+ viewHolder.tab_chenghuolv5.setText("成活率:"+message.getDetailses().getChenghuolv5());
+ viewHolder.tab_dienub5.setText("死亡:" + message.getDetailses().getDienumber5());
+ viewHolder.tab_obs5.setText("淘汰:" + message.getDetailses().getObs5());
}
if (message.getDetailses().getDays6()!=null) {
viewHolder.ll_tb6.setVisibility(View.VISIBLE);
viewHolder.view_v6.setVisibility(View.VISIBLE);
- viewHolder.tab_days6.setText("日龄6: " + message.getDetailses().getDays6());
- viewHolder.tab_dienub6.setText("死亡: " + message.getDetailses().getDienumber6());
- viewHolder.tab_obs6.setText("淘汰: " + message.getDetailses().getObs6());
+ viewHolder.tab_days6.setText("日龄6:" + message.getDetailses().getDays6());
+ viewHolder.tab_chenghuolv6.setText("成活率:"+message.getDetailses().getChenghuolv6());
+ viewHolder.tab_dienub6.setText("死亡:" + message.getDetailses().getDienumber6());
+ viewHolder.tab_obs6.setText("淘汰:" + message.getDetailses().getObs6());
}
if (message.getDetailses().getDays7()!=null) {
viewHolder.ll_tb7.setVisibility(View.VISIBLE);
viewHolder.view_v7.setVisibility(View.VISIBLE);
- viewHolder.tab_days7.setText("日龄7: " + message.getDetailses().getDays7());
- viewHolder.tab_dienub7.setText("死亡: " + message.getDetailses().getDienumber7());
- viewHolder.tab_obs7.setText("淘汰: " + message.getDetailses().getObs7());
+ viewHolder.tab_days7.setText("日龄7:" + message.getDetailses().getDays7());
+ viewHolder.tab_chenghuolv7.setText("成活率:"+message.getDetailses().getChenghuolv7());
+ viewHolder.tab_dienub7.setText("死亡:" + message.getDetailses().getDienumber7());
+ viewHolder.tab_obs7.setText("淘汰:" + message.getDetailses().getObs7());
}
@@ -203,5 +218,13 @@ public class XFactryAdapter extends BaseAdapter{
private TextView view_v6;
private TextView view_v7;
+ private TextView tab_chenghuolv1;
+ private TextView tab_chenghuolv2;
+ private TextView tab_chenghuolv3;
+ private TextView tab_chenghuolv4;
+ private TextView tab_chenghuolv5;
+ private TextView tab_chenghuolv6;
+ private TextView tab_chenghuolv7;
+
}
}
diff --git a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/changle/ChangleFragment.java b/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/changle/ChangleFragment.java
index 430f6a7..ac46898 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/changle/ChangleFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/changle/ChangleFragment.java
@@ -130,6 +130,7 @@ public class ChangleFragment extends BaseFragment {
if (detailsList.get(0).getInt("LiveNumber") != null) {
details1b.setCunhuo1(detailsList.get(0).getInt("LiveNumber") + "");
}
+ details1b.setChenghuolv1("10.00%");
if (detailsList.size()>1) {
if (detailsList.get(1).getInt("Days") != null) {
details1b.setDays2(detailsList.get(1).getInt("Days") + "");
@@ -143,6 +144,7 @@ public class ChangleFragment extends BaseFragment {
if (detailsList.get(1).getInt("LiveNumber") != null) {
details1b.setCunhuo2(detailsList.get(1).getInt("LiveNumber") + "");
}
+ details1b.setChenghuolv2("20.00%");
if (detailsList.size()>2){
if (detailsList.get(2).getInt("Days") != null) {
details1b.setDays3(detailsList.get(2).getInt("Days") + "");
@@ -156,6 +158,7 @@ public class ChangleFragment extends BaseFragment {
if (detailsList.get(2).getInt("LiveNumber") != null) {
details1b.setCunhuo3(detailsList.get(2).getInt("LiveNumber") + "");
}
+ details1b.setChenghuolv3("30.00%");
if (detailsList.size()>3){
if (detailsList.get(3).getInt("Days") != null) {
details1b.setDays4(detailsList.get(3).getInt("Days") + "");
@@ -169,6 +172,7 @@ public class ChangleFragment extends BaseFragment {
if (detailsList.get(3).getInt("LiveNumber") != null) {
details1b.setCunhuo4(detailsList.get(3).getInt("LiveNumber") + "");
}
+ details1b.setChenghuolv4("40.00%");
if (detailsList.size()>4){
if (detailsList.get(4).getInt("Days") != null) {
details1b.setDays5(detailsList.get(4).getInt("Days") + "");
@@ -182,7 +186,7 @@ public class ChangleFragment extends BaseFragment {
if (detailsList.get(4).getInt("LiveNumber") != null) {
details1b.setCunhuo5(detailsList.get(4).getInt("LiveNumber") + "");
}
-
+ details1b.setChenghuolv5("50.00%");
if (detailsList.size()>5){
if (detailsList.get(5).getInt("Days") != null) {
details1b.setDays6(detailsList.get(5).getInt("Days") + "");
@@ -196,6 +200,7 @@ public class ChangleFragment extends BaseFragment {
if (detailsList.get(5).getInt("LiveNumber") != null) {
details1b.setCunhuo6(detailsList.get(5).getInt("LiveNumber") + "");
}
+ details1b.setChenghuolv6("60.00%");
if (detailsList.size()>6){
if (detailsList.get(6).getInt("Days") != null) {
details1b.setDays7(detailsList.get(6).getInt("Days") + "");
@@ -209,6 +214,7 @@ public class ChangleFragment extends BaseFragment {
if (detailsList.get(6).getInt("LiveNumber") != null) {
details1b.setCunhuo7(detailsList.get(6).getInt("LiveNumber") + "");
}
+ details1b.setChenghuolv7("70.00%");
}
}
}
diff --git a/app/src/main/res/layout/item_tablep.xml b/app/src/main/res/layout/item_tablep.xml
index 6ed24e6..89d6bcb 100644
--- a/app/src/main/res/layout/item_tablep.xml
+++ b/app/src/main/res/layout/item_tablep.xml
@@ -8,7 +8,7 @@
android:id="@+id/tab_breedFactory_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="@dimen/dp_20"
+ android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_12"
android:paddingBottom="@dimen/dp_2"
android:textColor="@color/grey666666"
@@ -20,8 +20,7 @@
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="horizontal"
- android:paddingLeft="@dimen/dp_20"
- android:paddingRight="@dimen/dp_10"
+ android:paddingLeft="@dimen/dp_10"
android:visibility="gone">
+
+
+
+
+
+
+
+
+
+
+