1.登录添加判断erpId逻辑

2.//TODO 设备三个子菜单,坩埚下单，mes其他页面，mes用户反馈空也展示，编辑任务担当无法修改.支数参数

app/src/main/java/com/wd/workoffice/presenter/LoginPresenter.java

 package com.wd.workoffice.presenter;
 
+import android.text.TextUtils;
+
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.wd.workoffice.app.BaseBean;
+import com.wd.workoffice.bean.UserInfoBean;
 import com.wd.workoffice.contract.LoginContract;
 import com.wd.workoffice.model.LoginModel;
+import com.wd.workoffice.retrofit.RtfUtils;
 import com.wd.workoffice.retrofit.WorkObserver;
 import com.wd.workoffice.util.UserKeeper;
 
@@ -12,6 +17,7 @@ import java.util.Map;
 
 import flexible.xd.android_base.mvpBase.BasePresenter;
 import flexible.xd.android_base.network.rtfhttp.Transformer;
+import flexible.xd.android_base.utils.ToastUtil;
 import io.reactivex.disposables.Disposable;
 import okhttp3.ResponseBody;
 import retrofit2.Call;
@@ -65,8 +71,7 @@ public class LoginPresenter extends BasePresenter<LoginContract.View, LoginContr
                         mView.onError(data.getMessage());
                         return;
                     }
-                    UserKeeper.getInstance().keepLoginInfo(JSON.toJSONString(data.getData()));
-                    mView.loginSuccess();
+                    getUserInfo(JSON.toJSONString(data.getData()));
                 } else {
                     ResponseBody data = response.errorBody();
                     mView.hideLoading();
@@ -76,8 +81,8 @@ public class LoginPresenter extends BasePresenter<LoginContract.View, LoginContr
                             mView.onError(backData.getMessage());
                             return;
                         }
-                        UserKeeper.getInstance().keepLoginInfo(JSON.toJSONString(backData.getData()));
-                        mView.loginSuccess();
+//                        UserKeeper.getInstance().keepLoginInfo(JSON.toJSONString(backData.getData()));
+//                        mView.loginSuccess();
                     } catch (IOException e) {
                         e.printStackTrace();
                     }
@@ -126,6 +131,34 @@ public class LoginPresenter extends BasePresenter<LoginContract.View, LoginContr
 //        });
     }
 
+    private void getUserInfo(String loginInfo) {
+        RtfUtils.getRtf().userInfo().compose(Transformer.schedule()).subscribe(new WorkObserver<BaseBean>() {
+            @Override
+            public void doOnSubscribe(Disposable d) {
+            }
+
+            @Override
+            public void onFail(String errorMsg) {
+            }
+
+            @Override
+            public void onSuccess(BaseBean data) {
+                if (data.getCode() != 0) {
+                    return;
+                }
+                JSONObject userData = JSON.parseObject(data.getData().toString());
+                if (UserKeeper.getInstance().getMesLogin()&&
+                        !TextUtils.equals(UserKeeper.getInstance().getMesErpId(),userData.getString("erpId"))){
+                    ToastUtil.showShort("员工编号不一致");
+                    return;
+                }
+                UserKeeper.getInstance().keepLoginInfo(loginInfo);
+                mView.loginSuccess();
+                UserKeeper.getInstance().keepUserInfo(data.getData().toString());
+            }
+        });
+    }
+
     @Override
     public LoginContract.Model bindModel() {
         return LoginModel.newInstance();

app/src/main/java/com/wd/workoffice/ui/activity/MainLoginActivity.java

@@ -44,23 +44,6 @@ public class MainLoginActivity extends WorkBaseActivity {
 
     @Override
     protected void initData() {
-        if (!UserKeeper.getInstance().getIsAgree()) {
-//            View view = LayoutInflater.from(this).inflate(R.layout.activity_about, null);
-//            AlertDialog.Builder builder =new AlertDialog.Builder(this);
-//
-//            builder.setView(view).setNegativeButton("暂不使用", new DialogInterface.OnClickListener() {
-//                @Override
-//                public void onClick(DialogInterface dialog, int which) {
-//                    dialog.dismiss();
-//                }
-//            }).setPositiveButton("确定", new DialogInterface.OnClickListener() {
-//                @Override
-//                public void onClick(DialogInterface dialog, int which) {
-//                    dialog.dismiss();
-//                    UserKeeper.getInstance().keepIsAgree(true);
-//                }
-//            }).show();
-        }
     }
 
 

app/src/main/java/com/wd/workoffice/ui/activity/mes/MesLoginActivity.java

@@ -136,10 +136,15 @@ public class MesLoginActivity extends WorkToolBarActivity {
                     toast(data.getMessage());
                     return;
                 }
+                JSONObject userData = JSON.parseObject(data.getData().toString());
+                if (!TextUtils.isEmpty(UserKeeper.getInstance().getLoginInfo())&&
+                !TextUtils.equals(UserKeeper.getInstance().getUserErpId(),userData.getString("userCode"))){
+                    toast("员工编号不一致");
+                    return;
+                }
                 toast("登录成功");
                 UserKeeper.getInstance().keepMesLogin(true);
-                JSONObject userData = JSON.parseObject(data.getData().toString());
-                UserKeeper.getInstance().keepMesUid(userData.getString("userId"));
+                UserKeeper.getInstance().keepMesLoginInfo(JSON.toJSONString(userData));
                 Intent intent = new Intent(MesLoginActivity.this, MainActivity.class);
                 intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
                 startActivity(intent);

app/src/main/java/com/wd/workoffice/util/UserKeeper.java

@@ -4,6 +4,7 @@ package com.wd.workoffice.util;
 import android.text.TextUtils;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.wd.workoffice.bean.TokenBean;
 import com.wd.workoffice.bean.UserInfoBean;
 
@@ -21,6 +22,7 @@ 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_LOGIN_INFO = "_MES_LOGIN_INFO";
     private final String MES_UID = "_MES_UID";
     private final String COOKIE = "_COOKIE";
     private final String IS_AGREE = "_IS_AGREE";
@@ -39,22 +41,22 @@ public class UserKeeper {
         return keeper;
     }
 
-    /**
-     * 同意协议
-     *
-     * @param info
-     */
-    public void keepIsAgree(Boolean info) {
-        sp.put(IS_AGREE, info);
-    }
-
-    public Boolean getIsAgree() {
-        return sp.getBoolean(IS_AGREE);
-    }
-
-    public void clearIsAgree() {
-        sp.put(IS_AGREE, false);
-    }
+//    /**
+//     * 同意协议
+//     *
+//     * @param info
+//     */
+//    public void keepIsAgree(Boolean info) {
+//        sp.put(IS_AGREE, info);
+//    }
+//
+//    public Boolean getIsAgree() {
+//        return sp.getBoolean(IS_AGREE);
+//    }
+//
+//    public void clearIsAgree() {
+//        sp.put(IS_AGREE, false);
+//    }
 
     /**
      * mescookie
@@ -90,18 +92,47 @@ public class UserKeeper {
         sp.put(MES_LOGIN, false);
     }
 
-    public void keepMesUid(String info) {
-        sp.put(MES_UID, info);
+    /**
+     * mes的用户信息
+     *
+     * @param info
+     */
+    public void keepMesLoginInfo(String info) {
+        sp.put(MES_LOGIN_INFO, info);
+    }
+
+    public String getMesLoginInfo() {
+        return sp.getString(MES_LOGIN_INFO);
     }
 
-    public String getMesUid() {
-        return sp.getString(MES_UID);
+    public void clearMesLoginInfo() {
+        sp.put(MES_LOGIN_INFO, "");
     }
+    /**
+     * mes的用户id
+     *
+     * @param
+     */
 
-    public void clearMesUid() {
-        sp.put(MES_UID, "");
+    public String getMesUid() {
+        JSONObject mesInfo = JSON.parseObject(getMesLoginInfo());
+        if (!TextUtils.isEmpty(getMesLoginInfo())){
+            return mesInfo.getString("userId");
+        }
+        return "";
+    }
+    public String getMesErpId() {
+        JSONObject mesInfo = JSON.parseObject(getMesLoginInfo());
+        if (!TextUtils.isEmpty(getMesLoginInfo())){
+            return mesInfo.getString("userCode");
+        }
+        return "";
     }
 
+    /**
+     * bat 用户信息
+     * @param info
+     */
     public void keepLoginInfo(String info) {
         sp.put(LOGIN_INFO, info);
     }
@@ -230,6 +261,7 @@ public class UserKeeper {
         clearLoginInfo();
         clearUserInfo();
         clearMesLogin();
-        clearMesUid();
+        clearMesLoginInfo();
+        clearCookie();
     }
 }