Browse Source

重大改变啊啊啊啊啊啊啊啊啊啊啊啊

master
lh 8 years ago
parent
commit
f136099e5b
5 changed files with 33 additions and 32 deletions
  1. +4
    -4
      app/build.gradle
  2. +3
    -2
      app/src/main/java/com/qhclh/ytzh/work/productiondaily/ShowInfoActivity.java
  3. +15
    -15
      app/src/main/java/com/qhclh/ytzh/work/productiondaily/ShowInfoFragment.java
  4. +3
    -3
      app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDActivity.java
  5. +8
    -8
      app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java

+ 4
- 4
app/build.gradle View File

@ -33,10 +33,10 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
lintOptions {
abortOnError false
checkReleaseBuilds false
}
// lintOptions {
// abortOnError false
// checkReleaseBuilds false
// }
}
dependencies {


+ 3
- 2
app/src/main/java/com/qhclh/ytzh/work/productiondaily/ShowInfoActivity.java View File

@ -44,7 +44,7 @@ public class ShowInfoActivity extends BaseActivity {
private TabViewPagerAdapter mViewPagerAdapter;
private List<RpcObject> rpcObjectList;
private List<WriteBean> list=null;
public static List<WriteBean> 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());
}


+ 15
- 15
app/src/main/java/com/qhclh/ytzh/work/productiondaily/ShowInfoFragment.java View File

@ -38,7 +38,7 @@ public class ShowInfoFragment extends BaseFragment {
@BindView(R.id.frag_pressure_info)
TextView frag_pressure_info;
private List<WriteBean> list;
// private List<WriteBean> list;
private ShowInfoActivity activity;
//Fragment的View加载完毕的标记
@ -47,9 +47,9 @@ public class ShowInfoFragment extends BaseFragment {
//Fragment对用户可见的标记
private boolean isUIVisible;
public ShowInfoFragment(List<WriteBean> list) {
this.list = list;
}
// public ShowInfoFragment(List<WriteBean> 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;


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

@ -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<String> mTitleList = new ArrayList<>();
private TabViewPagerAdapter mViewPagerAdapter;
private List<WriteBean> list;
public static List<WriteBean> list;
private List<WriteBean> writeBeanList;
public static List<WriteBean> 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());
}


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

@ -51,12 +51,12 @@ public class WriteDFragment extends BaseFragment {
@BindView(R.id.frag_tijiao)
Button frag_tijiao;
private List<WriteBean> list;
// private List<WriteBean> list;
private List<WriteBean> mWrite;
public WriteDFragment(List<WriteBean> list) {
this.list = list;
}
// public WriteDFragment(List<WriteBean> 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();
}


Loading…
Cancel
Save