diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/BasicattributesFragment.java b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/BasicattributesFragment.java index 3dac946..8686db2 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/BasicattributesFragment.java +++ b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/BasicattributesFragment.java @@ -10,6 +10,7 @@ import com.qhclh.ytzh.R; import com.qhclh.ytzh.base.BaseFragment; import com.qhclh.ytzh.home.RpcUrl; import com.qhclh.ytzh.tasks.ViewOnClickTask; +import com.qhclh.ytzh.ui.CalendarDialogFragment; import org.forks.jsonrpc.JsonRpcResult; import org.forks.jsonrpc.RpcFacade; @@ -31,8 +32,7 @@ public class BasicattributesFragment extends BaseFragment { Spinner basicattr_batch; @BindView(R.id.basicattr_account) Spinner basicattr_account; - @BindView(R.id.basicattr_date) - TextView basicattr_date; + public static TextView basicattr_date; private List farmnameList=new ArrayList<>(); private List farmidList=new ArrayList<>(); @@ -41,6 +41,8 @@ public class BasicattributesFragment extends BaseFragment { private List accountnameList=new ArrayList<>(); private List accountidList=new ArrayList<>(); private String farmid; + + private ProductiondailywActivity act; @Override protected int setLayout() { return R.layout.fragment_basicattr; @@ -48,12 +50,12 @@ public class BasicattributesFragment extends BaseFragment { @Override protected void initView() { - + basicattr_date = getActivity().findViewById(R.id.basicattr_date); } @Override protected void initData() { - + act = (ProductiondailywActivity) getActivity(); } @Override @@ -62,6 +64,7 @@ public class BasicattributesFragment extends BaseFragment { @Override public void onItemSelected(AdapterView adapterView, View view, int i, long l) { farmid = farmidList.get(i); + act.setFarmId(Long.parseLong(farmid)); batch(); } @@ -72,6 +75,38 @@ public class BasicattributesFragment extends BaseFragment { } }); + basicattr_batch.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int i, long l) { + act.setBatchId(Long.parseLong(batchidList.get(i))); + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + + basicattr_account.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + @Override + public void onItemSelected(AdapterView adapterView, View view, int i, long l) { + act.setAccountId(Long.parseLong(accountidList.get(i))); + } + + @Override + public void onNothingSelected(AdapterView adapterView) { + + } + }); + + basicattr_date.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + new CalendarDialogFragment().show(getFragmentManager(), "start"); + + } + }); + } @Override @@ -88,8 +123,10 @@ public class BasicattributesFragment extends BaseFragment { protected void successUI() { int size = rpcobj.size(); accountnameList.clear(); + accountidList.clear(); for (int i=0;i adapter=new ArrayAdapter(getActivity(), android.R.layout.simple_spinner_item,accountnameList); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); @@ -115,9 +152,10 @@ public class BasicattributesFragment extends BaseFragment { protected void successUI() { int size = rpcobj.size(); batchnameList.clear(); - + batchidList.clear(); for (int i=0;i adapter=new ArrayAdapter(getActivity(), android.R.layout.simple_spinner_item,batchnameList); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/ProductiondailywActivity.java b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/ProductiondailywActivity.java index 7650a9e..da4491a 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/ProductiondailywActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/ProductiondailywActivity.java @@ -12,8 +12,12 @@ import android.view.View; import com.qhclh.ytzh.R; import com.qhclh.ytzh.base.BaseActivity; +import com.qhclh.ytzh.ui.CalendarDialogFragment; +import com.qhclh.ytzh.utils.DateTimeUtil; +import java.math.BigDecimal; import java.util.ArrayList; +import java.util.Date; import java.util.List; import butterknife.BindView; @@ -22,7 +26,7 @@ import butterknife.BindView; * Created by 青花瓷 on 2017/12/4. */ ///< 写生产日报 -public class ProductiondailywActivity extends BaseActivity { +public class ProductiondailywActivity extends BaseActivity implements CalendarDialogFragment.CalendarClickListener{ @BindView(R.id.toolbar) Toolbar mToolbar; @BindView(R.id.tabLayout_productiondailyw) @@ -33,6 +37,108 @@ public class ProductiondailywActivity extends BaseActivity { private List mFragmentList = new ArrayList<>(); private List mTitleList = new ArrayList<>(); private TabViewPagerAdapter mViewPagerAdapter; + + private long farmId; + private long batchId; + private long accountId; + private Date time; + + private long houseid; + private int days; + private double cunhuolv; + private int dienum; + private int taotai; + private BigDecimal water; + private BigDecimal weight; + + public long getFarmId() { + return farmId; + } + + public void setFarmId(long farmId) { + this.farmId = farmId; + } + + public long getBatchId() { + return batchId; + } + + public void setBatchId(long batchId) { + this.batchId = batchId; + } + + public long getAccountId() { + return accountId; + } + + public void setAccountId(long accountId) { + this.accountId = accountId; + } + + public Date getTime() { + return time; + } + + public void setTime(Date time) { + this.time = time; + } + + public long getHouseid() { + return houseid; + } + + public void setHouseid(long houseid) { + this.houseid = houseid; + } + + public int getDays() { + return days; + } + + public void setDays(int days) { + this.days = days; + } + + public double getCunhuolv() { + return cunhuolv; + } + + public void setCunhuolv(double cunhuolv) { + this.cunhuolv = cunhuolv; + } + + public int getDienum() { + return dienum; + } + + public void setDienum(int dienum) { + this.dienum = dienum; + } + + public int getTaotai() { + return taotai; + } + + public void setTaotai(int taotai) { + this.taotai = taotai; + } + + public BigDecimal getWater() { + return water; + } + + public void setWater(BigDecimal water) { + this.water = water; + } + + public BigDecimal getWeight() { + return weight; + } + + public void setWeight(BigDecimal weight) { + this.weight = weight; + } + @Override protected int setLayoutId() { return R.layout.act_productiondailyw; @@ -84,6 +190,17 @@ public class ProductiondailywActivity extends BaseActivity { mTabLayout.setTabMode(TabLayout.MODE_FIXED); } + @Override + public void onStartCalendarClick(Date date) { + setTime(date); + BasicattributesFragment.basicattr_date.setText(DateTimeUtil.getYMD2(date)); + } + + @Override + public void onEndCalendarClick(Date date) { + + } + private class TabViewPagerAdapter extends FragmentPagerAdapter { public TabViewPagerAdapter(FragmentManager fm) { super(fm); @@ -116,6 +233,10 @@ public class ProductiondailywActivity extends BaseActivity { public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.save_info: + System.out.println("aaa1--"+getFarmId()); + System.out.println("aaa2---"+getBatchId()); + System.out.println("aaa3---"+getAccountId()); + System.out.println("aaa4---"+getTime()); break; } return super.onOptionsItemSelected(item);