From a670f85fe9f15a7767541e323b94f039742a7621 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Wed, 20 Dec 2017 14:53:10 +0800
Subject: [PATCH] no message

---
 .../work/productiondailyw/WriteDActivity.java | 24 +++++++++++++++----
 .../work/productiondailyw/WriteDFragment.java | 24 +++++--------------
 2 files changed, 25 insertions(+), 23 deletions(-)

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 bcc5652..4ce6637 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
@@ -17,6 +17,7 @@ import com.qhclh.ytzh.bean.WriteBean;
 import com.qhclh.ytzh.home.RpcUrl;
 import com.qhclh.ytzh.tasks.ViewOnClickTask;
 import com.qhclh.ytzh.ui.CalendarDialogFragment;
+import com.qhclh.ytzh.utils.DateTimeUtil;
 
 import org.forks.jsonrpc.JsonRpcResult;
 import org.forks.jsonrpc.RpcFacade;
@@ -56,13 +57,13 @@ public class WriteDActivity extends BaseActivity implements CalendarDialogFragme
 
     @Override
     protected void initView() {
-        tv_toolbar_title.setText("生产日报");
         initToolbar(mToolbar, "", new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 finish();
             }
         });
+        tv_toolbar_title.setText("生产日报");
 
     }
 
@@ -171,16 +172,21 @@ public class WriteDActivity extends BaseActivity implements CalendarDialogFragme
                     } else {
                         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 {
                         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 {
                         zuidatongfeng = "";
                     }
+                    if (detailsList.get(i).getDecimal("NegativePressure") != null) {
+                        fuya = detailsList.get(i).getDecimal("NegativePressure") + "";
+                    } else {
+                        fuya = "";
+                    }
 
 
                     WriteBean writebean = new WriteBean();
@@ -190,6 +196,13 @@ public class WriteDActivity extends BaseActivity implements CalendarDialogFragme
                     writebean.setTaotai(obs);
                     writebean.setYinshuiliang(water);
                     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);
                 }
                 initTabLayout();
@@ -248,6 +261,7 @@ public class WriteDActivity extends BaseActivity implements CalendarDialogFragme
     @Override
     public void onStartCalendarClick(Date date) {
         LoadOrCreateEditingDayProduct(date);
+        tv_toolbar_title.setText(DateTimeUtil.getYMD2(date));
     }
 
     @Override
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
index 1805822..15f261d 100644
--- a/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java
+++ b/app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java
@@ -92,23 +92,6 @@ public class WriteDFragment extends BaseFragment {
                 zuigaotongfeng = frag_maxw.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.setHouseid(list.get(activity.mViewPager.getCurrentItem()).getHouseid());
                 writeBean.setSiwang(siwang);
@@ -128,7 +111,12 @@ public class WriteDFragment extends BaseFragment {
                     activity.mViewPager.setCurrentItem(activity.mViewPager.getCurrentItem() + 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());
+                    }
                 }
 
             }