Browse Source

no message

master
lh 8 years ago
parent
commit
a670f85fe9
2 changed files with 25 additions and 23 deletions
  1. +19
    -5
      app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDActivity.java
  2. +6
    -18
      app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java

+ 19
- 5
app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDActivity.java View File

@ -17,6 +17,7 @@ import com.qhclh.ytzh.bean.WriteBean;
import com.qhclh.ytzh.home.RpcUrl; import com.qhclh.ytzh.home.RpcUrl;
import com.qhclh.ytzh.tasks.ViewOnClickTask; import com.qhclh.ytzh.tasks.ViewOnClickTask;
import com.qhclh.ytzh.ui.CalendarDialogFragment; import com.qhclh.ytzh.ui.CalendarDialogFragment;
import com.qhclh.ytzh.utils.DateTimeUtil;
import org.forks.jsonrpc.JsonRpcResult; import org.forks.jsonrpc.JsonRpcResult;
import org.forks.jsonrpc.RpcFacade; import org.forks.jsonrpc.RpcFacade;
@ -56,13 +57,13 @@ public class WriteDActivity extends BaseActivity implements CalendarDialogFragme
@Override @Override
protected void initView() { protected void initView() {
tv_toolbar_title.setText("生产日报");
initToolbar(mToolbar, "", new View.OnClickListener() { initToolbar(mToolbar, "", new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
finish(); finish();
} }
}); });
tv_toolbar_title.setText("生产日报");
} }
@ -171,16 +172,21 @@ public class WriteDActivity extends BaseActivity implements CalendarDialogFragme
} else { } else {
zuigaoshidu = ""; zuigaoshidu = "";
} }
if (detailsList.get(i).getDecimal("MinFanNum") != null) {
zuixiaotongfeng = detailsList.get(i).getDecimal("MinFanNum") + "";
if (detailsList.get(i).getString("NightMinAirQuantity") != null) {
zuixiaotongfeng = detailsList.get(i).getString("NightMinAirQuantity");
} else { } else {
zuixiaotongfeng = ""; zuixiaotongfeng = "";
} }
if (detailsList.get(i).getDecimal("MaxVentilating") != null) {
zuidatongfeng = detailsList.get(i).getDecimal("MaxVentilating") + "";
if (detailsList.get(i).getString("DayMaxAirQuantity") != null) {
zuidatongfeng = detailsList.get(i).getString("DayMaxAirQuantity");
} else { } else {
zuidatongfeng = ""; zuidatongfeng = "";
} }
if (detailsList.get(i).getDecimal("NegativePressure") != null) {
fuya = detailsList.get(i).getDecimal("NegativePressure") + "";
} else {
fuya = "";
}
WriteBean writebean = new WriteBean(); WriteBean writebean = new WriteBean();
@ -190,6 +196,13 @@ public class WriteDActivity extends BaseActivity implements CalendarDialogFragme
writebean.setTaotai(obs); writebean.setTaotai(obs);
writebean.setYinshuiliang(water); writebean.setYinshuiliang(water);
writebean.setTizhong(weight); writebean.setTizhong(weight);
writebean.setZuidiwendu(zuidiwendu);
writebean.setZuigaowendu(zuigaowendu);
writebean.setZuidishidu(zuidishidu);
writebean.setZuigaoshidu(zuigaoshidu);
writebean.setZuixiaotongfeng(zuixiaotongfeng);
writebean.setZuidatongfeng(zuidatongfeng);
writebean.setFuya(fuya);
list.add(writebean); list.add(writebean);
} }
initTabLayout(); initTabLayout();
@ -248,6 +261,7 @@ public class WriteDActivity extends BaseActivity implements CalendarDialogFragme
@Override @Override
public void onStartCalendarClick(Date date) { public void onStartCalendarClick(Date date) {
LoadOrCreateEditingDayProduct(date); LoadOrCreateEditingDayProduct(date);
tv_toolbar_title.setText(DateTimeUtil.getYMD2(date));
} }
@Override @Override


+ 6
- 18
app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java View File

@ -92,23 +92,6 @@ public class WriteDFragment extends BaseFragment {
zuigaotongfeng = frag_maxw.getText().toString().trim(); zuigaotongfeng = frag_maxw.getText().toString().trim();
fuya = frag_pressure.getText().toString().trim(); fuya = frag_pressure.getText().toString().trim();
System.out.println("aaa++++++"+siwang);
System.out.println("aaa1++++++"+taotai);
System.out.println("aaa2++++++"+yinshuiliang);
System.out.println("aaa3++++++"+tizhong);
System.out.println("aaa4++++++"+zuidiwendu);
System.out.println("aaa5++++++"+zuigaowendu);
System.out.println("aaa6++++++"+zuidishidu);
System.out.println("aaa7++++++"+zuigaoshidu);
System.out.println("aaa8++++++"+zuixiaotongfeng);
System.out.println("aaa9++++++"+zuigaotongfeng);
System.out.println("aaa10++++++"+fuya);
System.out.println("aaa11++++++"+activity.mViewPager.getCurrentItem());
System.out.println("aaa12++++++"+activity.mViewPager.getAdapter().getCount());
System.out.println("aaa++++++-------------------");
System.out.println("aaa13++++++"+list.get(activity.mViewPager.getCurrentItem()).getHousename());
WriteBean writeBean = new WriteBean(); WriteBean writeBean = new WriteBean();
writeBean.setHouseid(list.get(activity.mViewPager.getCurrentItem()).getHouseid()); writeBean.setHouseid(list.get(activity.mViewPager.getCurrentItem()).getHouseid());
writeBean.setSiwang(siwang); writeBean.setSiwang(siwang);
@ -128,7 +111,12 @@ public class WriteDFragment extends BaseFragment {
activity.mViewPager.setCurrentItem(activity.mViewPager.getCurrentItem() + 1); activity.mViewPager.setCurrentItem(activity.mViewPager.getCurrentItem() + 1);
}else if (activity.mViewPager.getCurrentItem()== (activity.mViewPager.getAdapter().getCount()-1)){ }else if (activity.mViewPager.getCurrentItem()== (activity.mViewPager.getAdapter().getCount()-1)){
for (int i=0;i<WriteDActivity.tijiaoList.size();i++) {
System.out.println("aaa1++++++" + WriteDActivity.tijiaoList.get(i).getSiwang());
System.out.println("aaa2++++++" + WriteDActivity.tijiaoList.get(i).getHousename());
System.out.println("aaa3++++++" + WriteDActivity.tijiaoList.get(i).getHouseid());
System.out.println("aaa4++++++" + WriteDActivity.tijiaoList.get(i).getTizhong());
}
} }
} }


Loading…
Cancel
Save