From f136099e5b75a1888489517130e38f684cfbd19e Mon Sep 17 00:00:00 2001 From: lh <1209405678@qq.com> Date: Thu, 21 Dec 2017 14:44:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=A7=E6=94=B9=E5=8F=98=E5=95=8A?= =?UTF-8?q?=E5=95=8A=E5=95=8A=E5=95=8A=E5=95=8A=E5=95=8A=E5=95=8A=E5=95=8A?= =?UTF-8?q?=E5=95=8A=E5=95=8A=E5=95=8A=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 8 ++--- .../productiondaily/ShowInfoActivity.java | 5 ++-- .../productiondaily/ShowInfoFragment.java | 30 +++++++++---------- .../work/productiondailyw/WriteDActivity.java | 6 ++-- .../work/productiondailyw/WriteDFragment.java | 16 +++++----- 5 files changed, 33 insertions(+), 32 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9894c85..be11bd1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -33,10 +33,10 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - lintOptions { - abortOnError false - checkReleaseBuilds false - } +// lintOptions { +// abortOnError false +// checkReleaseBuilds false +// } } dependencies { diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ShowInfoActivity.java b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ShowInfoActivity.java index e8cb15b..2e93883 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ShowInfoActivity.java +++ b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ShowInfoActivity.java @@ -44,7 +44,7 @@ public class ShowInfoActivity extends BaseActivity { private TabViewPagerAdapter mViewPagerAdapter; private List rpcObjectList; - private List list=null; + public static List list=null; private long id; @Override @@ -215,7 +215,8 @@ public class ShowInfoActivity extends BaseActivity { private void initViewPager() { for (int i = 0; i < rpcObjectList.size(); i++) { - mFragmentList.add(new ShowInfoFragment(list)); +// mFragmentList.add(new ShowInfoFragment(list)); + mFragmentList.add(new ShowInfoFragment()); } diff --git a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ShowInfoFragment.java b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ShowInfoFragment.java index 0c4a257..d1041a7 100644 --- a/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ShowInfoFragment.java +++ b/app/src/main/java/com/qhclh/ytzh/work/productiondaily/ShowInfoFragment.java @@ -38,7 +38,7 @@ public class ShowInfoFragment extends BaseFragment { @BindView(R.id.frag_pressure_info) TextView frag_pressure_info; - private List list; +// private List list; private ShowInfoActivity activity; //Fragment的View加载完毕的标记 @@ -47,9 +47,9 @@ public class ShowInfoFragment extends BaseFragment { //Fragment对用户可见的标记 private boolean isUIVisible; - public ShowInfoFragment(List list) { - this.list = list; - } +// public ShowInfoFragment(List list) { +// this.list = list; +// } @Override protected int setLayout() { @@ -88,17 +88,17 @@ public class ShowInfoFragment extends BaseFragment { //这里进行双重标记判断,是因为setUserVisibleHint会多次回调,并且会在onCreateView执行前回调,必须确保onCreateView加载完毕且页面可见,才加载数据 if (isViewCreated && isUIVisible) { - frag_death_info.setText(list.get(activity.mViewPager.getCurrentItem()).getSiwang()); - frag_eliminate_info.setText(list.get(activity.mViewPager.getCurrentItem()).getTaotai()); - frag_water_info.setText(list.get(activity.mViewPager.getCurrentItem()).getYinshuiliang()); - frag_weight.setText(list.get(activity.mViewPager.getCurrentItem()).getTizhong()); - frag_mint_info.setText(list.get(activity.mViewPager.getCurrentItem()).getZuidiwendu()); - frag_maxt_info.setText(list.get(activity.mViewPager.getCurrentItem()).getZuigaowendu()); - frag_minh_info.setText(list.get(activity.mViewPager.getCurrentItem()).getZuidishidu()); - frag_maxh_info.setText(list.get(activity.mViewPager.getCurrentItem()).getZuigaoshidu()); - frag_minw_info.setText(list.get(activity.mViewPager.getCurrentItem()).getZuixiaotongfeng()); - frag_maxw_info.setText(list.get(activity.mViewPager.getCurrentItem()).getZuidatongfeng()); - frag_pressure_info.setText(list.get(activity.mViewPager.getCurrentItem()).getFuya()); + frag_death_info.setText(ShowInfoActivity.list.get(activity.mViewPager.getCurrentItem()).getSiwang()); + frag_eliminate_info.setText(ShowInfoActivity.list.get(activity.mViewPager.getCurrentItem()).getTaotai()); + frag_water_info.setText(ShowInfoActivity.list.get(activity.mViewPager.getCurrentItem()).getYinshuiliang()); + frag_weight.setText(ShowInfoActivity.list.get(activity.mViewPager.getCurrentItem()).getTizhong()); + frag_mint_info.setText(ShowInfoActivity.list.get(activity.mViewPager.getCurrentItem()).getZuidiwendu()); + frag_maxt_info.setText(ShowInfoActivity.list.get(activity.mViewPager.getCurrentItem()).getZuigaowendu()); + frag_minh_info.setText(ShowInfoActivity.list.get(activity.mViewPager.getCurrentItem()).getZuidishidu()); + frag_maxh_info.setText(ShowInfoActivity.list.get(activity.mViewPager.getCurrentItem()).getZuigaoshidu()); + frag_minw_info.setText(ShowInfoActivity.list.get(activity.mViewPager.getCurrentItem()).getZuixiaotongfeng()); + frag_maxw_info.setText(ShowInfoActivity.list.get(activity.mViewPager.getCurrentItem()).getZuidatongfeng()); + frag_pressure_info.setText(ShowInfoActivity.list.get(activity.mViewPager.getCurrentItem()).getFuya()); //数据加载完毕,恢复标记,防止重复加载 isViewCreated = false; isUIVisible = false; 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 5e4060c..d7038be 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 @@ -20,7 +20,6 @@ import com.qhclh.ytzh.tasks.ViewOnClickTask; import com.qhclh.ytzh.ui.CalendarDialogFragment; import com.qhclh.ytzh.utils.DateTimeUtil; import com.qhclh.ytzh.work.productiondaily.ProductiondailyActivity; -import com.qhclh.ytzh.work.productiondaily.ShowInfoActivity; import org.forks.jsonrpc.JsonRpcResult; import org.forks.jsonrpc.RpcFacade; @@ -50,7 +49,7 @@ public class WriteDActivity extends BaseActivity implements CalendarDialogFragme private List mTitleList = new ArrayList<>(); private TabViewPagerAdapter mViewPagerAdapter; - private List list; + public static List list; private List writeBeanList; public static List tijiaoList; @@ -279,7 +278,8 @@ public class WriteDActivity extends BaseActivity implements CalendarDialogFragme private void initViewPager() { for (int i = 0; i < writeBeanList.size(); i++) { - mFragmentList.add(new WriteDFragment(list)); +// mFragmentList.add(new WriteDFragment(list)); + mFragmentList.add(new WriteDFragment()); } 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 877e90b..ad5c1e7 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 @@ -51,12 +51,12 @@ public class WriteDFragment extends BaseFragment { @BindView(R.id.frag_tijiao) Button frag_tijiao; - private List list; +// private List list; private List mWrite; - public WriteDFragment(List list) { - this.list = list; - } +// public WriteDFragment(List list) { +// this.list = list; +// } private WriteDActivity activity; private String siwang, taotai, yinshuiliang, tizhong, zuidiwendu, zuigaowendu, zuidishidu, zuigaoshidu, zuixiaotongfeng, zuigaotongfeng, fuya; @@ -218,7 +218,7 @@ public class WriteDFragment extends BaseFragment { if (activity.mViewPager.getCurrentItem() < (activity.mViewPager.getAdapter().getCount() - 1)) { WriteBean writeBean = new WriteBean(); - writeBean.setHouseid(list.get(activity.mViewPager.getCurrentItem()).getHouseid()); + writeBean.setHouseid(WriteDActivity.list.get(activity.mViewPager.getCurrentItem()).getHouseid()); writeBean.setSiwang(siwang); writeBean.setTaotai(taotai); writeBean.setYinshuiliang(yinshuiliang); @@ -243,12 +243,12 @@ public class WriteDFragment extends BaseFragment { values.put("zuixiaotongfeng", zuixiaotongfeng); values.put("zuidatongfeng", zuigaotongfeng); values.put("fuya", fuya); - DataSupport.updateAll(WriteBean.class, values , "houseid = ?",list.get(activity.mViewPager.getCurrentItem()).getHouseid()+""); + DataSupport.updateAll(WriteBean.class, values , "houseid = ?",WriteDActivity.list.get(activity.mViewPager.getCurrentItem()).getHouseid()+""); activity.mViewPager.setCurrentItem(activity.mViewPager.getCurrentItem() + 1); } else if (activity.mViewPager.getCurrentItem() == (activity.mViewPager.getAdapter().getCount() - 1)) { WriteBean writeBean = new WriteBean(); - writeBean.setHouseid(list.get(activity.mViewPager.getCurrentItem()).getHouseid()); + writeBean.setHouseid(WriteDActivity.list.get(activity.mViewPager.getCurrentItem()).getHouseid()); writeBean.setSiwang(siwang); writeBean.setTaotai(taotai); writeBean.setYinshuiliang(yinshuiliang); @@ -274,7 +274,7 @@ public class WriteDFragment extends BaseFragment { values.put("zuixiaotongfeng", zuixiaotongfeng); values.put("zuidatongfeng", zuigaotongfeng); values.put("fuya", fuya); - DataSupport.updateAll(WriteBean.class, values , "houseid = ?",list.get(activity.mViewPager.getCurrentItem()).getHouseid()+""); + DataSupport.updateAll(WriteBean.class, values , "houseid = ?",WriteDActivity.list.get(activity.mViewPager.getCurrentItem()).getHouseid()+""); mWrite = DataSupport.findAll(WriteBean.class); commit(); }