可选择显示 商品鸡报表

app/src/main/java/com/qhclh/ytzh/bean/TablePBean.java

@@ -22,58 +22,104 @@ public class TablePBean {
     }
 
     public static class Details{
-        private String Days;
-        private String dienumber;
-        private String obs;
-        private String cunhuo;
+        private String Days1;
+        private String dienumber1;
+        private String obs1;
+        private String cunhuo1;
+        private String Days2;
+        private String dienumber2;
+        private String obs2;
+        private String cunhuo2;
+        public Details(){}
+
+//        public Details(String days1, String dienumber1, String obs1, String cunhuo1, String days2, String dienumber2, String obs2, String cunhuo2) {
+//            Days1 = days1;
+//            this.dienumber1 = dienumber1;
+//            this.obs1 = obs1;
+//            this.cunhuo1 = cunhuo1;
+//            Days2 = days2;
+//            this.dienumber2 = dienumber2;
+//            this.obs2 = obs2;
+//            this.cunhuo2 = cunhuo2;
+//        }
+
 
         @Override
         public String toString() {
             return "Details{" +
-                    "Days='" + Days + '\'' +
-                    ", dienumber='" + dienumber + '\'' +
-                    ", obs='" + obs + '\'' +
-                    ", cunhuo='" + cunhuo + '\'' +
+                    "Days1='" + Days1 + '\'' +
+                    ", dienumber1='" + dienumber1 + '\'' +
+                    ", obs1='" + obs1 + '\'' +
+                    ", cunhuo1='" + cunhuo1 + '\'' +
+                    ", Days2='" + Days2 + '\'' +
+                    ", dienumber2='" + dienumber2 + '\'' +
+                    ", obs2='" + obs2 + '\'' +
+                    ", cunhuo2='" + cunhuo2 + '\'' +
                     '}';
         }
 
-        public Details(String days, String dienumber, String obs, String cunhuo) {
-            Days = days;
-            this.dienumber = dienumber;
-            this.obs = obs;
-            this.cunhuo = cunhuo;
+        public String getDays1() {
+            return Days1;
+        }
+
+        public void setDays1(String days1) {
+            Days1 = days1;
+        }
+
+        public String getDienumber1() {
+            return dienumber1;
+        }
+
+        public void setDienumber1(String dienumber1) {
+            this.dienumber1 = dienumber1;
+        }
+
+        public String getObs1() {
+            return obs1;
+        }
+
+        public void setObs1(String obs1) {
+            this.obs1 = obs1;
+        }
+
+        public String getCunhuo1() {
+            return cunhuo1;
+        }
+
+        public void setCunhuo1(String cunhuo1) {
+            this.cunhuo1 = cunhuo1;
         }
 
-        public String getDays() {
-            return Days;
+        public String getDays2() {
+            return Days2;
         }
 
-        public void setDays(String days) {
-            Days = days;
+        public void setDays2(String days2) {
+            Days2 = days2;
         }
 
-        public String getDienumber() {
-            return dienumber;
+        public String getDienumber2() {
+            return dienumber2;
         }
 
-        public void setDienumber(String dienumber) {
-            this.dienumber = dienumber;
+        public void setDienumber2(String dienumber2) {
+            this.dienumber2 = dienumber2;
         }
 
-        public String getObs() {
-            return obs;
+        public String getObs2() {
+            return obs2;
         }
 
-        public void setObs(String obs) {
-            this.obs = obs;
+        public void setObs2(String obs2) {
+            this.obs2 = obs2;
         }
 
-        public String getCunhuo() {
-            return cunhuo;
+        public String getCunhuo2() {
+            return cunhuo2;
         }
 
-        public void setCunhuo(String cunhuo) {
-            this.cunhuo = cunhuo;
+        public void setCunhuo2(String cunhuo2) {
+            this.cunhuo2 = cunhuo2;
         }
     }
 

app/src/main/java/com/qhclh/ytzh/work/tablepoultry/XFactryAdapter.java

@@ -5,6 +5,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.qhclh.ytzh.R;
@@ -57,6 +58,8 @@ public class XFactryAdapter extends BaseAdapter{
             viewHolder.tab_days2 = view.findViewById(R.id.tab_days2);
             viewHolder.tab_dienub2 = view.findViewById(R.id.tab_dienub2);
             viewHolder.tab_obs2 = view.findViewById(R.id.tab_obs2);
+            viewHolder.ll_tb1 = view.findViewById(R.id.ll_tb1);
+            viewHolder.ll_tb2 = view.findViewById(R.id.ll_tb2);
 
 
             view.setTag(viewHolder);
@@ -65,12 +68,21 @@ public class XFactryAdapter extends BaseAdapter{
         }
 
         viewHolder.tab_breedFactory_name.setText("厂:"+message.getBreedFactory_name());
-        viewHolder.tab_days1.setText("日龄1:"+message.getDetailses().getDays());
-        viewHolder.tab_dienub1.setText("死亡:"+message.getDetailses().getDienumber());
-        viewHolder.tab_obs1.setText("淘汰:"+message.getDetailses().getObs());
-        viewHolder.tab_days2.setText("日龄2:"+message.getDetailses().getDays());
-        viewHolder.tab_dienub2.setText("死亡:"+message.getDetailses().getDienumber());
-        viewHolder.tab_obs2.setText("淘汰:"+message.getDetailses().getObs());
+        if (message.getDetailses().getDays1()!=null) {
+            viewHolder.tab_days1.setText("日龄1:" + message.getDetailses().getDays1());
+            viewHolder.tab_dienub1.setText("死亡:" + message.getDetailses().getDienumber1());
+            viewHolder.tab_obs1.setText("淘汰:" + message.getDetailses().getObs1());
+        }else {
+            viewHolder.ll_tb1.setVisibility(View.GONE);
+        }
+
+        if (message.getDetailses().getDays2()!=null) {
+            viewHolder.tab_days2.setText("日龄2:" + message.getDetailses().getDays2());
+            viewHolder.tab_dienub2.setText("死亡:" + message.getDetailses().getDienumber2());
+            viewHolder.tab_obs2.setText("淘汰:" + message.getDetailses().getObs2());
+        }else {
+            viewHolder.ll_tb2.setVisibility(View.GONE);
+        }
 
         return view;
     }
@@ -83,6 +95,8 @@ public class XFactryAdapter extends BaseAdapter{
         private TextView tab_days2;
         private TextView tab_dienub2;
         private TextView tab_obs2;
+        private LinearLayout ll_tb1;
+        private LinearLayout ll_tb2;
 
     }
 }

app/src/main/java/com/qhclh/ytzh/work/tablepoultry/changle/ChangleFragment.java

@@ -118,12 +118,44 @@ public class ChangleFragment extends BaseFragment {
                         tb.setBreedFactory_name(rpcList.get(i).getString("Name"));
 
                         for (int j=0;j<detailsList.size();j++){
-                            tb.setDetailses(new TablePBean.Details(detailsList.get(j).getInt("Days")+"",detailsList.get(j).getInt("DieNumber")+"",detailsList.get(j).getInt("ObsoleteNumber")+""
-                                    ,detailsList.get(j).getInt("LiveNumber")+""));
+                            TablePBean.Details details1b = new TablePBean.Details();
+
+                            if (detailsList.size()>0) {
+                                if (detailsList.get(0).getInt("Days") != null) {
+                                    details1b.setDays1(detailsList.get(0).getInt("Days") + "");
+                                }
+                                if (detailsList.get(0).getInt("DieNumber") != null) {
+                                    details1b.setDienumber1(detailsList.get(0).getInt("DieNumber") + "");
+                                }
+                                if (detailsList.get(0).getInt("ObsoleteNumber") != null) {
+                                    details1b.setObs1(detailsList.get(0).getInt("ObsoleteNumber") + "");
+                                }
+                                if (detailsList.get(0).getInt("LiveNumber") != null) {
+                                    details1b.setCunhuo1(detailsList.get(0).getInt("LiveNumber") + "");
+                                }
+                                if (detailsList.size()>1) {
+                                    if (detailsList.get(1).getInt("Days") != null) {
+                                        details1b.setDays2(detailsList.get(1).getInt("Days") + "");
+                                    }
+                                    if (detailsList.get(1).getInt("DieNumber") != null) {
+                                        details1b.setDienumber2(detailsList.get(1).getInt("DieNumber") + "");
+                                    }
+                                    if (detailsList.get(1).getInt("ObsoleteNumber") != null) {
+                                        details1b.setObs2(detailsList.get(1).getInt("ObsoleteNumber") + "");
+                                    }
+                                    if (detailsList.get(1).getInt("LiveNumber") != null) {
+                                        details1b.setCunhuo2(detailsList.get(1).getInt("LiveNumber") + "");
+                                    }
+                                }
+
+                            }
+
+                            tb.setDetailses(details1b);
                         }
 
                         list.add(tb);
-                        System.out.println("aaa++++"+list);
+                        System.out.println("aaa++++"+list.toString());
+                        System.out.println("aaa+rrr+++"+rpcList);
                     } catch (JsonRpcException e) {
                         e.printStackTrace();
                     }

app/src/main/res/layout/item_tablep.xml

@@ -15,6 +15,7 @@
         android:textSize="@dimen/text_size_16" />
 
     <LinearLayout
+        android:id="@+id/ll_tb1"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
@@ -53,6 +54,7 @@
     </LinearLayout>
 
     <LinearLayout
+        android:id="@+id/ll_tb2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"