大量修改前备份

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/FlihtsTimeActivity.java

@@ -350,7 +350,11 @@ public class FlihtsTimeActivity extends OABaseActivity implements View.OnClickLi
             String start = m.startTime;
             String end = m.endTime;
             if (StringUtils.isEmpty(start) || StringUtils.isEmpty(end)) continue;
-            time += OACheckUtil.getDifferSS(start, end);
+            try {
+                time += OACheckUtil.getDifferSS(start, end);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
         int min = time / 60;//获取分钟
         int h = min / 60;//获取小时

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/oa/MyRuleSetActivity.java

@@ -99,7 +99,11 @@ public class MyRuleSetActivity extends BaseActivity {
                 String t1 = e.getWorkTime();
                 String t2 = e.getOffTime();
                 timeShow.append(t1 + "-" + t2 + " ");
-                allTime += OACheckUtil.getDifferSS(t1, t2);
+                try {
+                    allTime += OACheckUtil.getDifferSS(t1, t2);
+                } catch (Exception e1) {
+                    e1.printStackTrace();
+                }
             }
             float h = Float.valueOf(allTime) / (60 * 60);
             String hour = float2String(h);

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/model/oa/FlightsModel.java

@@ -207,7 +207,7 @@ public class FlightsModel implements Parcelable {
      *
      * @return
      */
-    public String getTime() {
+    public String getTime()  {
         StringBuilder builder = new StringBuilder();
         if (!StringUtils.isEmpty(timeModel.getWd_ondutyone())) {
             builder.append(timeModel.getWd_ondutyone() + "-" + timeModel.getWd_offdutyone() + " ");
@@ -220,7 +220,12 @@ public class FlightsModel implements Parcelable {
         }
 
         //计算小时
-        float allTime = getAllTime() / 60;//分钟
+        float allTime = 0;//分钟
+        try {
+            allTime = getAllTime() / 60;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         float h = allTime / 60f;
         String hour = float2String(h);
         builder.append(hour + "小时");
@@ -241,7 +246,7 @@ public class FlightsModel implements Parcelable {
         return h;
     }
 
-    public int getAllTime() {
+    public int getAllTime()throws Exception {
         int time = 0;
         if (!StringUtils.isEmpty(timeModel.getWd_ondutyone()) && !StringUtils.isEmpty(timeModel.getWd_offdutyone())) {
             time += OACheckUtil.getDifferSS(timeModel.getWd_ondutyone(), timeModel.getWd_offdutyone());

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/CommonUtil.java

@@ -1447,7 +1447,7 @@ public class CommonUtil {
             return 0;
         }
     }
-
+    /*获取账套，erp的账套  b2b的公司uu号*/
     public static String getMaster() {
         boolean isB2b = ApiUtils.getApiModel() instanceof ApiPlatform;
         String master = isB2b ? CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu")
@@ -1461,4 +1461,10 @@ public class CommonUtil {
         String emcode = isB2b ? CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu") : CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
         return emcode;
     }
+    public static String getName() {
+        String name =  getSharedPreferences(MyApplication.getInstance(), "erp_emname");
+        if (StringUtils.isEmpty(name))
+            name = MyApplication.getInstance().mLoginUser.getNickName();
+        return name;
+    }
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/OACheckUtil.java

@@ -5,8 +5,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.xzjmyk.pm.activity.util.TimeUtils;
 
-import static com.xzjmyk.pm.activity.util.TimeUtils.s_long_2_str;
-
 /**
  * Created by Bitliker on 2017/1/22.
  */
@@ -128,8 +126,8 @@ public class OACheckUtil {
      * @param end   结束时间 HH:mm
      * @return 时间长度差（s）
      */
-    public static int getDifferSS(String start, String end) {
-        String startTime = s_long_2_str(System.currentTimeMillis()) + " " + start + ":00";
+    public static int getDifferSS(String start, String end) throws Exception{
+        String startTime = TimeUtils.s_long_2_str(System.currentTimeMillis()) + " " + start + ":00";
         String endTime = null;
         if (start.compareTo(end) > 0) {
             endTime = TimeUtils.s_long_2_str(System.currentTimeMillis() + (24 * 60 * 60 * 1000)) + " " + end + ":00";

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/AutoErpService.java

@@ -102,7 +102,7 @@ public class AutoErpService extends Service {
                     break;
                 case STATUS_MISSION://外勤签到
                     MissionModel model = bundle.getParcelable("data");
-                    signinUitl.signinMissio(model);
+                    signinUitl.signinMission(model);
                     break;
                 case STATUS_LEAVE_ALARM://内勤离开提醒
                     getNotificationManage().sendNotification(MyApplication.getInstance(),

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/util/oa/AutoErpSigninUitl.java

@@ -28,8 +28,13 @@ import com.xzjmyk.pm.activity.ui.erp.model.oa.MissionModel;
 import com.xzjmyk.pm.activity.ui.erp.model.oa.WorkModel;
 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.LogUtil;
+import com.xzjmyk.pm.activity.ui.erp.util.OACheckUtil;
 import com.xzjmyk.pm.activity.ui.erp.util.StringUtils;
 import com.xzjmyk.pm.activity.ui.erp.util.baidu.OnGetDrivingRouteResult;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OAHttpHelper;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.http.OnHttpResultListener;
+import com.xzjmyk.pm.activity.ui.erp.util.oa.http.Request;
 import com.xzjmyk.pm.activity.ui.tool.ThreadUtil;
 import com.xzjmyk.pm.activity.util.BaiduMapUtil;
 import com.xzjmyk.pm.activity.util.MacAndIDUtil;
@@ -44,6 +49,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static com.xzjmyk.pm.activity.ui.erp.net.ViewUtil.ct;
 import static com.xzjmyk.pm.activity.ui.erp.util.CommonUtil.getSharedPreferences;
 import static com.xzjmyk.pm.activity.ui.erp.util.oa.AutoErpService.CHANGE_WORK_TASK;
 
@@ -51,7 +57,7 @@ import static com.xzjmyk.pm.activity.ui.erp.util.oa.AutoErpService.CHANGE_WORK_T
  * 负责签到   内外勤
  * Created by Bitliker on 2016/12/20.
  */
-public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
+public class AutoErpSigninUitl implements OnHttpResultListener {
 
     private final int MAC_VAL = 0x11;//判断mac地址
     private final int SIGNING = 0x12;//内勤签到
@@ -62,8 +68,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
     private final int WORK_LOG = 0x17;//下拉列表时候的获取打卡列表
     private final int LOAD_PLAN = 0x18;
 
-    private final int END_MISSION = 0x19;//还有未拜访外勤计划
-    private final int IFINCOMPANY = 0x20;//还有未拜访外勤计划
+
     private final int LOAD_WORK_SET = 0x21;//获取打卡高级设置
     private boolean isB2b;
 
@@ -102,93 +107,92 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
      *
      * @param model 签到对象
      */
-    public void signinMissio(MissionModel model) {
+    public void signinMission(MissionModel model) {
         if (model == null) return;
-        Context ct = MyApplication.getInstance();
         if (!MyApplication.getInstance().isNetworkActive()) {
             notificationManage.sendNotification(ct, R.string.out_net_signin, MissionActivity.class);
         }
-        if (isB2b) {
-            signinByB2b(model);
-            return;
-        }
+        Context ct = MyApplication.getInstance();
         Map<String, Object> param = new HashMap<>();
         Map<String, Object> formStore = new HashMap<>();
-        String emconde = isB2b ? CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu") :
-                CommonUtil.getSharedPreferences(ct, "erp_username");
-        String name = CommonUtil.getSharedPreferences(ct, "erp_emname");
-        if (StringUtils.isEmpty(name))
-            name = MyApplication.getInstance().mLoginUser.getNickName();
+        String emcode = CommonUtil.getEmcode();
+        String name = CommonUtil.getName();
         String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
         if (StringUtils.isEmpty(address))
             address = model.getCompanyAddr();
-        formStore.put("mo_address", address);//TODO 当前地址
         String remark = model.getStatus() == 2 ? "自动外勤签退" : "自动外勤签到";
-        formStore.put("mo_remark", remark);//备注
         String location = model.getCompanyName();
         if (StringUtils.isEmpty(location) || isB2b)
             location = MyApplication.getInstance().getBdLocationHelper().getName();
-        formStore.put("mo_company", location);
-        formStore.put("mo_man", name);//人员编号
-        formStore.put("mo_mancode", emconde);//人员编号
-        if (!isB2b) {
-            param.put("caller", "Mobile_outsign");
-            param.put("mpd_id", model.getId());
-        } else {
-            formStore.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
-            formStore.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
-        }
-        param.put("formStore", StringUtils.mapToJson(formStore));
-        Bundle bundle = new Bundle();
-        bundle.putParcelable("data", model);
-        HttpHandler.getInstance().loadERPByNet(SIGNIN_MISSION, "mobile/addAutoSign.action", param, bundle, this);
-    }
-
-    private void signinByB2b(MissionModel model) {
-        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().saveOutSign;
-        Map<String, Object> formStore = new HashMap<>();
-        String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
-        if (StringUtils.isEmpty(address))
-            address = model.getCompanyAddr();
-        String remark = model.getStatus() == 2 ? "自动外勤签退" : "自动外勤签到";
-        String location = model.getCompanyName();
-        if (StringUtils.isEmpty(location) || isB2b)
-            location = MyApplication.getInstance().getBdLocationHelper().getName();
-        formStore.put("mo_remark", remark);
+        formStore.put("mo_remark", remark);//备注
         formStore.put("mo_company", location);
         formStore.put("mo_address", address);
-        formStore.put("mo_mancode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
-        String name = MyApplication.getInstance().mLoginUser.getNickName();
-        formStore.put("mo_man", name);
+        formStore.put("mo_mancode", emcode);
+        formStore.put("mo_man", name);//人员编号
         formStore.put("mpd_id", model.getId());
-        formStore.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
-        formStore.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
-        Map<String, Object> param = new HashMap<>();
+        //b2b出现取的是这个，感觉不对
+        //formStore.put("mo_mancode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
+        formStore.put("emcode", CommonUtil.getEmcode());
+        if (isB2b)
+            formStore.put("enuu", CommonUtil.getMaster());
+        else param.put("caller", "Mobile_outsign");
         param.put("formStore", StringUtils.mapToJson(formStore));
         Bundle bundle = new Bundle();
         bundle.putParcelable("data", model);
-        HttpHandler.getInstance().loadB2BByNet(SIGNIN_MISSION, url, param, bundle, this);
-
-    }
-
-    private void endMission(MissionModel model) {
-        Map<String, Object> param = new HashMap<>();
-        param.put("id", model.getId());
-        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().updateOutplanStatus : "mobile/mobileplanUpdate.action";
-        if (isB2b)
-            param.put("statuscode", "CHECKOUT");
-        HttpHandler.getInstance().loadByNet(END_MISSION,
-                url, param, null, this);
+        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().saveOutSign :
+                "mobile/addAutoSign.action";
+        Request request = new Request.Bulider()
+                .setBundle(bundle)
+                .setMode(Request.Mode.POST)
+                .setParam(param)
+                .setUrl(url)
+                .setWhat(SIGNIN_MISSION)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
+//    private void signinByB2b(MissionModel model) {
+//        String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().saveOutSign;
+//        Map<String, Object> formStore = new HashMap<>();
+//        String address = MyApplication.getInstance().getBdLocationHelper().getAddress();
+//        if (StringUtils.isEmpty(address))
+//            address = model.getCompanyAddr();
+//        String remark = model.getStatus() == 2 ? "自动外勤签退" : "自动外勤签到";
+//        String location = model.getCompanyName();
+//        if (StringUtils.isEmpty(location) || isB2b)
+//            location = MyApplication.getInstance().getBdLocationHelper().getName();
+////        formStore.put("mo_remark", remark);
+////        formStore.put("mo_company", location);
+////        formStore.put("mo_address", address);
+//        String name = MyApplication.getInstance().mLoginUser.getNickName();
+////        formStore.put("mo_man", name);
+////        formStore.put("mpd_id", model.getId());
+////        formStore.put("mo_mancode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
+////        formStore.put("enuu", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "companyEnUu"));
+////        formStore.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance().getApplicationContext(), "b2b_uu"));
+//        Map<String, Object> param = new HashMap<>();
+//        param.put("formStore", StringUtils.mapToJson(formStore));
+//        Bundle bundle = new Bundle();
+//        bundle.putParcelable("data", model);
+//        HttpHandler.getInstance().loadB2BByNet(SIGNIN_MISSION, url, param, bundle, this);
+//    }
+
+    /*判断mac地址是否符合*/
     private void validatorMac(WorkModel model, String macAddress) {
         Map<String, Object> param = new HashMap<>();
         param.put("macAddress", macAddress);
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
         Bundle bundle = new Bundle();
         bundle.putParcelable("data", model);
-        HttpHandler.getInstance().loadERPByNet(MAC_VAL, "mobile/addMobileMac.action",
-                param, bundle, this);
+        String url = "mobile/addMobileMac.action";
+        Request request = new Request.Bulider()
+                .setBundle(bundle)
+                .setMode(Request.Mode.POST)
+                .setParam(param)
+                .setUrl(url)
+                .setWhat(MAC_VAL)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
     //签到
@@ -227,12 +231,17 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
         String formStore = StringUtils.mapToJson(form);
         param.put("formStore", formStore);
         param.put("emcode", getSharedPreferences(ct, "erp_username"));
-        if (isB2b) {
-            String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_worksignin_url;
-            HttpHandler.getInstance().loadB2BByNet(SIGNING, url, param, bunder, this);
-        } else
-            HttpHandler.getInstance().loadERPByNet(SIGNING, "mobile/saveCardLog.action",
-                    param, bunder, this);
+        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_worksignin_url :
+                "mobile/saveCardLog.action";
+        Request request = new Request.Bulider()
+                .setBundle(bunder)
+                .setMode(Request.Mode.POST)
+                .setParam(param)
+                .setUrl(url)
+                .setWhat(SIGNING)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
+
     }
 
 
@@ -274,24 +283,28 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
         Map<String, Object> param = new HashMap<>();
         String code = getSharedPreferences(MyApplication.getInstance(), "erp_username");
         param.put("currentMaster", getSharedPreferences(MyApplication.getInstance(), "erp_master"));
-        if (isB2b)
+        if (isB2b) {
             param.put("pageNumber", 1);
-        else
+            param.put("date", TimeUtils.long2str(System.currentTimeMillis(), "yyyyMMdd"));
+        } else {
             param.put("page", 1);
-        param.put("pageSize", 100);
-        if (!isB2b)
             param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
-        else
-            param.put("date", TimeUtils.long2str(System.currentTimeMillis(), "yyyyMMdd"));
+        }
+        param.put("pageSize", 100);
         param.put("caller", "CardLog");
         param.put("emcode", code);
         param.put("master", getSharedPreferences(MyApplication.getInstance(), "erp_master"));
-        if (isB2b) {
-            String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_record_url;
-            HttpHandler.getInstance().loadB2BByNet(LOAD_WORKLOG, url, param, bunder, this, "get");
-        } else
-            HttpHandler.getInstance().loadERPByNet(LOAD_WORKLOG, "mobile/oa/workdata.action", param, bunder, this);
 
+        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_record_url :
+                "mobile/oa/workdata.action";
+        Request request = new Request.Bulider()
+                .setBundle(bunder)
+                .setMode(Request.Mode.GET)
+                .setParam(param)
+                .setUrl(url)
+                .setWhat(LOAD_WORKLOG)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
     //获取是否有外勤计划
@@ -300,17 +313,15 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
         Bundle bunder = new Bundle();
         bunder.putParcelable("data", model);
-        HttpHandler.getInstance().loadERPByNet(HAVE_OUT_PLAN, "mobile/yesornoplan.action",
-                param, bunder, this);
-    }
-
-    //判断是否需要打卡，现在不需要了
-    public void loadIsCompany() {
-        Map<String, Object> param = new HashMap<>();
-        param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
-        Bundle bunder = new Bundle();
-        HttpHandler.getInstance().loadERPByNet(IFINCOMPANY, "mobile/ifInCompany.action",
-                param, bunder, this);
+        String url = "mobile/yesornoplan.action";
+        Request request = new Request.Bulider()
+                .setParam(param)
+                .setBundle(bunder)
+                .setUrl(url)
+                .setWhat(HAVE_OUT_PLAN)
+                .setMode(Request.Mode.GET)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
 
@@ -325,11 +336,18 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
         param.put("date", TimeUtils.int_long_2_str(System.currentTimeMillis()));
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
         Bundle bundle = new Bundle();
-        if (isB2b) {
-            String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_schedule_url;
-            HttpHandler.getInstance().loadB2BByNet(WORK_DATA, url, param, bundle, this, "get");
-        } else
-            HttpHandler.getInstance().loadERPByNet(WORK_DATA, "mobile/getWorkDate.action", param, bundle, this);
+
+        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_schedule_url :
+                "mobile/getWorkDate.action";
+        Request request = new Request.Bulider()
+                .setBundle(bundle)
+                .setMode(Request.Mode.GET)
+                .setParam(param)
+                .setUrl(url)
+                .setWhat(WORK_DATA)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
+
     }
 
 
@@ -339,25 +357,30 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
         Map<String, Object> param = new HashMap<>();
         String code = CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username");
         param.put("currentMaster", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
-        if (isB2b)
+        if (isB2b) {
+            param.put("date", TimeUtils.long2str(System.currentTimeMillis(), "yyyyMMdd"));
             param.put("pageNumber", 1);
-        else
+        } else {
+            param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
             param.put("page", 1);
+        }
         param.put("pageSize", 100);
-        if (!isB2b)
-            param.put("condition", "cl_emcode='" + code + "' and to_char(cl_time,'yyyy-MM-dd')='" + date + "'");
-        else
-            param.put("date", TimeUtils.long2str(System.currentTimeMillis(), "yyyyMMdd"));
         param.put("caller", "CardLog");
         param.put("emcode", code);
         param.put("master", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_master"));
         Bundle bundle = new Bundle();
         bundle.putParcelableArrayList("models", models);
-        if (isB2b) {
-            String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_record_url;
-            HttpHandler.getInstance().loadB2BByNet(WORK_LOG, url, param, bundle, this, "get");
-        } else
-            HttpHandler.getInstance().loadERPByNet(WORK_LOG, "mobile/oa/workdata.action", param, bundle, this);
+
+        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().punch_record_url :
+                "mobile/oa/workdata.action";
+        Request request = new Request.Bulider()
+                .setBundle(bundle)
+                .setMode(Request.Mode.GET)
+                .setParam(param)
+                .setUrl(url)
+                .setWhat(WORK_LOG)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
     public void loadWorkSet() {
@@ -365,11 +388,16 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
         Map<String, Object> param = new HashMap<>();
         if (!isB2b)
             param.put("code", 1);
-        if (isB2b) {
-            String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().get_plat_senior_setting_url;
-            HttpHandler.getInstance().loadB2BByNet(LOAD_WORK_SET, url, param, null, this, "get");
-        } else
-            HttpHandler.getInstance().loadERPByNet(LOAD_WORK_SET, "/mobile/getconfigs.action", param, null, this);
+
+        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().get_plat_senior_setting_url :
+                "mobile/getconfigs.action";
+        Request request = new Request.Bulider()
+                .setMode(Request.Mode.GET)
+                .setParam(param)
+                .setUrl(url)
+                .setWhat(LOAD_WORK_SET)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
     //获取外勤计划列表
@@ -378,12 +406,15 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
         param.put("emcode", CommonUtil.getSharedPreferences(MyApplication.getInstance(), "erp_username"));
 
 
-        if (isB2b) {
-            String url = ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getOutPlan;
-            HttpHandler.getInstance().loadB2BByNet(LOAD_PLAN, url, param, null, this, "get");
-        } else
-            HttpHandler.getInstance().loadERPByNet(LOAD_PLAN, "mobile/mobileoutplan.action", param, null, this);
-
+        String url = isB2b ? ApiConfig.getInstance(ApiUtils.getApiModel()).getmApiBase().getOutPlan :
+                "mobile/mobileoutplan.action";
+        Request request = new Request.Bulider()
+                .setMode(Request.Mode.GET)
+                .setParam(param)
+                .setUrl(url)
+                .setWhat(LOAD_PLAN)
+                .bulid();
+        OAHttpHelper.getInstance().requestHttp(request, this);
     }
 
     @Override
@@ -432,7 +463,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                         if (bundle != null && bundle.getParcelable("data") != null) {
                             MissionModel model = bundle.getParcelable("data");
                             if (model == null) {
-                                log("model==null");
+                                LogUtil.i("model==null");
                                 return;
                             }
                             boolean saveOk = MissionDao.getInstance().updata(model);
@@ -466,8 +497,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                     }
                     handlerData(array);
                     break;
-                case IFINCOMPANY:
-                    break;
+
                 case LOAD_WORK_SET:
                     if (isJSON) {
                         handlerWorkSet(JSON.parseObject(message));
@@ -478,7 +508,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
             }
         } catch (Exception e) {
             if (e != null)
-                log("result=" + e.getMessage());
+                LogUtil.i("result=" + e.getMessage());
         }
 
 
@@ -487,7 +517,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
     boolean isErrorMac;
 
     @Override
-    public void error(int what, int statuCode, String message, Bundle bundle) {
+    public void error(int what, String message, Bundle bundle) {
         if (!StringUtils.isEmpty(message)) {
             String msg = null;
             if (StringUtils.isInclude(message, "该设备不是考勤打卡常用设备")) {
@@ -582,12 +612,12 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                         minTime = e.getDuration();
                     }
                 }
-                log("最短时间为" + minTime);
+                LogUtil.i("最短时间为" + minTime);
                 //获取使用时间为。。。。
                 //当前时间
                 List<WorkModel> models = WorkModelDao.getInstance().query(true);
                 if (ListUtils.isEmpty(models)) {
-                    log("数据库中的班次为空的");
+                    LogUtil.i("数据库中的班次为空的");
                     if (saveOk)
                         notificationManage.sendNotification(MyApplication.getInstance(),
                                 "对" + model.getCompanyName() + "外勤签退成功", MissionActivity.class);
@@ -606,7 +636,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                     return;
                 }
                 int time = getTime(lastTime);
-                log("与下班时间相差" + time);
+                LogUtil.i("与下班时间相差" + time);
                 int deTime = PreferenceUtils.getInt(AppConfig.AUTO_MISSION_TIME, 10);
                 if ((minTime + deTime * 60) < time) {
                     notificationManage.sendNotification(MyApplication.getInstance(),
@@ -648,7 +678,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                 && model.getWorkTime().compareTo(time) >= 0) {
             model.setWorkSignin(time);
             long i = WorkModelDao.getInstance().update(model);
-            log("i=" + i);
+            LogUtil.i("i=" + i);
             notificationManage.sendNotification(MyApplication.getInstance(),
                     R.string.auto_signin, WorkActivity.class);
             boolean b = hasMore();
@@ -663,7 +693,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                 && model.getOffend().compareTo(time) >= 0) {
             model.setOffSignin(time);
             long i = WorkModelDao.getInstance().update(model);
-            log("i=" + i);
+            LogUtil.i("i=" + i);
             notificationManage.sendNotification(MyApplication.getInstance(),
                     R.string.auto_signin, WorkActivity.class);
             boolean b = hasMore();
@@ -735,7 +765,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                 public void run() {
                     boolean saveOK = WorkModelDao.getInstance().createOrUpdata(models, System.currentTimeMillis());
                     if (saveOK) {
-                        HttpHandler.getInstance().post(new Runnable() {
+                        OAHttpHelper.getInstance().post(new Runnable() {
                             @Override
                             public void run() {
                                 Intent intent = new Intent();
@@ -763,7 +793,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                 public void run() {
                     List<MissionModel> models = MissionDao.getInstance().queryByEnCode();
                     if (!ListUtils.isEmpty(models)) {
-                        HttpHandler.getInstance().post(new Runnable() {
+                        OAHttpHelper.getInstance().post(new Runnable() {
                             @Override
                             public void run() {
                                 Intent intent = new Intent();
@@ -788,7 +818,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                 entities.add(entity);
             }
             if (!ListUtils.isEmpty(entities)) {
-                log("保存到数据库成功");
+                LogUtil.i("保存到数据库成功");
                 ThreadUtil.getInstance().addTask(new Runnable() {
                     @Override
                     public void run() {
@@ -799,14 +829,14 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
 
                         }
                         if (saveOk) {
-                            HttpHandler.getInstance().post(new Runnable() {
+                            OAHttpHelper.getInstance().post(new Runnable() {
                                 @Override
                                 public void run() {
                                     Intent intent = new Intent();
                                     intent.putExtra(AutoErpService.CHANGE_MISSION_TASK, true);
                                     intent.setAction(AutoErpService.CHANGE_MISSION_TASK);
                                     MsgBroadcast.sendLocalBroadcast(intent);
-                                    log("发送广播成功");
+                                    LogUtil.i("发送广播成功");
                                 }
                             });
                         }
@@ -831,14 +861,14 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                 WorkModelDao.getInstance().clearByDate(System.currentTimeMillis());
             } catch (Exception e) {
                 if (e != null)
-                    log("initNet Exception=" + e.getMessage());
+                    LogUtil.i("initNet Exception=" + e.getMessage());
             }
     }
 
     private boolean isMoreMission(List<MissionModel> models) {
         for (MissionModel e : models) {
             if (e.getType() != 1) {
-                log("返回正确");
+                LogUtil.i("返回正确");
                 return true;
             }
         }
@@ -862,14 +892,4 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
     }
 
 
-    private void log(String message) {
-        try {
-            if (!AppConfig.DEBUG || StringUtils.isEmpty(message)) return;
-            Log.i("gongpengming", message);
-        } catch (Exception e) {
-            if (e != null)
-                Log.i("gongpengming", "show Exception" + e.getMessage());
-        }
-    }
-
 }