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 99f596e..a3bef94 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 @@ -6,6 +6,8 @@ import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.view.ViewPager; import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.MenuItem; import android.view.View; import com.qhclh.ytzh.R; @@ -26,7 +28,6 @@ import butterknife.BindView; */ public class WriteDActivity extends BaseActivity { - @BindView(R.id.toolbar) Toolbar mToolbar; @BindView(R.id.tabLayout_write) @@ -36,6 +37,7 @@ public class WriteDActivity extends BaseActivity { private List mFragmentList = new ArrayList<>(); private List mTitleList = new ArrayList<>(); private TabViewPagerAdapter mViewPagerAdapter; + @Override protected int setLayoutId() { return R.layout.act_writed; @@ -64,24 +66,43 @@ public class WriteDActivity extends BaseActivity { } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.save, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.save_info: + break; + case R.id.commit_info: + break; + } + return super.onOptionsItemSelected(item); + } + + private void initTabLayout() { - mTitleList.add(getString(R.string.changle)); - mTitleList.add(getString(R.string.shouguangdong)); - mTitleList.add(getString(R.string.shouguangxi)); - mTitleList.add(getString(R.string.anqiu)); - mTitleList.add(getString(R.string.qiuping)); + mTitleList.add(getString(R.string.changle)); + mTitleList.add(getString(R.string.shouguangdong)); + mTitleList.add(getString(R.string.shouguangxi)); + mTitleList.add(getString(R.string.anqiu)); + mTitleList.add(getString(R.string.qiuping)); - mTabLayout.setTabMode(TabLayout.MODE_FIXED); + mTabLayout.setTabMode(TabLayout.MODE_SCROLLABLE); } private void initViewPager() { - mFragmentList.add(new ChangleFragment()); - mFragmentList.add(new ShouguangdFragment()); - mFragmentList.add(new ShouguangxFragment()); - mFragmentList.add(new AnqiuFragment()); - mFragmentList.add(new QiupingFragment()); + mFragmentList.add(new WriteDFragment()); + mFragmentList.add(new WriteDFragment()); + mFragmentList.add(new WriteDFragment()); + mFragmentList.add(new WriteDFragment()); + mFragmentList.add(new WriteDFragment()); mViewPagerAdapter = new TabViewPagerAdapter(getSupportFragmentManager()); mViewPager.setAdapter(mViewPagerAdapter); @@ -90,7 +111,6 @@ public class WriteDActivity extends BaseActivity { } - private class TabViewPagerAdapter extends FragmentPagerAdapter { public TabViewPagerAdapter(FragmentManager fm) { super(fm); diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java new file mode 100644 index 0000000..02a84c4 --- /dev/null +++ b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java @@ -0,0 +1,30 @@ +package com.qhclh.ytzh.work.productiondailyw; + +import com.qhclh.ytzh.R; +import com.qhclh.ytzh.base.BaseFragment; + +/** + * Created by 青花瓷 on 2017/12/19. + */ + +public class WriteDFragment extends BaseFragment { + @Override + protected int setLayout() { + return R.layout.frag_daily; + } + + @Override + protected void initView() { + + } + + @Override + protected void initData() { + + } + + @Override + protected void initOper() { + + } +} diff --git a/app/src/main/res/layout/frag_daily.xml b/app/src/main/res/layout/frag_daily.xml new file mode 100644 index 0000000..c9dff8c --- /dev/null +++ b/app/src/main/res/layout/frag_daily.xml @@ -0,0 +1,374 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 249b58f..49af33b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -74,6 +74,7 @@ 淘汰: 淘汰 饮水: + 饮水量: 饮水 请选择 出厂时间: