Skip to content

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

1.修改工作台页面数量刷新 

2.修改极光别名规则
上级 422fe50b
隐藏空白字符变更
内嵌 并排
正在显示 包含 58 行增加 和 18 行删除
app/src/main/java/com/wd/workoffice/bean/event/WorkNumEvent.java 0 → 100644
浏览文件 @ 7f135542
package com.wd.workoffice.bean.event;
/**
* author : flexible
* email : lgd19940421@163.com
* github: https://github.com/FlexibleXd
**/
public class WorkNumEvent {
public WorkNumEvent() {
}
}
app/src/main/java/com/wd/workoffice/ui/activity/MainActivity.java
浏览文件 @ 7f135542
...@@ -15,6 +15,7 @@ import com.wd.workoffice.R; ...@@ -15,6 +15,7 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.WorkBaseActivity; import com.wd.workoffice.app.WorkBaseActivity;
import com.wd.workoffice.bean.event.NotifyEvent; import com.wd.workoffice.bean.event.NotifyEvent;
import com.wd.workoffice.bean.event.RefreshTokenEvent; import com.wd.workoffice.bean.event.RefreshTokenEvent;
import com.wd.workoffice.bean.event.WorkNumEvent;
import com.wd.workoffice.ui.activity.bat.approval.WorkApprovalActivity; import com.wd.workoffice.ui.activity.bat.approval.WorkApprovalActivity;
import com.wd.workoffice.ui.activity.login.LoginActivity; import com.wd.workoffice.ui.activity.login.LoginActivity;
import com.wd.workoffice.ui.activity.login.MainLoginActivity; import com.wd.workoffice.ui.activity.login.MainLoginActivity;
...@@ -154,6 +155,9 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa ...@@ -154,6 +155,9 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa
startActivity(LoginActivity.class); startActivity(LoginActivity.class);
return; return;
} }
if (position == 1) {
EventBus.getDefault().post(new WorkNumEvent());
}
} }
if (position == 2) { if (position == 2) {
if (!UserKeeper.getInstance().getMesLogin()) { if (!UserKeeper.getInstance().getMesLogin()) {
...@@ -254,7 +258,7 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa ...@@ -254,7 +258,7 @@ public class MainActivity extends WorkBaseActivity implements BottomNavigationBa
public void login(LoginEvent lg) { public void login(LoginEvent lg) {
if (!UserKeeper.getInstance().getMesLogin()) { if (!UserKeeper.getInstance().getMesLogin()) {
if (!TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo())) if (!TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo()))
WorkUtils.handleAlias(Integer.valueOf(UserKeeper.getInstance().getUserId()),1); WorkUtils.handleAlias(Integer.valueOf(UserKeeper.getInstance().getUserId()), 1);
Intent intent = new Intent(MainActivity.this, LoginActivity.class); Intent intent = new Intent(MainActivity.this, LoginActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
UserKeeper.getInstance().clearAll(); UserKeeper.getInstance().clearAll();
......
app/src/main/java/com/wd/workoffice/ui/fg/WorkFragment.java
浏览文件 @ 7f135542
...@@ -12,6 +12,8 @@ import com.wd.workoffice.R; ...@@ -12,6 +12,8 @@ import com.wd.workoffice.R;
import com.wd.workoffice.app.BaseBean; import com.wd.workoffice.app.BaseBean;
import com.wd.workoffice.app.WorkBaseFg; import com.wd.workoffice.app.WorkBaseFg;
import com.wd.workoffice.app.WorkToolBarActivity; import com.wd.workoffice.app.WorkToolBarActivity;
import com.wd.workoffice.bean.event.CheckLogisticEvent;
import com.wd.workoffice.bean.event.WorkNumEvent;
import com.wd.workoffice.bean.vo.BatLayoutVo; import com.wd.workoffice.bean.vo.BatLayoutVo;
import com.wd.workoffice.bean.workEnum.PagePermissionType; import com.wd.workoffice.bean.workEnum.PagePermissionType;
import com.wd.workoffice.retrofit.RtfUtils; import com.wd.workoffice.retrofit.RtfUtils;
...@@ -40,6 +42,9 @@ import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseActivity; ...@@ -40,6 +42,9 @@ import com.wd.workoffice.ui.activity.bat.work.WorkWarehouseActivity;
import com.wd.workoffice.ui.adapter.BatLayoutAdapter; import com.wd.workoffice.ui.adapter.BatLayoutAdapter;
import com.wd.workoffice.util.WorkUtils; import com.wd.workoffice.util.WorkUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -84,11 +89,11 @@ public class WorkFragment extends WorkBaseFg { ...@@ -84,11 +89,11 @@ public class WorkFragment extends WorkBaseFg {
// "部门账户", // "部门账户",
"仓库", "部门", "财务中心", "设备", "仓库", "部门", "财务中心", "设备",
// "流程", "报表", // "流程", "报表",
"库存类别","生产计划"}; "库存类别", "生产计划"};
List<BatLayoutVo> saleList = new ArrayList<>(); List<BatLayoutVo> saleList = new ArrayList<>();
List<BatLayoutVo> productList = new ArrayList<>(); List<BatLayoutVo> productList = new ArrayList<>();
int[] productImg = new int[]{R.mipmap.order_sale1, R.mipmap.order_sale2, R.mipmap.order_sale3, R.mipmap.order_sale4, R.mipmap.order_sale5 int[] productImg = new int[]{R.mipmap.order_sale1, R.mipmap.order_sale2, R.mipmap.order_sale3, R.mipmap.order_sale4, R.mipmap.order_sale5
}; };
String[] saleName = new String[]{"销售订单", "外采购订单", "供应订单", "内部订单", "组装订单"}; String[] saleName = new String[]{"销售订单", "外采购订单", "供应订单", "内部订单", "组装订单"};
int[] saleImg = new int[]{R.mipmap.order_product1, R.mipmap.order_product2, R.mipmap.order_product3, int[] saleImg = new int[]{R.mipmap.order_product1, R.mipmap.order_product2, R.mipmap.order_product3,
R.mipmap.order_product4, R.mipmap.order_product5}; R.mipmap.order_product4, R.mipmap.order_product5};
...@@ -256,10 +261,10 @@ public class WorkFragment extends WorkBaseFg { ...@@ -256,10 +261,10 @@ public class WorkFragment extends WorkBaseFg {
startActivity(WorkApprovalActivity.class, "type", "1", "status", "0", WorkToolBarActivity._TITLE, "我发起的"); startActivity(WorkApprovalActivity.class, "type", "1", "status", "0", WorkToolBarActivity._TITLE, "我发起的");
break; break;
case R.id.ll_deal: case R.id.ll_deal:
startActivity(ApprovalDealActivity.class,WorkToolBarActivity._TITLE, "我处理的"); startActivity(ApprovalDealActivity.class, WorkToolBarActivity._TITLE, "我处理的");
break; break;
case R.id.ll_not_deal: case R.id.ll_not_deal:
startActivity(WorkApprovalActivity.class, "type", "2", "status", "0",WorkToolBarActivity._TITLE, "待我审批"); startActivity(WorkApprovalActivity.class, "type", "2", "status", "0", WorkToolBarActivity._TITLE, "待我审批");
break; break;
} }
} }
...@@ -283,35 +288,35 @@ public class WorkFragment extends WorkBaseFg { ...@@ -283,35 +288,35 @@ public class WorkFragment extends WorkBaseFg {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch (position) { switch (position) {
case 0: case 0:
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
startActivity(SaleSaleOrderActivity.class, "identity", "1"); startActivity(SaleSaleOrderActivity.class, "identity", "1");
break; break;
case 1: case 1:
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
startActivity(SaleOutOrderActivity.class, "identity", "1"); startActivity(SaleOutOrderActivity.class, "identity", "1");
break; break;
case 2: case 2:
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
startActivity(SaleSupplierOrderActivity.class, "identity", "1"); startActivity(SaleSupplierOrderActivity.class, "identity", "1");
break; break;
case 3: case 3:
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
startActivity(SaleInsideOrderActivity.class, "identity", "1"); startActivity(SaleInsideOrderActivity.class, "identity", "1");
break; break;
case 4: case 4:
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_LIST.getPermission())&& if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_LIST.getPermission()) &&
!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_LIST.getPermission())) { !WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
...@@ -319,7 +324,7 @@ public class WorkFragment extends WorkBaseFg { ...@@ -319,7 +324,7 @@ public class WorkFragment extends WorkBaseFg {
startActivity(SaleProductOrderActivity.class, "identity", "1"); startActivity(SaleProductOrderActivity.class, "identity", "1");
break; break;
case 5: case 5:
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
...@@ -335,35 +340,35 @@ public class WorkFragment extends WorkBaseFg { ...@@ -335,35 +340,35 @@ public class WorkFragment extends WorkBaseFg {
public void onItemClick(BaseQuickAdapter adapter, View view, int position) { public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
switch (position) { switch (position) {
case 0: case 0:
if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.SALE_ORDER_PAGE.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
startActivity(ProductSaleOrderActivity.class); startActivity(ProductSaleOrderActivity.class);
break; break;
case 1: case 1:
if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.PO_PURCHASE_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
startActivity(ProductOutOrderActivity.class); startActivity(ProductOutOrderActivity.class);
break; break;
case 2: case 2:
if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.FO_SUPPLIER_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
startActivity(ProductSupplierOrderActivity.class); startActivity(ProductSupplierOrderActivity.class);
break; break;
case 3: case 3:
if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.IO_INSIDE_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
startActivity(ProductInsideOrderActivity.class); startActivity(ProductInsideOrderActivity.class);
break; break;
case 4: case 4:
if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_LIST.getPermission())&& if (!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_LIST.getPermission()) &&
!WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_LIST.getPermission())) { !WorkUtils.hasPermission(PagePermissionType.AO_PACKAGE_APPLY_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
...@@ -371,7 +376,7 @@ public class WorkFragment extends WorkBaseFg { ...@@ -371,7 +376,7 @@ public class WorkFragment extends WorkBaseFg {
startActivity(SaleProductOrderActivity.class, "identity", "2"); startActivity(SaleProductOrderActivity.class, "identity", "2");
break; break;
case 5: case 5:
if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getPermission())){ if (!WorkUtils.hasPermission(PagePermissionType.CO_CRUCIBLE_LIST.getPermission())) {
toast(R.string.permission); toast(R.string.permission);
return; return;
} }
...@@ -389,4 +394,21 @@ public class WorkFragment extends WorkBaseFg { ...@@ -389,4 +394,21 @@ public class WorkFragment extends WorkBaseFg {
super.onResume(); super.onResume();
getNum(); getNum();
} }
@Override
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
}
@Override
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
}
@Subscribe
public void refresh(WorkNumEvent event) {
getNum();
}
} }
app/src/main/java/com/wd/workoffice/util/WorkUtils.java
浏览文件 @ 7f135542
...@@ -901,7 +901,7 @@ public class WorkUtils { ...@@ -901,7 +901,7 @@ public class WorkUtils {
case 2: case 2:
// JPushInterface.setAlias(WorkApp.getAppContext(), sequence, sequence + "_" + DataKeeper.getInstance().getBatLoginType().toUpperCase()); // JPushInterface.setAlias(WorkApp.getAppContext(), sequence, sequence + "_" + DataKeeper.getInstance().getBatLoginType().toUpperCase());
//TODO 多账套需要修改 //TODO 多账套需要修改
JPushInterface.setAlias(WorkApp.getAppContext(), sequence, sequence + "_" + "gk"); JPushInterface.setAlias(WorkApp.getAppContext(), sequence, sequence + "_" + "GK");
break; break;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论