Skip to content

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

1.添加菜单缓存 

2.//TODO 设备三个子菜单,坩埚下单，下单30天验证，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改
上级 60cada7a
显示空白字符变更
内嵌 并排
正在显示 包含 68 行增加 和 33 行删除
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityAboutDeptActivity.java
浏览文件 @ f9520104
......@@ -97,7 +97,7 @@ public class MesQualityAboutDeptActivity extends WorkToolBarActivity {
param.put("factoryImplement",tvFactoryStatus.getText().toString());
param.put("treatRectPlan",tvFactorySuggest.getText().toString());
param.put("verifyUserDate",TimeUtils.getNowString());
RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
RtfUtils.getMesRtf().startFeedback(WorkUtils.getMesMenuId("市场服务","质量反馈"), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityClientActivity.java
浏览文件 @ f9520104
......@@ -68,7 +68,7 @@ public class MesQualityClientActivity extends WorkToolBarActivity {
param.put("customerResponse", tvClientReply.getText().toString());
// param.put("relatedRecord",tvClientRecord.getText().toString());
RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
RtfUtils.getMesRtf().startFeedback(WorkUtils.getMesMenuId("市场服务","质量反馈"), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/activity/mes/quality/MesQualityDeptActivity.java
浏览文件 @ f9520104
......@@ -66,7 +66,7 @@ public class MesQualityDeptActivity extends WorkToolBarActivity {
param.put("factoryAnalysis", tvDesc.getText().toString());
param.put("responsibleQualityId", UserKeeper.getInstance().getMesUid());
param.put("responsibleQualityDate", TimeUtils.getNowString());
RtfUtils.getMesRtf().startFeedback(DataKeeper.getInstance().getMenuId(), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
RtfUtils.getMesRtf().startFeedback(WorkUtils.getMesMenuId("市场服务","质量反馈"), WorkUtils.convertMapToBody(param)).compose(Transformer.schedule()).subscribe(new WorkObserver<BaseMesBean>() {
@Override
public void doOnSubscribe(Disposable d) {
}
......
app/src/main/java/com/wd/workoffice/ui/fg/MesFragment.java
浏览文件 @ f9520104
......@@ -16,6 +16,7 @@ import com.wd.workoffice.ui.activity.mes.MesProcessActivity;
import com.wd.workoffice.ui.activity.mes.report.MesReportActivity;
import com.wd.workoffice.ui.activity.mes.ticket.MesTicketActivity;
import com.wd.workoffice.ui.adapter.BatLayoutAdapter;
import com.wd.workoffice.util.WorkUtils;
import java.util.ArrayList;
import java.util.List;
......@@ -42,12 +43,12 @@ public class MesFragment extends WorkBaseFg {
// R.mipmap.mes_icon9, R.mipmap.mes_icon10, R.mipmap.mes_icon10};
int[] dataImg = new int[]{R.mipmap.mes_icon1, R.mipmap.mes_icon2, R.mipmap.mes_icon3, R.mipmap.mes_icon4,
R.mipmap.mes_icon5,
R.mipmap.mes_icon9, R.mipmap.mes_icon10, R.mipmap.mes_icon10};
R.mipmap.mes_icon9,R.mipmap.mes_icon10};
// String[] dataName = new String[]{"订单追踪", "质量报表", "质量分析", "质量绩效",
// "质量追溯", "质量反馈", "过程检测", "报废管理", "检维修记录", "设备监控"
// , "工单管理"};
String[] dataName = new String[]{"订单追踪", "质量报表", "质量分析", "质量绩效",
"质量追溯", "检维修记录", "设备监控"
"质量追溯", "检维修记录"
, "市场服务"};
......@@ -61,7 +62,7 @@ public class MesFragment extends WorkBaseFg {
@Override
protected void initData() {
WorkUtils.getMesMenu();
}
......@@ -122,10 +123,11 @@ public class MesFragment extends WorkBaseFg {
break;
case 6:
// startActivity(MesProcessActivity.class);
startActivity(MesTicketActivity.class);
break;
case 7:
// startActivity(MesScrappedActivity.class);
startActivity(MesTicketActivity.class);
break;
case 8:
// startActivity(MesServiceActivity.class);
......
app/src/main/java/com/wd/workoffice/util/DataKeeper.java
浏览文件 @ f9520104
package com.wd.workoffice.util;
import android.text.TextUtils;
import com.alibaba.fastjson.JSON;
import com.wd.workoffice.bean.TokenBean;
import com.wd.workoffice.bean.UserInfoBean;
import java.util.List;
import flexible.xd.android_base.utils.SPUtils;
/**
......@@ -19,7 +11,7 @@ public class DataKeeper {
private volatile static DataKeeper keeper;
private SPUtils sp = SPUtils.getInstance("DataKeeper");
private final String MES_MENU_ID = "MES_MENU_ID";
private final String MES_MENU = "MES_MENU";
private DataKeeper() {
}
......@@ -33,24 +25,42 @@ public class DataKeeper {
}
return keeper;
}
/**
* mes菜单id
* mes菜单
*
* @param info
*/
public void keepMenuId(String info) {
sp.put(MES_MENU_ID, info);
public void keepMenu(String info) {
sp.put(MES_MENU, info);
}
public String getMenuId() {
return sp.getString(MES_MENU_ID);
public String getMenu() {
return sp.getString(MES_MENU);
}
public void clearMenuId() {
sp.put(MES_MENU_ID, false);
public void clearMenu() {
sp.put(MES_MENU, "");
}
// /**
// * mes菜单id
// *
// * @param info
// */
// public void keepMenuId(String info) {
// sp.put(MES_MENU_ID, info);
// }
//
// public String getMenuId() {
// return sp.getString(MES_MENU_ID);
// }
//
// public void clearMenuId() {
// sp.put(MES_MENU_ID, "");
// }
public void clearAll() {
clearMenuId();
clearMenu();
}
}
app/src/main/java/com/wd/workoffice/util/WorkUtils.java
浏览文件 @ f9520104
......@@ -443,7 +443,7 @@ public class WorkUtils {
}
/**
* 刷新token
* mes权限
*
* @return
*/
......@@ -462,21 +462,44 @@ public class WorkUtils {
if (!data.isSuccess()) {
return;
}
List<MenuBean> menuList = JSON.parseArray(data.getData().toString(), MenuBean.class);
// List<MenuBean> menuList = JSON.parseArray(data.getData().toString(), MenuBean.class);
DataKeeper.getInstance().keepMenu(data.getData().toString());
// for (MenuBean menuBean : menuList) {
// if (TextUtils.equals("市场服务",menuBean.getText())){
// for (MenuBean.NodesBean node : menuBean.getNodes()) {
// if (TextUtils.equals("质量反馈",node.getText())){
// DataKeeper.getInstance().keepMenuId(node.getId());
// }
// }
// }
// }
}
});
}
/**
* 根据名称获取菜单id
*
* @return
*/
public static String getMesMenuId(String oneName,String nextName) {
if (TextUtils.isEmpty((DataKeeper.getInstance().getMenu()))){
return "";
}
List<MenuBean> menuList = JSON.parseArray(DataKeeper.getInstance().getMenu(), MenuBean.class);
for (MenuBean menuBean : menuList) {
if (TextUtils.equals("市场服务",menuBean.getText())){
if (TextUtils.equals(oneName,menuBean.getText())){
for (MenuBean.NodesBean node : menuBean.getNodes()) {
if (TextUtils.equals("质量反馈",node.getText())){
DataKeeper.getInstance().keepMenuId(node.getId());
if (TextUtils.equals(nextName,node.getText())){
return node.getId();
}
}
}
}
}
});
return "";
}
/**
* 判断是否拥有权限
*
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论