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 2463adb..a1e6ed9 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 @@ -1,6 +1,7 @@ package com.qhclh.ytzh.work.Poultrydailyreport; import android.support.v7.widget.Toolbar; +import android.view.View; import android.widget.LinearLayout; import android.widget.TextView; @@ -17,6 +18,8 @@ import lecho.lib.hellocharts.view.LineChartView; public class PoultryDataChartActivity extends BaseActivity { @BindView(R.id.toolbar) Toolbar mToolbar; + @BindView(R.id.tv_toolbar_title) + TextView tv_toolbar_title; @BindView(R.id.line_chart_poultry) LineChartView lineChart; @@ -28,6 +31,8 @@ public class PoultryDataChartActivity extends BaseActivity { LinearLayout ll_chandanlv; + private long House_ID; + private String House_Name; @Override protected int setLayoutId() { return R.layout.act_poultry_data_chart; @@ -35,12 +40,19 @@ public class PoultryDataChartActivity extends BaseActivity { @Override protected void initView() { - + initToolbar(mToolbar, "报表指数", new View.OnClickListener() { + @Override + public void onClick(View view) { + finish(); + } + }); } @Override protected void initData() { - + House_ID = getIntent().getLongExtra("House_ID",-1); + House_Name = getIntent().getStringExtra("House_Name"); + tv_toolbar_title.setText(House_Name); } @Override 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 3e7ed8a..c568e77 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 @@ -1,8 +1,10 @@ package com.qhclh.ytzh.work.Poultrydailyreport; +import android.content.Intent; import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.AbsListView; +import android.widget.AdapterView; import android.widget.HorizontalScrollView; import android.widget.ListView; @@ -77,7 +79,24 @@ public class PoultryReportActvity extends BaseActivity { @Override protected void initOper() { - + lv_buildhousename.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView adapterView, View view, int i, long l) { + Intent intent = new Intent(PoultryReportActvity.this,PoultryDataChartActivity.class); + intent.putExtra("House_ID",l); + intent.putExtra("House_Name",reportBeanList.get(i).getHouse_Name()); + startActivity(intent); + } + }); + lv_report_info.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView adapterView, View view, int i, long l) { + Intent intent = new Intent(PoultryReportActvity.this,PoultryDataChartActivity.class); + intent.putExtra("House_ID",l); + intent.putExtra("House_Name",reportBeanList.get(i).getHouse_Name()); + startActivity(intent); + } + }); } @Override