diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDActivity.java b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDActivity.java index aebc2be..5e4060c 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDActivity.java @@ -1,5 +1,6 @@ package com.qhclh.ytzh.work.productiondailyw; +import android.content.Intent; import android.support.design.widget.TabLayout; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; @@ -18,6 +19,8 @@ import com.qhclh.ytzh.home.RpcUrl; import com.qhclh.ytzh.tasks.ViewOnClickTask; import com.qhclh.ytzh.ui.CalendarDialogFragment; import com.qhclh.ytzh.utils.DateTimeUtil; +import com.qhclh.ytzh.work.productiondaily.ProductiondailyActivity; +import com.qhclh.ytzh.work.productiondaily.ShowInfoActivity; import org.forks.jsonrpc.JsonRpcResult; import org.forks.jsonrpc.RpcFacade; @@ -247,16 +250,19 @@ public class WriteDActivity extends BaseActivity implements CalendarDialogFragme @Override public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.chosetime, menu); + getMenuInflater().inflate(R.menu.chosetime1, menu); return true; } @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case R.id.chose_time: + case R.id.chose_time1: new CalendarDialogFragment().show(getSupportFragmentManager(), "start"); break; + case R.id.show_list: + startActivity(new Intent(WriteDActivity.this, ProductiondailyActivity.class)); + break; } return super.onOptionsItemSelected(item); } diff --git a/app/src/main/res/menu/chosetime1.xml b/app/src/main/res/menu/chosetime1.xml new file mode 100644 index 0000000..cbac562 --- /dev/null +++ b/app/src/main/res/menu/chosetime1.xml @@ -0,0 +1,13 @@ + +
\ No newline at end of file