处理关于外勤的相关bug

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/activity/crm/VisitReportAddActivity.java

@@ -32,6 +32,7 @@ import com.xzjmyk.pm.activity.ui.erp.util.JsonValidator;
 import com.xzjmyk.pm.activity.ui.erp.view.SingleDialog;
 import com.xzjmyk.pm.activity.util.DateFormatUtil;
 import com.xzjmyk.pm.activity.util.StringUtils;
+import com.xzjmyk.pm.activity.util.TimeUtils;
 import com.xzjmyk.pm.activity.view.crouton.Crouton;
 import com.xzjmyk.pm.activity.view.wheel.DateTimePicker;
 
@@ -209,26 +210,24 @@ public class VisitReportAddActivity extends BaseActivity implements View.OnClick
                 if (CommonUtil.isNetWorkConnected(ct)) {
                     String start = tv_date_start.getText().toString().trim();
                     String end = tv_date_end.getText().toString().trim();
-                    String current=DateFormatUtil.getStrDate4Date(new Date(),"yyyy-MM-dd HH:mm:ss");
-                    if (start.compareTo(current)<0&&end.compareTo(current)<0){
-                        if (StringUtils.isEmpty(start)) {
-                            Crouton.makeText(ct, "开始时间不能为空");
-                        } else if (StringUtils.isEmpty(end)) {
-                            Crouton.makeText(ct, "截止时间不能为空");
-                        } else if (start.compareTo(end) < 0) {
-                            CommonInterface.getInstance().getCodeByNet("VisitRecord", new CommonInterface.OnResultListener() {
-                                @Override
-                                public void result(boolean isOk, String result, String message) {
-                                    sendHttpResquest(Constants.HTTP_SUCCESS_INIT, result);
-                                }
-                            });
-                        } else {
-                            Crouton.makeText(ct, R.string.end_less_start);
-                        }
-                    }else{
-                        Crouton.makeText(ct, "开始时间不能大于当前时间，结束时间不能大于当前时间！");
+                    String current = TimeUtils.f_long_2_str(System.currentTimeMillis());
+
+                    if (StringUtils.isEmpty(start)) {
+                        Crouton.makeText(ct, "开始时间不能为空");
+                    } else if (StringUtils.isEmpty(end)) {
+                        Crouton.makeText(ct, "截止时间不能为空");
+                    } else if (current.compareTo(end) < 0) {
+                        Crouton.makeText(ct, "截止时间不能大于当前时间");
+                    } else if (start.compareTo(end) < 0) {
+                        CommonInterface.getInstance().getCodeByNet("VisitRecord", new CommonInterface.OnResultListener() {
+                            @Override
+                            public void result(boolean isOk, String result, String message) {
+                                sendHttpResquest(Constants.HTTP_SUCCESS_INIT, result);
+                            }
+                        });
+                    } else {
+                        Crouton.makeText(ct, R.string.end_less_start);
                     }
-                   
                 } else
                     Crouton.makeText(ct, "网络连接错误，请检查网络");
                 break;

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

@@ -119,8 +119,6 @@ public class DestinationActivity extends BaseActivity {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
                 int item = (i - 2) <= 0 ? 0 : (i - 2);
                 MissionModel entity = showList.get(item);
-                Log.i("gongpengming", "item=" + item);
-                Log.i("gongpengming", "entity=" + entity.getCompanyName());
                 if (entity == null) return;
                 if (entity.getStatus() != 2) {//正常公司
                     Intent intent = new Intent();

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

@@ -257,6 +257,7 @@ public class LocationSearchActivity extends BaseActivity {
             List<PoiInfo> chches = poiResult.getAllPoi();
             if (ListUtils.isEmpty(chches)) {
                 if (isChina) {
+                    Log.i("gongpengming","isChina isEmpty(chches)");
                     isChina = false;
                     BaiduMapUtil.getInstence().searchByInput(keyWork, pageNum, listener);
                     return;

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/adapter/OAListAdapter.java

@@ -163,7 +163,11 @@ public class OAListAdapter extends BaseAdapter {
             //当天未完成的不显示任何图标，状态为未完成，超过拜访时间，即第二天0点，添加图标 未完成。
             holder.status_tv.setText("");
             if (isMoreToday) {
-                holder.doit_img.setVisibility(View.GONE);
+                if ("签退".equals(getJSONString(object, "mpd_status"))) {
+                    holder.doit_img.setImageResource(R.drawable.mission_plan_ok);
+                } else {
+                    holder.doit_img.setVisibility(View.GONE);
+                }
             } else {
                 int recid = 0;
                 if (!StringUtils.isEmpty(actdate) && !StringUtils.isEmpty(outdate)) {//签到时间没有

WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/erp/presenter/MissionPresenter.java

@@ -378,7 +378,6 @@ public class MissionPresenter implements IMissionPresenter, HttpHandler.OnResult
             }
             if (!ListUtils.isEmpty(entities))
                 setModels(entities);
-
         }
     }
 

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

@@ -140,7 +140,6 @@ public class CommonInterface implements HttpHandler.OnResultListener {
                 case ADD_OUT_SET_WHAT:
                     if (listener != null)
                         listener.result(true, null, message);
-                    else listener.result(false, null, message);
                     break;
             }
         } catch (NullPointerException e) {

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

@@ -127,6 +127,7 @@ public class AutoErpService extends Service {
                 } else if (intent.getAction().equals(CHANGE_MISSION_TASK)) {//自动外勤任务开启变更
                     log(CHANGE_MISSION_TASK);
                     canMission = intent.getBooleanExtra(CHANGE_MISSION_TASK, true);
+                    log("canMission=" + canMission);
                     if (canMission && !isMissionRuning) {
                         startMissionTask();
                     } else if (!missioning)

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

@@ -711,6 +711,7 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
     }
 
     /**
+     * 第一次进来应用会请求一次数据，并把数据保存到数据库中，保存成功后发送广播，更新轮询
      * 解析处理外勤计划列表并保存到数据库
      *
      * @param array
@@ -763,16 +764,22 @@ public class AutoErpSigninUitl implements HttpHandler.OnResultListener {
                 entities.add(entity);
             }
             if (!ListUtils.isEmpty(entities)) {
-                //TODO 保存到数据库
+                log("保存到数据库成功");
                 ThreadUtil.getInstance().addTask(new Runnable() {
                     @Override
                     public void run() {
                         boolean saveOk = MissionDao.getInstance().updataOrCreate(entities);
                         if (saveOk) {
-                            Intent intent = new Intent();
-                            intent.putExtra(AutoErpService.CHANGE_MISSION_TASK, true);
-                            intent.setAction(AutoErpService.CHANGE_MISSION_TASK);
-                            MyApplication.getInstance().sendBroadcast(intent);
+                            HttpHandler.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);
+                                    MyApplication.getInstance().sendBroadcast(intent);
+                                    log("发送广播成功");
+                                }
+                            });
                         }
                     }
                 });

WeiChat/src/main/java/com/xzjmyk/pm/activity/util/BaiduMapUtil.java

@@ -328,7 +328,7 @@ public class BaiduMapUtil {
     }
 
 
-    public void getDrivingRoute( LatLng from, LatLng to, OnGetRoutePlanResultListener onGetRoutePlanResultListener) {
+    public void getDrivingRoute(LatLng from, LatLng to, OnGetRoutePlanResultListener onGetRoutePlanResultListener) {
         drivingSearch = RoutePlanSearch.newInstance();
         drivingSearch.setOnGetRoutePlanResultListener(onGetRoutePlanResultListener);
         PlanNode stNode = PlanNode.withLocation(from);