diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..3b5f215
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..3b31283
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
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 49135d6..de5228a 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
@@ -9,9 +9,11 @@ import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
+import android.widget.TextView;
import com.qhclh.ytzh.R;
import com.qhclh.ytzh.base.BaseActivity;
+import com.qhclh.ytzh.bean.WriteBean;
import com.qhclh.ytzh.home.RpcUrl;
import com.qhclh.ytzh.tasks.ViewOnClickTask;
@@ -31,6 +33,8 @@ import butterknife.BindView;
public class WriteDActivity extends BaseActivity {
@BindView(R.id.toolbar)
Toolbar mToolbar;
+ @BindView(R.id.tv_toolbar_title)
+ TextView tv_toolbar_title;
@BindView(R.id.tabLayout_write)
TabLayout mTabLayout;
@BindView(R.id.viewPager_write)
@@ -38,8 +42,8 @@ public class WriteDActivity extends BaseActivity {
private List mFragmentList = new ArrayList<>();
private List mTitleList = new ArrayList<>();
private TabViewPagerAdapter mViewPagerAdapter;
- private List mHouseId = new ArrayList<>();
+ private List list;
@Override
protected int setLayoutId() {
@@ -48,20 +52,19 @@ public class WriteDActivity extends BaseActivity {
@Override
protected void initView() {
- initToolbar(mToolbar, "生产日报", new View.OnClickListener() {
+ tv_toolbar_title.setText("生产日报");
+ initToolbar(mToolbar, "", new View.OnClickListener() {
@Override
public void onClick(View view) {
finish();
}
});
- initTabLayout();
- initViewPager();
}
@Override
protected void initData() {
-
+ list = new ArrayList<>();
}
@Override
@@ -74,8 +77,9 @@ public class WriteDActivity extends BaseActivity {
super.onResume();
LoadOrCreateEditingDayProduct();
}
- private RpcObject rpcObj;
+ public static RpcObject rpcObj;
+ private List detailsList;
private String houseid;
private String housename;
private String days;
@@ -87,7 +91,7 @@ public class WriteDActivity extends BaseActivity {
ViewOnClickTask LoadOrCreateEditingDayProductTask = new ViewOnClickTask(this, "加载中...") {
@Override
protected void successUI() {
- List detailsList = rpcObj.getManyList("Details");
+ detailsList = rpcObj.getManyList("Details");
for (int i = 0; i < detailsList.size(); i++) {
if (detailsList.get(i).getLong("House_ID")!=null) {
houseid = detailsList.get(i).getLong("House_ID")+"";
@@ -130,8 +134,14 @@ public class WriteDActivity extends BaseActivity {
}else {
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
@@ -166,22 +176,18 @@ public class WriteDActivity extends BaseActivity {
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 list;
+
+ public WriteDFragment(List list) {
+ this.list = list;
+ }
+
private WriteDActivity activity;
private String siwang,taotai,yinshuiliang,tizhong,zuidiwendu,zuigaowendu,zuidishidu,zuigaoshidu,zuixiaotongfeng,zuigaotongfeng,fuya;
@Override
@@ -53,7 +62,6 @@ public class WriteDFragment extends BaseFragment {
@Override
protected void initData() {
-
}
@Override
@@ -88,6 +96,11 @@ public class WriteDFragment extends BaseFragment {
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()