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 7c1d1aa..1b6622e 100644 --- a/app/src/main/java/com/qhclh/ytzh/bean/TablePBean.java +++ b/app/src/main/java/com/qhclh/ytzh/bean/TablePBean.java @@ -1,5 +1,7 @@ package com.qhclh.ytzh.bean; + + /** * Created by 青花瓷 on 2017/12/11. */ @@ -8,36 +10,74 @@ public class TablePBean { private long id; private long BreedFactory_id; private String BreedFactory_name; - private String Days; - private String dienumber; - private String obs; - private String riling; - public String getRiling() { - return riling; + private Details detailses; + + public Details getDetailses() { + return detailses; } - public void setRiling(String riling) { - this.riling = riling; + public void setDetailses(Details detailses) { + this.detailses = detailses; } - public TablePBean(long id, long breedFactory_id, String breedFactory_name, String days, String dienumber, String obs, String riling) { - this.id = id; - BreedFactory_id = breedFactory_id; - BreedFactory_name = breedFactory_name; - Days = days; - this.dienumber = dienumber; - this.obs = obs; - this.riling = riling; + public static class Details{ + private String Days; + private String dienumber; + private String obs; + private String cunhuo; + + @Override + public String toString() { + return "Details{" + + "Days='" + Days + '\'' + + ", dienumber='" + dienumber + '\'' + + ", obs='" + obs + '\'' + + ", cunhuo='" + cunhuo + '\'' + + '}'; + } + + public Details(String days, String dienumber, String obs, String cunhuo) { + Days = days; + this.dienumber = dienumber; + this.obs = obs; + this.cunhuo = cunhuo; + } + + public String getDays() { + return Days; + } + + public void setDays(String days) { + Days = days; + } + + public String getDienumber() { + return dienumber; + } + + public void setDienumber(String dienumber) { + this.dienumber = dienumber; + } + + public String getObs() { + return obs; + } + + public void setObs(String obs) { + this.obs = obs; + } + + public String getCunhuo() { + return cunhuo; + } + + public void setCunhuo(String cunhuo) { + this.cunhuo = cunhuo; + } } - public TablePBean(long id, long breedFactory_id, String breedFactory_name, String days, String dienumber, String obs) { - this.id = id; - BreedFactory_id = breedFactory_id; - BreedFactory_name = breedFactory_name; - Days = days; - this.dienumber = dienumber; - this.obs = obs; + public TablePBean() { } public long getId() { @@ -64,39 +104,13 @@ public class TablePBean { BreedFactory_name = breedFactory_name; } - public String getDays() { - return Days; - } - - public void setDays(String days) { - Days = days; - } - - public String getDienumber() { - return dienumber; - } - - public void setDienumber(String dienumber) { - this.dienumber = dienumber; - } - - public String getObs() { - return obs; - } - - public void setObs(String obs) { - this.obs = obs; - } - @Override public String toString() { return "TablePBean{" + "id=" + id + ", BreedFactory_id=" + BreedFactory_id + ", BreedFactory_name='" + BreedFactory_name + '\'' + - ", Days='" + Days + '\'' + - ", dienumber='" + dienumber + '\'' + - ", obs='" + obs + '\'' + + ", detailses=" + detailses + '}'; } } 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 bc3d3cd..e4e4d8e 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 @@ -51,9 +51,12 @@ public class XFactryAdapter extends BaseAdapter{ view = layoutInflater.inflate(R.layout.item_tablep,viewGroup,false); viewHolder = new ViewHolder(); viewHolder.tab_breedFactory_name = view.findViewById(R.id.tab_breedFactory_name); - viewHolder.tab_days = view.findViewById(R.id.tab_days); - viewHolder.tab_dienub = view.findViewById(R.id.tab_dienub); - viewHolder.tab_obs = view.findViewById(R.id.tab_obs); + viewHolder.tab_days1 = view.findViewById(R.id.tab_days1); + viewHolder.tab_dienub1 = view.findViewById(R.id.tab_dienub1); + viewHolder.tab_obs1 = view.findViewById(R.id.tab_obs1); + 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); view.setTag(viewHolder); @@ -62,18 +65,24 @@ public class XFactryAdapter extends BaseAdapter{ } viewHolder.tab_breedFactory_name.setText("厂:"+message.getBreedFactory_name()); - viewHolder.tab_days.setText("日龄:"+message.getDays()); - viewHolder.tab_dienub.setText("死亡:"+message.getDienumber()); - viewHolder.tab_obs.setText("淘汰:"+message.getObs()); + 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()); return view; } private class ViewHolder { private TextView tab_breedFactory_name; - private TextView tab_days; - private TextView tab_dienub; - private TextView tab_obs; + private TextView tab_days1; + private TextView tab_dienub1; + private TextView tab_obs1; + private TextView tab_days2; + private TextView tab_dienub2; + private TextView tab_obs2; } } diff --git a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/anqiu/AnqiuFragment.java b/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/anqiu/AnqiuFragment.java deleted file mode 100644 index 4123572..0000000 --- a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/anqiu/AnqiuFragment.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.qhclh.ytzh.work.tablepoultry.anqiu; - -import android.view.View; -import android.widget.AdapterView; -import android.widget.ListView; - -import com.qhclh.ytzh.R; -import com.qhclh.ytzh.base.BaseFragment; -import com.qhclh.ytzh.bean.TablePBean; -import com.qhclh.ytzh.work.tablepoultry.XFactryAdapter; - -import java.util.ArrayList; -import java.util.List; - -import butterknife.BindView; - -/** - * Created by 青花瓷 on 2017/12/4. - */ - -public class AnqiuFragment extends BaseFragment { - @BindView(R.id.lv_anqiu) - ListView lv_anqiu; - - private List list; - private XFactryAdapter adapter; - @Override - protected int setLayout() { - return R.layout.fragment_anqiu; - } - - @Override - protected void initView() { - - } - - @Override - protected void initData() { - list = new ArrayList<>(); - for (int i=0;i<8;i++){ - list.add(new TablePBean(i,i+11,"aaaa1"+i,"221"+i,"3331"+i,"55551"+i)); - } - - adapter = new XFactryAdapter(getActivity(),list); - lv_anqiu.setAdapter(adapter); - - } - - @Override - protected void initOper() { - lv_anqiu.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView adapterView, View view, int i, long l) { - } - }); - } -} 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 59e17d0..8190e1b 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 @@ -16,6 +16,7 @@ import com.qhclh.ytzh.work.tablepoultry.ChoseEvent; import com.qhclh.ytzh.work.tablepoultry.ReportActivity; import com.qhclh.ytzh.work.tablepoultry.XFactryAdapter; +import org.forks.jsonrpc.JsonRpcException; import org.forks.jsonrpc.JsonRpcResult; import org.forks.jsonrpc.RpcFacade; import org.forks.jsonrpc.RpcObject; @@ -54,6 +55,11 @@ public class ChangleFragment extends BaseFragment { private long mType; private long choseDate; + //Fragment的View加载完毕的标记 + private boolean isViewCreated; + + //Fragment对用户可见的标记 + private boolean isUIVisible; @Override protected int setLayout() { return R.layout.fragment_changle; @@ -70,7 +76,7 @@ public class ChangleFragment extends BaseFragment { @Override protected void initData() { mType = getArguments().getLong(ARG_TIMELINE_TYPE); - choseDate = getArguments().getLong("time"); +// choseDate = getArguments().getLong("time"); } @Override @@ -87,7 +93,7 @@ public class ChangleFragment extends BaseFragment { @Override public void onResume() { super.onResume(); -// BreedFactoryReportListView(choseDate); + BreedFactoryReportListView(choseDate); } private void BreedFactoryReportListView(final long time) { @@ -96,9 +102,32 @@ public class ChangleFragment extends BaseFragment { @Override protected void successUI() { list.clear(); - System.out.println("aaa++++"+rpcList); + List detailsList; for (int i=0;i) rpcList.get(i).get("Details"); + + TablePBean tb = new TablePBean(); + tb.setBreedFactory_id(rpcList.get(i).getLong("ID")); + tb.setBreedFactory_name(rpcList.get(i).getString("Name")); + + for (int j=0;j list; - private XFactryAdapter adapter; - @Override - protected int setLayout() { - return R.layout.fragment_qiuping; - } - - @Override - protected void initView() { - - } - - @Override - protected void initData() { - list = new ArrayList<>(); - for (int i=0;i<8;i++){ - list.add(new TablePBean(i,i+12,"aaaa2"+i,"222"+i,"3332"+i,"55552"+i)); - } - - adapter = new XFactryAdapter(getActivity(),list); - lv_qiuping.setAdapter(adapter); - - } - - @Override - protected void initOper() { - lv_qiuping.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView adapterView, View view, int i, long l) { - } - }); - - } -} diff --git a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/shouguangdong/ShouguangdFragment.java b/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/shouguangdong/ShouguangdFragment.java deleted file mode 100644 index 4f6bb3e..0000000 --- a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/shouguangdong/ShouguangdFragment.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.qhclh.ytzh.work.tablepoultry.shouguangdong; - -import android.view.View; -import android.widget.AdapterView; -import android.widget.ListView; - -import com.qhclh.ytzh.R; -import com.qhclh.ytzh.base.BaseFragment; -import com.qhclh.ytzh.bean.TablePBean; -import com.qhclh.ytzh.work.tablepoultry.XFactryAdapter; - -import java.util.ArrayList; -import java.util.List; - -import butterknife.BindView; - -/** - * Created by 青花瓷 on 2017/12/4. - */ - -public class ShouguangdFragment extends BaseFragment { - @BindView(R.id.lv_shouguangdong) - ListView lv_shouguangdong; - - private List list; - private XFactryAdapter adapter; - @Override - protected int setLayout() { - return R.layout.fragment_shouguangd; - } - - @Override - protected void initView() { - - } - - @Override - protected void initData() { - list = new ArrayList<>(); - for (int i=0;i<8;i++){ - list.add(new TablePBean(i,i+4,"aaa4"+i,"24"+i,"334"+i,"5554"+i)); - } - - adapter = new XFactryAdapter(getActivity(),list); - lv_shouguangdong.setAdapter(adapter); - - } - - @Override - protected void initOper() { - lv_shouguangdong.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView adapterView, View view, int i, long l) { - } - }); - - } -} diff --git a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/shouguangxi/ShouguangxFragment.java b/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/shouguangxi/ShouguangxFragment.java deleted file mode 100644 index 83c9599..0000000 --- a/app/src/main/java/com/qhclh/ytzh/work/tablepoultry/shouguangxi/ShouguangxFragment.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.qhclh.ytzh.work.tablepoultry.shouguangxi; - -import android.view.View; -import android.widget.AdapterView; -import android.widget.ListView; - -import com.qhclh.ytzh.R; -import com.qhclh.ytzh.base.BaseFragment; -import com.qhclh.ytzh.bean.TablePBean; -import com.qhclh.ytzh.work.tablepoultry.XFactryAdapter; - -import java.util.ArrayList; -import java.util.List; - -import butterknife.BindView; - -/** - * Created by 青花瓷 on 2017/12/4. - */ - -public class ShouguangxFragment extends BaseFragment { - @BindView(R.id.lv_shouguangxi) - ListView lv_shouguangxi; - - private List list; - private XFactryAdapter adapter; - @Override - protected int setLayout() { - return R.layout.fragment_shouguangx; - } - - @Override - protected void initView() { - - } - - @Override - protected void initData() { - list = new ArrayList<>(); - for (int i=0;i<8;i++){ - list.add(new TablePBean(i,i+6,"aaa6"+i,"226"+i,"336"+i,"5556"+i)); - } - - adapter = new XFactryAdapter(getActivity(),list); - lv_shouguangxi.setAdapter(adapter); - - } - - @Override - protected void initOper() { - lv_shouguangxi.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView adapterView, View view, int i, long l) { - } - }); - - } -} diff --git a/app/src/main/res/layout/item_tablep.xml b/app/src/main/res/layout/item_tablep.xml index 5041d63..9f5bc36 100644 --- a/app/src/main/res/layout/item_tablep.xml +++ b/app/src/main/res/layout/item_tablep.xml @@ -21,7 +21,7 @@ android:padding="@dimen/dp_10"> + + + + + + + + + + + \ No newline at end of file