Explorar o código

优化内勤外勤

RaoMeng %!s(int64=9) %!d(string=hai) anos
pai
achega
7db762a578

+ 1 - 1
WeiChat/build.gradle

@@ -13,7 +13,7 @@ android {
     }
     signingConfigs {
         config {
-            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
+            storeFile file('D:/config/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'

+ 10 - 3
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/AddMeetingActivity.java

@@ -22,6 +22,7 @@ import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.model.Employees;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
@@ -88,12 +89,18 @@ public class AddMeetingActivity extends BaseActivity implements View.OnClickList
                         // 创建会议成功  开始日程
                         if (create_ric_sv.isChecked()) {
                             Crouton.makeText(ct, "添加会议成功,正在为会议成员创建日程");
-                            CodeUtil.getInstance().getCode(ct, "ProjectTask", new CodeUtil.OnCodeLinstener() {
+                            CommonInterface.getInstance().getCodeByNet("ProjectTask", new CommonInterface.OnResultListener() {
                                 @Override
-                                public void callBack(String code) {
-                                    sendHttpResquest(code);
+                                public void result(boolean isOk, String result, String message) {
+                                    sendHttpResquest(result);
                                 }
                             });
+//                            CodeUtil.getInstance().getCode(ct, "ProjectTask", new CodeUtil.OnCodeLinstener() {
+//                                @Override
+//                                public void callBack(String code) {
+//                                    sendHttpResquest(code);
+//                                }
+//                            });
                         } else {
                             Crouton.makeText(ct, "添加会议成功!");
                             sumitExamine();

+ 0 - 4
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MissionSetActivity.java

@@ -16,7 +16,6 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.bean.oa.SelectBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonInterfaceUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
@@ -45,7 +44,6 @@ public class MissionSetActivity extends BaseActivity implements SwitchView.OnChe
     private TextView distance_tv;
     @ViewInject(R.id.time_tv)
     private TextView time_tv;
-    private CommonInterfaceUtil util;
 
     private boolean isAuto = false;//是否自动外勤
     private int distance = 100;//
@@ -95,7 +93,6 @@ public class MissionSetActivity extends BaseActivity implements SwitchView.OnChe
 
     private void initView() {
         setAdminStatus();
-        util = new CommonInterfaceUtil();
         isAuto = PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
         auto_sv.setChecked(isAuto);
         setClickAble(isAuto);
@@ -237,7 +234,6 @@ public class MissionSetActivity extends BaseActivity implements SwitchView.OnChe
     }
 
     private void updataSet() {
-//        util.addOutSet(distance, time, isAuto, null);
         CommonInterface.getInstance().addOutSet(distance, time, isAuto, null);
     }
 }

+ 0 - 2
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OAActivity.java

@@ -485,8 +485,6 @@ public class OAActivity extends BaseActivity implements View.OnClickListener, Wo
         if (adminStatus == -1) {
             judgeManager();
         }
-//        CommonInterfaceUtil util = new CommonInterfaceUtil();
-//        util.getOutSetInfo(null);
         CommonInterface.getInstance().saveOutSetInfo(null);
     }
 

+ 19 - 27
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutSigninOKActivity.java

@@ -40,8 +40,7 @@ import com.xzjmyk.pm.activity.bean.oa.OutSigninBean;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.entity.EditChangeListener;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.CodeUtil;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonInterfaceUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.Constants;
 import com.xzjmyk.pm.activity.ui.erp.util.FlexJsonUtil;
@@ -88,7 +87,6 @@ public class OutSigninOKActivity extends BaseActivity {
     private File waterBitmapToFile = null;
     private PopupWindow mPopupWindow;
     private File mCurrentFile;
-    private CommonInterfaceUtil util;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -484,32 +482,26 @@ public class OutSigninOKActivity extends BaseActivity {
             return;
         }
         isSubmit = true;
-//        util = new CommonInterfaceUtil();
-//        util.getIdByNet("MOBILE_OUTSIGN_SEQ", new CommonInterfaceUtil.OnResultListener() {
-//            @Override
-//            public void result(int code, String result) {
-//
-//                util.getCodeByNet("MOBILE_OUTSIGN", new CommonInterfaceUtil.OnResultListener() {
-//                    @Override
-//                    public void result(int code, String result) {
-//
-//                    }
-//                });
-//            }
-//        });
-        CodeUtil.getInstance().getId(ct, "MOBILE_OUTSIGN_SEQ", new CodeUtil.OnCodeLinstener() {
+        CommonInterface.getInstance().getIdByNet("MOBILE_OUTSIGN_SEQ", new CommonInterface.OnResultListener() {
             @Override
-            public void callBack(String code) {
-                if (!StringUtils.isEmpty(code) && isNum(code))
-                    mo_id = Integer.valueOf(code);
-                CodeUtil.getInstance().getCode(MyApplication.getInstance(), "MOBILE_OUTSIGN", new CodeUtil.OnCodeLinstener() {
-                    @Override
-                    public void callBack(String code) {
-                        doSignin(code, mo_id, id);
-                    }
-                });
+            public void result(boolean isOk, String result, String message) {
+                try {
+                    if (isOk && !StringUtils.isEmpty(result) && isNum(result))
+                        mo_id = Integer.valueOf(result);
+                    CommonInterface.getInstance().getCodeByNet("MOBILE_OUTSIGN", new CommonInterface.OnResultListener() {
+                        @Override
+                        public void result(boolean isOk, String result, String message) {
+                            doSignin(result, mo_id, id);
+                        }
+                    });
+                } catch (ClassCastException e) {
+
+                } catch (Exception e) {
+
+                }
             }
         });
+
     }
 
     private boolean isNum(String chche) {
@@ -547,7 +539,7 @@ public class OutSigninOKActivity extends BaseActivity {
         String emconde = CommonUtil.getSharedPreferences(this, "erp_username");
         bean.setMo_mancode(emconde);
         String name = CommonUtil.getSharedPreferences(ct, "erp_emname");
-        if (com.xzjmyk.pm.activity.util.StringUtils.isEmpty(name))
+        if (StringUtils.isEmpty(name))
             name = MyApplication.getInstance().mLoginUser.getNickName();
         bean.setMo_man(name);
         bean.setMo_remark(text_edit.getText().toString());

+ 2 - 15
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/OutofficeSetActivity.java

@@ -20,7 +20,6 @@ import com.xzjmyk.pm.activity.R;
 import com.xzjmyk.pm.activity.ui.base.BaseActivity;
 import com.xzjmyk.pm.activity.ui.erp.net.ViewUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonInterfaceUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.view.SwitchView;
@@ -209,11 +208,9 @@ public class OutofficeSetActivity extends BaseActivity {
         }
     }
 
-    private CommonInterfaceUtil util = null;
 
     private void updataSet(final boolean isAuto) {
-        if (util == null)
-            util = new CommonInterfaceUtil();
+
         int distance = PreferenceUtils.getInt(AppConfig.ALARM_MISSION_DISTANCE, 500);
         final int time = PreferenceUtils.getInt(AppConfig.AUTO_MISSION_TIME, 30);
         CommonInterface.getInstance().addOutSet(distance, time, isAuto, new CommonInterface.OnResultListener() {
@@ -227,16 +224,6 @@ public class OutofficeSetActivity extends BaseActivity {
                 }
             }
         });
-//        util.addOutSet(distance, time, isAuto, new CommonInterfaceUtil.OnResultListener() {
-//            @Override
-//            public void result(int code, String result) {
-//                if (isAuto) {
-//                    Intent intent = new Intent(ct, MissionActivity.class);
-//                    intent.putExtra("flag", 2);
-//                    intent.putExtra(AppConfig.IS_ADMIN, true);//上传管理员状态
-//                    startActivityForResult(intent, 0x20);
-//                }
-//            }
-//        });
+
     }
 }

+ 0 - 12
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/WorkPresenter.java

@@ -21,7 +21,6 @@ import com.xzjmyk.pm.activity.ui.erp.model.WorkModel;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IWorkPresenter;
 import com.xzjmyk.pm.activity.ui.erp.presenter.imp.IWorkView;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonInterface;
-import com.xzjmyk.pm.activity.ui.erp.util.CommonInterfaceUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.CommonUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.ListUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
@@ -59,7 +58,6 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
     private int companyDistance;
     private boolean isMacInNet = false;//服务器上是否有mac地址
     private boolean isSubmiting = false;
-    private CommonInterfaceUtil util;
 
     private String macAddress;
 
@@ -566,12 +564,6 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
                                 signinWork(bundle, result);
                             }
                         });
-//                        getUtil().getCodeByNet("CardLog", new CommonInterfaceUtil.OnResultListener() {
-//                            @Override
-//                            public void result(int code, String result) {
-//                                signinWork(bundle, result);
-//                            }
-//                        });
                     }
                     break;
                 case LOAD_MAC://判断是否是第一次请求数据
@@ -644,8 +636,4 @@ public class WorkPresenter implements HttpHandler.OnResultListener, IWorkPresent
     }
 
 
-    public CommonInterfaceUtil getUtil() {
-        if (util == null) util = new CommonInterfaceUtil();
-        return util;
-    }
 }

+ 0 - 154
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/CommonInterfaceUtil.java

@@ -1,154 +0,0 @@
-package com.xzjmyk.pm.activity.ui.erp.util;
-
-import android.os.Handler;
-import android.os.Message;
-import android.util.Log;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.xzjmyk.pm.activity.AppConfig;
-import com.xzjmyk.pm.activity.MyApplication;
-import com.xzjmyk.pm.activity.db.dao.ErrorMagDao;
-import com.xzjmyk.pm.activity.ui.erp.entity.ErrorEntity;
-import com.xzjmyk.pm.activity.util.PreferenceUtils;
-import com.xzjmyk.pm.activity.util.TimeUtils;
-
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * 多用接口
- * Created by Bitliker on 2016/12/2.
- */
-@Deprecated
-public class CommonInterfaceUtil {
-    private final int CODE_WHAT = 0x11;//获取code
-    private final int ID_WHAT = 0x12;//获取id
-    private final int OUT_SET_WHAT = 0x13;//获取
-    private final int ADD_OUT_SET_WHAT = 0x14;//外勤设置
-
-
-    private OnResultListener onResultListener;
-    private Handler handler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            try {
-                String message = msg.getData().getString("result");
-                int status = msg.getData().getInt("code");
-                JsonValidator validator = new JsonValidator();
-                boolean isJSON = StringUtils.isEmpty(message) ? false : validator.validate(message);
-                if (!isJSON) return;
-                JSONObject json = JSON.parseObject(message);
-                switch (msg.what) {
-                    case CODE_WHAT:
-                        String code = json.getString("code");
-                        if (onResultListener != null)
-                            onResultListener.result(status, code);
-                        break;
-                    case ID_WHAT:
-                        if (json.containsKey("success") && json.getBoolean("success")) {
-                            int id = JSON.parseObject(message).getInteger("id");
-                            if (onResultListener != null)
-                                onResultListener.result(status, String.valueOf(id));
-                        }
-                        break;
-                    case OUT_SET_WHAT:
-                        if (json.containsKey("success") && json.getBoolean("success") && json.containsKey("result")) {
-                            JSONArray array = json.getJSONArray("result");
-                            if (ListUtils.isEmpty(array)) return;
-                            JSONObject object = array.getJSONObject(0);
-                            int distance = object.getIntValue("MO_DISTANCE");
-                            int time = object.getIntValue("MO_TIME");
-                            boolean isAuto = object.getIntValue("MO_AUTOSIGN") > 0 ? true : false;
-                            //获取到外勤设置   保存下来
-                            PreferenceUtils.putBoolean(AppConfig.AUTO_MISSION, isAuto);
-                            PreferenceUtils.putInt(AppConfig.ALARM_MISSION_DISTANCE, distance);
-                            PreferenceUtils.putInt(AppConfig.AUTO_MISSION_TIME, time);
-                            if (onResultListener != null)
-                                onResultListener.result(status, object.toString());
-                        }
-
-                        break;
-                    case ADD_OUT_SET_WHAT:
-                        if (onResultListener != null)
-                            onResultListener.result(status, json.toString());
-                        break;
-                }
-            } catch (NullPointerException e) {
-                if (e != null)
-                    Log.i("gongpengming", "handleMessage NullPointerException=" + e.getMessage());
-            } catch (Exception e) {
-                if (e != null)
-                    Log.i("gongpengming", "handleMessage Exception=" + e.getMessage());
-            }
-        }
-    };
-
-    //获取服务端表的编号
-    public void getCodeByNet(String titleName, OnResultListener onResultListener) {
-        Map<String, Object> param = new HashMap<>();
-        param.put("caller", titleName);
-        param.put("type", 2);
-        net(onResultListener, "common/getCodeString.action", param, CODE_WHAT);
-    }
-
-    //获取服务端表的id
-    public void getIdByNet(String sql, OnResultListener onResultListener) {
-        Map<String, Object> param = new HashMap<>();
-        param.put("seq", sql);
-        net(onResultListener, "common/getId.action", param, ID_WHAT);
-    }
-
-
-    //获取外勤设置,判断是否是
-    public void getOutSetInfo(OnResultListener onResultListener) {
-        net(onResultListener, "mobile/getOutSetInfo.action", new HashMap<String, Object>(), OUT_SET_WHAT);
-    }
-
-    //更新外勤设置
-    public void addOutSet(int distance, int time, boolean isAuto, OnResultListener onResultListener) {
-        Map<String, Object> param = new HashMap<>();
-        param.put("caller", "OUTSET");
-        Map<String, Object> map = new HashMap<>();
-        map.put("mo_distance", distance);//距离
-        map.put("mo_time", time);//预留时间
-        map.put("mo_autosign", isAuto ? 1 : 0);//是否自动外勤
-        param.put("formStore", StringUtils.mapToJson(map));
-        try {
-            saveMsg2DB(isAuto);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        net(onResultListener, "mobile/addOutSet.action", param, ADD_OUT_SET_WHAT);
-    }
-
-
-    private void saveMsg2DB(boolean is) throws Exception {
-        ErrorEntity entity = new ErrorEntity();
-        entity.setTitle("mobile/addOutSet.action");
-        entity.setTime(TimeUtils.f_long_2_str(System.currentTimeMillis()));
-        entity.setMsg("自动外勤开关=" + is);
-        ErrorMagDao.getInstance().insert(entity);
-    }
-
-    private void net(OnResultListener onResultListener, String action, Map<String, Object> param, int what) {
-        this.onResultListener = onResultListener;
-        LinkedHashMap<String, Object> headers = new LinkedHashMap<>();
-        headers.put("Cookie", "JSESSIONID=" + CommonUtil.getSharedPreferences(MyApplication.getInstance(), "sessionId"));
-        String url = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_baseurl") + action;
-        com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.httpSendRequest(MyApplication.getInstance(), url, param, handler, headers, what, null, null, "post");
-    }
-
-    public interface OnResultListener {
-        /**
-         * 接口返回信息
-         *
-         * @param code   状态码
-         * @param result 返回结果
-         */
-        void result(int code, String result);
-    }
-
-}

+ 0 - 20
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/AutoErpService.java

@@ -353,26 +353,6 @@ public class AutoErpService extends Service {
         });
 
 
-        //TODO 修改
-//        CommonInterfaceUtil commonInterfaceUtil = new CommonInterfaceUtil();
-//        commonInterfaceUtil.getOutSetInfo(new CommonInterfaceUtil.OnResultListener() {
-//            @Override
-//            public void result(int code, String result) {
-//                boolean isNeedAutoOut = PreferenceUtils.getBoolean(AppConfig.AUTO_MISSION, false);
-//                if (isNeedAutoOut) {
-//                    canMission = true;
-//                    signinUitl.loadMissionPlan();
-//                } else {
-//                    try {
-//                        //如果不是自动外勤,清空数据库今天的数据
-//                        MissionDao.getInstance().clearAll(System.currentTimeMillis());
-//                    } catch (Exception e) {
-//                        if (e != null)
-//                            log("initNet Exception=" + e.getMessage());
-//                    }
-//                }
-//            }
-//        });
     }
 
     private void initWork() {

+ 0 - 7
WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/attendance/AutoErpSigninUitl.java

@@ -266,13 +266,6 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                                 signinWork(bundle, result);
                             }
                         });
-//                        CommonInterfaceUtil util = new CommonInterfaceUtil();
-//                        util.getCodeByNet("CardLog", new CommonInterfaceUtil.OnResultListener() {
-//                            @Override
-//                            public void result(int code, String result) {
-//                                signinWork(bundle, result);
-//                            }
-//                        });
                     }
                     break;
                 case SIGNING: