From 2f8f7384b4da98fbbdaabc5d9f9b9e378e667887 Mon Sep 17 00:00:00 2001
From: lh <1209405678@qq.com>
Date: Thu, 21 Dec 2017 09:05:15 +0800
Subject: [PATCH] no message

---
 .../work/productiondailyw/WriteDActivity.java |   2 +
 .../work/productiondailyw/WriteDFragment.java | 131 ++++++++++++------
 2 files changed, 88 insertions(+), 45 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 3b94875..c43c5ca 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
@@ -106,6 +106,8 @@ public class WriteDActivity extends BaseActivity implements CalendarDialogFragme
         ViewOnClickTask LoadOrCreateEditingDayProductTask = new ViewOnClickTask(this, "加载中...") {
             @Override
             protected void successUI() {
+                list.clear();
+                tijiaoList.clear();
                 detailsList = rpcObj.getManyList("Details");
                 for (int i = 0; i < detailsList.size(); i++) {
                     if (detailsList.get(i).getLong("House_ID") != null) {
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 d8b4695..1a2f34e 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
@@ -56,7 +56,8 @@ public class WriteDFragment extends BaseFragment {
     }
 
     private WriteDActivity activity;
-    private String siwang,taotai,yinshuiliang,tizhong,zuidiwendu,zuigaowendu,zuidishidu,zuigaoshidu,zuixiaotongfeng,zuigaotongfeng,fuya;
+    private String siwang, taotai, yinshuiliang, tizhong, zuidiwendu, zuigaowendu, zuidishidu, zuigaoshidu, zuixiaotongfeng, zuigaotongfeng, fuya;
+
     @Override
     protected int setLayout() {
         return R.layout.frag_daily;
@@ -99,8 +100,53 @@ public class WriteDFragment extends BaseFragment {
                 zuigaotongfeng = frag_maxw.getText().toString().trim();
                 fuya = frag_pressure.getText().toString().trim();
 
+                if (siwang.equals("") || siwang == null) {
+                    showToast("请输入死亡只数");
+                    return;
+                }
+                if (taotai.equals("") || taotai == null) {
+                    showToast("请输入淘汰只数");
+                    return;
+                }
+                if (yinshuiliang.equals("") || yinshuiliang == null) {
+                    showToast("请输入饮水量");
+                    return;
+                }
+                if (tizhong.equals("") || tizhong == null) {
+                    showToast("请输入体重");
+                    return;
+                }
+                if (zuidiwendu.equals("") || zuidiwendu == null) {
+                    showToast("请输入最低温度");
+                    return;
+                }
+                if (zuigaowendu.equals("") || zuigaowendu == null) {
+                    showToast("请输入最高温度");
+                    return;
+                }
+                if (zuidishidu.equals("") || zuidishidu == null) {
+                    showToast("请输入最低湿度");
+                    return;
+                }
+                if (zuigaoshidu.equals("") || zuigaoshidu == null) {
+                    showToast("请输入最高湿度");
+                    return;
+                }
+                if (zuixiaotongfeng.equals("") || zuixiaotongfeng == null) {
+                    showToast("请输入最小通风");
+                    return;
+                }
+                if (zuigaotongfeng.equals("") || zuigaotongfeng == null) {
+                    showToast("请输入最大通风");
+                    return;
+                }
+                if (fuya.equals("") || fuya == null) {
+                    showToast("请输入负压");
+                    return;
+                }
+
 
-                if (activity.mViewPager.getCurrentItem()<(activity.mViewPager.getAdapter().getCount()-1)) {
+                if (activity.mViewPager.getCurrentItem() < (activity.mViewPager.getAdapter().getCount() - 1)) {
                     WriteBean writeBean = new WriteBean();
                     writeBean.setHouseid(list.get(activity.mViewPager.getCurrentItem()).getHouseid());
                     writeBean.setSiwang(siwang);
@@ -117,7 +163,7 @@ public class WriteDFragment extends BaseFragment {
                     WriteDActivity.tijiaoList.add(writeBean);
                     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)) {
                     WriteBean writeBean = new WriteBean();
                     writeBean.setHouseid(list.get(activity.mViewPager.getCurrentItem()).getHouseid());
                     writeBean.setSiwang(siwang);
@@ -132,12 +178,6 @@ public class WriteDFragment extends BaseFragment {
                     writeBean.setZuidatongfeng(zuigaotongfeng);
                     writeBean.setFuya(fuya);
                     WriteDActivity.tijiaoList.add(writeBean);
-                    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());
-                    }
                     commit();
                 }
 
@@ -146,13 +186,15 @@ public class WriteDFragment extends BaseFragment {
     }
 
     private void commit() {
-        ViewOnClickTask updateTask = new ViewOnClickTask(getActivity(),"加载中...") {
+        ViewOnClickTask updateTask = new ViewOnClickTask(getActivity(), "加载中...") {
             RpcObject rpcobj;
+
             @Override
             protected void successUI() {
                 showToast("提交成功");
                 activity.finish();
             }
+
             @Override
             public Object call() throws Exception {
 
@@ -163,76 +205,75 @@ public class WriteDFragment extends BaseFragment {
                     for (int i = 0; i < WriteDActivity.tijiaoList.size(); i++) {
                         RpcObject setDetails = parmObject.getManyList("Details").get(i);
 
-                        if (WriteDActivity.tijiaoList.get(i).getSiwang()!=null && !"".equals(WriteDActivity.tijiaoList.get(i).getSiwang())) {
+                        if (WriteDActivity.tijiaoList.get(i).getSiwang() != null && !"".equals(WriteDActivity.tijiaoList.get(i).getSiwang())) {
                             setDetails.setInt("DieNumber", Integer.parseInt(WriteDActivity.tijiaoList.get(i).getSiwang()));
-                        }else {
-                            setDetails.setInt("DieNumber",null);
+                        } else {
+                            setDetails.setInt("DieNumber", null);
                         }
 
-                        if (WriteDActivity.tijiaoList.get(i).getTaotai()!=null && !"".equals(WriteDActivity.tijiaoList.get(i).getTaotai())) {
+                        if (WriteDActivity.tijiaoList.get(i).getTaotai() != null && !"".equals(WriteDActivity.tijiaoList.get(i).getTaotai())) {
                             setDetails.setInt("Obsolete", Integer.parseInt(WriteDActivity.tijiaoList.get(i).getTaotai()));
-                        }else {
-                            setDetails.setInt("Obsolete",null);
+                        } else {
+                            setDetails.setInt("Obsolete", null);
                         }
 
-                        if (WriteDActivity.tijiaoList.get(i).getYinshuiliang()!=null && !"".equals(WriteDActivity.tijiaoList.get(i).getYinshuiliang())) {
+                        if (WriteDActivity.tijiaoList.get(i).getYinshuiliang() != null && !"".equals(WriteDActivity.tijiaoList.get(i).getYinshuiliang())) {
                             setDetails.setDecimal("WaterIntake", new BigDecimal(WriteDActivity.tijiaoList.get(i).getYinshuiliang()));
-                        }else {
-                            setDetails.setDecimal("WaterIntake",null);
+                        } else {
+                            setDetails.setDecimal("WaterIntake", null);
                         }
 
-                        if (WriteDActivity.tijiaoList.get(i).getTizhong()!=null && !"".equals(WriteDActivity.tijiaoList.get(i).getTizhong())) {
+                        if (WriteDActivity.tijiaoList.get(i).getTizhong() != null && !"".equals(WriteDActivity.tijiaoList.get(i).getTizhong())) {
                             setDetails.setDecimal("Weight", new BigDecimal(WriteDActivity.tijiaoList.get(i).getTizhong()));
-                        }else {
-                            setDetails.setDecimal("Weight",null);
+                        } else {
+                            setDetails.setDecimal("Weight", null);
                         }
 
-                        if (WriteDActivity.tijiaoList.get(i).getZuidiwendu()!=null && !"".equals(WriteDActivity.tijiaoList.get(i).getZuidiwendu())) {
+                        if (WriteDActivity.tijiaoList.get(i).getZuidiwendu() != null && !"".equals(WriteDActivity.tijiaoList.get(i).getZuidiwendu())) {
                             setDetails.setDecimal("MinTemperature", new BigDecimal(WriteDActivity.tijiaoList.get(i).getZuidiwendu()));
-                        }else {
-                            setDetails.setDecimal("MinTemperature",null);
+                        } else {
+                            setDetails.setDecimal("MinTemperature", null);
                         }
 
-                        if (WriteDActivity.tijiaoList.get(i).getZuigaowendu()!=null && !"".equals(WriteDActivity.tijiaoList.get(i).getZuigaowendu())) {
+                        if (WriteDActivity.tijiaoList.get(i).getZuigaowendu() != null && !"".equals(WriteDActivity.tijiaoList.get(i).getZuigaowendu())) {
                             setDetails.setDecimal("MaxTemperature", new BigDecimal(WriteDActivity.tijiaoList.get(i).getZuigaowendu()));
-                        }else {
-                            setDetails.setDecimal("MaxTemperature",null);
+                        } else {
+                            setDetails.setDecimal("MaxTemperature", null);
                         }
 
-                        if (WriteDActivity.tijiaoList.get(i).getZuidishidu()!=null && !"".equals(WriteDActivity.tijiaoList.get(i).getZuidishidu())) {
+                        if (WriteDActivity.tijiaoList.get(i).getZuidishidu() != null && !"".equals(WriteDActivity.tijiaoList.get(i).getZuidishidu())) {
                             setDetails.setDecimal("MinHumidity", new BigDecimal(WriteDActivity.tijiaoList.get(i).getZuidishidu()));
-                        }else {
-                            setDetails.setDecimal("MinHumidity",null);
+                        } else {
+                            setDetails.setDecimal("MinHumidity", null);
                         }
 
-                        if (WriteDActivity.tijiaoList.get(i).getFuya()!=null && !"".equals(WriteDActivity.tijiaoList.get(i).getFuya())) {
+                        if (WriteDActivity.tijiaoList.get(i).getFuya() != null && !"".equals(WriteDActivity.tijiaoList.get(i).getFuya())) {
                             setDetails.setMoney("NegativePressure", new BigDecimal(WriteDActivity.tijiaoList.get(i).getFuya()));
-                        }else {
-                            setDetails.setMoney("NegativePressure",null);
+                        } else {
+                            setDetails.setMoney("NegativePressure", null);
                         }
 
-                        if (WriteDActivity.tijiaoList.get(i).getZuigaoshidu()!=null && !"".equals(WriteDActivity.tijiaoList.get(i).getZuigaoshidu())) {
+                        if (WriteDActivity.tijiaoList.get(i).getZuigaoshidu() != null && !"".equals(WriteDActivity.tijiaoList.get(i).getZuigaoshidu())) {
                             setDetails.setDecimal("MaxHumidity", new BigDecimal(WriteDActivity.tijiaoList.get(i).getZuigaoshidu()));
-                        }else {
-                            setDetails.setDecimal("MaxHumidity",null);
+                        } else {
+                            setDetails.setDecimal("MaxHumidity", null);
                         }
-                        if (WriteDActivity.tijiaoList.get(i).getZuixiaotongfeng()!=null && !"".equals(WriteDActivity.tijiaoList.get(i).getZuixiaotongfeng())) {
+                        if (WriteDActivity.tijiaoList.get(i).getZuixiaotongfeng() != null && !"".equals(WriteDActivity.tijiaoList.get(i).getZuixiaotongfeng())) {
                             setDetails.setString("NightMinAirQuantity", WriteDActivity.tijiaoList.get(i).getZuixiaotongfeng());
-                        }else {
-                            setDetails.setString("NightMinAirQuantity",null);
+                        } else {
+                            setDetails.setString("NightMinAirQuantity", null);
                         }
 
-                        if (WriteDActivity.tijiaoList.get(i).getZuidatongfeng()!=null && !"".equals(WriteDActivity.tijiaoList.get(i).getZuidatongfeng())) {
+                        if (WriteDActivity.tijiaoList.get(i).getZuidatongfeng() != null && !"".equals(WriteDActivity.tijiaoList.get(i).getZuidatongfeng())) {
                             setDetails.setString("DayMaxAirQuantity", WriteDActivity.tijiaoList.get(i).getZuidatongfeng());
-                        }else {
-                            setDetails.setString("DayMaxAirQuantity",null);
+                        } else {
+                            setDetails.setString("DayMaxAirQuantity", null);
                         }
                     }
 
                     JsonRpcResult result = RpcFacade.rpcCall(RpcUrl.DayProductRpc_Update, parmObject);
                     rpcobj = result.getRpcObject(RpcUrl.DayProductRpc_Update_canshu_fanhui);
-                }catch (NumberFormatException e)
-                {
+                } catch (NumberFormatException e) {
                     e.printStackTrace();
                 }
                 return null;