Skip to content

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

1.添加连铸机名称，关联查询字段修正 

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.支数参数
上级 6a31e4c0
隐藏空白字符变更
内嵌 并排
正在显示 包含 228 行增加 和 55 行删除
app/src/main/java/com/wd/workoffice/ui/activity/mes/search/MesSearchConditionActivity.java
浏览文件 @ 49465ba8
package com.wd.workoffice.ui.activity.mes.search;
import android.content.DialogInterface;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.EditText;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.util.DialogUtils;
import com.wd.workoffice.util.WorkUtils;
import java.util.Map;
......@@ -17,6 +22,7 @@ import java.util.Map;
import androidx.core.widget.NestedScrollView;
import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.OnClick;
/**
* author : flexible
......@@ -25,7 +31,9 @@ import butterknife.ButterKnife;
**/
public class MesSearchConditionActivity extends WorkToolBarActivity {
@BindView(R.id.et_type)
EditText etType;
TextView etType;
@BindView(R.id.rl_status)
RelativeLayout rlStatus;
@BindView(R.id.et_name)
EditText etName;
@BindView(R.id.et_img_code)
......@@ -46,12 +54,26 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
EditText etSection;
@BindView(R.id.et_steel)
EditText etSteel;
@BindView(R.id.srl_refresh)
NestedScrollView srlRefresh;
private Map<String, Object> param;
private QMUIDialog.MenuDialogBuilder statusDialog;
private String[] statusList = new String[]{"成品", "辅件", "模具", "泥料"};
private Integer[] statusValue = new Integer[]{0, 1, 2, 3};
@Override
protected void initView() {
ButterKnife.bind(this);
param = WorkUtils.simpleParam();
statusDialog = DialogUtils.listDialog(this);
statusDialog.addItems(statusList, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
etType.setText(statusList[which]);
dialog.dismiss();
param.put("productType", statusValue[which]);
}
});
}
......@@ -83,10 +105,10 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
param.put("customerUserName", etClient.getText().toString());
}
if (!TextUtils.isEmpty(etDrawing.getText().toString())) {
param.put("drawingNumberProd", etDrawing.getText().toString());
param.put("drawingNumberProc", etDrawing.getText().toString());
}
if (!TextUtils.isEmpty(etImgCode.getText().toString())) {
param.put("drawingNumberProc", etImgCode.getText().toString());
param.put("drawingNumberProd", etImgCode.getText().toString());
}
if (!TextUtils.isEmpty(etName.getText().toString())) {
param.put("productName", etName.getText().toString());
......@@ -103,9 +125,6 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
if (!TextUtils.isEmpty(etSteel.getText().toString())) {
param.put("steelGrade", etSteel.getText().toString());
}
if (!TextUtils.isEmpty(etType.getText().toString())) {
param.put("productType", etType.getText().toString());
}
if (!TextUtils.isEmpty(etWeight.getText().toString())) {
param.put("weight", etWeight.getText().toString());
}
......@@ -123,4 +142,15 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
}
@OnClick(R.id.rl_status)
public void onViewClicked() {
statusDialog.show();
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryActivity.java
浏览文件 @ 49465ba8
......@@ -72,7 +72,7 @@ public class MesChooseFactoryActivity extends WorkToolBarActivity {
clientAdapter.bindToRecyclerView(rvClient);
clientAdapter.setEmptyView(R.layout.view_empty_content, rvClient);
paramMap = WorkUtils.simpleParam();
param = WorkUtils.pageKey();
param = WorkUtils.simpleParam();
param.put("paramMap", paramMap);
getData();
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseFactoryAddActivity.java
浏览文件 @ 49465ba8
......@@ -170,6 +170,7 @@ public class MesChooseFactoryAddActivity extends WorkToolBarActivity {
if (!checkParam()) {
return;
}
data.setSteelmakingWorksCode(null);
Map<String, Object> param = getParam();
startActivity(MesChooseMachineAddActivity.class,"from","1"
,"data",JSON.toJSONString(data),"factory",JSON.toJSONString(param));
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineActivity.java
浏览文件 @ 49465ba8
......@@ -146,7 +146,7 @@ public class MesChooseMachineActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.add:
data.setSteelmakingWorksCode(null);
// data.setSteelmakingWorksCode(null);
startActivity(MesChooseMachineAddActivity.class, "data", JSON.toJSONString(data));
break;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineAddActivity.java
浏览文件 @ 49465ba8
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
......@@ -42,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;
......@@ -79,7 +79,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
@BindView(R.id.tv_middle7)
EditText tvMiddle7;
@BindView(R.id.tv_middle8)
TextView tvMiddle8;
EditText tvMiddle8;
@BindView(R.id.ll_middle)
LinearLayout llMiddle;
@BindView(R.id.rl_cover)
......@@ -134,6 +134,10 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
TextView tvAdd6;
@BindView(R.id.rl_add)
RelativeLayout rlAdd;
@BindView(R.id.tv_machine_name)
EditText tvMachineName;
@BindView(R.id.tv_add2)
TextView tvAdd2;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -247,6 +251,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
castInfo = new MachineDetailBean.CastInfoBean();
machineDetailBean.setCastInfo(castInfo);
}
castInfo.setContinuousCasterName(tvMachineName.getText().toString());
castInfo.setContinuousCasterType(tvMachineType.getText().toString());
castInfo.setFractureSurface(tvSection.getText().toString());
castInfo.setSteelGrade(tvSteelType.getText().toString());
......@@ -263,12 +268,15 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
}
castLadle.setCapacity(tvMiddle1.getText().toString());
castLadle.setLifeSpan(tvMiddle2.getText().toString());
castLadle.setLadleCode(tvMiddle3.getText().toString());
// castLadle.setLadleCode(tvMiddle3.getText().toString());
castLadle.setLiquidLevel(tvMiddle4.getText().toString());
castLadle.setLiquidSteelTemperature(tvMiddle5.getText().toString());
castLadle.setBakingMethod(tvMiddle6.getText().toString());
castLadle.setBakingTemperature(tvMiddle7.getText().toString());
castLadle.setBakingDateTime(TimeUtils.string2Millis(tvMiddle8.getText().toString()) / 1000);
String time = tvMiddle8.getText().toString();
if (!TextUtils.isEmpty(time)) {
castLadle.setBakingDateTime(Long.valueOf(tvMiddle8.getText().toString()));
}
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent == null) {
......@@ -337,16 +345,16 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
}
}
@OnClick({R.id.tv_add2,R.id.rl_cover4,R.id.rl_protection4,R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
@OnClick({R.id.tv_add2, R.id.rl_cover4, R.id.rl_protection4, R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.rl_cover4:
startActivityForResult(MesChooseClientActivity.class,
10001,"from", "1");
10001, "from", "1");
break;
case R.id.rl_protection4:
startActivityForResult(MesChooseClientActivity.class,
10002,"from", "1");
10002, "from", "1");
break;
case R.id.tv_add1:
startActivity(MesThreeAddActivity.class,
......@@ -367,7 +375,7 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
case R.id.tv_add5:
startActivity(MesStockAddActivity.class,
"from", "1", "continuousCasterCode", data.getContinuousCasterCode()
,"id", data.getCustomerUserCode());
, "id", data.getCustomerUserCode());
break;
case R.id.tv_add6:
startActivity(MesMiddleAddActivity.class,
......@@ -528,6 +536,10 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.finish:
if (TextUtils.isEmpty(tvMachineName.getText().toString())){
toast("请输入连铸机名称");
return super.onOptionsItemSelected(item);
}
changeSimple();
if (TextUtils.equals("1", getIntent().getStringExtra("from"))) {// 1 多步骤新增
submitAll();
......@@ -620,8 +632,8 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent==null){
covAgent =new MachineDetailBean.CovAgentBean();
if (covAgent == null) {
covAgent = new MachineDetailBean.CovAgentBean();
machineDetailBean.setCovAgent(covAgent);
}
tvCover4.setText(modifyClient.getCustomerName());
......@@ -633,8 +645,8 @@ public class MesChooseMachineAddActivity extends WorkToolBarActivity {
if (resultCode == 10001) {
MesClientBean.ListBean modifyClient = JSON.parseObject(data.getStringExtra("data"), MesClientBean.ListBean.class);
MachineDetailBean.MouldFluBean mouldFlu = machineDetailBean.getMouldFlu();
if (mouldFlu==null){
mouldFlu =new MachineDetailBean.MouldFluBean();
if (mouldFlu == null) {
mouldFlu = new MachineDetailBean.MouldFluBean();
machineDetailBean.setMouldFlu(mouldFlu);
}
tvProtection4.setText(modifyClient.getCustomerName());
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesChooseMachineDetailActivity.java
浏览文件 @ 49465ba8
package com.wd.workoffice.ui.activity.mes.user;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
......@@ -35,7 +36,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;
/**
......@@ -121,6 +121,10 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
RecyclerView rvData6;
@BindView(R.id.tv_add6)
TextView tvAdd6;
@BindView(R.id.tv_machine_name)
TextView tvMachineName;
@BindView(R.id.tv_add2)
TextView tvAdd2;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -200,17 +204,18 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
tvSection.setText(castInfo.getFractureSurface());
tvSteelType.setText(castInfo.getSteelGrade());
tvSpeed.setText(castInfo.getCastingSpeed());
tvMachineName.setText(castInfo.getContinuousCasterName());
}
MachineDetailBean.CastLadleBean castLadle = machineDetailBean.getCastLadle();
if (castLadle != null) {
tvMiddle1.setText(castLadle.getCapacity());
tvMiddle2.setText(castLadle.getLifeSpan());
tvMiddle3.setText(castLadle.getLadleCode());
// tvMiddle3.setText(castLadle.getLadleCode());
tvMiddle4.setText(castLadle.getLiquidLevel());
tvMiddle5.setText(castLadle.getLiquidSteelTemperature());
tvMiddle6.setText(castLadle.getBakingMethod());
tvMiddle7.setText(castLadle.getBakingTemperature());
tvMiddle8.setText(TimeUtils.millis2String(castLadle.getBakingDateTime()/1000));
tvMiddle8.setText(String.valueOf(castLadle.getBakingDateTime()));
}
MachineDetailBean.CovAgentBean covAgent = machineDetailBean.getCovAgent();
if (covAgent != null) {
......@@ -325,7 +330,7 @@ public class MesChooseMachineDetailActivity extends WorkToolBarActivity {
}
@OnClick({R.id.tv_add2,R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
@OnClick({R.id.tv_add2, R.id.tv_add5, R.id.tv_add6, R.id.rl_middle, R.id.rl_cover, R.id.rl_protection, R.id.tv_add1, R.id.tv_add3, R.id.tv_add4, R.id.rl_add})
public void onViewClicked(View view) {
switch (view.getId()) {
case R.id.tv_add1:
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailActivity.java
浏览文件 @ 49465ba8
......@@ -174,6 +174,8 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
TextView tvAdd6;
@BindView(R.id.tv_add2)
TextView tvAdd2;
@BindView(R.id.tv_machine_name)
TextView tvMachineName;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -371,6 +373,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
machineDetailBean = JSON.parseObject(data.getData().toString(), MachineDetailBean.class);
MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
if (castInfo != null) {
tvMachineName.setText(castInfo.getContinuousCasterName());
tvMachineType.setText(castInfo.getContinuousCasterType());
tvSection.setText(castInfo.getFractureSurface());
tvSteelType.setText(castInfo.getSteelGrade());
......@@ -380,7 +383,7 @@ public class MesUserDataDetailActivity extends WorkToolBarActivity {
if (castLadle != null) {
tvMiddle1.setText(castLadle.getCapacity());
tvMiddle2.setText(castLadle.getLifeSpan());
tvMiddle3.setText(castLadle.getLadleCode());
// tvMiddle3.setText(castLadle.getLadleCode());
tvMiddle4.setText(castLadle.getLiquidLevel());
tvMiddle5.setText(castLadle.getLiquidSteelTemperature());
tvMiddle6.setText(castLadle.getBakingMethod());
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataDetailModifyActivity.java
浏览文件 @ 49465ba8
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
......@@ -178,6 +179,10 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
TextView tvAdd6;
@BindView(R.id.rl_add)
RelativeLayout rlAdd;
@BindView(R.id.tv_machine_name)
EditText tvMachineName;
@BindView(R.id.tv_add2)
TextView tvAdd2;
private UserDataMachineAdapter data1Adapter;
private UserDataMachineAdapter data2Adapter;
private UserDataMachineAdapter data3Adapter;
......@@ -363,6 +368,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
MachineDetailBean.CastInfoBean castInfo = machineDetailBean.getCastInfo();
if (castInfo != null) {
tvMachineType.setText(castInfo.getContinuousCasterType());
tvMachineName.setText(castInfo.getContinuousCasterName());
tvSection.setText(castInfo.getFractureSurface());
tvSteelType.setText(castInfo.getSteelGrade());
tvSpeed.setText(castInfo.getCastingSpeed());
......@@ -371,7 +377,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
if (castLadle != null) {
tvMiddle1.setText(castLadle.getCapacity());
tvMiddle2.setText(castLadle.getLifeSpan());
tvMiddle3.setText(castLadle.getLadleCode());
// tvMiddle3.setText(castLadle.getLadleCode());
tvMiddle4.setText(castLadle.getLiquidLevel());
tvMiddle5.setText(castLadle.getLiquidSteelTemperature());
tvMiddle6.setText(castLadle.getBakingMethod());
......@@ -659,6 +665,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
castInfo = new MachineDetailBean.CastInfoBean();
machineDetailBean.setCastInfo(castInfo);
}
castInfo.setContinuousCasterName(tvMachineName.getText().toString());
castInfo.setContinuousCasterType(tvMachineType.getText().toString());
castInfo.setFractureSurface(tvSection.getText().toString());
castInfo.setSteelGrade(tvSteelType.getText().toString());
......@@ -671,7 +678,7 @@ public class MesUserDataDetailModifyActivity extends WorkToolBarActivity {
}
castLadle.setCapacity(tvMiddle1.getText().toString());
castLadle.setLifeSpan(tvMiddle2.getText().toString());
castLadle.setLadleCode(tvMiddle3.getText().toString());
// castLadle.setLadleCode(tvMiddle3.getText().toString());
castLadle.setLiquidLevel(tvMiddle4.getText().toString());
castLadle.setLiquidSteelTemperature(tvMiddle5.getText().toString());
castLadle.setBakingMethod(tvMiddle6.getText().toString());
......
app/src/main/java/com/wd/workoffice/ui/adapter/UserDataChooseMachineAdapter.java
浏览文件 @ 49465ba8
......@@ -21,7 +21,7 @@ public class UserDataChooseMachineAdapter extends BaseQuickAdapter<MachineBean,
@Override
protected void convert(BaseViewHolder helper, MachineBean item) {
helper.setText(R.id.tv_name,item.getContinuousCasterType());
helper.setText(R.id.tv_name,item.getContinuousCasterName());
}
}
app/src/main/res/layout/activity_mes_search_cnd.xml
浏览文件 @ 49465ba8
......@@ -9,12 +9,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
<RelativeLayout
android:id="@+id/rl_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
......@@ -26,23 +24,32 @@
android:text="产品类别"
android:textSize="14sp" />
<EditText
android:id="@+id/et_type"
android:layout_width="0dp"
android:layout_height="30mm"
android:layout_marginLeft="40mm"
android:layout_marginRight="3mm"
android:layout_weight="1"
android:background="@drawable/shape_input_white"
android:hint="请输入"
android:paddingLeft="13mm"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:gravity="center_vertical">
<TextView
android:id="@+id/et_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
<ImageView
android:layout_width="15mm"
android:layout_height="20mm"
android:src="@mipmap/arrow_right_gray" />
</LinearLayout>
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
app/src/main/res/layout/activity_mes_user_data_detail.xml
浏览文件 @ 49465ba8
......@@ -376,7 +376,33 @@
android:src="@mipmap/mes_modify" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="连铸机名称"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_machine_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -570,6 +596,7 @@
</RelativeLayout>
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......
app/src/main/res/layout/activity_mes_user_data_detail_modify.xml
浏览文件 @ 49465ba8
......@@ -378,7 +378,33 @@
android:src="@mipmap/mes_modify" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="连铸机名称"
android:textSize="14sp" />
<EditText
android:id="@+id/tv_machine_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -572,6 +598,7 @@
</RelativeLayout>
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......
app/src/main/res/layout/activity_mes_user_data_machine_add.xml
浏览文件 @ 49465ba8
......@@ -7,7 +7,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -16,6 +15,34 @@
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="连铸机名称"
android:textSize="14sp" />
<EditText
android:id="@+id/tv_machine_name"
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>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -208,6 +235,7 @@
</RelativeLayout>
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......@@ -358,7 +386,7 @@
android:textSize="14sp" />
<TextView
<EditText
android:id="@+id/tv_middle8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -510,7 +538,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:hint="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
......@@ -635,14 +663,12 @@
android:textSize="14sp" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_protection4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10mm"
android:paddingLeft="25mm"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
......@@ -664,7 +690,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginRight="3mm"
android:text="请选择"
android:hint="请选择"
android:textColor="@color/flexible_text_gray"
android:textSize="14sp" />
......
app/src/main/res/layout/activity_mes_user_data_machine_detail.xml
浏览文件 @ 49465ba8
......@@ -7,7 +7,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -16,6 +15,33 @@
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:text="连铸机名称"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_machine_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:background="@null"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -202,6 +228,7 @@
</RelativeLayout>
<RelativeLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/white"
......
app/src/main/res/menu/menu_add.xml
浏览文件 @ 49465ba8
......@@ -2,7 +2,7 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/history"
android:id="@+id/add"
android:title="添加"
app:showAsAction="always" />
</menu>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论