Skip to content

W
workoffice
提交 e416aa0a authored 作者: lgd's avatar lgd
浏览文件
操作

1.修改精炼厂展示

上级 b87dc50f
隐藏空白字符变更
内嵌 并排
正在显示 包含 291 行增加 和 38 行删除
app/src/main/java/com/wd/workoffice/bean/mesBean/FactoryDetailBean.java
浏览文件 @ e416aa0a
......@@ -424,7 +424,7 @@ public class FactoryDetailBean {
private String steelmakingWorksCode;
private String steelmakingWorksName;
private String modelNumber;
private int tablesNumber;
private String tablesNumber;
private String calciumTreatmentSituation;
private String createUserId;
private Object createUserName;
......@@ -497,11 +497,11 @@ public class FactoryDetailBean {
this.modelNumber = modelNumber;
}
public int getTablesNumber() {
public String getTablesNumber() {
return tablesNumber;
}
public void setTablesNumber(int tablesNumber) {
public void setTablesNumber(String tablesNumber) {
this.tablesNumber = tablesNumber;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/history/HistoryDetailActivity.java
浏览文件 @ e416aa0a
......@@ -276,7 +276,7 @@ public class HistoryDetailActivity extends WorkToolBarActivity {
// factory2Adapter = new UserDataDetailFactory2Adapter(R.layout.item_user_detail_factory2, dataFactory2List);
// factory3Adapter = new UserDataAdd3LabelAdapter(R.layout.item_add3_label, dataFactory3List);
factory1Adapter = new UserDataAdd3Adapter(R.layout.item_user_add3, dataFactory1List);
factory2Adapter = new UserDataAdd3RefAdapter(R.layout.item_user_add3, dataFactory2List);
factory2Adapter = new UserDataAdd3RefAdapter(R.layout.item_user_add3_ref, dataFactory2List);
factory3Adapter = new UserDataAdd3LabelAdapter(R.layout.item_add3_label, dataFactory3List);
factory1Adapter.bindToRecyclerView(rvFactoryData1);
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryAddActivity.java
浏览文件 @ e416aa0a
......@@ -10,7 +10,6 @@ import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
......@@ -24,14 +23,12 @@ import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.UserDataAdd3AddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3RefAddAdapter;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -41,7 +38,6 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
/**
......@@ -95,7 +91,7 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
data2List = new ArrayList<>();
data3List = new ArrayList<>();
data1Adapter = new UserDataAdd3AddAdapter(R.layout.item_user_add3_add, data1List);
data2Adapter = new UserDataAdd3RefAddAdapter(R.layout.item_user_add3_add, data2List);
data2Adapter = new UserDataAdd3RefAddAdapter(R.layout.item_user_add3_add_ref, data2List);
data3Adapter = new UserDataAdd3LabelAddAdapter(R.layout.item_user_add_factory_label, data3List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryModifyActivity.java
浏览文件 @ e416aa0a
......@@ -9,16 +9,12 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.AddFactoryEvent;
import com.wd.workoffice.bean.event.AddUserDataEvent;
import com.wd.workoffice.bean.event.ModifyFactoryEvent;
import com.wd.workoffice.bean.event.ModifyUserDataEvent;
import com.wd.workoffice.bean.mesBean.FactoryDetailBean;
import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils;
......@@ -26,14 +22,12 @@ import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.UserDataAdd3AddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3RefAddAdapter;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -43,7 +37,6 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
......@@ -101,7 +94,7 @@ public class MesChooseFactoryModifyActivity extends WorkToolBarActivity {
data2List = new ArrayList<>();
data3List = new ArrayList<>();
data1Adapter = new UserDataAdd3AddAdapter(R.layout.item_user_add3_add, data1List);
data2Adapter = new UserDataAdd3RefAddAdapter(R.layout.item_user_add3_add, data2List);
data2Adapter = new UserDataAdd3RefAddAdapter(R.layout.item_user_add3_add_ref, data2List);
data3Adapter = new UserDataAdd3LabelAddAdapter(R.layout.item_user_add_factory_label, data3List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataAdd3Activity.java
浏览文件 @ e416aa0a
......@@ -84,7 +84,7 @@ public class MesUserDataAdd3Activity extends WorkToolBarActivity {
data2List = new ArrayList<>();
data3List = new ArrayList<>();
data1Adapter = new UserDataAdd3Adapter(R.layout.item_user_add3, data1List);
data2Adapter = new UserDataAdd3RefAdapter(R.layout.item_user_add3, data2List);
data2Adapter = new UserDataAdd3RefAdapter(R.layout.item_user_add3_ref, data2List);
data3Adapter = new UserDataAdd3LabelAdapter(R.layout.item_add3_label, data3List);
data1Adapter.bindToRecyclerView(rvData1);
data2Adapter.bindToRecyclerView(rvData2);
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ e416aa0a
......@@ -263,7 +263,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
// factory2Adapter = new UserDataDetailFactory2Adapter(R.layout.item_user_detail_factory2, dataFactory2List);
// factory3Adapter = new UserDataAdd3LabelAdapter(R.layout.item_add3_label, dataFactory3List);
factory1Adapter = new UserDataAdd3Adapter(R.layout.item_user_add3, dataFactory1List);
factory2Adapter = new UserDataAdd3RefAdapter(R.layout.item_user_add3, dataFactory2List);
factory2Adapter = new UserDataAdd3RefAdapter(R.layout.item_user_add3_ref, dataFactory2List);
factory3Adapter = new UserDataAdd3LabelAdapter(R.layout.item_add3_label, dataFactory3List);
factory1Adapter.bindToRecyclerView(rvFactoryData1);
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailAddActivity.java
浏览文件 @ e416aa0a
......@@ -14,7 +14,6 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
......@@ -32,14 +31,12 @@ import com.wd.workoffice.ui.adapter.UserDataAdd3AddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3RefAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -50,7 +47,6 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
......@@ -270,7 +266,7 @@ public class MesUserDataDetailAddActivity extends WorkToolBarActivity {
dataFactory2List = new ArrayList<>();
dataFactory3List = new ArrayList<>();
factory1Adapter = new UserDataAdd3AddAdapter(R.layout.item_user_add3_add, dataFactory1List);
factory2Adapter = new UserDataAdd3RefAddAdapter(R.layout.item_user_add3_add, dataFactory2List);
factory2Adapter = new UserDataAdd3RefAddAdapter(R.layout.item_user_add3_add_ref, dataFactory2List);
factory3Adapter = new UserDataAdd3LabelAddAdapter(R.layout.item_user_add_factory_label, dataFactory3List);
factory1Adapter.bindToRecyclerView(rvFactoryData1);
factory2Adapter.bindToRecyclerView(rvFactoryData2);
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailModifyActivity.java
浏览文件 @ e416aa0a
package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
......@@ -13,7 +12,6 @@ import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.bigkoo.pickerview.listener.OnTimeSelectListener;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
......@@ -30,14 +28,12 @@ import com.wd.workoffice.ui.adapter.UserDataAdd3AddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3LabelAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataAdd3RefAddAdapter;
import com.wd.workoffice.ui.adapter.UserDataMachineAdapter;
import com.wd.workoffice.util.PickTimeUtils;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
......@@ -47,7 +43,6 @@ import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import flexible.xd.android_base.utils.TimeUtils;
import io.reactivex.disposables.Disposable;
import okhttp3.MediaType;
import okhttp3.RequestBody;
......@@ -268,7 +263,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
dataFactory2List = new ArrayList<>();
dataFactory3List = new ArrayList<>();
factory1Adapter = new UserDataAdd3AddAdapter(R.layout.item_user_add3_add, dataFactory1List);
factory2Adapter = new UserDataAdd3RefAddAdapter(R.layout.item_user_add3_add, dataFactory2List);
factory2Adapter = new UserDataAdd3RefAddAdapter(R.layout.item_user_add3_add_ref, dataFactory2List);
factory3Adapter = new UserDataAdd3LabelAddAdapter(R.layout.item_user_add_factory_label, dataFactory3List);
factory1Adapter.bindToRecyclerView(rvFactoryData1);
factory2Adapter.bindToRecyclerView(rvFactoryData2);
......
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3RefAdapter.java
浏览文件 @ e416aa0a
......@@ -36,13 +36,11 @@ public class UserDataAdd3RefAdapter extends BaseQuickAdapter<FactoryDetailBean.S
}
}
});
helper.setText(R.id.tv_desc1, "型号和台数");
helper.setText(R.id.tv_desc2, "钙处理方式");
helper.setText(R.id.tv_name, "精炼炉");
helper.setText(R.id.tv_content1, item.getModelNumber());
helper.setText(R.id.tv_content2, item.getCalciumTreatmentSituation());
helper.setText(R.id.tv_content2, item.getTablesNumber());
helper.setText(R.id.tv_content3, item.getCalciumTreatmentSituation());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataAdd3RefAddAdapter.java
浏览文件 @ e416aa0a
......@@ -37,16 +37,15 @@ public class UserDataAdd3RefAddAdapter extends BaseQuickAdapter<FactoryDetailBea
}
}
});
helper.setText(R.id.tv_desc1, "型号和台数");
helper.setText(R.id.tv_desc2, "钙处理方式");
helper.addOnClickListener(R.id.tv_delete);
helper.setText(R.id.et_name, "精炼炉");
helper.setText(R.id.et_content1, item.getModelNumber());
helper.setText(R.id.et_content2, item.getCalciumTreatmentSituation());
helper.setText(R.id.et_content2, item.getCalciumTreatmentSituation());
helper.setText(R.id.et_content2, item.getTablesNumber());
helper.setText(R.id.et_content3, item.getCalciumTreatmentSituation());
EditText etContent1 = helper.getView(R.id.et_content1);
EditText etContent2 = helper.getView(R.id.et_content2);
EditText etContent3 = helper.getView(R.id.et_content3);
etContent1.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
......@@ -74,6 +73,22 @@ public class UserDataAdd3RefAddAdapter extends BaseQuickAdapter<FactoryDetailBea
}
@Override
public void afterTextChanged(Editable s) {
item.setTablesNumber(s.toString());
}
});
etContent3.addTextChangedListener(new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable s) {
item.setCalciumTreatmentSituation(s.toString());
......
app/src/main/res/layout/item_user_add3_add_ref.xml 0 → 100644
浏览文件 @ e416aa0a
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:id="@+id/et_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/tv_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="10mm"
android:paddingHorizontal="10mm"
android:text="删除"
android:textColor="#ffba6262"
android:textSize="15sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3mm"
android:src="@mipmap/mes_arrow_down" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:id="@+id/tv_desc1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="型号"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<EditText
android:id="@+id/et_content1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:id="@+id/tv_desc2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="台数"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<EditText
android:id="@+id/et_content2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:inputType="numberDecimal"
android:hint="请输入"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="钙处理方式"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<EditText
android:id="@+id/et_content3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:hint="请输入"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_user_add3_ref.xml 0 → 100644
浏览文件 @ e416aa0a
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="炼钢炉"
android:textSize="14sp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:src="@mipmap/mes_arrow_down" />
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="20mm">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:id="@+id/tv_desc1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="型号"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_content1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:id="@+id/tv_desc2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="台数"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_content2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingVertical="9mm"
android:paddingLeft="25mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="钙处理方式"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_content3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:textSize="14sp" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论