diff --git a/app/src/main/java/com/qhclh/ytzh/index/JPInfoActivity.java b/app/src/main/java/com/qhclh/ytzh/index/JPInfoActivity.java index 53d3529..cf6f067 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/JPInfoActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/index/JPInfoActivity.java @@ -1,5 +1,6 @@ package com.qhclh.ytzh.index; +import android.content.Intent; import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.ImageView; @@ -10,6 +11,7 @@ import com.bumptech.glide.Glide; import com.qhclh.ytzh.R; import com.qhclh.ytzh.base.BaseActivity; import com.qhclh.ytzh.bean.NewsBean; +import com.qhclh.ytzh.index.planorder.WarningActivity; import org.litepal.crud.DataSupport; @@ -163,30 +165,34 @@ public class JPInfoActivity extends BaseActivity { } + private Intent intent; @OnClick({R.id.system_ll, R.id.warninginfo_ll, R.id.chickscan_ll,R.id.killc_ll}) public void onClick(View view) { + intent = new Intent(JPInfoActivity.this, WarningActivity.class); switch (view.getId()) { + ///< 系统消息 case R.id.system_ll: { - + intent.putExtra("type","通知通告"); break; } ///< 预警消息 case R.id.warninginfo_ll: { - + intent.putExtra("type","报警信息"); break; } ///< 扫描消息 case R.id.chickscan_ll: { - + intent.putExtra("type","鸡苗运输信息"); break; } ///< 屠宰消息 case R.id.killc_ll: { - + intent.putExtra("type","胴体验收"); break; } } + startActivity(intent); } } diff --git a/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java b/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java index 6bb63aa..aceb808 100644 --- a/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/index/planorder/WarningActivity.java @@ -3,6 +3,7 @@ package com.qhclh.ytzh.index.planorder; import android.support.v7.widget.Toolbar; import android.view.View; import android.widget.ListView; +import android.widget.TextView; import com.qhclh.ytzh.R; import com.qhclh.ytzh.base.BaseActivity; @@ -20,6 +21,8 @@ import butterknife.BindView; public class WarningActivity extends BaseActivity{ @BindView(R.id.toolbar) Toolbar mToolbar; + @BindView(R.id.tv_toolbar_title) + TextView tv_toolbar_title; @BindView(R.id.lv_warning) ListView lv_warning; @@ -32,7 +35,7 @@ public class WarningActivity extends BaseActivity{ @Override protected void initView() { - initToolbar(mToolbar, "预警详情页", new View.OnClickListener() { + initToolbar(mToolbar, "", new View.OnClickListener() { @Override public void onClick(View view) { finish(); @@ -42,6 +45,7 @@ public class WarningActivity extends BaseActivity{ @Override protected void initData() { + tv_toolbar_title.setText(getIntent().getStringExtra("type")); warningBeanList = new ArrayList<>(); for (int i=0;i<8;i++){ warningBeanList.add(new WarningBean(i,"https://www.baidu.com/img/bd_logo1.png","asagggggggggggwwwwwwwwwwwwwaa"+i,"adf"));