Skip to content

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

1.mes列表页整改，新增登录跳转逻辑 

2.//TODO ，质检接口数据无对应问题,内部交易订单审核，审核规则，领用申请列表/退件列表/参数，坩埚下单，mes其他页面，mes质量反馈，编辑任务担当无法修改.支数参数
上级 256172eb
隐藏空白字符变更
内嵌 并排
正在显示 包含 632 行增加 和 356 行删除
app/src/main/java/com/wd/workoffice/app/WorkApp.java
浏览文件 @ 749d5efb
package com.wd.workoffice.app;
import android.app.Application;
import android.content.Context;
import android.content.SharedPreferences;
import android.text.TextUtils;
import android.util.Log;
import com.scwang.smartrefresh.header.BezierCircleHeader;
import com.scwang.smartrefresh.layout.SmartRefreshLayout;
......@@ -11,6 +15,9 @@ import com.wd.workoffice.retrofit.MesApiService;
import com.wd.workoffice.retrofit.RtfMesHelper;
import com.wd.workoffice.util.UserKeeper;
import java.io.IOException;
import java.util.HashMap;
import cn.jpush.android.api.JPushInterface;
import flexible.xd.android_base.base.BaseApp;
import flexible.xd.android_base.network.rtfhttp.RtfHelper;
......@@ -18,6 +25,7 @@ import flexible.xd.android_base.utils.Utils;
import me.jessyan.autosize.AutoSizeConfig;
import me.jessyan.autosize.unit.Subunits;
import okhttp3.Request;
import okhttp3.Response;
/**
......@@ -26,6 +34,7 @@ import okhttp3.Request;
public class WorkApp extends BaseApp {
private static Application instance;
private HashMap<String, String> cookies;
@Override
public void onCreate() {
......@@ -48,13 +57,51 @@ public class WorkApp extends BaseApp {
return chain.proceed(request);
});
cookies = new HashMap<>();
RtfMesHelper.getInstance().init(MesApiService.DOMAIN, chain -> {
Request original = chain.request();
Request request = original.newBuilder()
.method(original.method(), original.body())
//获取请求链接
Request originalRequest = chain.request();
//获取url的主机地址
String hostString = originalRequest.url().host();
if (!cookies.containsKey(hostString)) {
//获取磁盘里面的spCookie字符串
String spCookie = UserKeeper.getInstance().getCookie();
if (!TextUtils.isEmpty(spCookie)) {
//获取spCookie解密放到内存中
cookies.put(hostString, spCookie);
}
}
//获取内存中的Cookie
String memoryCookie = cookies.get(hostString);
//拦截网络请求数据
Request request = originalRequest.newBuilder()
//设置请求头Cookie值
.addHeader("Cookie", memoryCookie == null ? "" : memoryCookie)
.build();
return chain.proceed(request);
//拦截返回数据
Response originalResponse = chain.proceed(request);
//判断请求头里面是否有Set-Cookie值,更新Cookie
if (!originalResponse.headers("Set-Cookie").isEmpty()) {
//字符串集
StringBuilder stringBuilder = new StringBuilder();
for (String header : originalResponse.headers("Set-Cookie")) {
stringBuilder.append(header);
stringBuilder.append(";");
}
//拼接Cookie成字符串
String cookie = stringBuilder.toString();
//更新内存中Cookies值
cookies.put(hostString, cookie);
//存储到本地磁盘中
UserKeeper.getInstance().keepCookie(cookie);
Log.e("Set-Cookie", "cookies: " + cookie + " host: " + hostString);
}
return originalResponse;
});
smartInit();
JPushInterface.setDebugMode(true);
......
app/src/main/java/com/wd/workoffice/bean/mesBean/FeedbackBean.java
浏览文件 @ 749d5efb
......@@ -101,80 +101,80 @@ public class FeedbackBean extends BaseMesPageBean {
*/
private String id;
private Object createDateTime;
private Object updateDateTime;
private String createDateTime;
private String updateDateTime;
private String feedbackCode;
private Object productId;
private Object productCode;
private String productId;
private String productCode;
private String productName;
private Object drawingNumber;
private Object version;
private Object specification;
private Object customerId;
private String drawingNumber;
private String version;
private String specification;
private String customerId;
private String customerName;
private Object saleUserId;
private Object saleUserCode;
private String saleUserId;
private String saleUserCode;
private String saleUserName;
private String phoneNumber;
private Object boxId;
private String boxId;
private String boxCode;
private Object serialNumber;
private String serialNumber;
private String caster;
private Object casterName;
private Object defectId;
private String casterName;
private String defectId;
private int defectCount;
private Object defectCounts;
private Object defectCode;
private String defectCounts;
private String defectCode;
private String defectName;
private Object mainCause;
private Object steelTypeId;
private Object steelTypeName;
private Object feedbackDescription;
private Object otherProviderBehavior;
private Object salerOpinion;
private Object attachmentId;
private Object factoryAnalysis;
private Object factoryLeaderOpinion;
private Object factoryImplement;
private Object procedureId;
private Object procedureCode;
private Object procedureName;
private Object defectMudId;
private Object defectMudCode;
private Object defectMudName;
private Object rapidResponse;
private Object customerResponse;
private Object relatedRecord;
private Object seriesName;
private Object seriesType;
private Object severity;
private Object treatRectPlan;
private String mainCause;
private String steelTypeId;
private String steelTypeName;
private String feedbackDescription;
private String otherProviderBehavior;
private String salerOpinion;
private String attachmentId;
private String factoryAnalysis;
private String factoryLeaderOpinion;
private String factoryImplement;
private String procedureId;
private String procedureCode;
private String procedureName;
private String defectMudId;
private String defectMudCode;
private String defectMudName;
private String rapidResponse;
private String customerResponse;
private String relatedRecord;
private String seriesName;
private String seriesType;
private String severity;
private String treatRectPlan;
private String status;
private Object attachments;
private Object responsibleUserId;
private Object responsibleUserName;
private Object factoryTreatmentDateTime;
private Object verifyUserId;
private Object verifyUserName;
private Object verifyUserDate;
private Object recordUserId;
private Object recorUserName;
private Object recorUserDate;
private Object responsibleDealId;
private Object responsibleDealName;
private Object responsibleDealDate;
private Object responsibleCustId;
private Object responsibleCustName;
private Object responsibleCustDate;
private Object approvalUserId;
private Object approvalUserName;
private Object approvalUserDate;
private String attachments;
private String responsibleUserId;
private String responsibleUserName;
private String factoryTreatmentDateTime;
private String verifyUserId;
private String verifyUserName;
private String verifyUserDate;
private String recordUserId;
private String recorUserName;
private String recorUserDate;
private String responsibleDealId;
private String responsibleDealName;
private String responsibleDealDate;
private String responsibleCustId;
private String responsibleCustName;
private String responsibleCustDate;
private String approvalUserId;
private String approvalUserName;
private String approvalUserDate;
private String createUserId;
private String createUserName;
private Object updateUserId;
private Object updateUserName;
private Object defectMudIds;
private Object attachment;
private String updateUserId;
private String updateUserName;
private String defectMudIds;
private String attachment;
private boolean delete;
public String getId() {
......@@ -185,19 +185,19 @@ public class FeedbackBean extends BaseMesPageBean {
this.id = id;
}
public Object getCreateDateTime() {
public String getCreateDateTime() {
return createDateTime;
}
public void setCreateDateTime(Object createDateTime) {
public void setCreateDateTime(String createDateTime) {
this.createDateTime = createDateTime;
}
public Object getUpdateDateTime() {
public String getUpdateDateTime() {
return updateDateTime;
}
public void setUpdateDateTime(Object updateDateTime) {
public void setUpdateDateTime(String updateDateTime) {
this.updateDateTime = updateDateTime;
}
......@@ -209,19 +209,19 @@ public class FeedbackBean extends BaseMesPageBean {
this.feedbackCode = feedbackCode;
}
public Object getProductId() {
public String getProductId() {
return productId;
}
public void setProductId(Object productId) {
public void setProductId(String productId) {
this.productId = productId;
}
public Object getProductCode() {
public String getProductCode() {
return productCode;
}
public void setProductCode(Object productCode) {
public void setProductCode(String productCode) {
this.productCode = productCode;
}
......@@ -233,35 +233,35 @@ public class FeedbackBean extends BaseMesPageBean {
this.productName = productName;
}
public Object getDrawingNumber() {
public String getDrawingNumber() {
return drawingNumber;
}
public void setDrawingNumber(Object drawingNumber) {
public void setDrawingNumber(String drawingNumber) {
this.drawingNumber = drawingNumber;
}
public Object getVersion() {
public String getVersion() {
return version;
}
public void setVersion(Object version) {
public void setVersion(String version) {
this.version = version;
}
public Object getSpecification() {
public String getSpecification() {
return specification;
}
public void setSpecification(Object specification) {
public void setSpecification(String specification) {
this.specification = specification;
}
public Object getCustomerId() {
public String getCustomerId() {
return customerId;
}
public void setCustomerId(Object customerId) {
public void setCustomerId(String customerId) {
this.customerId = customerId;
}
......@@ -273,19 +273,19 @@ public class FeedbackBean extends BaseMesPageBean {
this.customerName = customerName;
}
public Object getSaleUserId() {
public String getSaleUserId() {
return saleUserId;
}
public void setSaleUserId(Object saleUserId) {
public void setSaleUserId(String saleUserId) {
this.saleUserId = saleUserId;
}
public Object getSaleUserCode() {
public String getSaleUserCode() {
return saleUserCode;
}
public void setSaleUserCode(Object saleUserCode) {
public void setSaleUserCode(String saleUserCode) {
this.saleUserCode = saleUserCode;
}
......@@ -305,11 +305,11 @@ public class FeedbackBean extends BaseMesPageBean {
this.phoneNumber = phoneNumber;
}
public Object getBoxId() {
public String getBoxId() {
return boxId;
}
public void setBoxId(Object boxId) {
public void setBoxId(String boxId) {
this.boxId = boxId;
}
......@@ -321,11 +321,11 @@ public class FeedbackBean extends BaseMesPageBean {
this.boxCode = boxCode;
}
public Object getSerialNumber() {
public String getSerialNumber() {
return serialNumber;
}
public void setSerialNumber(Object serialNumber) {
public void setSerialNumber(String serialNumber) {
this.serialNumber = serialNumber;
}
......@@ -337,19 +337,19 @@ public class FeedbackBean extends BaseMesPageBean {
this.caster = caster;
}
public Object getCasterName() {
public String getCasterName() {
return casterName;
}
public void setCasterName(Object casterName) {
public void setCasterName(String casterName) {
this.casterName = casterName;
}
public Object getDefectId() {
public String getDefectId() {
return defectId;
}
public void setDefectId(Object defectId) {
public void setDefectId(String defectId) {
this.defectId = defectId;
}
......@@ -361,19 +361,19 @@ public class FeedbackBean extends BaseMesPageBean {
this.defectCount = defectCount;
}
public Object getDefectCounts() {
public String getDefectCounts() {
return defectCounts;
}
public void setDefectCounts(Object defectCounts) {
public void setDefectCounts(String defectCounts) {
this.defectCounts = defectCounts;
}
public Object getDefectCode() {
public String getDefectCode() {
return defectCode;
}
public void setDefectCode(Object defectCode) {
public void setDefectCode(String defectCode) {
this.defectCode = defectCode;
}
......@@ -385,187 +385,187 @@ public class FeedbackBean extends BaseMesPageBean {
this.defectName = defectName;
}
public Object getMainCause() {
public String getMainCause() {
return mainCause;
}
public void setMainCause(Object mainCause) {
public void setMainCause(String mainCause) {
this.mainCause = mainCause;
}
public Object getSteelTypeId() {
public String getSteelTypeId() {
return steelTypeId;
}
public void setSteelTypeId(Object steelTypeId) {
public void setSteelTypeId(String steelTypeId) {
this.steelTypeId = steelTypeId;
}
public Object getSteelTypeName() {
public String getSteelTypeName() {
return steelTypeName;
}
public void setSteelTypeName(Object steelTypeName) {
public void setSteelTypeName(String steelTypeName) {
this.steelTypeName = steelTypeName;
}
public Object getFeedbackDescription() {
public String getFeedbackDescription() {
return feedbackDescription;
}
public void setFeedbackDescription(Object feedbackDescription) {
public void setFeedbackDescription(String feedbackDescription) {
this.feedbackDescription = feedbackDescription;
}
public Object getOtherProviderBehavior() {
public String getOtherProviderBehavior() {
return otherProviderBehavior;
}
public void setOtherProviderBehavior(Object otherProviderBehavior) {
public void setOtherProviderBehavior(String otherProviderBehavior) {
this.otherProviderBehavior = otherProviderBehavior;
}
public Object getSalerOpinion() {
public String getSalerOpinion() {
return salerOpinion;
}
public void setSalerOpinion(Object salerOpinion) {
public void setSalerOpinion(String salerOpinion) {
this.salerOpinion = salerOpinion;
}
public Object getAttachmentId() {
public String getAttachmentId() {
return attachmentId;
}
public void setAttachmentId(Object attachmentId) {
public void setAttachmentId(String attachmentId) {
this.attachmentId = attachmentId;
}
public Object getFactoryAnalysis() {
public String getFactoryAnalysis() {
return factoryAnalysis;
}
public void setFactoryAnalysis(Object factoryAnalysis) {
public void setFactoryAnalysis(String factoryAnalysis) {
this.factoryAnalysis = factoryAnalysis;
}
public Object getFactoryLeaderOpinion() {
public String getFactoryLeaderOpinion() {
return factoryLeaderOpinion;
}
public void setFactoryLeaderOpinion(Object factoryLeaderOpinion) {
public void setFactoryLeaderOpinion(String factoryLeaderOpinion) {
this.factoryLeaderOpinion = factoryLeaderOpinion;
}
public Object getFactoryImplement() {
public String getFactoryImplement() {
return factoryImplement;
}
public void setFactoryImplement(Object factoryImplement) {
public void setFactoryImplement(String factoryImplement) {
this.factoryImplement = factoryImplement;
}
public Object getProcedureId() {
public String getProcedureId() {
return procedureId;
}
public void setProcedureId(Object procedureId) {
public void setProcedureId(String procedureId) {
this.procedureId = procedureId;
}
public Object getProcedureCode() {
public String getProcedureCode() {
return procedureCode;
}
public void setProcedureCode(Object procedureCode) {
public void setProcedureCode(String procedureCode) {
this.procedureCode = procedureCode;
}
public Object getProcedureName() {
public String getProcedureName() {
return procedureName;
}
public void setProcedureName(Object procedureName) {
public void setProcedureName(String procedureName) {
this.procedureName = procedureName;
}
public Object getDefectMudId() {
public String getDefectMudId() {
return defectMudId;
}
public void setDefectMudId(Object defectMudId) {
public void setDefectMudId(String defectMudId) {
this.defectMudId = defectMudId;
}
public Object getDefectMudCode() {
public String getDefectMudCode() {
return defectMudCode;
}
public void setDefectMudCode(Object defectMudCode) {
public void setDefectMudCode(String defectMudCode) {
this.defectMudCode = defectMudCode;
}
public Object getDefectMudName() {
public String getDefectMudName() {
return defectMudName;
}
public void setDefectMudName(Object defectMudName) {
public void setDefectMudName(String defectMudName) {
this.defectMudName = defectMudName;
}
public Object getRapidResponse() {
public String getRapidResponse() {
return rapidResponse;
}
public void setRapidResponse(Object rapidResponse) {
public void setRapidResponse(String rapidResponse) {
this.rapidResponse = rapidResponse;
}
public Object getCustomerResponse() {
public String getCustomerResponse() {
return customerResponse;
}
public void setCustomerResponse(Object customerResponse) {
public void setCustomerResponse(String customerResponse) {
this.customerResponse = customerResponse;
}
public Object getRelatedRecord() {
public String getRelatedRecord() {
return relatedRecord;
}
public void setRelatedRecord(Object relatedRecord) {
public void setRelatedRecord(String relatedRecord) {
this.relatedRecord = relatedRecord;
}
public Object getSeriesName() {
public String getSeriesName() {
return seriesName;
}
public void setSeriesName(Object seriesName) {
public void setSeriesName(String seriesName) {
this.seriesName = seriesName;
}
public Object getSeriesType() {
public String getSeriesType() {
return seriesType;
}
public void setSeriesType(Object seriesType) {
public void setSeriesType(String seriesType) {
this.seriesType = seriesType;
}
public Object getSeverity() {
public String getSeverity() {
return severity;
}
public void setSeverity(Object severity) {
public void setSeverity(String severity) {
this.severity = severity;
}
public Object getTreatRectPlan() {
public String getTreatRectPlan() {
return treatRectPlan;
}
public void setTreatRectPlan(Object treatRectPlan) {
public void setTreatRectPlan(String treatRectPlan) {
this.treatRectPlan = treatRectPlan;
}
......@@ -577,155 +577,155 @@ public class FeedbackBean extends BaseMesPageBean {
this.status = status;
}
public Object getAttachments() {
public String getAttachments() {
return attachments;
}
public void setAttachments(Object attachments) {
public void setAttachments(String attachments) {
this.attachments = attachments;
}
public Object getResponsibleUserId() {
public String getResponsibleUserId() {
return responsibleUserId;
}
public void setResponsibleUserId(Object responsibleUserId) {
public void setResponsibleUserId(String responsibleUserId) {
this.responsibleUserId = responsibleUserId;
}
public Object getResponsibleUserName() {
public String getResponsibleUserName() {
return responsibleUserName;
}
public void setResponsibleUserName(Object responsibleUserName) {
public void setResponsibleUserName(String responsibleUserName) {
this.responsibleUserName = responsibleUserName;
}
public Object getFactoryTreatmentDateTime() {
public String getFactoryTreatmentDateTime() {
return factoryTreatmentDateTime;
}
public void setFactoryTreatmentDateTime(Object factoryTreatmentDateTime) {
public void setFactoryTreatmentDateTime(String factoryTreatmentDateTime) {
this.factoryTreatmentDateTime = factoryTreatmentDateTime;
}
public Object getVerifyUserId() {
public String getVerifyUserId() {
return verifyUserId;
}
public void setVerifyUserId(Object verifyUserId) {
public void setVerifyUserId(String verifyUserId) {
this.verifyUserId = verifyUserId;
}
public Object getVerifyUserName() {
public String getVerifyUserName() {
return verifyUserName;
}
public void setVerifyUserName(Object verifyUserName) {
public void setVerifyUserName(String verifyUserName) {
this.verifyUserName = verifyUserName;
}
public Object getVerifyUserDate() {
public String getVerifyUserDate() {
return verifyUserDate;
}
public void setVerifyUserDate(Object verifyUserDate) {
public void setVerifyUserDate(String verifyUserDate) {
this.verifyUserDate = verifyUserDate;
}
public Object getRecordUserId() {
public String getRecordUserId() {
return recordUserId;
}
public void setRecordUserId(Object recordUserId) {
public void setRecordUserId(String recordUserId) {
this.recordUserId = recordUserId;
}
public Object getRecorUserName() {
public String getRecorUserName() {
return recorUserName;
}
public void setRecorUserName(Object recorUserName) {
public void setRecorUserName(String recorUserName) {
this.recorUserName = recorUserName;
}
public Object getRecorUserDate() {
public String getRecorUserDate() {
return recorUserDate;
}
public void setRecorUserDate(Object recorUserDate) {
public void setRecorUserDate(String recorUserDate) {
this.recorUserDate = recorUserDate;
}
public Object getResponsibleDealId() {
public String getResponsibleDealId() {
return responsibleDealId;
}
public void setResponsibleDealId(Object responsibleDealId) {
public void setResponsibleDealId(String responsibleDealId) {
this.responsibleDealId = responsibleDealId;
}
public Object getResponsibleDealName() {
public String getResponsibleDealName() {
return responsibleDealName;
}
public void setResponsibleDealName(Object responsibleDealName) {
public void setResponsibleDealName(String responsibleDealName) {
this.responsibleDealName = responsibleDealName;
}
public Object getResponsibleDealDate() {
public String getResponsibleDealDate() {
return responsibleDealDate;
}
public void setResponsibleDealDate(Object responsibleDealDate) {
public void setResponsibleDealDate(String responsibleDealDate) {
this.responsibleDealDate = responsibleDealDate;
}
public Object getResponsibleCustId() {
public String getResponsibleCustId() {
return responsibleCustId;
}
public void setResponsibleCustId(Object responsibleCustId) {
public void setResponsibleCustId(String responsibleCustId) {
this.responsibleCustId = responsibleCustId;
}
public Object getResponsibleCustName() {
public String getResponsibleCustName() {
return responsibleCustName;
}
public void setResponsibleCustName(Object responsibleCustName) {
public void setResponsibleCustName(String responsibleCustName) {
this.responsibleCustName = responsibleCustName;
}
public Object getResponsibleCustDate() {
public String getResponsibleCustDate() {
return responsibleCustDate;
}
public void setResponsibleCustDate(Object responsibleCustDate) {
public void setResponsibleCustDate(String responsibleCustDate) {
this.responsibleCustDate = responsibleCustDate;
}
public Object getApprovalUserId() {
public String getApprovalUserId() {
return approvalUserId;
}
public void setApprovalUserId(Object approvalUserId) {
public void setApprovalUserId(String approvalUserId) {
this.approvalUserId = approvalUserId;
}
public Object getApprovalUserName() {
public String getApprovalUserName() {
return approvalUserName;
}
public void setApprovalUserName(Object approvalUserName) {
public void setApprovalUserName(String approvalUserName) {
this.approvalUserName = approvalUserName;
}
public Object getApprovalUserDate() {
public String getApprovalUserDate() {
return approvalUserDate;
}
public void setApprovalUserDate(Object approvalUserDate) {
public void setApprovalUserDate(String approvalUserDate) {
this.approvalUserDate = approvalUserDate;
}
......@@ -745,35 +745,35 @@ public class FeedbackBean extends BaseMesPageBean {
this.createUserName = createUserName;
}
public Object getUpdateUserId() {
public String getUpdateUserId() {
return updateUserId;
}
public void setUpdateUserId(Object updateUserId) {
public void setUpdateUserId(String updateUserId) {
this.updateUserId = updateUserId;
}
public Object getUpdateUserName() {
public String getUpdateUserName() {
return updateUserName;
}
public void setUpdateUserName(Object updateUserName) {
public void setUpdateUserName(String updateUserName) {
this.updateUserName = updateUserName;
}
public Object getDefectMudIds() {
public String getDefectMudIds() {
return defectMudIds;
}
public void setDefectMudIds(Object defectMudIds) {
public void setDefectMudIds(String defectMudIds) {
this.defectMudIds = defectMudIds;
}
public Object getAttachment() {
public String getAttachment() {
return attachment;
}
public void setAttachment(Object attachment) {
public void setAttachment(String attachment) {
this.attachment = attachment;
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/MesLoginActivity.java
浏览文件 @ 749d5efb
......@@ -9,6 +9,7 @@ import android.widget.EditText;
import android.widget.LinearLayout;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseMesBean;
import com.wd.workoffice.app.WorkBaseActivity;
......@@ -137,6 +138,8 @@ public class MesLoginActivity extends WorkToolBarActivity {
}
toast("登录成功");
UserKeeper.getInstance().keepMesLogin(true);
JSONObject userData = JSON.parseObject(data.getData().toString());
UserKeeper.getInstance().keepMesUid(userData.getString("userId"));
Intent intent = new Intent(MesLoginActivity.this, MainActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(intent);
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityActivity.java
浏览文件 @ 749d5efb
......@@ -153,7 +153,7 @@ public class MesQualityActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_search, menu);
getMenuInflater().inflate(R.menu.menu_mes_search, menu);
return super.onCreateOptionsMenu(menu);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/search/MesSearchActivity.java
浏览文件 @ 749d5efb
......@@ -59,8 +59,11 @@ public class MesSearchActivity extends WorkToolBarActivity {
dataAdapter = new MesSearchAdapter(R.layout.item_mes_search, dataList);
dataAdapter.bindToRecyclerView(rvData);
dataAdapter.setEmptyView(R.layout.view_empty_content,rvData);
param = WorkUtils.pageKey();
param = WorkUtils.pageMesKey();
Map<String, Object> paramMap = WorkUtils.simpleParam();
paramMap.put("materialCode","306");
param.put("pageNum", page);
param.put("paramMap", paramMap);
getData();
}
......@@ -130,7 +133,7 @@ public class MesSearchActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_search, menu);
getMenuInflater().inflate(R.menu.menu_mes_search, menu);
return super.onCreateOptionsMenu(menu);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/search/MesSearchConditionActivity.java
浏览文件 @ 749d5efb
......@@ -47,6 +47,7 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
@BindView(R.id.et_steel)
EditText etSteel;
private Map<String, Object> param;
@Override
protected void initView() {
ButterKnife.bind(this);
......@@ -111,6 +112,7 @@ public class MesSearchConditionActivity extends WorkToolBarActivity {
if (!TextUtils.isEmpty(etYears.getText().toString())) {
param.put("designedLife", etYears.getText().toString());
}
param.put("materialCode", "306");
Intent intent = new Intent();
intent.putExtra("param", JSON.toJSONString(param));
setResult(10001, intent);
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListActivity.java
浏览文件 @ 749d5efb
package com.wd.workoffice.ui.activity.mes.ticket;
import android.content.Intent;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
......@@ -18,6 +19,7 @@ import com.wd.workoffice.bean.mesBean.TicketBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesTicketAdapter;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
......@@ -62,6 +64,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
ButterKnife.bind(this);
tvGo.setText("任务担当\n" +
"页面");
tvGo.setVisibility(View.GONE);
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
}
......@@ -131,21 +134,22 @@ public class MesTicketListActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
boolean isJob = TextUtils.equals(UserKeeper.getInstance().getMesUid(), dataList.get(position).getJobUserId());
switch (dataList.get(position).getJobStatus()) {
case 0:
startActivity(MesTicketAddActivity.class, "data", JSON.toJSONString(dataList.get(position)));
startActivity(MesTicketAddActivity.class, "from", isJob ? "1" : "0","data", JSON.toJSONString(dataList.get(position)));
break;
case 1:
startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(dataList.get(position)));
startActivity(MesTicketDetailActivity.class, "from",isJob ? "1" : "0","data", JSON.toJSONString(dataList.get(position)));
break;
case 2:
startActivity(MesTicketDetailActivity.class, "data", JSON.toJSONString(dataList.get(position)));
startActivity(MesTicketDetailActivity.class, "from", isJob ? "1" : "0","data", JSON.toJSONString(dataList.get(position)));
break;
case 3:
startActivity(MesTicketDetailFinishActivity.class, "data", JSON.toJSONString(dataList.get(position)));
startActivity(MesTicketDetailFinishActivity.class, "from", isJob ? "1" : "0","data", JSON.toJSONString(dataList.get(position)));
break;
case 4:
startActivity(MesTicketDetailReviewActivity.class, "data", JSON.toJSONString(dataList.get(position)));
startActivity(MesTicketDetailReviewActivity.class, "from", isJob ? "1" : "0","data", JSON.toJSONString(dataList.get(position)));
break;
}
}
......@@ -160,7 +164,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_search, menu);
getMenuInflater().inflate(R.menu.menu_mes_search, menu);
return super.onCreateOptionsMenu(menu);
}
......@@ -212,7 +216,7 @@ public class MesTicketListActivity extends WorkToolBarActivity {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 10001 && resultCode == 10001) {
String returnParam = data.getStringExtra("param");
param.put("paramMap", JSON.parseObject(returnParam,Map.class));
param.put("paramMap", JSON.parseObject(returnParam, Map.class));
page = 1;
param.put("pageNum", page);
getData();
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/ticket/MesTicketListTakeOnActivity.java
浏览文件 @ 749d5efb
......@@ -172,7 +172,7 @@ public class MesTicketListTakeOnActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_search, menu);
getMenuInflater().inflate(R.menu.menu_mes_search, menu);
return super.onCreateOptionsMenu(menu);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListActivity.java
浏览文件 @ 749d5efb
package com.wd.workoffice.ui.activity.mes.user;
import android.content.Intent;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
......@@ -18,6 +19,7 @@ import com.wd.workoffice.bean.mesBean.UserDataBean;
import com.wd.workoffice.retrofit.RtfUtils;
import com.wd.workoffice.retrofit.WorkObserver;
import com.wd.workoffice.ui.adapter.MesUserDataAdapter;
import com.wd.workoffice.util.UserKeeper;
import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
......@@ -63,6 +65,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
rvData.setLayoutManager(new LinearLayoutManager(this, RecyclerView.VERTICAL, false));
tvGo.setText("市场服务\n" +
"审核");
tvGo.setVisibility(View.GONE);
}
......@@ -131,7 +134,8 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
dataAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
startActivity(MesUserDataDetailActivity.class,"from","0","id",
boolean isJob = TextUtils.equals(UserKeeper.getInstance().getMesUid(), dataList.get(position).getApprovalUserId());
startActivity(MesUserDataDetailActivity.class,"from",isJob ? "1" : "0","id",
dataList.get(position).getId(),"status",
dataList.get(position).getApprovalStatus()+"");
}
......@@ -146,7 +150,7 @@ public class MesUserDataListActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_search, menu);
getMenuInflater().inflate(R.menu.menu_mes_search, menu);
return super.onCreateOptionsMenu(menu);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/user/MesUserDataListCheckActivity.java
浏览文件 @ 749d5efb
......@@ -147,7 +147,7 @@ public class MesUserDataListCheckActivity extends WorkToolBarActivity {
@Override
public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.menu_search, menu);
getMenuInflater().inflate(R.menu.menu_mes_search, menu);
return super.onCreateOptionsMenu(menu);
}
......
app/src/main/java/com/wd/workoffice/ui/activity/user/UserSettingActivity.java
浏览文件 @ 749d5efb
......@@ -92,32 +92,37 @@ public class UserSettingActivity extends WorkToolBarActivity {
}
private void logout() {
RtfUtils.getRtf().logout().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
@Override
public void onFail(String errorMsg) {
hideLoading();
toast(errorMsg);
}
@Override
public void onSuccess(BaseBean data) {
hideLoading();
if (data.getCode() != 0) {
toast(data.getMessage());
return;
}
toast("退出成功");
Intent intent = new Intent(UserSettingActivity.this, MainLoginActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
UserKeeper.getInstance().clearAll();
startActivity(intent);
}
});
toast("退出成功");
Intent intent = new Intent(UserSettingActivity.this, MainLoginActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
UserKeeper.getInstance().clearAll();
startActivity(intent);
// RtfUtils.getRtf().logout().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
//
//
// @Override
// public void doOnSubscribe(Disposable d) {
// }
//
// @Override
// public void onFail(String errorMsg) {
// hideLoading();
// toast(errorMsg);
// }
//
// @Override
// public void onSuccess(BaseBean data) {
// hideLoading();
// if (data.getCode() != 0) {
// toast(data.getMessage());
// return;
// }
// toast("退出成功");
// Intent intent = new Intent(UserSettingActivity.this, MainLoginActivity.class);
// intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
// UserKeeper.getInstance().clearAll();
// startActivity(intent);
// }
// });
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesQualityAdapter.java
浏览文件 @ 749d5efb
......@@ -26,7 +26,19 @@ public class MesQualityAdapter extends BaseQuickAdapter<FeedbackBean.ListBean, B
helper.setText(R.id.tv_manager, item.getSaleUserName());
helper.setText(R.id.tv_name, item.getCustomerName());
helper.setText(R.id.tv_phone, item.getPhoneNumber());
helper.setText(R.id.tv_pro, item.getProductName());
helper.setText(R.id.tv_pro, item.getProductCode());
helper.setText(R.id.tv_pro_name, item.getProductName());
helper.setText(R.id.tv_spec, item.getSpecification());
helper.setText(R.id.tv_img_code, item.getDrawingNumber());
helper.setText(R.id.tv_box, item.getBoxCode());
helper.setText(R.id.tv_num, item.getDefectCount()+"");
helper.setText(R.id.tv_mark_code, item.getSerialNumber());
helper.setText(R.id.tv_machine, item.getCasterName());
helper.setText(R.id.tv_steel, item.getSteelTypeId());
helper.setText(R.id.tv_defect, item.getDefectName());
}
}
app/src/main/java/com/wd/workoffice/ui/adapter/MesTicketAdapter.java
浏览文件 @ 749d5efb
......@@ -26,7 +26,7 @@ public class MesTicketAdapter extends BaseQuickAdapter<TicketBean.ListBean, Base
@Override
protected void convert(BaseViewHolder helper, TicketBean.ListBean item) {
helper.setText(R.id.tv_name, item.getCustomerUserName());
helper.setText(R.id.tv_pro_name, item.getJobTypeName());
helper.setText(R.id.tv_pro_name, item.getSalesManagerName());
helper.setText(R.id.tv_status, WorkUtils.getTicketStatus(item.getJobStatus()));
helper.setText(R.id.tv_time, item.getCreateDateTime());
}
......
app/src/main/java/com/wd/workoffice/util/UserKeeper.java
浏览文件 @ 749d5efb
......@@ -21,6 +21,9 @@ public class UserKeeper {
private final String LOGIN_INFO = "_LOGIN_INFO";
private final String USER_INFO = "_USER_INFO";
private final String MES_LOGIN = "_MES_LOGIN";
private final String MES_UID = "_MES_UID";
private final String COOKIE = "_COOKIE";
private UserKeeper() {
}
......@@ -35,8 +38,21 @@ public class UserKeeper {
return keeper;
}
public void keepCookie(String info) {
sp.put(COOKIE, info);
}
public String getCookie() {
return sp.getString(COOKIE);
}
public void clearCookie() {
sp.put(COOKIE, "");
}
/**
* mes登录状态
*
* @param info
*/
public void keepMesLogin(Boolean info) {
......@@ -51,6 +67,17 @@ public class UserKeeper {
sp.put(MES_LOGIN, false);
}
public void keepMesUid(String info) {
sp.put(MES_UID, info);
}
public String getMesUid() {
return sp.getString(MES_UID);
}
public void clearMesUid() {
sp.put(MES_UID, "");
}
public void keepLoginInfo(String info) {
sp.put(LOGIN_INFO, info);
......@@ -74,6 +101,7 @@ public class UserKeeper {
}
return tokenBean.getAccess_token();
}
public String getRefreshToken() {
if (TextUtils.isEmpty(sp.getString(LOGIN_INFO))) {
return "";
......@@ -84,6 +112,7 @@ public class UserKeeper {
}
return tokenBean.getRefresh_token();
}
public String getUserId() {
if (TextUtils.isEmpty(sp.getString(LOGIN_INFO))) {
return "";
......@@ -150,9 +179,11 @@ public class UserKeeper {
}
return infoBean.getNickName();
}
public void clearAll() {
clearLoginInfo();
clearUserInfo();
clearMesLogin();
clearMesUid();
}
}
app/src/main/res/layout/activity_mes_quality.xml
浏览文件 @ 749d5efb
......@@ -8,61 +8,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="16mm">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="反馈单号"
android:textSize="12sp" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="客户名称"
android:textSize="12sp" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="销售经理"
android:textSize="12sp" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="联系电话"
android:textSize="12sp" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="产品"
android:textSize="12sp" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white" />
</LinearLayout>
<Button
android:id="@+id/btn_add"
android:layout_width="wrap_content"
......@@ -73,5 +19,133 @@
android:background="@color/blue_btn"
android:text="新建"
android:textColor="@color/white" />
<HorizontalScrollView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_above="@id/btn_add">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="16mm">
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="反馈单号"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="客户名称"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="销售经理"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="联系电话"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="产品编码"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="产品名称"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="规格型号"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="图号"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="箱号"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="支数"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="单指标记码"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="对应连铸机"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="对应钢种"
android:textSize="12sp" />
<TextView
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="缺陷名称"
android:textSize="12sp" />
</LinearLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rv_data"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/white" />
</LinearLayout>
</HorizontalScrollView>
</RelativeLayout>
</com.scwang.smartrefresh.layout.SmartRefreshLayout>
\ No newline at end of file
app/src/main/res/layout/activity_mes_ticket_list.xml
浏览文件 @ 749d5efb
......@@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="产品名称"
android:text="销售公司"
android:textColor="@color/flexible_text_sup"
android:textSize="12sp" />
......@@ -43,16 +43,15 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="制单日期"
android:text="任务状态"
android:textColor="@color/flexible_text_sup"
android:textSize="12sp" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="任务状态"
android:text="制单日期"
android:textColor="@color/flexible_text_sup"
android:textSize="12sp" />
</LinearLayout>
......
app/src/main/res/layout/activity_mes_user_data_list.xml
浏览文件 @ 749d5efb
......@@ -19,12 +19,14 @@
android:layout_height="wrap_content"
android:paddingVertical="16mm">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="反馈日期"
android:text="客户信息"
android:textColor="@color/flexible_text_sup"
android:textSize="12sp" />
......@@ -33,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="客户信息"
android:text="炼钢厂"
android:textColor="@color/flexible_text_sup"
android:textSize="12sp" />
......@@ -42,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="炼钢厂"
android:text="连铸机"
android:textColor="@color/flexible_text_sup"
android:textSize="12sp" />
......@@ -51,16 +53,15 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="连铸机"
android:text="状态"
android:textColor="@color/flexible_text_sup"
android:textSize="12sp" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="状态"
android:text="反馈日期"
android:textColor="@color/flexible_text_sup"
android:textSize="12sp" />
</LinearLayout>
......
app/src/main/res/layout/item_mes_quality.xml
浏览文件 @ 749d5efb
......@@ -3,50 +3,129 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:padding="10mm">
android:orientation="vertical">
<TextView
android:id="@+id/tv_no"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="反馈单号"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="客户名称"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_manager"
android:layout_width="0dp"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="销售经理"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_phone"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="联系电话"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_pro"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="产品"
android:textSize="12sp" />
android:paddingVertical="16mm">
<TextView
android:id="@+id/tv_no"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="反馈单号"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_name"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="客户名称"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_manager"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="销售经理"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_phone"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="联系电话"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_pro"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="产品编码"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_pro_name"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="产品名称"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_spec"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="规格型号"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_img_code"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="图号"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_box"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="箱号"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_num"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="支数"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_mark_code"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="单指标记码"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_machine"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="对应连铸机"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_steel"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="对应钢种"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_defect"
android:layout_width="80mm"
android:layout_height="wrap_content"
android:gravity="center"
android:text="缺陷名称"
android:textSize="12sp" />
</LinearLayout>
<View
style="@style/dividerX"
android:background="#FF86A0BC" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_mes_ticket.xml
浏览文件 @ 749d5efb
......@@ -24,21 +24,19 @@
android:textSize="12sp" />
<TextView
android:id="@+id/tv_time"
android:id="@+id/tv_status"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="制单日期"
android:text="任务状态"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_status"
android:id="@+id/tv_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:textColor="@color/red"
android:text="任务状态"
android:text="制单日期"
android:textSize="12sp" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/item_mes_user_data.xml
浏览文件 @ 749d5efb
......@@ -5,14 +5,6 @@
android:background="@color/white"
android:paddingVertical="13mm">
<TextView
android:id="@+id/tv_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="反馈日期"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_client"
......@@ -50,4 +42,13 @@
android:text="状态"
android:textColor="@color/red"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center"
android:text="反馈日期"
android:textSize="12sp" />
</LinearLayout>
\ No newline at end of file
app/src/main/res/menu/menu_mes_search.xml 0 → 100644
浏览文件 @ 749d5efb
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/search"
android:title="筛选"
app:showAsAction="always" />
</menu>
\ No newline at end of file
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论