diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e957330..ca16812 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -57,6 +57,13 @@ android:name=".index.planorder.WarningActivity" android:screenOrientation="portrait" /> + + + list_path; - private LinearLayout work_breedingpoultry,work_carsmanager,work_scan; + private LinearLayout work_breedingpoultry,work_carsmanager,work_scan,work_tablepoultry; @Override protected int setLayout() { return R.layout.fragment_work; @@ -37,6 +38,8 @@ public class WorkFragment extends BaseFragment implements View.OnClickListener { work_breedingpoultry = getActivity().findViewById(R.id.work_breedingpoultry); work_carsmanager = getActivity().findViewById(R.id.work_carsmanager); work_scan = getActivity().findViewById(R.id.work_scan); + work_tablepoultry = getActivity().findViewById(R.id.work_tablepoultry); + work_tablepoultry.setVisibility(View.INVISIBLE); } @Override @@ -66,6 +69,7 @@ public class WorkFragment extends BaseFragment implements View.OnClickListener { work_breedingpoultry.setOnClickListener(this); work_carsmanager.setOnClickListener(this); work_scan.setOnClickListener(this); + work_tablepoultry.setOnClickListener(this); } @Override @@ -88,11 +92,13 @@ public class WorkFragment extends BaseFragment implements View.OnClickListener { @Override public void onClick(View view) { if (view.equals(work_breedingpoultry)){ - showToast("种禽"); + startActivity(new Intent(getActivity(), DatanalysisActivity.class)); }else if (view.equals(work_carsmanager)){ startActivity(new Intent(getActivity(), CarsManageActivity.class)); }else if (view.equals(work_scan)){ startActivity(new Intent(getActivity(), ScanResultActivity.class)); + }else if (view.equals(work_tablepoultry)){ + showToast("敬请期待！"); } } diff --git a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java new file mode 100644 index 0000000..e356f1a --- /dev/null +++ b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisActivity.java @@ -0,0 +1,63 @@ +package com.qhclh.ytzh.work.breedpoultry; + +import android.content.Intent; +import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; + +import com.qhclh.ytzh.R; +import com.qhclh.ytzh.base.BaseActivity; + +import butterknife.BindView; + +/** + * Created by 青花瓷 on 2017/11/30. + */ +///< 数据分析 +public class DatanalysisActivity extends BaseActivity { + @BindView(R.id.toolbar) + Toolbar mToolbar; + @Override + protected int setLayoutId() { + return R.layout.act_datanalysis; + } + + @Override + protected void initView() { + initToolbar(mToolbar, "数据分析", new View.OnClickListener() { + @Override + public void onClick(View view) { + finish(); + } + }); + } + + @Override + protected void initData() { + + } + + @Override + protected void initOper() { + + } + + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.datanalysismenu, menu); + menu.findItem(R.id.datanalysis_menu).setVisible(true); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.datanalysis_menu: + startActivity(new Intent(this,DatanalysisSActivity.class)); + break; + } + return super.onOptionsItemSelected(item); + } +} diff --git a/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java new file mode 100644 index 0000000..510c14c --- /dev/null +++ b/app/src/main/java/com/qhclh/ytzh/work/breedpoultry/DatanalysisSActivity.java @@ -0,0 +1,42 @@ +package com.qhclh.ytzh.work.breedpoultry; + +import android.support.v7.widget.Toolbar; +import android.view.View; + +import com.qhclh.ytzh.R; +import com.qhclh.ytzh.base.BaseActivity; + +import butterknife.BindView; + +/** + * Created by 青花瓷 on 2017/11/30. + */ +///< 筛选 +public class DatanalysisSActivity extends BaseActivity { + @BindView(R.id.toolbar) + Toolbar mToolbar; + @Override + protected int setLayoutId() { + return R.layout.act_datanaly_s; + } + + @Override + protected void initView() { + initToolbar(mToolbar, "筛选", new View.OnClickListener() { + @Override + public void onClick(View view) { + finish(); + } + }); + } + + @Override + protected void initData() { + + } + + @Override + protected void initOper() { + + } +} diff --git a/app/src/main/res/drawable-xhdpi/rouqin_3x.png b/app/src/main/res/drawable-xhdpi/rouqin_3x.png new file mode 100644 index 0000000..da16e4e Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/rouqin_3x.png differ diff --git a/app/src/main/res/layout/act_datanaly_s.xml b/app/src/main/res/layout/act_datanaly_s.xml new file mode 100644 index 0000000..150a42a --- /dev/null +++ b/app/src/main/res/layout/act_datanaly_s.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/act_datanalysis.xml b/app/src/main/res/layout/act_datanalysis.xml new file mode 100644 index 0000000..d6cb79d --- /dev/null +++ b/app/src/main/res/layout/act_datanalysis.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_work.xml b/app/src/main/res/layout/fragment_work.xml index bd6b3ef..a2718c2 100644 --- a/app/src/main/res/layout/fragment_work.xml +++ b/app/src/main/res/layout/fragment_work.xml @@ -13,9 +13,9 @@ + android:layout_height="50dp" + android:src="@drawable/rouqin_3x" /> + android:layout_marginTop="@dimen/dp_5" + android:text="@string/work_tablepoultry" + android:textSize="@dimen/text_size_14" /> diff --git a/app/src/main/res/menu/datanalysismenu.xml b/app/src/main/res/menu/datanalysismenu.xml new file mode 100644 index 0000000..a38282b --- /dev/null +++ b/app/src/main/res/menu/datanalysismenu.xml @@ -0,0 +1,9 @@ + + + + \ 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 44571be..f89756d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -10,6 +10,7 @@ 种禽 车辆管理 扫一扫 + 肉禽 功能区 日期: 供货商: