diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 875e2fd..ba1fe99 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -78,9 +78,15 @@ + + diff --git a/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java b/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java index 0b4f97c..f2102c6 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java +++ b/app/src/main/java/com/qhclh/ytzh/work/WorkFragment.java @@ -17,7 +17,9 @@ import com.qhclh.ytzh.utils.GlideImageLoader; import com.qhclh.ytzh.utils.RecyclerViewUtil; import com.qhclh.ytzh.work.breedpoultry.DatanalysisActivity; import com.qhclh.ytzh.work.carsmannage.CarsManageActivity; +import com.qhclh.ytzh.work.carsmannage.FumudaiCarsManageActivity; import com.qhclh.ytzh.work.productiondailyw.WriteDActivity; +import com.qhclh.ytzh.work.scan.FumudaiScanResultActivity; import com.qhclh.ytzh.work.scan.ScanResultActivity; import com.qhclh.ytzh.work.tablepoultry.TablepoultryActivity; import com.youth.banner.Banner; @@ -123,12 +125,12 @@ public class WorkFragment extends BaseFragment { } if (x == 8) { ///< 父母代扫一扫 -// startActivity(new Intent(getActivity(), )); + startActivity(new Intent(getActivity(), FumudaiScanResultActivity.class)); } if (x == 9) { ///< 父母代扫码记录 -// startActivity(new Intent(getActivity(), )); + startActivity(new Intent(getActivity(), FumudaiCarsManageActivity.class)); } diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java index fa34bab..fcf993a 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/CarsManageActivity.java @@ -19,7 +19,7 @@ import butterknife.OnClick; /** * Created by 青花瓷 on 2017/11/30. */ -///< 车辆管理 +///< 商品代车辆管理 public class CarsManageActivity extends BaseActivity1 implements CalendarDialogFragment.CalendarClickListener{ @BindView(R.id.toolbar1) Toolbar mToolbar; diff --git a/app/src/main/java/com/qhclh/ytzh/work/carsmannage/FumudaiCarsManageActivity.java b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/FumudaiCarsManageActivity.java new file mode 100644 index 0000000..0df9999 --- /dev/null +++ b/app/src/main/java/com/qhclh/ytzh/work/carsmannage/FumudaiCarsManageActivity.java @@ -0,0 +1,211 @@ +package com.qhclh.ytzh.work.carsmannage; + +import android.support.v4.app.FragmentTransaction; +import android.support.v7.widget.Toolbar; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.widget.TextView; + +import com.qhclh.ytzh.R; +import com.qhclh.ytzh.ui.CalendarDialogFragment; +import com.qhclh.ytzh.utils.DateTimeUtil; + +import java.util.Date; + +import butterknife.BindView; +import butterknife.OnClick; + +/** + * Created by 青花瓷 on 2017/11/30. + */ +///< 父母代车辆管理 +public class FumudaiCarsManageActivity extends BaseActivity1 implements CalendarDialogFragment.CalendarClickListener{ + @BindView(R.id.toolbar1) + Toolbar mToolbar; + @BindView(R.id.chicks) + TextView chicks; + @BindView(R.id.GrossChicken) + TextView GrossChicken; + @BindView(R.id.feed) + TextView feed; + + ///< 鸡苗 + private static final int TAB_POSITION_CHICKS = 0; + ///< 毛鸡 + private static final int TAB_POSITION_GROSSCHICKEN = 1; + ///< 饲料 + private static final int TAB_POSITION_FEED = 2; + private int mCurrentTabPosition = -1; + private int mTargetTabPosition = TAB_POSITION_CHICKS; + + private ChicksFragment chicksFragment; + private GrossChickenFragment grossChickenFragment; + private FeedFragment feedFragment; + + @Override + protected int setLayoutId() { + return R.layout.act_carsmanage; + } + + @Override + protected void initView() { + ///< 点击切换fragment + onTabClick(mTargetTabPosition); + initToolbar(mToolbar, "车辆管理", new View.OnClickListener() { + @Override + public void onClick(View view) { + finish(); + } + }); + } + + @Override + protected void initData() { + feed.setVisibility(View.GONE); + } + + @Override + protected void initOper() { + + } + + @OnClick({R.id.chicks,R.id.GrossChicken,R.id.feed}) + public void OnClick(View v){ + switch (v.getId()){ + case R.id.chicks: + onTabClick(TAB_POSITION_CHICKS); + break; + case R.id.GrossChicken: + onTabClick(TAB_POSITION_GROSSCHICKEN); + break; + case R.id.feed: + onTabClick(TAB_POSITION_FEED); + break; + + } + } + + private void onTabClick(int tabPosition) { + if (mCurrentTabPosition == tabPosition) { + return; + } + mCurrentTabPosition = tabPosition; + changeTabState(tabPosition); + changeFragment(tabPosition); + } + + private void changeTabState(int tabPosition) { + clearAllTabState(); + switch (tabPosition) { + case TAB_POSITION_CHICKS: { + chicks.setTextColor(this.getResources().getColor(R.color.white)); + chicks.setBackgroundColor(this.getResources().getColor(R.color.green02aa3e)); + break; + } + + case TAB_POSITION_GROSSCHICKEN: { + GrossChicken.setTextColor(this.getResources().getColor(R.color.white)); + GrossChicken.setBackgroundColor(this.getResources().getColor(R.color.green02aa3e)); + break; + } + case TAB_POSITION_FEED: { + feed.setTextColor(this.getResources().getColor(R.color.white)); + feed.setBackgroundColor(this.getResources().getColor(R.color.green02aa3e)); + break; + } + } + } + + + private void clearAllTabState() { + ///< 首页 + chicks.setTextColor(this.getResources().getColor(R.color.grey666666)); + chicks.setBackgroundColor(this.getResources().getColor(R.color.white)); + ///< 工作 + GrossChicken.setTextColor(this.getResources().getColor(R.color.grey666666)); + GrossChicken.setBackgroundColor(this.getResources().getColor(R.color.white)); + ///< 我的 + feed.setTextColor(this.getResources().getColor(R.color.grey666666)); + feed.setBackgroundColor(this.getResources().getColor(R.color.white)); + + } + + + private void changeFragment(int tabPosition) { + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + hideFragment(transaction); + switch (tabPosition) { + case TAB_POSITION_CHICKS: { + if (chicksFragment == null) { + chicksFragment = new ChicksFragment(); + transaction.add(R.id.main_container, chicksFragment); + } else { + transaction.show(chicksFragment); + } + break; + } + + case TAB_POSITION_GROSSCHICKEN: { + if (grossChickenFragment == null) { + grossChickenFragment = new GrossChickenFragment(); + transaction.add(R.id.main_container, grossChickenFragment); + } else { + transaction.show(grossChickenFragment); + } + break; + } + + case TAB_POSITION_FEED: { + if (feedFragment == null) { + feedFragment = new FeedFragment(); + transaction.add(R.id.main_container, feedFragment); + } else { + transaction.show(feedFragment); + } + break; + } + } + transaction.commitAllowingStateLoss(); + } + + private void hideFragment(FragmentTransaction transaction) { + if (chicksFragment != null) { + transaction.hide(chicksFragment); + } + + if (grossChickenFragment != null) { + transaction.hide(grossChickenFragment); + } + if (feedFragment != null) { + transaction.hide(feedFragment); + } + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getMenuInflater().inflate(R.menu.screen, menu); + menu.findItem(R.id.screenr).setVisible(true); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.screenr: + new CalendarDialogFragment().show(getSupportFragmentManager(), "start"); + break; + } + return super.onOptionsItemSelected(item); + } + + @Override + public void onStartCalendarClick(Date date) { + showToast(DateTimeUtil.FormatDate(date)); + } + + @Override + public void onEndCalendarClick(Date date) { + showToast(DateTimeUtil.FormatDate(date)); + } +} diff --git a/app/src/main/java/com/qhclh/ytzh/work/scan/FumudaiScanResultActivity.java b/app/src/main/java/com/qhclh/ytzh/work/scan/FumudaiScanResultActivity.java new file mode 100644 index 0000000..d9886d7 --- /dev/null +++ b/app/src/main/java/com/qhclh/ytzh/work/scan/FumudaiScanResultActivity.java @@ -0,0 +1,132 @@ +package com.qhclh.ytzh.work.scan; + +import android.Manifest; +import android.content.Intent; +import android.support.annotation.NonNull; +import android.support.v7.widget.Toolbar; +import android.view.View; +import android.widget.AdapterView; +import android.widget.ListView; + +import com.google.zxing.integration.android.IntentIntegrator; +import com.google.zxing.integration.android.IntentResult; +import com.qhclh.ytzh.R; +import com.qhclh.ytzh.base.BaseActivity; +import com.qhclh.ytzh.bean.ScanBean; + +import java.util.ArrayList; +import java.util.List; + +import butterknife.BindView; +import pub.devrel.easypermissions.AfterPermissionGranted; +import pub.devrel.easypermissions.EasyPermissions; + +/** + * Created by 青花瓷 on 2017/11/29. + */ +///< 父母代扫一扫 +public class FumudaiScanResultActivity extends BaseActivity { + @BindView(R.id.toolbar) + Toolbar mToolbar; + @BindView(R.id.fumudai_lv_infos) + ListView fumudai_lv_infos; + private String scanStr = ""; + private boolean scanf = false; + + private List scanBeanList; + private ScanAdapter scanAdapter; + + @Override + protected int setLayoutId() { + return R.layout.act_fumudaiscanresult; + } + + @Override + protected void initView() { + initToolbar(mToolbar, "扫码结果", new View.OnClickListener() { + @Override + public void onClick(View view) { + finish(); + } + }); + } + + @Override + protected void initData() { + scanBeanList = new ArrayList<>(); + } + + @Override + protected void initOper() { + fumudai_lv_infos.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView adapterView, View view, int i, long l) { + showToast(l+""); + } + }); + } + + @Override + protected void onResume() { + super.onResume(); + if (scanf == false) { + dongtaiQuanxian(); + } + } + + + private static final int REQUEST_PERMISSION_CAMERA_CODE = 102; + + @AfterPermissionGranted(REQUEST_PERMISSION_CAMERA_CODE) + private void dongtaiQuanxian() { + String[] perms = {Manifest.permission.CAMERA}; + if (!EasyPermissions.hasPermissions(this, perms)) { + // Do not have permissions, request them now + EasyPermissions.requestPermissions(this, getString(R.string.permission_camera), + REQUEST_PERMISSION_CAMERA_CODE, perms); + } else { + // Already have permission, do the thing + scan(); + scanf = true; + } + } + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults); + EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this); + } + + private void scan() { + IntentIntegrator integrator = new IntentIntegrator(this); + // 设置要扫描的条码类型，ONE_D_CODE_TYPES：一维码，QR_CODE_TYPES-二维码 + integrator.setDesiredBarcodeFormats(IntentIntegrator.QR_CODE_TYPES); + integrator.setCaptureActivity(ScanActivity.class); + integrator.setPrompt("请扫描"); //底部的提示文字，设为""可以置空 + integrator.setCameraId(0); //前置或者后置摄像头 + integrator.setBeepEnabled(false); //扫描成功的「哔哔」声，默认开启 + integrator.setBarcodeImageEnabled(true); + integrator.initiateScan(); + } + + ///< 回调获取扫描得到的条码值 + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data); + if (result != null) { + if (result.getContents() == null) { + showToast("取消扫描"); + finish(); + } else { + scanStr = result.getContents(); + for (int i=0;i<4;i++){ + scanBeanList.add(new ScanBean(i,"车牌号"+i,"司机"+i,"联系方式"+i,"批次"+i,"厂址"+i, + "时间"+i,"数量"+i,"免疫"+i,"均匀度"+i,"起始时间"+i,"到达时间"+i)); + } + scanAdapter = new ScanAdapter(this,scanBeanList); + fumudai_lv_infos.setAdapter(scanAdapter); + } + } else { + super.onActivityResult(requestCode, resultCode, data); + } + } +} diff --git a/app/src/main/res/layout/act_fumudaiscanresult.xml b/app/src/main/res/layout/act_fumudaiscanresult.xml new file mode 100644 index 0000000..4b93541 --- /dev/null +++ b/app/src/main/res/layout/act_fumudaiscanresult.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + \ No newline at end of file