Skip to content

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

1.缺陷字典详情 

2.//TODO 坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改
上级 3dbfb3f3
隐藏空白字符变更
内嵌 并排
正在显示 包含 316 行增加 和 9 行删除
app/src/main/AndroidManifest.xml
浏览文件 @ 2a56872e
...@@ -2176,6 +2176,14 @@ ...@@ -2176,6 +2176,14 @@
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/Work.Base" android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" /> android:windowSoftInputMode="adjustPan" />
<activity
android:name=".ui.activity.mes.analysis.MesAnalysisDetailActivity"
android:configChanges="keyboardHidden|orientation"
android:label="缺陷字典详情"
android:launchMode="singleTop"
android:screenOrientation="portrait"
android:theme="@style/Work.Base"
android:windowSoftInputMode="adjustPan" />
<provider <provider
android:name="androidx.core.content.FileProvider" android:name="androidx.core.content.FileProvider"
android:authorities="com.wd.workoffice.fileprovider" android:authorities="com.wd.workoffice.fileprovider"
......
app/src/main/java/com/wd/workoffice/bean/mesBean/AnalysisBean.java
浏览文件 @ 2a56872e
...@@ -78,11 +78,11 @@ public class AnalysisBean extends BaseMesPageBean { ...@@ -78,11 +78,11 @@ public class AnalysisBean extends BaseMesPageBean {
private String defectCode; private String defectCode;
private String defectName; private String defectName;
private String productClassType; private String productClassType;
private Object mainCause; private String mainCause;
private int severity; private int severity;
private Object detectionValue; private String detectionValue;
private boolean enable; private boolean enable;
private Object remark; private String remark;
public String getId() { public String getId() {
return id; return id;
...@@ -172,11 +172,11 @@ public class AnalysisBean extends BaseMesPageBean { ...@@ -172,11 +172,11 @@ public class AnalysisBean extends BaseMesPageBean {
this.productClassType = productClassType; this.productClassType = productClassType;
} }
public Object getMainCause() { public String getMainCause() {
return mainCause; return mainCause;
} }
public void setMainCause(Object mainCause) { public void setMainCause(String mainCause) {
this.mainCause = mainCause; this.mainCause = mainCause;
} }
...@@ -188,11 +188,11 @@ public class AnalysisBean extends BaseMesPageBean { ...@@ -188,11 +188,11 @@ public class AnalysisBean extends BaseMesPageBean {
this.severity = severity; this.severity = severity;
} }
public Object getDetectionValue() { public String getDetectionValue() {
return detectionValue; return detectionValue;
} }
public void setDetectionValue(Object detectionValue) { public void setDetectionValue(String detectionValue) {
this.detectionValue = detectionValue; this.detectionValue = detectionValue;
} }
...@@ -204,11 +204,11 @@ public class AnalysisBean extends BaseMesPageBean { ...@@ -204,11 +204,11 @@ public class AnalysisBean extends BaseMesPageBean {
this.enable = enable; this.enable = enable;
} }
public Object getRemark() { public String getRemark() {
return remark; return remark;
} }
public void setRemark(Object remark) { public void setRemark(String remark) {
this.remark = remark; this.remark = remark;
} }
} }
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/analysis/MesAnalysisActivity.java
浏览文件 @ 2a56872e
package com.wd.workoffice.ui.activity.mes.analysis; package com.wd.workoffice.ui.activity.mes.analysis;
import android.view.View;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.wd.workoffice.R; import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean; import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
...@@ -113,6 +115,12 @@ public class MesAnalysisActivity extends WorkToolBarActivity { ...@@ -113,6 +115,12 @@ public class MesAnalysisActivity extends WorkToolBarActivity {
@Override @Override
protected void initEvent() { protected void initEvent() {
proBadAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesAnalysisDetailActivity.class,"info",JSON.toJSONString(proBadList.get(position)));
}
});
} }
@Override @Override
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/analysis/MesAnalysisDetailActivity.java 0 → 100644
浏览文件 @ 2a56872e
package com.wd.workoffice.ui.activity.mes.analysis;
import android.os.Bundle;
import android.widget.TextView;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.mesBean.AnalysisBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.ReportAnalysisBadAdapter;
import com.wd.workoffice.ui.adapter.ReportTopAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import butterknife.BindView;
import butterknife.ButterKnife;
import flexible.xd.android_base.network.rtfhttp.Transformer;
import io.reactivex.disposables.Disposable;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class MesAnalysisDetailActivity extends WorkToolBarActivity {
@BindView(R.id.tv_code)
TextView tvCode;
@BindView(R.id.tv_name)
TextView tvName;
@BindView(R.id.tv_pro_type)
TextView tvProType;
@BindView(R.id.tv_severity)
TextView tvSeverity;
@BindView(R.id.tv_detectability)
TextView tvDetectability;
@BindView(R.id.tv_effective)
TextView tvEffective;
@BindView(R.id.tv_main_reason)
TextView tvMainReason;
@BindView(R.id.tv_main_remark)
TextView tvMainRemark;
@Override
protected void initView() {
ButterKnife.bind(this);
}
@Override
protected void initData() {
AnalysisBean.ListBean info = JSON.parseObject(getIntent().getStringExtra("info"), AnalysisBean.ListBean.class);
tvCode.setText(info.getDefectCode());
tvName.setText(info.getDefectCode());
tvProType.setText(WorkUtils.getClazzType(info.getProductClassType()));
tvSeverity.setText(info.getSeverity()+"");
tvEffective.setText(info.isEnable()?"有效":"无效");
tvDetectability.setText(info.getDetectionValue());
tvMainReason.setText(info.getMainCause());
tvMainRemark.setText(info.getRemark());
}
@Override
protected void initEvent() {
}
@Override
protected int layoutId() {
return R.layout.activity_analysis_detail;
}
}
app/src/main/res/layout/activity_analysis_detail.xml 0 → 100644
浏览文件 @ 2a56872e
<?xml version="1.0" encoding="utf-8"?>
<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="缺陷编码"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="11111"
android:textSize="14sp" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="缺陷名称"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="11111" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="产品类型"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_pro_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="11111" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="严重程度"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_severity"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="11111" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="可探测度"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_detectability"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="11111" />
</RelativeLayout>
<View style="@style/dividerX" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
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_effective"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="3mm"
android:text="11111" />
</RelativeLayout>
<View style="@style/dividerX" />
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="主要原因"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_main_reason"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3mm"
android:layout_marginTop="3mm"
android:text="11111" />
</LinearLayout>
<View style="@style/dividerX" />
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="20mm"
android:paddingVertical="9mm">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="主要原因"
android:textSize="14sp" />
<TextView
android:id="@+id/tv_main_remark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="3mm"
android:layout_marginTop="3mm"
android:text="11111" />
</LinearLayout>
</LinearLayout>
</androidx.core.widget.NestedScrollView>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论