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

---
 .../work/productiondailyw/WriteDFragment.java | 80 +++++++++++--------
 app/src/main/res/layout/frag_daily.xml        | 25 ++++--
 2 files changed, 67 insertions(+), 38 deletions(-)

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 ad5c1e7..625951f 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
@@ -50,6 +50,8 @@ public class WriteDFragment extends BaseFragment {
     EditText frag_pressure;
     @BindView(R.id.frag_tijiao)
     Button frag_tijiao;
+    @BindView(R.id.frag_tijiao_zuihou)
+    Button frag_tijiao_zuihou;
 
 //    private List<WriteBean> list;
     private List<WriteBean> mWrite;
@@ -146,6 +148,9 @@ public class WriteDFragment extends BaseFragment {
                 frag_pressure.setText(dewrb.get(activity.mViewPager.getCurrentItem()).getFuya());
             }
 
+            if (activity.mViewPager.getCurrentItem() == (activity.mViewPager.getAdapter().getCount() - 1)) {
+                frag_tijiao_zuihou.setVisibility(View.VISIBLE);
+            }
             //数据加载完毕,恢复标记,防止重复加载
             isViewCreated = false;
             isUIVisible = false;
@@ -216,7 +221,7 @@ public class WriteDFragment extends BaseFragment {
                 }
 
 
-                if (activity.mViewPager.getCurrentItem() < (activity.mViewPager.getAdapter().getCount() - 1)) {
+//                if (activity.mViewPager.getCurrentItem() < (activity.mViewPager.getAdapter().getCount() - 1)) {
                     WriteBean writeBean = new WriteBean();
                     writeBean.setHouseid(WriteDActivity.list.get(activity.mViewPager.getCurrentItem()).getHouseid());
                     writeBean.setSiwang(siwang);
@@ -245,40 +250,49 @@ public class WriteDFragment extends BaseFragment {
                     values.put("fuya", fuya);
                     DataSupport.updateAll(WriteBean.class, values , "houseid = ?",WriteDActivity.list.get(activity.mViewPager.getCurrentItem()).getHouseid()+"");
                     activity.mViewPager.setCurrentItem(activity.mViewPager.getCurrentItem() + 1);
+                showToast("保存成功");
+
+//                } else if (activity.mViewPager.getCurrentItem() == (activity.mViewPager.getAdapter().getCount() - 1)) {
+//                    WriteBean writeBean = new WriteBean();
+//                    writeBean.setHouseid(WriteDActivity.list.get(activity.mViewPager.getCurrentItem()).getHouseid());
+//                    writeBean.setSiwang(siwang);
+//                    writeBean.setTaotai(taotai);
+//                    writeBean.setYinshuiliang(yinshuiliang);
+//                    writeBean.setTizhong(tizhong);
+//                    writeBean.setZuidiwendu(zuidiwendu);
+//                    writeBean.setZuigaowendu(zuigaowendu);
+//                    writeBean.setZuidishidu(zuidishidu);
+//                    writeBean.setZuigaoshidu(zuigaoshidu);
+//                    writeBean.setZuixiaotongfeng(zuixiaotongfeng);
+//                    writeBean.setZuidatongfeng(zuigaotongfeng);
+//                    writeBean.setFuya(fuya);
+//                    WriteDActivity.tijiaoList.add(writeBean);
+
+//                    ContentValues values = new ContentValues();
+//                    values.put("siwang", siwang);
+//                    values.put("taotai", taotai);
+//                    values.put("yinshuiliang", yinshuiliang);
+//                    values.put("tizhong", tizhong);
+//                    values.put("zuidiwendu", zuidiwendu);
+//                    values.put("zuigaowendu", zuigaowendu);
+//                    values.put("zuidishidu", zuidishidu);
+//                    values.put("zuigaoshidu", zuigaoshidu);
+//                    values.put("zuixiaotongfeng", zuixiaotongfeng);
+//                    values.put("zuidatongfeng", zuigaotongfeng);
+//                    values.put("fuya", fuya);
+//                    DataSupport.updateAll(WriteBean.class, values , "houseid = ?",WriteDActivity.list.get(activity.mViewPager.getCurrentItem()).getHouseid()+"");
+//                    mWrite =  DataSupport.findAll(WriteBean.class);
+//                    commit();
+//                }
 
-                } else if (activity.mViewPager.getCurrentItem() == (activity.mViewPager.getAdapter().getCount() - 1)) {
-                    WriteBean writeBean = new WriteBean();
-                    writeBean.setHouseid(WriteDActivity.list.get(activity.mViewPager.getCurrentItem()).getHouseid());
-                    writeBean.setSiwang(siwang);
-                    writeBean.setTaotai(taotai);
-                    writeBean.setYinshuiliang(yinshuiliang);
-                    writeBean.setTizhong(tizhong);
-                    writeBean.setZuidiwendu(zuidiwendu);
-                    writeBean.setZuigaowendu(zuigaowendu);
-                    writeBean.setZuidishidu(zuidishidu);
-                    writeBean.setZuigaoshidu(zuigaoshidu);
-                    writeBean.setZuixiaotongfeng(zuixiaotongfeng);
-                    writeBean.setZuidatongfeng(zuigaotongfeng);
-                    writeBean.setFuya(fuya);
-                    WriteDActivity.tijiaoList.add(writeBean);
-
-                    ContentValues values = new ContentValues();
-                    values.put("siwang", siwang);
-                    values.put("taotai", taotai);
-                    values.put("yinshuiliang", yinshuiliang);
-                    values.put("tizhong", tizhong);
-                    values.put("zuidiwendu", zuidiwendu);
-                    values.put("zuigaowendu", zuigaowendu);
-                    values.put("zuidishidu", zuidishidu);
-                    values.put("zuigaoshidu", zuigaoshidu);
-                    values.put("zuixiaotongfeng", zuixiaotongfeng);
-                    values.put("zuidatongfeng", zuigaotongfeng);
-                    values.put("fuya", fuya);
-                    DataSupport.updateAll(WriteBean.class, values , "houseid = ?",WriteDActivity.list.get(activity.mViewPager.getCurrentItem()).getHouseid()+"");
-                    mWrite =  DataSupport.findAll(WriteBean.class);
-                    commit();
-                }
+            }
+        });
 
+        frag_tijiao_zuihou.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                mWrite =  DataSupport.findAll(WriteBean.class);
+                commit();
             }
         });
     }
diff --git a/app/src/main/res/layout/frag_daily.xml b/app/src/main/res/layout/frag_daily.xml
index 138eb3a..cc24706 100644
--- a/app/src/main/res/layout/frag_daily.xml
+++ b/app/src/main/res/layout/frag_daily.xml
@@ -369,12 +369,27 @@
 
             <include layout="@layout/include_line" />
 
-            <Button
-                android:id="@+id/frag_tijiao"
-                android:text="保存"
-                android:layout_margin="@dimen/dp_10"
+            <LinearLayout
+                android:orientation="horizontal"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content">
+                <Button
+                    android:id="@+id/frag_tijiao"
+                    android:text="保存"
+                    android:layout_margin="@dimen/dp_10"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content" />
+                <Button
+                    android:id="@+id/frag_tijiao_zuihou"
+                    android:text="提交"
+                    android:visibility="gone"
+                    android:layout_margin="@dimen/dp_10"
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:layout_height="wrap_content" />
+            </LinearLayout>
+
         </LinearLayout>
 
     </ScrollView>