diff --git a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryDataChartActivity.java b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryDataChartActivity.java index cc0a10e..74af384 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryDataChartActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryDataChartActivity.java @@ -10,13 +10,16 @@ import com.qhclh.ytzh.R; import com.qhclh.ytzh.base.BaseActivity; import com.qhclh.ytzh.home.RpcUrl; import com.qhclh.ytzh.tasks.ViewOnClickTask; +import com.qhclh.ytzh.utils.DateTimeUtil; import org.forks.jsonrpc.JsonRpcResult; import org.forks.jsonrpc.RpcFacade; import org.json.JSONArray; import org.json.JSONException; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.List; import butterknife.BindView; @@ -68,6 +71,8 @@ public class PoultryDataChartActivity extends BaseActivity { ///< 指标数据 List listshuju = new ArrayList(); Float[] score;//图表的数据 + + private long time; @Override protected int setLayoutId() { return R.layout.act_poultry_data_chart; @@ -88,6 +93,7 @@ public class PoultryDataChartActivity extends BaseActivity { House_ID = getIntent().getLongExtra("House_ID",-1); House_Name = getIntent().getStringExtra("House_Name"); type = getIntent().getIntExtra("TYPE",-1); + time = getIntent().getLongExtra("tiem",0); tv_toolbar_title.setText(House_Name); if (type == 1){ ll_chandanlv.setVisibility(View.GONE); @@ -158,7 +164,7 @@ public class PoultryDataChartActivity extends BaseActivity { @Override public Object call() throws Exception { - JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.HouseView1,House_ID,item); + JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.HouseView1,new SimpleDateFormat("yyyy-MM-dd").parse(DateTimeUtil.getYMD(new Date(time))),House_ID,item); rpobj = result.getStringList(); return null; } 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 16c87a2..1d3ecdd 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 @@ -91,6 +91,7 @@ public class PoultryReportActvity extends BaseActivity { intent.putExtra("House_ID",l); intent.putExtra("House_Name",reportBeanList.get(i).getHouse_Name()); intent.putExtra("TYPE",1); + intent.putExtra("tiem",time); startActivity(intent); } }); @@ -101,6 +102,7 @@ public class PoultryReportActvity extends BaseActivity { intent.putExtra("House_ID",l); intent.putExtra("House_Name",reportBeanList.get(i).getHouse_Name()); intent.putExtra("TYPE",1); + intent.putExtra("tiem",time); startActivity(intent); } }); diff --git a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportChandanActvity.java b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportChandanActvity.java index 050f336..6f7ab09 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportChandanActvity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/Poultrydailyreport/PoultryReportChandanActvity.java @@ -91,6 +91,7 @@ public class PoultryReportChandanActvity extends BaseActivity { intent.putExtra("House_ID",l); intent.putExtra("House_Name",reportBeanList.get(i).getHouse_Name()); intent.putExtra("TYPE",2); + intent.putExtra("tiem",time); startActivity(intent); } }); @@ -101,6 +102,7 @@ public class PoultryReportChandanActvity extends BaseActivity { intent.putExtra("House_ID",l); intent.putExtra("House_Name",reportBeanList.get(i).getHouse_Name()); intent.putExtra("TYPE",2); + intent.putExtra("tiem",time); startActivity(intent); } });