Browse Source

no message

master
lh 8 years ago
parent
commit
eafe62631a
4 changed files with 53 additions and 25 deletions
  1. +6
    -0
      .idea/inspectionProfiles/Project_Default.xml
  2. +7
    -0
      .idea/inspectionProfiles/profiles_settings.xml
  3. +26
    -24
      app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDActivity.java
  4. +14
    -1
      app/src/main/java/com/qhclh/ytzh/work/productiondailyw/WriteDFragment.java

+ 6
- 0
.idea/inspectionProfiles/Project_Default.xml View File

@ -0,0 +1,6 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="AndroidLintValidFragment" enabled="false" level="ERROR" enabled_by_default="false" />
</profile>
</component>

+ 7
- 0
.idea/inspectionProfiles/profiles_settings.xml View File

@ -0,0 +1,7 @@
<component name="InspectionProjectProfileManager">
<settings>
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_PROFILE" value="true" />
<version value="1.0" />
</settings>
</component>

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

@ -9,9 +9,11 @@ import android.support.v7.widget.Toolbar;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.TextView;
import com.qhclh.ytzh.R; import com.qhclh.ytzh.R;
import com.qhclh.ytzh.base.BaseActivity; import com.qhclh.ytzh.base.BaseActivity;
import com.qhclh.ytzh.bean.WriteBean;
import com.qhclh.ytzh.home.RpcUrl; import com.qhclh.ytzh.home.RpcUrl;
import com.qhclh.ytzh.tasks.ViewOnClickTask; import com.qhclh.ytzh.tasks.ViewOnClickTask;
@ -31,6 +33,8 @@ import butterknife.BindView;
public class WriteDActivity extends BaseActivity { public class WriteDActivity extends BaseActivity {
@BindView(R.id.toolbar) @BindView(R.id.toolbar)
Toolbar mToolbar; Toolbar mToolbar;
@BindView(R.id.tv_toolbar_title)
TextView tv_toolbar_title;
@BindView(R.id.tabLayout_write) @BindView(R.id.tabLayout_write)
TabLayout mTabLayout; TabLayout mTabLayout;
@BindView(R.id.viewPager_write) @BindView(R.id.viewPager_write)
@ -38,8 +42,8 @@ public class WriteDActivity extends BaseActivity {
private List<Fragment> mFragmentList = new ArrayList<>(); private List<Fragment> mFragmentList = new ArrayList<>();
private List<String> mTitleList = new ArrayList<>(); private List<String> mTitleList = new ArrayList<>();
private TabViewPagerAdapter mViewPagerAdapter; private TabViewPagerAdapter mViewPagerAdapter;
private List<Long> mHouseId = new ArrayList<>();
private List<WriteBean> list;
@Override @Override
protected int setLayoutId() { protected int setLayoutId() {
@ -48,20 +52,19 @@ public class WriteDActivity extends BaseActivity {
@Override @Override
protected void initView() { protected void initView() {
initToolbar(mToolbar, "生产日报", new View.OnClickListener() {
tv_toolbar_title.setText("生产日报");
initToolbar(mToolbar, "", new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
finish(); finish();
} }
}); });
initTabLayout();
initViewPager();
} }
@Override @Override
protected void initData() { protected void initData() {
list = new ArrayList<>();
} }
@Override @Override
@ -74,8 +77,9 @@ public class WriteDActivity extends BaseActivity {
super.onResume(); super.onResume();
LoadOrCreateEditingDayProduct(); LoadOrCreateEditingDayProduct();
} }
private RpcObject rpcObj;
public static RpcObject rpcObj;
private List<RpcObject> detailsList;
private String houseid; private String houseid;
private String housename; private String housename;
private String days; private String days;
@ -87,7 +91,7 @@ public class WriteDActivity extends BaseActivity {
ViewOnClickTask LoadOrCreateEditingDayProductTask = new ViewOnClickTask(this, "加载中...") { ViewOnClickTask LoadOrCreateEditingDayProductTask = new ViewOnClickTask(this, "加载中...") {
@Override @Override
protected void successUI() { protected void successUI() {
List<RpcObject> detailsList = rpcObj.getManyList("Details");
detailsList = rpcObj.getManyList("Details");
for (int i = 0; i < detailsList.size(); i++) { for (int i = 0; i < detailsList.size(); i++) {
if (detailsList.get(i).getLong("House_ID")!=null) { if (detailsList.get(i).getLong("House_ID")!=null) {
houseid = detailsList.get(i).getLong("House_ID")+""; houseid = detailsList.get(i).getLong("House_ID")+"";
@ -130,8 +134,14 @@ public class WriteDActivity extends BaseActivity {
}else { }else {
weight = ""; weight = "";
} }
mHouseId.add(detailsList.get(i).getLong("House_ID"));
WriteBean writebean = new WriteBean();
writebean.setHouseid(Long.parseLong(houseid));
writebean.setHousename(housename);
list.add(writebean);
} }
initTabLayout();
initViewPager();
} }
@Override @Override
@ -166,22 +176,18 @@ public class WriteDActivity extends BaseActivity {
private void initTabLayout() { private void initTabLayout() {
mTitleList.add(getString(R.string.changle));
mTitleList.add(getString(R.string.shouguangdong));
mTitleList.add(getString(R.string.shouguangxi));
mTitleList.add(getString(R.string.anqiu));
mTitleList.add(getString(R.string.qiuping));
for (int i =0 ;i<detailsList.size() ;i++) {
mTitleList.add(detailsList.get(i).getString("House_Name"));
}
mTabLayout.setTabMode(TabLayout.MODE_SCROLLABLE); mTabLayout.setTabMode(TabLayout.MODE_SCROLLABLE);
} }
private void initViewPager() { private void initViewPager() {
mFragmentList.add(new WriteDFragment());
mFragmentList.add(new WriteDFragment());
mFragmentList.add(new WriteDFragment());
mFragmentList.add(new WriteDFragment());
mFragmentList.add(new WriteDFragment());
for (int i=0;i<detailsList.size();i++) {
mFragmentList.add(new WriteDFragment(list));
}
mViewPagerAdapter = new TabViewPagerAdapter(getSupportFragmentManager()); mViewPagerAdapter = new TabViewPagerAdapter(getSupportFragmentManager());
mViewPager.setAdapter(mViewPagerAdapter); mViewPager.setAdapter(mViewPagerAdapter);
@ -209,9 +215,5 @@ public class WriteDActivity extends BaseActivity {
public CharSequence getPageTitle(int position) { public CharSequence getPageTitle(int position) {
return mTitleList.get(position); return mTitleList.get(position);
} }
// @Override
// public long getItemId(int position) {
// return mHouseId.get(position);
// }
} }
} }

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

@ -6,6 +6,9 @@ import android.widget.EditText;
import com.qhclh.ytzh.R; import com.qhclh.ytzh.R;
import com.qhclh.ytzh.base.BaseFragment; import com.qhclh.ytzh.base.BaseFragment;
import com.qhclh.ytzh.bean.WriteBean;
import java.util.List;
import butterknife.BindView; import butterknife.BindView;
@ -39,6 +42,12 @@ public class WriteDFragment extends BaseFragment {
@BindView(R.id.frag_tijiao) @BindView(R.id.frag_tijiao)
Button frag_tijiao; Button frag_tijiao;
private List<WriteBean> list;
public WriteDFragment(List<WriteBean> list) {
this.list = list;
}
private WriteDActivity activity; 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 @Override
@ -53,7 +62,6 @@ public class WriteDFragment extends BaseFragment {
@Override @Override
protected void initData() { protected void initData() {
} }
@Override @Override
@ -88,6 +96,11 @@ public class WriteDFragment extends BaseFragment {
System.out.println("aaa12++++++"+activity.mViewPager.getAdapter().getCount()); System.out.println("aaa12++++++"+activity.mViewPager.getAdapter().getCount());
System.out.println("aaa++++++-------------------");
System.out.println("aaa13++++++"+list.get(activity.mViewPager.getCurrentItem()).getHousename());
if (activity.mViewPager.getCurrentItem()<activity.mViewPager.getAdapter().getCount()-1) { if (activity.mViewPager.getCurrentItem()<activity.mViewPager.getAdapter().getCount()-1) {
activity.mViewPager.setCurrentItem(activity.mViewPager.getCurrentItem() + 1); activity.mViewPager.setCurrentItem(activity.mViewPager.getCurrentItem() + 1);
} }


Loading…
Cancel
Save